Upgrade npm to 1.1.6

* Fix #472 Adds support for os/cpu fields in package.json (Adam Blackburn)
* Don't use existing pkg if explicit
* Install missing deps, even if they are in bundleDependencies
* bundle node-gyp
* Automatically node-gyp build stuff with a bindings.gyp
* Fix #2230 Unpack in place. No folder renaming malarky
* Never create un-listable directories
* Fix cases where an optionalDependency fails to build
* Always ignore .wafpickle-7 files
* fix shrinkwrap test
* Fix: bundleDependencies being re-installed unnecessarily

11 files changed, 72 insertions, 17 deletions

diff --git a/deps/npm/test/packages/npm-test-bundled-git/minimatch-expected.json b/deps/npm/test/packages/npm-test-bundled-git/minimatch-expected.json
new file mode 100644
index 0000000000..62b20d698e
--- /dev/null
+++ b/deps/npm/test/packages/npm-test-bundled-git/minimatch-expected.json
@@ -0,0 +1,29 @@
+{
+  "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)",
+  "name": "minimatch",
+  "description": "a glob matcher in javascript",
+  "version": "0.2.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/minimatch.git"
+  },
+  "main": "minimatch.js",
+  "scripts": {
+    "test": "tap test"
+  },
+  "engines": {
+    "node": "*"
+  },
+  "dependencies": {
+    "lru-cache": "~1.0.5"
+  },
+  "devDependencies": {
+    "tap": "~0.1.3"
+  },
+  "licenses" : [
+    {
+      "type" : "MIT",
+      "url" : "http://github.com/isaacs/minimatch/raw/master/LICENSE"
+    }
+  ]
+}
diff --git a/deps/npm/test/packages/npm-test-bundled-git/package.json b/deps/npm/test/packages/npm-test-bundled-git/package.json
new file mode 100644
index 0000000000..69e0eb7a8b
--- /dev/null
+++ b/deps/npm/test/packages/npm-test-bundled-git/package.json
@@ -0,0 +1,5 @@
+{"name":"npm-test-bundled-git"
+,"scripts":{"test":"node test.js"}
+,"version":"1.2.5"
+,"dependencies":{"glob":"git://github.com/isaacs/node-glob.git#npm-test"}
+,"bundledDependencies":["glob"]}
diff --git a/deps/npm/test/packages/npm-test-bundled-git/test.js b/deps/npm/test/packages/npm-test-bundled-git/test.js
new file mode 100644
index 0000000000..4fcc54cafe
--- /dev/null
+++ b/deps/npm/test/packages/npm-test-bundled-git/test.js
@@ -0,0 +1,4 @@
+var a = require("./node_modules/glob/node_modules/minimatch/package.json")
+var e = require("./minimatch-expected.json")
+var assert = require("assert")
+assert.deepEqual(a, e, "didn't get expected minimatch/package.json")
diff --git a/deps/npm/test/packages/npm-test-env-reader/package.json b/deps/npm/test/packages/npm-test-env-reader/package.json
index ddd5c91abd..99d7fc9307 100644
--- a/deps/npm/test/packages/npm-test-env-reader/package.json
+++ b/deps/npm/test/packages/npm-test-env-reader/package.json
@@ -1,14 +1,14 @@
 { "name":"npm-test-env-reader"
 , "version" : "1.2.3"
 , "scripts" :
-  { "install"       : "./test.sh"
-  , "preinstall"    : "./test.sh"
-  , "preuninstall"  : "./test.sh"
-  , "postuninstall" : "./test.sh"
-  , "test"          : "./test.sh"
-  , "stop"          : "./test.sh"
-  , "start"         : "./test.sh"
-  , "restart"       : "./test.sh"
-  , "foo"           : "./test.sh"
+  { "install"       : "node test.js"
+  , "preinstall"    : "node test.js"
+  , "preuninstall"  : "node test.js"
+  , "postuninstall" : "node test.js"
+  , "test"          : "node test.js"
+  , "stop"          : "node test.js"
+  , "start"         : "node test.js"
+  , "restart"       : "node test.js"
+  , "foo"           : "node test.js"
   }
 }
diff --git a/deps/npm/test/packages/npm-test-env-reader/test.js b/deps/npm/test/packages/npm-test-env-reader/test.js
new file mode 100644
index 0000000000..d6cb7893a7
--- /dev/null
+++ b/deps/npm/test/packages/npm-test-env-reader/test.js
@@ -0,0 +1,9 @@
+var envs = []
+for (var e in process.env) {
+  if (e.match(/npm|^path$/i)) envs.push(e + '=' + process.env[e])
+}
+envs.sort(function (a, b) {
+  return a === b ? 0 : a > b ? -1 : 1
+}).forEach(function (e) {
+  console.log(e)
+})
diff --git a/deps/npm/test/packages/npm-test-env-reader/test.sh b/deps/npm/test/packages/npm-test-env-reader/test.sh
deleted file mode 100755
index b4ca4374ed..0000000000
--- a/deps/npm/test/packages/npm-test-env-reader/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-env | grep npm | sort | uniq
-echo PATH=$PATH
diff --git a/deps/npm/test/packages/npm-test-optional-deps/package.json b/deps/npm/test/packages/npm-test-optional-deps/package.json
index ebcd56832d..56c6f09ed0 100644
--- a/deps/npm/test/packages/npm-test-optional-deps/package.json
+++ b/deps/npm/test/packages/npm-test-optional-deps/package.json
@@ -1,10 +1,12 @@
 { "name": "npm-test-optional-deps"
 , "version": "1.2.5"
+, "scripts": { "test": "node test.js" }
 , "optionalDependencies":
   { "npm-test-foobarzaaakakaka": "http://example.com/"
   , "dnode": "10.999.14234"
-  , "sax": "*"
+  , "sax": "0.3.5"
   , "999 invalid name": "1.2.3"
   , "glob": "some invalid version 99 #! $$ x y z"
+  , "npm-test-failer":"*"
   }
 }
diff --git a/deps/npm/test/packages/npm-test-optional-deps/test.js b/deps/npm/test/packages/npm-test-optional-deps/test.js
new file mode 100644
index 0000000000..2232906d64
--- /dev/null
+++ b/deps/npm/test/packages/npm-test-optional-deps/test.js
@@ -0,0 +1,9 @@
+var fs = require("fs")
+var assert = require("assert")
+var path = require("path")
+
+// sax should be the only dep that ends up installed
+
+var dir = path.resolve(__dirname, "node_modules")
+assert.deepEqual(fs.readdirSync(dir), ["sax"])
+assert.equal(require("sax/package.json").version, "0.3.5")
diff --git a/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json b/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json
index c4f7fbf815..27553c181f 100644
--- a/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json
+++ b/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json
@@ -7,11 +7,11 @@
       "from": "https://raw.github.com/gist/1837112/index.js"
     },
     "glob": {
-      "version": "3.1.4",
-      "from": "git://github.com/isaacs/node-glob.git",
+      "version": "3.1.5",
+      "from": "git://github.com/isaacs/node-glob.git#npm-test",
       "dependencies": {
         "minimatch": {
-          "version": "0.2.0",
+          "version": "0.2.1",
           "dependencies": {
             "lru-cache": {
               "version": "1.0.5"
diff --git a/deps/npm/test/packages/npm-test-shrinkwrap/package.json b/deps/npm/test/packages/npm-test-shrinkwrap/package.json
index 34a8abc21c..b2684a1233 100644
--- a/deps/npm/test/packages/npm-test-shrinkwrap/package.json
+++ b/deps/npm/test/packages/npm-test-shrinkwrap/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "dependencies": {
     "npm-test-single-file": "https://raw.github.com/gist/1837112/index.js",
-    "glob": "git://github.com/isaacs/node-glob.git",
+    "glob": "git://github.com/isaacs/node-glob.git#npm-test",
     "minimatch": "~0.1.0"
   },
   "scripts": {
diff --git a/deps/npm/test/update-test.sh b/deps/npm/test/update-test.sh
index f72c90dd98..f72c90dd98 100755..100644
--- a/deps/npm/test/update-test.sh
+++ b/deps/npm/test/update-test.sh