Bump semver to version 3

This makes the '^' operator stricter for 0.x.y versions, even if 'x' is
not 0.

As a direct result, several *other* deps had to be updated, because they
either depended on semver 2.x, or because the new stricter rules meant
that they (or their deps) were no longer valid.

The update to 'read-installed', in particular, causes a test failure.
That update must be rolled back, or the test made to pass, prior to a
stable npm 2.0.0 release going out.

5 files changed, 37 insertions, 8 deletions

diff --git a/node_modules/read-installed/node_modules/util-extend/package.json b/node_modules/read-installed/node_modules/util-extend/package.json
index 96f5a3f51..cbcbed27f 100644
--- a/node_modules/read-installed/node_modules/util-extend/package.json
+++ b/node_modules/read-installed/node_modules/util-extend/package.json
@@ -22,7 +22,7 @@
     "shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc",
     "tarball": "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
   },
-  "_from": "util-extend@^1.0.1",
+  "_from": "util-extend@>=1.0.1-0 <2.0.0-0",
   "_npmVersion": "1.3.4",
   "_npmUser": {
     "name": "isaacs",
@@ -36,5 +36,6 @@
   ],
   "directories": {},
   "_shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc",
-  "_resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
+  "_resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz",
+  "homepage": "https://github.com/isaacs/util-extend"
 }
diff --git a/node_modules/read-installed/package.json b/node_modules/read-installed/package.json
index de958a544..dc869c6f6 100644
--- a/node_modules/read-installed/package.json
+++ b/node_modules/read-installed/package.json
@@ -1,7 +1,7 @@
 {
   "name": "read-installed",
   "description": "Read all the installed packages in a folder, and return a tree structure with all the data.",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/read-installed"
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "read-package-json": "1",
-    "semver": "2",
+    "semver": "2 || 3",
     "slide": "~1.1.3",
     "util-extend": "^1.0.1",
     "graceful-fs": "2 || 3"
@@ -31,12 +31,12 @@
   },
   "readme": "# read-installed\n\nRead all the installed packages in a folder, and return a tree\nstructure with all the data.\n\nnpm uses this.\n\n## 2.0.0\n\nBreaking changes in `2.0.0`:\n\nThe second argument is now an `Object` that contains the following keys:\n\n * `depth` optional, defaults to Infinity\n * `log` optional log Function\n * `dev` optional, default false, set to true to include devDependencies\n\n## Usage\n\n```javascript\nvar readInstalled = require(\"read-installed\")\n// optional options\nvar options = { dev: false, log: fn, depth: 2 }\nreadInstalled(folder, options, function (er, data) {\n  ...\n})\n```\n",
   "readmeFilename": "README.md",
-  "gitHead": "2595631e4d3cbd64b26cee63dc3b5ce9f53e3533",
+  "gitHead": "4b38f9ed81e9c533764241c2ee45fe96ef31e2f8",
   "bugs": {
     "url": "https://github.com/isaacs/read-installed/issues"
   },
   "homepage": "https://github.com/isaacs/read-installed",
-  "_id": "read-installed@2.0.5",
-  "_shasum": "761eda1fd2dc322f8e77844a8bf1ddedbcfc754b",
+  "_id": "read-installed@2.0.7",
+  "_shasum": "a82157a5e273576c57f230ecec3702ab215a6d6c",
   "_from": "read-installed@latest"
 }
diff --git a/node_modules/read-installed/read-installed.js b/node_modules/read-installed/read-installed.js
index 9b5a47962..3574e6c2f 100644
--- a/node_modules/read-installed/read-installed.js
+++ b/node_modules/read-installed/read-installed.js
@@ -330,7 +330,7 @@ function findUnmet (obj, opts) {
     } else if (!semver.satisfies(dependency.version, peerDeps[d], true)) {
       dependency.peerInvalid = true
     } else {
-      dependency.extraneous = false
+      dependency.extraneous = dependency.extraneous || false
     }
   })
 
diff --git a/node_modules/read-installed/test/fixtures/grandparent-peer-dev/package.json b/node_modules/read-installed/test/fixtures/grandparent-peer-dev/package.json
new file mode 100644
index 000000000..1a229c1cf
--- /dev/null
+++ b/node_modules/read-installed/test/fixtures/grandparent-peer-dev/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "example",
+  "version": "0.0.0",
+  "devDependencies": {
+    "plugin-wrapper": "0.0.0",
+    "framework": "0.0.0"
+  }
+}
diff --git a/node_modules/read-installed/test/grandparent-peer-dev.js b/node_modules/read-installed/test/grandparent-peer-dev.js
new file mode 100644
index 000000000..fd7c2d2bc
--- /dev/null
+++ b/node_modules/read-installed/test/grandparent-peer-dev.js
@@ -0,0 +1,20 @@
+var readInstalled = require('../read-installed.js')
+var test = require('tap').test
+var path = require('path');
+
+function allValid(t, map) {
+  var deps = Object.keys(map.dependencies || {})
+  deps.forEach(function (dep) {
+    t.ok(map.dependencies[dep].extraneous, 'dependency ' + dep + ' of ' + map.name + ' is extraneous')
+  })
+}
+
+test('grandparent dev peer dependencies should be extraneous', function(t) {
+  readInstalled(
+    path.join(__dirname, 'fixtures/grandparent-peer-dev'),
+    { log: console.error },
+    function(err, map) {
+      allValid(t, map)
+      t.end()
+    })
+})