deps: upgrade npm to 2.2.0

PR-URL: https://github.com/iojs/io.js/pull/479
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Rod Vagg <rod@vagg.org>

3 files changed, 23 insertions, 15 deletions

diff --git a/deps/npm/lib/config.js b/deps/npm/lib/config.js
index f51156aad4..d2a6a89f69 100644
--- a/deps/npm/lib/config.js
+++ b/deps/npm/lib/config.js
@@ -84,7 +84,7 @@ function edit (cb) {
                        ]
                      )
               .concat(Object.keys(npmconf.defaults).reduce(function (arr, key) {
-                var obj = {};
+                var obj = {}
                 obj[key] = npmconf.defaults[key]
                 if (key === "logstream") return arr
                 return arr.concat(
@@ -138,7 +138,7 @@ function set (key, val, cb) {
 
 function get (key, cb) {
   if (!key) return list(cb)
-  if (key.charAt(0) === "_") {
+  if (!public(key)) {
     return cb(new Error("---sekretz---"))
   }
   console.log(npm.config.get(key))
@@ -150,7 +150,9 @@ function sort (a, b) {
 }
 
 function public (k) {
-  return !(k.charAt(0) === "_" || types[k] !== types[k])
+  return !(k.charAt(0) === "_" ||
+           k.indexOf(":_") !== -1 ||
+           types[k] !== types[k])
 }
 
 function getKeys (data) {
diff --git a/deps/npm/lib/run-script.js b/deps/npm/lib/run-script.js
index fd26a0c43b..ce8ea0f13a 100644
--- a/deps/npm/lib/run-script.js
+++ b/deps/npm/lib/run-script.js
@@ -125,9 +125,17 @@ function run (pkg, wd, cmd, args, cb) {
   } else {
     if (!pkg.scripts[cmd]) {
       if (cmd === "test") {
-        pkg.scripts.test = "echo \"Error: no test specified\"";
+        pkg.scripts.test = "echo \"Error: no test specified\""
+      } else if (cmd === "env") {
+        if (process.platform === "win32") {
+          log.verbose("run-script using default platform env: SET (Windows)")
+          pkg.scripts[cmd] = "SET"
+        } else {
+          log.verbose("run-script using default platform env: env (Unix)")
+          pkg.scripts[cmd] = "env"
+        }
       } else {
-        return cb(new Error("missing script: " + cmd));
+        return cb(new Error("missing script: " + cmd))
       }
     }
     cmds = [cmd]
@@ -140,7 +148,9 @@ function run (pkg, wd, cmd, args, cb) {
   log.verbose("run-script", cmds)
   chain(cmds.map(function (c) {
     // pass cli arguments after -- to script.
-    if (pkg.scripts[c] && c === cmd) pkg.scripts[c] = pkg.scripts[c] + joinArgs(args)
+    if (pkg.scripts[c] && c === cmd) {
+      pkg.scripts[c] = pkg.scripts[c] + joinArgs(args)
+    }
 
     // when running scripts explicitly, assume that they're trusted.
     return [lifecycle, pkg, c, wd, true]
diff --git a/deps/npm/lib/version.js b/deps/npm/lib/version.js
index 930708676e..d4af41be57 100644
--- a/deps/npm/lib/version.js
+++ b/deps/npm/lib/version.js
@@ -36,11 +36,10 @@ function version (args, silent, cb_) {
       data = JSON.parse(data)
     }
     catch (er) {
-      log.error("version", "Bad package.json data", data)
-      return cb_(er)
+      data = null
     }
 
-    if (!args.length && data) return dump(data.name, data.version, cb_)
+    if (!args.length) return dump(data, cb_)
 
     if (er) {
       log.error("version", "No package.json found")
@@ -93,15 +92,12 @@ function updateShrinkwrap (newVersion, cb) {
   })
 }
 
-function dump (name, version, cb) {
-  assert(typeof name === "string", "package name must be passed to version dump")
-  assert(typeof version === "string", "package version must be passed to version dump")
-
+function dump (data, cb) {
   var v = {}
 
-  if (name) v[name] = version
+  if (data && data.name && data.version) v[data.name] = data.version
   v.npm = npm.version
-  Object.keys(process.versions).forEach(function (k) {
+  Object.keys(process.versions).sort().forEach(function (k) {
     v[k] = process.versions[k]
   })