diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-22 08:42:05 -0800 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-22 08:42:05 -0800 |
commit | fdc3cc9d7a2d1e12c74fc0c0939d22f40e58b52b (patch) | |
tree | 0e73ef7de9054f7d9b2fe90a5aec9ad072716865 /deps/npm/lib/docs.js | |
parent | 6514a4128c3e7aa6c1bb1c6f3f018412fa76e5d9 (diff) | |
parent | 25f9e92813eda927c3d3eaa56dab3a397afadebe (diff) | |
download | node-merge-test.tar.gz |
Merge remote-tracking branch 'upstream/v0.10'merge-test
Conflicts:
node.gyp
Diffstat (limited to 'deps/npm/lib/docs.js')
-rw-r--r-- | deps/npm/lib/docs.js | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/deps/npm/lib/docs.js b/deps/npm/lib/docs.js index 0f59572ac..2abbd62f2 100644 --- a/deps/npm/lib/docs.js +++ b/deps/npm/lib/docs.js @@ -5,7 +5,6 @@ docs.usage += "\n" docs.usage += "npm docs ." docs.completion = function (opts, cb) { - if (opts.conf.argv.remain.length > 2) return cb() registry.get("/-/short", 60000, function (er, list) { return cb(null, list || []) }) @@ -22,8 +21,20 @@ function url (json) { } function docs (args, cb) { - var project = args[0] || '.' - , package = path.resolve(process.cwd(), "package.json") + args = args || [] + var pending = args.length + if (!pending) return getDoc('.', cb) + args.forEach(function(proj) { + getDoc(proj, function(err) { + if (err) return cb(err) + --pending || cb() + }) + }) +} + +function getDoc (project, cb) { + project = project || '.' + var package = path.resolve(process.cwd(), "package.json") if (project === '.' || project === './') { try { |