read-installed@0.2.2

4 files changed, 37 insertions, 36 deletions

diff --git a/node_modules/read-installed/README.md b/node_modules/read-installed/README.md
index 59e882fb0..616371ef9 100644
--- a/node_modules/read-installed/README.md
+++ b/node_modules/read-installed/README.md
@@ -10,7 +10,7 @@ npm uses this.
 ```javascript
 var readInstalled = require("read-installed")
 // depth is optional, defaults to Infinity
-readInstalled(folder, depth, function (er, data) {
+readInstalled(folder, depth, logFunction, function (er, data) {
   ...
 })
 ```
diff --git a/node_modules/read-installed/package.json b/node_modules/read-installed/package.json
index c20eada02..c76887427 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": "0.1.1",
+  "version": "0.2.2",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/read-installed"
@@ -11,23 +11,24 @@
     "test": "node test/basic.js"
   },
   "dependencies": {
-    "semver": "1.x",
+    "semver": "2",
     "slide": "~1.1.3",
-    "read-package-json": "0",
-    "graceful-fs": "~1.2.0",
-    "npmlog": "0"
+    "read-package-json": "1",
+    "graceful-fs": "~1.2.0"
   },
   "optionalDependencies": {
-    "graceful-fs": "~1.2.0",
-    "npmlog": "0"
+    "graceful-fs": "~1.2.0"
   },
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "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## Usage\n\n```javascript\nvar readInstalled = require(\"read-installed\")\n// depth is optional, defaults to Infinity\nreadInstalled(folder, depth, function (er, data) {\n  ...\n})\n```\n",
+  "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## Usage\n\n```javascript\nvar readInstalled = require(\"read-installed\")\n// depth is optional, defaults to Infinity\nreadInstalled(folder, depth, logFunction, function (er, data) {\n  ...\n})\n```\n",
   "readmeFilename": "README.md",
-  "_id": "read-installed@0.1.1",
-  "_from": "read-installed@0"
+  "bugs": {
+    "url": "https://github.com/isaacs/read-installed/issues"
+  },
+  "_id": "read-installed@0.2.2",
+  "_from": "read-installed@latest"
 }
diff --git a/node_modules/read-installed/read-installed.js b/node_modules/read-installed/read-installed.js
index 4babfc862..f7e73be26 100644
--- a/node_modules/read-installed/read-installed.js
+++ b/node_modules/read-installed/read-installed.js
@@ -93,13 +93,6 @@ try {
   var fs = require("fs")
 }
 
-try {
-  var log = require("npmlog")
-} catch (_) {
-  var log = { verbose: noop, info: noop, warn: noop, error: noop }
-  function noop () {}
-}
-
 var path = require("path")
 var asyncMap = require("slide").asyncMap
 var semver = require("semver")
@@ -108,13 +101,21 @@ var url = require("url")
 
 module.exports = readInstalled
 
-function readInstalled (folder, depth, cb) {
-  if (typeof cb !== "function") cb = depth, depth = Infinity
+function readInstalled (folder, depth_, log_, cb_) {
+  var depth = Infinity, log = function () {}, cb
+  for (var i = 1; i < arguments.length - 1; i++) {
+    if (typeof arguments[i] === 'number')
+      depth = arguments[i]
+    else if (typeof arguments[i] === 'function')
+      log = arguments[i]
+  }
+  cb = arguments[i]
+
   readInstalled_(folder, null, null, null, 0, depth, function (er, obj) {
     if (er) return cb(er)
     // now obj has all the installed things, where they're installed
     // figure out the inheritance links, now that the object is built.
-    resolveInheritance(obj)
+    resolveInheritance(obj, log)
     cb(null, obj)
   })
 }
@@ -178,8 +179,8 @@ function readInstalled_ (folder, parent, name, reqver, depth, maxDepth, cb) {
 
     // "foo":"http://blah" is always presumed valid
     if (reqver
-        && semver.validRange(reqver)
-        && !semver.satisfies(obj.version, reqver)) {
+        && semver.validRange(reqver, true)
+        && !semver.satisfies(obj.version, reqver, true)) {
       obj.invalid = true
     }
 
@@ -236,7 +237,7 @@ function readInstalled_ (folder, parent, name, reqver, depth, maxDepth, cb) {
 
 // starting from a root object, call findUnmet on each layer of children
 var riSeen = []
-function resolveInheritance (obj) {
+function resolveInheritance (obj, log) {
   if (typeof obj !== "object") return
   if (riSeen.indexOf(obj) !== -1) return
   riSeen.push(obj)
@@ -244,18 +245,18 @@ function resolveInheritance (obj) {
     obj.dependencies = {}
   }
   Object.keys(obj.dependencies).forEach(function (dep) {
-    findUnmet(obj.dependencies[dep])
+    findUnmet(obj.dependencies[dep], log)
   })
   Object.keys(obj.dependencies).forEach(function (dep) {
-    resolveInheritance(obj.dependencies[dep])
+    resolveInheritance(obj.dependencies[dep], log)
   })
-  findUnmet(obj)
+  findUnmet(obj, log)
 }
 
 // find unmet deps by walking up the tree object.
 // No I/O
 var fuSeen = []
-function findUnmet (obj) {
+function findUnmet (obj, log) {
   if (fuSeen.indexOf(obj) !== -1) return
   fuSeen.push(obj)
   //console.error("find unmet", obj.name, obj.parent && obj.parent.name)
@@ -280,12 +281,12 @@ function findUnmet (obj) {
         if ( typeof deps[d] === "string"
             // url deps presumed innocent.
             && !url.parse(deps[d]).protocol
-            && !semver.satisfies(found.version, deps[d])) {
+            && !semver.satisfies(found.version, deps[d], true)) {
           // the bad thing will happen
-          log.warn("unmet dependency", obj.path + " requires "+d+"@'"+deps[d]
-                  +"' but will load\n"
-                  +found.path+",\nwhich is version "+found.version
-                  )
+          log("unmet dependency", obj.path + " requires "+d+"@'"+deps[d]
+             +"' but will load\n"
+             +found.path+",\nwhich is version "+found.version
+             )
           found.invalid = true
         } else {
           found.extraneous = false
@@ -314,12 +315,11 @@ function findUnmet (obj) {
 
     dependency.extraneous = false
 
-    if (!semver.satisfies(dependency.version, peerDeps[d])) {
+    if (!semver.satisfies(dependency.version, peerDeps[d], true)) {
       dependency.peerInvalid = true
     }
   })
 
-  log.verbose("readInstalled", "returning", obj._id)
   return obj
 }
 
diff --git a/node_modules/read-installed/test/basic.js b/node_modules/read-installed/test/basic.js
index 0f833203f..2b0c03983 100644
--- a/node_modules/read-installed/test/basic.js
+++ b/node_modules/read-installed/test/basic.js
@@ -3,7 +3,7 @@ var util = require("util")
 console.error("testing")
 
 var called = 0
-readInstalled(process.cwd(), function (er, map) {
+readInstalled(process.cwd(), console.error, function (er, map) {
   console.error(called ++)
   if (er) return console.error(er.stack || er.message)
   cleanup(map)