deps: upgrade npm to 2.11.0

PR-URL: https://github.com/iojs/io.js/pull/1829
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

5 files changed, 66 insertions, 7 deletions

diff --git a/deps/npm/test/fixtures/config/userconfig-with-gc b/deps/npm/test/fixtures/config/userconfig-with-gc
index 824d492bce..7268fcb3c6 100644
--- a/deps/npm/test/fixtures/config/userconfig-with-gc
+++ b/deps/npm/test/fixtures/config/userconfig-with-gc
@@ -1,4 +1,4 @@
-globalconfig=/Users/rebecca/code/npm-release/test/fixtures/config/globalconfig
+globalconfig=/Users/ogd/Documents/projects/npm/npm/test/fixtures/config/globalconfig
 email=i@izs.me
 env-thing=asdf
 init.author.name=Isaac Z. Schlueter
diff --git a/deps/npm/test/tap/ignore-scripts.js b/deps/npm/test/tap/ignore-scripts.js
index a446579cdf..8c0d350198 100644
--- a/deps/npm/test/tap/ignore-scripts.js
+++ b/deps/npm/test/tap/ignore-scripts.js
@@ -37,7 +37,10 @@ var json = {
     poststart: 'exit 123',
     prerestart: 'exit 123',
     restart: 'exit 123',
-    postrestart: 'exit 123'
+    postrestart: 'exit 123',
+    preversion: 'exit 123',
+    version: 'exit 123',
+    postversion: 'exit 123'
   }
 }
 
@@ -69,7 +72,8 @@ var scripts = [
   'pretest', 'test', 'posttest',
   'prestop', 'stop', 'poststop',
   'prestart', 'start', 'poststart',
-  'prerestart', 'restart', 'postrestart'
+  'prerestart', 'restart', 'postrestart',
+  'preversion', 'version', 'postversion'
 ]
 
 scripts.forEach(function (script) {
diff --git a/deps/npm/test/tap/scripts-whitespace-windows.js b/deps/npm/test/tap/scripts-whitespace-windows.js
index d24a24d4d8..f23f062571 100644
--- a/deps/npm/test/tap/scripts-whitespace-windows.js
+++ b/deps/npm/test/tap/scripts-whitespace-windows.js
@@ -72,7 +72,6 @@ test('setup', function (t) {
   }, function (err, code, stdout, stderr) {
     t.ifErr(err, 'npm i ' + dep + ' finished without error')
     t.equal(code, 0, 'npm i ' + dep + ' exited ok')
-    console.log('stderr', stderr)
     t.notOk(stderr, 'no output stderr')
     t.end()
   })
@@ -81,8 +80,7 @@ test('setup', function (t) {
 test('test', function (t) {
   common.npm(['run', 'foo'], EXEC_OPTS, function (err, code, stdout, stderr) {
     stderr = stderr.trim()
-    if (stderr)
-      console.error(stderr)
+    if (stderr) console.error(stderr)
     t.ifErr(err, 'npm run finished without error')
     t.equal(code, 0, 'npm run exited ok')
     t.notOk(stderr, 'no output stderr: ' + stderr)
diff --git a/deps/npm/test/tap/version-no-git.js b/deps/npm/test/tap/version-no-git.js
index e5a5d23467..0acd0ab6a5 100644
--- a/deps/npm/test/tap/version-no-git.js
+++ b/deps/npm/test/tap/version-no-git.js
@@ -24,7 +24,7 @@ test("npm version <semver> in a git repo without the git binary", function(t) {
     })
 
     version(["patch"], function(err) {
-      if (err) return t.fail("Error performing version patch")
+      if (! t.error(err)) return t.end()
       var p = path.resolve(pkg, "package")
       var testPkg = require(p)
       t.equal("0.0.1", testPkg.version, "\"" + testPkg.version+"\" === \"0.0.1\"")
diff --git a/deps/npm/test/tap/view.js b/deps/npm/test/tap/view.js
index 5d371d6308..dcfd281011 100644
--- a/deps/npm/test/tap/view.js
+++ b/deps/npm/test/tap/view.js
@@ -250,6 +250,63 @@ test("npm view <package name> <field>", function (t) {
   })
 })
 
+test("npm view with invalid package name", function (t) {
+  var invalidName = "InvalidPackage"
+      obj = {}
+  obj["/" + invalidName] = [404, {"error": "not found"}]
+
+  mr({port : common.port, mocks: {"get": obj}}, function (er, s) {
+    common.npm([
+      "view"
+    , invalidName
+    , "--registry=" + common.registry
+    ], {}, function (err, code, stdout, stderr) {
+      t.ifError(err, "view command finished successfully")
+      t.equal(code, 1, "exit not ok")
+
+      t.similar(stderr, new RegExp("is not in the npm registry"),
+        "Package should NOT be found")
+
+      t.dissimilar(stderr, new RegExp("use the name yourself!"),
+        "Suggestion should not be there")
+
+      t.similar(stderr, new RegExp("name can no longer contain capital letters"),
+        "Suggestion about Capital letter should be there")
+
+      s.close()
+      t.end()
+    })
+  })
+})
+
+
+test("npm view with valid but non existent package name", function (t) {
+  mr({port : common.port, mocks: {
+      "get": {
+          "/valid-but-non-existent-package" : [404, {"error": "not found"}]
+      }
+  }}, function (er, s) {
+    common.npm([
+      "view"
+    , "valid-but-non-existent-package"
+    , "--registry=" + common.registry
+    ], {}, function (err, code, stdout, stderr) {
+      t.ifError(err, "view command finished successfully")
+      t.equal(code, 1, "exit not ok")
+
+      t.similar(stderr,
+        new RegExp("'valid-but-non-existent-package' is not in the npm registry\."),
+        "Package should NOT be found")
+
+      t.similar(stderr, new RegExp("use the name yourself!"),
+        "Suggestion should be there")
+
+      s.close()
+      t.end()
+    })
+  })
+})
+
 test("cleanup", function (t) {
   process.chdir(osenv.tmpdir())
   rimraf.sync(t1dir)