npm: upgrade to 1.4.6npm-1.4.6

9 files changed, 108 insertions, 16 deletions

diff --git a/deps/npm/node_modules/read-installed/test/basic.js b/deps/npm/node_modules/read-installed/test/basic.js
index a6c5ff546..4d83cd0ca 100644
--- a/deps/npm/node_modules/read-installed/test/basic.js
+++ b/deps/npm/node_modules/read-installed/test/basic.js
@@ -1,5 +1,5 @@
 var readInstalled = require("../read-installed.js")
-var json = require("../package.json")
+var json = require("./fixtures/package.json")
 var known = [].concat(Object.keys(json.dependencies)
   , Object.keys(json.optionalDependencies)
   , Object.keys(json.devDependencies)).sort()
@@ -8,6 +8,7 @@ var path = require("path")
 
 test("make sure that it works", function (t) {
   readInstalled(path.join(__dirname, "../"), {
+    dev: true,
     log: console.error
   }, function (er, map) {
     t.notOk(er, "er should be bull")
@@ -21,6 +22,7 @@ test("make sure that it works", function (t) {
     t.end()
   })
 })
+
 var seen = []
 function cleanup (map) {
   if (seen.indexOf(map) !== -1) return
diff --git a/deps/npm/node_modules/read-installed/test/depth-0.js b/deps/npm/node_modules/read-installed/test/depth-0.js
new file mode 100644
index 000000000..16dc6c525
--- /dev/null
+++ b/deps/npm/node_modules/read-installed/test/depth-0.js
@@ -0,0 +1,25 @@
+var readInstalled = require("../read-installed.js")
+var test = require("tap").test
+var json = require("../package.json")
+var path = require("path")
+var known = [].concat(Object.keys(json.dependencies)
+  , Object.keys(json.optionalDependencies)
+  , Object.keys(json.devDependencies)).sort()
+
+test("make sure that it works with depth=0", function (t) {
+  readInstalled(path.join(__dirname, "../"), {
+    depth: 0
+  }, function (er, map) {
+    t.notOk(er, "er should be bull")
+    t.ok(map, "map should be data")
+    if (er) return console.error(er.stack || er.message)
+    // Exclude self from dependencies when depth = 0
+    delete map.dependencies[json.name]
+    var subdeps = Object.keys(map.dependencies).reduce(function(acc, dep) {
+      acc += Object.keys(map.dependencies[dep].dependencies).length;
+      return acc;
+    }, 0);
+    t.equal(subdeps, 0, "there should be no sub dependencies")
+    t.end()
+  })
+})
diff --git a/deps/npm/node_modules/read-installed/test/depth-1.js b/deps/npm/node_modules/read-installed/test/depth-1.js
new file mode 100644
index 000000000..977c9276f
--- /dev/null
+++ b/deps/npm/node_modules/read-installed/test/depth-1.js
@@ -0,0 +1,23 @@
+var readInstalled = require("../read-installed.js")
+var test = require("tap").test
+var json = require("../package.json")
+var path = require("path")
+var known = [].concat(Object.keys(json.dependencies)
+  , Object.keys(json.optionalDependencies)
+  , Object.keys(json.devDependencies)).sort()
+
+test("make sure that it works with depth=1", function (t) {
+  readInstalled(path.join(__dirname, "../"), {
+    depth: 1
+  }, function (er, map) {
+    t.notOk(er, "er should be bull")
+    t.ok(map, "map should be data")
+    if (er) return console.error(er.stack || er.message)
+    var subdeps = Object.keys(map.dependencies).reduce(function(acc, dep) {
+      acc += Object.keys(map.dependencies[dep].dependencies).length;
+      return acc;
+    }, 0);
+    t.notEqual(subdeps, 0, "there should some sub dependencies")
+    t.end()
+  })
+})
diff --git a/deps/npm/node_modules/read-installed/test/dev.js b/deps/npm/node_modules/read-installed/test/dev.js
index 104761745..f6f4857bb 100644
--- a/deps/npm/node_modules/read-installed/test/dev.js
+++ b/deps/npm/node_modules/read-installed/test/dev.js
@@ -1,6 +1,6 @@
 var readInstalled = require("../read-installed.js")
 var test = require("tap").test
-var json = require("../package.json")
+var json = require("./fixtures/package.json")
 var path = require("path")
 var known = [].concat(Object.keys(json.dependencies)
   , Object.keys(json.optionalDependencies)
@@ -8,8 +8,9 @@ var known = [].concat(Object.keys(json.dependencies)
 
 test("make sure that it works without dev deps", function (t) {
   readInstalled(path.join(__dirname, "../"), {
-    log: console.error
-    , dev: true }, function (er, map) {
+    log: console.error,
+    dev: false
+  }, function (er, map) {
     t.notOk(er, "er should be bull")
     t.ok(map, "map should be data")
     if (er) return console.error(er.stack || er.message)
diff --git a/deps/npm/node_modules/read-installed/test/extraneous.js b/deps/npm/node_modules/read-installed/test/extraneous.js
new file mode 100644
index 000000000..2cc0d04e7
--- /dev/null
+++ b/deps/npm/node_modules/read-installed/test/extraneous.js
@@ -0,0 +1,17 @@
+var readInstalled = require('../read-installed.js')
+var test = require('tap').test
+var path = require('path');
+
+test('extraneous detected', function(t) {
+  // This test verifies read-installed#16
+  readInstalled(
+    path.join(__dirname, 'fixtures/extraneous-detected'),
+    { log: console.error },
+    function(err, map) {
+      t.ok(map.dependencies.foo.extraneous, 'foo is extraneous, it\'s not required by any module')
+      t.ok(map.dependencies.bar.extraneous, 'bar is extraneous, it\'s not required by any module')
+      t.notOk(map.dependencies.asdf.extraneous, 'asdf is not extraneous, it\'s required by ghjk')
+      t.notOk(map.dependencies.ghjk.extraneous, 'ghjk is not extraneous, it\'s required by our root module')
+      t.end();
+    })
+})
diff --git a/deps/npm/node_modules/read-installed/test/fixtures/extraneous-detected/package.json b/deps/npm/node_modules/read-installed/test/fixtures/extraneous-detected/package.json
new file mode 100644
index 000000000..f61531551
--- /dev/null
+++ b/deps/npm/node_modules/read-installed/test/fixtures/extraneous-detected/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "extraneous-detected",
+  "version": "0.0.0",
+  "dependencies": {
+    "ghjk": "0.0.0"
+  }
+}
diff --git a/deps/npm/node_modules/read-installed/test/fixtures/package.json b/deps/npm/node_modules/read-installed/test/fixtures/package.json
new file mode 100644
index 000000000..8f4f11916
--- /dev/null
+++ b/deps/npm/node_modules/read-installed/test/fixtures/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "read-installed",
+  "description": "Read all the installed packages in a folder, and return a tree structure with all the data.",
+  "version": "1.0.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/read-installed"
+  },
+  "main": "read-installed.js",
+  "scripts": {
+    "test": "tap ./test/"
+  },
+  "dependencies": {
+    "semver": "2",
+    "slide": "~1.1.3",
+    "read-package-json": "1",
+    "util-extend":"1"
+  },
+  "optionalDependencies": {
+    "graceful-fs": "~2"
+  },
+  "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
+  "license": "ISC",
+  "devDependencies": {
+    "tap": "~0.4.8"
+  }
+}
diff --git a/deps/npm/node_modules/read-installed/test/fixtures/peer-at-latest/node_modules/strong-task-emitter/package.json b/deps/npm/node_modules/read-installed/test/fixtures/peer-at-latest/node_modules/strong-task-emitter/package.json
deleted file mode 100644
index 8824f5387..000000000
--- a/deps/npm/node_modules/read-installed/test/fixtures/peer-at-latest/node_modules/strong-task-emitter/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "strong-task-emitter",
-  "version": "0.0.4",
-  "dependencies": {
-    "debug": "latest"
-  },
-  "_id": "strong-task-emitter@0.0.4",
-  "_from": "strong-task-emitter@0.0.4",
-  "_resolved": "https://registry.npmjs.org/strong-task-emitter/-/strong-task-emitter-0.0.4.tgz"
-}
diff --git a/deps/npm/node_modules/read-installed/test/noargs.js b/deps/npm/node_modules/read-installed/test/noargs.js
index 0de5ba430..a84a8f4cf 100644
--- a/deps/npm/node_modules/read-installed/test/noargs.js
+++ b/deps/npm/node_modules/read-installed/test/noargs.js
@@ -1,6 +1,6 @@
 var readInstalled = require("../read-installed.js")
 var test = require("tap").test
-var json = require("../package.json")
+var json = require("./fixtures/package.json")
 var path = require("path")
 var known = [].concat(Object.keys(json.dependencies)
   , Object.keys(json.optionalDependencies)
@@ -14,7 +14,7 @@ test("make sure that it works without dev deps", function (t) {
     var deps = Object.keys(map.dependencies).sort()
     t.equal(deps.length, known.length, "array lengths are equal")
     t.deepEqual(deps, known, "arrays should be equal")
-    t.notOk(map.dependencies.tap.extraneous, 'extraneous is set on devDep')
+    t.ok(map.dependencies.tap.extraneous, 'extraneous is set on devDep')
     t.end()
   })
 })