From 33a9ac6087732da48e7d12ea7f7fbb41926fe46c Mon Sep 17 00:00:00 2001 From: isaacs Date: Sat, 5 May 2012 22:33:06 -0700 Subject: Upgrade npm to 1.1.21 Somehow this got downgraded in the last v0.6 merge. Very strange. --- deps/npm/.npmignore | 4 + deps/npm/AUTHORS | 14 + deps/npm/LICENSE | 18 +- deps/npm/Makefile | 2 +- deps/npm/bin/npm-cli.js | 7 + deps/npm/bin/npm-get-uid-gid.js | 16 - deps/npm/bin/npm.cmd | 8 +- deps/npm/doc/api/ls.md | 6 + deps/npm/doc/cli/changelog.md | 44 + deps/npm/doc/cli/coding-style.md | 4 +- deps/npm/doc/cli/config.md | 72 +- deps/npm/doc/cli/developers.md | 11 + deps/npm/doc/cli/index.md | 8 + deps/npm/doc/cli/install.md | 130 +-- deps/npm/doc/cli/json.md | 47 +- deps/npm/doc/cli/list.md | 7 + deps/npm/doc/cli/scripts.md | 14 + deps/npm/html/api/bin.html | 2 +- deps/npm/html/api/bugs.html | 2 +- deps/npm/html/api/commands.html | 2 +- deps/npm/html/api/config.html | 2 +- deps/npm/html/api/deprecate.html | 2 +- deps/npm/html/api/docs.html | 2 +- deps/npm/html/api/edit.html | 2 +- deps/npm/html/api/explore.html | 2 +- deps/npm/html/api/help-search.html | 2 +- deps/npm/html/api/init.html | 2 +- deps/npm/html/api/install.html | 2 +- deps/npm/html/api/link.html | 2 +- deps/npm/html/api/load.html | 2 +- deps/npm/html/api/ls.html | 8 +- deps/npm/html/api/npm.html | 4 +- deps/npm/html/api/outdated.html | 2 +- deps/npm/html/api/owner.html | 2 +- deps/npm/html/api/pack.html | 2 +- deps/npm/html/api/prefix.html | 2 +- deps/npm/html/api/prune.html | 2 +- deps/npm/html/api/publish.html | 2 +- deps/npm/html/api/rebuild.html | 2 +- deps/npm/html/api/restart.html | 2 +- deps/npm/html/api/root.html | 2 +- deps/npm/html/api/run-script.html | 2 +- deps/npm/html/api/search.html | 2 +- deps/npm/html/api/shrinkwrap.html | 2 +- deps/npm/html/api/start.html | 2 +- deps/npm/html/api/stop.html | 2 +- deps/npm/html/api/submodule.html | 2 +- deps/npm/html/api/tag.html | 2 +- deps/npm/html/api/test.html | 2 +- deps/npm/html/api/uninstall.html | 2 +- deps/npm/html/api/unpublish.html | 2 +- deps/npm/html/api/update.html | 2 +- deps/npm/html/api/version.html | 2 +- deps/npm/html/api/view.html | 2 +- deps/npm/html/api/whoami.html | 2 +- deps/npm/html/doc/README.html | 2 +- deps/npm/html/doc/adduser.html | 2 +- deps/npm/html/doc/bin.html | 2 +- deps/npm/html/doc/bugs.html | 2 +- deps/npm/html/doc/build.html | 2 +- deps/npm/html/doc/bundle.html | 2 +- deps/npm/html/doc/cache.html | 2 +- deps/npm/html/doc/changelog.html | 33 +- deps/npm/html/doc/coding-style.html | 4 +- deps/npm/html/doc/completion.html | 2 +- deps/npm/html/doc/config.html | 67 +- deps/npm/html/doc/deprecate.html | 2 +- deps/npm/html/doc/developers.html | 14 +- deps/npm/html/doc/disputes.html | 2 +- deps/npm/html/doc/docs.html | 2 +- deps/npm/html/doc/edit.html | 2 +- deps/npm/html/doc/explore.html | 2 +- deps/npm/html/doc/faq.html | 2 +- deps/npm/html/doc/folders.html | 2 +- deps/npm/html/doc/help-search.html | 2 +- deps/npm/html/doc/help.html | 2 +- deps/npm/html/doc/index.html | 10 +- deps/npm/html/doc/init.html | 2 +- deps/npm/html/doc/install.html | 49 +- deps/npm/html/doc/json.html | 48 +- deps/npm/html/doc/link.html | 2 +- deps/npm/html/doc/list.html | 8 +- deps/npm/html/doc/npm.html | 4 +- deps/npm/html/doc/outdated.html | 2 +- deps/npm/html/doc/owner.html | 2 +- deps/npm/html/doc/pack.html | 2 +- deps/npm/html/doc/prefix.html | 2 +- deps/npm/html/doc/prune.html | 2 +- deps/npm/html/doc/publish.html | 2 +- deps/npm/html/doc/rebuild.html | 2 +- deps/npm/html/doc/registry.html | 2 +- deps/npm/html/doc/removing-npm.html | 2 +- deps/npm/html/doc/restart.html | 2 +- deps/npm/html/doc/root.html | 2 +- deps/npm/html/doc/run-script.html | 2 +- deps/npm/html/doc/scripts.html | 15 +- deps/npm/html/doc/search.html | 2 +- deps/npm/html/doc/semver.html | 2 +- deps/npm/html/doc/shrinkwrap.html | 2 +- deps/npm/html/doc/star.html | 2 +- deps/npm/html/doc/start.html | 2 +- deps/npm/html/doc/stop.html | 2 +- deps/npm/html/doc/submodule.html | 2 +- deps/npm/html/doc/tag.html | 2 +- deps/npm/html/doc/test.html | 2 +- deps/npm/html/doc/uninstall.html | 2 +- deps/npm/html/doc/unpublish.html | 2 +- deps/npm/html/doc/update.html | 2 +- deps/npm/html/doc/version.html | 2 +- deps/npm/html/doc/view.html | 2 +- deps/npm/html/doc/whoami.html | 2 +- deps/npm/html/index.html | 15 +- deps/npm/lib/bugs.js | 2 +- deps/npm/lib/cache.js | 125 +-- deps/npm/lib/config.js | 7 +- deps/npm/lib/docs.js | 2 +- deps/npm/lib/init.js | 12 +- deps/npm/lib/install.js | 524 +++++++++--- deps/npm/lib/link.js | 4 + deps/npm/lib/ls.js | 280 ++++-- deps/npm/lib/npm.js | 54 +- deps/npm/lib/outdated.js | 4 + deps/npm/lib/rebuild.js | 3 - deps/npm/lib/search.js | 3 +- deps/npm/lib/set.js | 1 + deps/npm/lib/unbuild.js | 20 +- deps/npm/lib/uninstall.js | 7 +- deps/npm/lib/utils/cmd-shim.js | 8 +- deps/npm/lib/utils/completion/file-completion.js | 2 +- deps/npm/lib/utils/config-defs.js | 17 + deps/npm/lib/utils/error-handler.js | 11 + deps/npm/lib/utils/excludes.js | 157 ---- deps/npm/lib/utils/exec.js | 20 +- deps/npm/lib/utils/fetch.js | 9 +- deps/npm/lib/utils/find-prefix.js | 5 +- deps/npm/lib/utils/get-agent.js | 62 -- deps/npm/lib/utils/get.js | 6 - deps/npm/lib/utils/ini.js | 10 +- deps/npm/lib/utils/lifecycle.js | 39 +- deps/npm/lib/utils/link.js | 6 +- deps/npm/lib/utils/mkdir-p.js | 191 ----- deps/npm/lib/utils/npm-registry-client/get.js | 12 +- deps/npm/lib/utils/npm-registry-client/request.js | 5 +- deps/npm/lib/utils/output.js | 1 + deps/npm/lib/utils/read-installed.js | 15 +- deps/npm/lib/utils/read-json.js | 101 ++- deps/npm/lib/utils/set.js | 25 - deps/npm/lib/utils/tar.js | 628 +++----------- deps/npm/lib/utils/uid-number.js | 55 -- deps/npm/lib/version.js | 2 +- deps/npm/lib/view.js | 5 + deps/npm/man/man1/README.1 | 2 +- deps/npm/man/man1/adduser.1 | 2 +- deps/npm/man/man1/bin.1 | 2 +- deps/npm/man/man1/bugs.1 | 2 +- deps/npm/man/man1/build.1 | 2 +- deps/npm/man/man1/bundle.1 | 2 +- deps/npm/man/man1/cache.1 | 2 +- deps/npm/man/man1/changelog.1 | 84 +- deps/npm/man/man1/coding-style.1 | 6 +- deps/npm/man/man1/completion.1 | 2 +- deps/npm/man/man1/config.1 | 126 ++- deps/npm/man/man1/deprecate.1 | 2 +- deps/npm/man/man1/developers.1 | 24 +- deps/npm/man/man1/disputes.1 | 2 +- deps/npm/man/man1/docs.1 | 2 +- deps/npm/man/man1/edit.1 | 2 +- deps/npm/man/man1/explore.1 | 2 +- deps/npm/man/man1/faq.1 | 2 +- deps/npm/man/man1/folders.1 | 2 +- deps/npm/man/man1/help-search.1 | 2 +- deps/npm/man/man1/help.1 | 2 +- deps/npm/man/man1/index.1 | 8 +- deps/npm/man/man1/init.1 | 2 +- deps/npm/man/man1/install.1 | 99 ++- deps/npm/man/man1/json.1 | 87 +- deps/npm/man/man1/link.1 | 2 +- deps/npm/man/man1/list.1 | 15 +- deps/npm/man/man1/npm.1 | 4 +- deps/npm/man/man1/outdated.1 | 2 +- deps/npm/man/man1/owner.1 | 2 +- deps/npm/man/man1/pack.1 | 2 +- deps/npm/man/man1/prefix.1 | 2 +- deps/npm/man/man1/prune.1 | 2 +- deps/npm/man/man1/publish.1 | 2 +- deps/npm/man/man1/rebuild.1 | 2 +- deps/npm/man/man1/registry.1 | 2 +- deps/npm/man/man1/removing-npm.1 | 2 +- deps/npm/man/man1/restart.1 | 2 +- deps/npm/man/man1/root.1 | 2 +- deps/npm/man/man1/run-script.1 | 2 +- deps/npm/man/man1/scripts.1 | 22 +- deps/npm/man/man1/search.1 | 2 +- deps/npm/man/man1/semver.1 | 2 +- deps/npm/man/man1/shrinkwrap.1 | 2 +- deps/npm/man/man1/star.1 | 2 +- deps/npm/man/man1/start.1 | 2 +- deps/npm/man/man1/stop.1 | 2 +- deps/npm/man/man1/submodule.1 | 2 +- deps/npm/man/man1/tag.1 | 2 +- deps/npm/man/man1/test.1 | 2 +- deps/npm/man/man1/uninstall.1 | 2 +- deps/npm/man/man1/unpublish.1 | 2 +- deps/npm/man/man1/update.1 | 2 +- deps/npm/man/man1/version.1 | 2 +- deps/npm/man/man1/view.1 | 2 +- deps/npm/man/man1/whoami.1 | 2 +- deps/npm/man/man3/bin.3 | 2 +- deps/npm/man/man3/bugs.3 | 2 +- deps/npm/man/man3/commands.3 | 2 +- deps/npm/man/man3/config.3 | 2 +- deps/npm/man/man3/deprecate.3 | 2 +- deps/npm/man/man3/docs.3 | 2 +- deps/npm/man/man3/edit.3 | 2 +- deps/npm/man/man3/explore.3 | 2 +- deps/npm/man/man3/help-search.3 | 2 +- deps/npm/man/man3/init.3 | 2 +- deps/npm/man/man3/install.3 | 2 +- deps/npm/man/man3/link.3 | 2 +- deps/npm/man/man3/load.3 | 2 +- deps/npm/man/man3/ls.3 | 9 +- deps/npm/man/man3/npm.3 | 4 +- deps/npm/man/man3/outdated.3 | 2 +- deps/npm/man/man3/owner.3 | 2 +- deps/npm/man/man3/pack.3 | 2 +- deps/npm/man/man3/prefix.3 | 2 +- deps/npm/man/man3/prune.3 | 2 +- deps/npm/man/man3/publish.3 | 2 +- deps/npm/man/man3/rebuild.3 | 2 +- deps/npm/man/man3/restart.3 | 2 +- deps/npm/man/man3/root.3 | 2 +- deps/npm/man/man3/run-script.3 | 2 +- deps/npm/man/man3/search.3 | 2 +- deps/npm/man/man3/shrinkwrap.3 | 2 +- deps/npm/man/man3/start.3 | 2 +- deps/npm/man/man3/stop.3 | 2 +- deps/npm/man/man3/submodule.3 | 2 +- deps/npm/man/man3/tag.3 | 2 +- deps/npm/man/man3/test.3 | 2 +- deps/npm/man/man3/uninstall.3 | 2 +- deps/npm/man/man3/unpublish.3 | 2 +- deps/npm/man/man3/update.3 | 2 +- deps/npm/man/man3/version.3 | 2 +- deps/npm/man/man3/view.3 | 2 +- deps/npm/man/man3/whoami.3 | 2 +- deps/npm/node_modules/block-stream/package.json | 4 +- deps/npm/node_modules/fast-list/.npmignore | 1 - deps/npm/node_modules/fast-list/.travis.yml | 4 - deps/npm/node_modules/fast-list/README.md | 116 --- deps/npm/node_modules/fast-list/fast-list.js | 144 ---- deps/npm/node_modules/fast-list/package.json | 20 - deps/npm/node_modules/fstream/.npmignore | 4 +- deps/npm/node_modules/fstream/lib/abstract.js | 5 + deps/npm/node_modules/fstream/lib/dir-reader.js | 111 ++- deps/npm/node_modules/fstream/lib/dir-writer.js | 8 +- deps/npm/node_modules/fstream/lib/link-writer.js | 1 - deps/npm/node_modules/fstream/lib/proxy-reader.js | 4 + deps/npm/node_modules/fstream/lib/reader.js | 31 +- deps/npm/node_modules/fstream/lib/writer.js | 218 +++-- deps/npm/node_modules/fstream/package.json | 30 +- deps/npm/node_modules/graceful-fs/graceful-fs.js | 67 +- deps/npm/node_modules/graceful-fs/package.json | 25 +- deps/npm/node_modules/inherits/LICENSE | 30 +- deps/npm/node_modules/inherits/package.json | 52 +- deps/npm/node_modules/minimatch/README.md | 14 +- deps/npm/node_modules/minimatch/minimatch.js | 67 +- deps/npm/node_modules/minimatch/package.json | 29 +- deps/npm/node_modules/mkdirp/README.markdown | 37 +- deps/npm/node_modules/mkdirp/index.js | 67 +- deps/npm/node_modules/mkdirp/package.json | 63 +- deps/npm/node_modules/read/lib/read.js | 16 +- deps/npm/node_modules/read/package.json | 18 +- deps/npm/node_modules/request/README.md | 4 +- deps/npm/node_modules/request/forever.js | 21 +- deps/npm/node_modules/request/main.js | 947 ++++++++++++++------- deps/npm/node_modules/request/mimetypes.js | 10 +- deps/npm/node_modules/request/oauth.js | 2 +- deps/npm/node_modules/request/package.json | 58 +- .../node_modules/request/vendor/cookie/index.js | 25 +- deps/npm/node_modules/rimraf/AUTHORS | 1 + deps/npm/node_modules/rimraf/README.md | 13 +- deps/npm/node_modules/rimraf/fiber.js | 86 -- deps/npm/node_modules/rimraf/package.json | 3 +- deps/npm/node_modules/rimraf/rimraf.js | 106 +-- deps/npm/node_modules/tar/lib/extract.js | 14 + deps/npm/node_modules/tar/package.json | 24 +- deps/npm/node_modules/which/package.json | 25 +- deps/npm/node_modules/which/which.js | 71 +- deps/npm/package.json | 26 +- deps/npm/scripts/index-build.js | 1 + .../test/packages/npm-test-env-reader/package.json | 18 +- deps/npm/test/packages/npm-test-env-reader/test.sh | 3 - deps/npm/test/packages/npm-test-files/package.json | 3 +- .../packages/npm-test-optional-deps/package.json | 4 +- 294 files changed, 3778 insertions(+), 2820 deletions(-) delete mode 100755 deps/npm/bin/npm-get-uid-gid.js delete mode 100644 deps/npm/lib/utils/excludes.js delete mode 100644 deps/npm/lib/utils/get-agent.js delete mode 100644 deps/npm/lib/utils/get.js delete mode 100644 deps/npm/lib/utils/mkdir-p.js delete mode 100644 deps/npm/lib/utils/set.js delete mode 100644 deps/npm/lib/utils/uid-number.js delete mode 100644 deps/npm/node_modules/fast-list/.npmignore delete mode 100644 deps/npm/node_modules/fast-list/.travis.yml delete mode 100644 deps/npm/node_modules/fast-list/README.md delete mode 100644 deps/npm/node_modules/fast-list/fast-list.js delete mode 100644 deps/npm/node_modules/fast-list/package.json delete mode 100644 deps/npm/node_modules/rimraf/fiber.js delete mode 100755 deps/npm/test/packages/npm-test-env-reader/test.sh (limited to 'deps') diff --git a/deps/npm/.npmignore b/deps/npm/.npmignore index 6ab186883..5ddef3560 100644 --- a/deps/npm/.npmignore +++ b/deps/npm/.npmignore @@ -11,3 +11,7 @@ npm-debug.log ./npmrc .gitignore release/ + +# don't ignore .npmignore files +# these are used in some tests. +!.npmignore diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS index c977af8c4..a2b8141d7 100644 --- a/deps/npm/AUTHORS +++ b/deps/npm/AUTHORS @@ -51,3 +51,17 @@ Stephen Sugden Gautham Pai David Trejo Paul Vorbach +George Ornbo +Tim Oxley +Tyler Green +atomizer +Rod Vagg +Christian Howe +Andrew Lunny +Henrik Hodne +Adam Blackburn +Kris Windham +Jens Grunert +Joost-Wim Boekesteijn +Dalmais Maxence +Marcus Ekwall diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE index 71ca385bd..c94425929 100644 --- a/deps/npm/LICENSE +++ b/deps/npm/LICENSE @@ -1,4 +1,4 @@ -Copyright 2009, 2010, 2011 Isaac Z. Schlueter (the "Author") +Copyright 2009-2012, Isaac Z. Schlueter (the "Original Author") All rights reserved. MIT +no-false-attribs License @@ -20,9 +20,9 @@ by the recipients as they would use the unmodified Software, containing modifications that substantially alter, remove, or disable functionality of the Software, outside of the documented configuration mechanisms provided by the Software, shall be -modified such that the Author's bug reporting email addresses and -urls are either replaced with the contact information of the -parties responsible for the changes, or removed entirely. +modified such that the Original Author's bug reporting email +addresses and urls are either replaced with the contact information +of the parties responsible for the changes, or removed entirely. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES @@ -36,7 +36,7 @@ OTHER DEALINGS IN THE SOFTWARE. Except where noted, this license applies to any and all software programs and associated documentation files created by the -Author, when distributed with the Software. +Original Author, when distributed with the Software. "Node.js" and "node" trademark Joyent, Inc. npm is not officially part of the Node.js project, and is neither owned by nor @@ -49,13 +49,11 @@ and are not covered by this license. "npm Logo" created by Mathias Pettersson and Brian Hammond, used with permission. -This program includes a BSDTar/LibArchive version 2.8.3-1 binary, -originally distributed as part of the MinGW suite, compiled for -Win32, according to the terms of the BSD license. -See deps/basic-bsdtar-2.8.3-1-ming32-bin/basic-bsdtar.LICENSE. - This program uses "node-uuid", Copyright (c) 2010 Robert Kieffer, according to the terms of the MIT license. This program uses "request", Copyright (c) 2011 Mikeal Rogers, according to the terms of the Apache license. + +This program uses "mkdirp", Copyright (c) 2010 James Halliday, +according to the terms of the MIT/X11 license. diff --git a/deps/npm/Makefile b/deps/npm/Makefile index 415a1b3d6..19efd815c 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -123,7 +123,7 @@ doc-publish: doc rsync -vazu --stats --no-implied-dirs --delete html/api/ npmjs.org:/var/www/npmjs.org/public/api zip-publish: release - scp release/*.zip npmjs.org:/var/www/npmjs.org/public/dist/ + scp release/* npmjs.org:/var/www/npmjs.org/public/dist/ release: @bash scripts/release.sh diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js index e0b9f20bb..f29437093 100755 --- a/deps/npm/bin/npm-cli.js +++ b/deps/npm/bin/npm-cli.js @@ -49,6 +49,13 @@ if (conf.version) { return } +if (conf.versions) { + var v = process.versions + v.npm = npm.version + console.log(v) + return +} + log.info("npm@"+npm.version, "using") log.info("node@"+process.version, "using") diff --git a/deps/npm/bin/npm-get-uid-gid.js b/deps/npm/bin/npm-get-uid-gid.js deleted file mode 100755 index 390e0f2fc..000000000 --- a/deps/npm/bin/npm-get-uid-gid.js +++ /dev/null @@ -1,16 +0,0 @@ -var argv = process.argv.slice(2) - , user = argv[0] || process.getuid() - , group = argv[1] || process.getgid() - -if (!isNaN(user)) user = +user -if (!isNaN(group)) group = +group - -console.error([user, group]) - -try { - process.setgid(group) - process.setuid(user) - console.log(JSON.stringify({uid:+process.getuid(), gid:+process.getgid()})) -} catch (ex) { - console.log(JSON.stringify({error:ex.message,errno:ex.errno})) -} diff --git a/deps/npm/bin/npm.cmd b/deps/npm/bin/npm.cmd index bac9e5f1c..7720e2052 100644 --- a/deps/npm/bin/npm.cmd +++ b/deps/npm/bin/npm.cmd @@ -1,6 +1,6 @@ :: Created by npm, please don't edit manually. -@IF EXIST "%~dp0"\"node.exe" ( - "%~dp0"\"node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* +@IF EXIST "%~dp0\node.exe" ( + "%~dp0\node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* ) ELSE ( - node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* -) \ No newline at end of file + node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* +) diff --git a/deps/npm/doc/api/ls.md b/deps/npm/doc/api/ls.md index a6c0a1382..ed890ff14 100644 --- a/deps/npm/doc/api/ls.md +++ b/deps/npm/doc/api/ls.md @@ -21,6 +21,12 @@ It will print out extraneous, missing, and invalid packages. If the silent parameter is set to true, nothing will be output to the screen, but the data will still be returned. +Callback is provided an error if one occurred, the full data about which +packages are installed and which dependencies they will receive, and a +"lite" data object which just shows which versions are installed where. +Note that the full data object is a circular structure, so care must be +taken if it is serialized to JSON. + ## CONFIGURATION ### long diff --git a/deps/npm/doc/cli/changelog.md b/deps/npm/doc/cli/changelog.md index 0115405ca..64feeacda 100644 --- a/deps/npm/doc/cli/changelog.md +++ b/deps/npm/doc/cli/changelog.md @@ -3,6 +3,50 @@ npm-changelog(1) -- Changes ## HISTORY +### 1.1.3, 1.1.4 + +* Update request to support HTTPS-over-HTTP proxy tunneling +* Throw on undefined envs in config settings +* Update which to 1.0.5 +* Fix windows UNC busyloop in findPrefix +* Bundle nested bundleDependencies properly +* Alias adduser to add-user +* Doc updates (Christian Howe, Henrik Hodne, Andrew Lunny) +* ignore logfd/outfd streams in makeEnv() (Rod Vagg) +* shrinkwrap: Behave properly with url-installed deps +* install: Support --save with url install targets +* Support installing naked tars or single-file modules from urls etc. +* init: Don't add engines section +* Don't run make clean on rebuild +* Added missing unicode replacement (atomizer) + +### 1.1.2 + +Dave Pacheco (2): + add "npm shrinkwrap" + +Martin Cooper (1): + Fix #1753 Make a copy of the cached objects we'll modify. + +Tim Oxley (1): + correctly remove readme from default npm view command. + +Tyler Green (1): + fix #2187 set terminal columns to Infinity if 0 + +isaacs (19): + update minimatch + update request + Experimental: single-file modules + Fix #2172 Don't remove global mans uninstalling local pkgs + Add --versions flag to show the version of node as well + Support --json flag for ls output + update request to 2.9.151 + +### 1.1 +* Replace system tar dependency with a JS tar +* Continue to refine + ### 1.0 * Greatly simplified folder structure * Install locally (bundle by default) diff --git a/deps/npm/doc/cli/coding-style.md b/deps/npm/doc/cli/coding-style.md index 5315c575c..42ac1d785 100644 --- a/deps/npm/doc/cli/coding-style.md +++ b/deps/npm/doc/cli/coding-style.md @@ -59,8 +59,8 @@ Don't use them except in four situations: * `for (;;)` loops. They're actually required. * null loops like: `while (something) ;` (But you'd better have a good reason for doing that.) -* case "foo": doSomething(); break -* In front of a leading ( or [ at the start of the line. +* `case "foo": doSomething(); break` +* In front of a leading `(` or `[` at the start of the line. This prevents the expression from being interpreted as a function call or property access, respectively. diff --git a/deps/npm/doc/cli/config.md b/deps/npm/doc/cli/config.md index 2c6ca26c0..3fd9cb826 100644 --- a/deps/npm/doc/cli/config.md +++ b/deps/npm/doc/cli/config.md @@ -115,6 +115,8 @@ The following shorthands are parsed on the command-line: * `-l`: `--long` * `-desc`: `--description` * `-S`: `--save` +* `-D`: `--save-dev` +* `-O`: `--save-optional` * `-y`: `--yes` * `-n`: `--yes false` * `ll` and `la` commands: `ls --long` @@ -218,6 +220,28 @@ See also the `strict-ssl` config. The location of npm's cache directory. See `npm-cache(1)` +### cache-max + +* Default: Infinity +* Type: Number + +The maximum time (in seconds) to keep items in the registry cache before +re-checking against the registry. + +Note that no purging is done unless the `npm cache clean` command is +explicitly used, and that only GET requests use the cache. + +### cache-min + +* Default: 0 +* Type: Number + +The minimum time (in seconds) to keep items in the registry cache before +re-checking against the registry. + +Note that no purging is done unless the `npm cache clean` command is +explicitly used, and that only GET requests use the cache. + ### color * Default: true on Posix, false on Windows @@ -336,6 +360,13 @@ user. A proxy to use for outgoing https requests. +### user-agent + +* Default: npm/{npm.version} node/{process.version} +* Type: String + +Sets a User-Agent to the request header + ### ignore * Default: "" @@ -353,7 +384,7 @@ The value `npm init` should use by default for the package version. ### init.author.name -* Default: "0.0.0" +* Default: "" * Type: String The value `npm init` should use by default for the package author's name. @@ -372,6 +403,17 @@ The value `npm init` should use by default for the package author's email. The value `npm init` should use by default for the package author's homepage. +### json + +* Default: false +* Type: Boolean + +Whether or not to output JSON data, rather than the normal output. + +This feature is currently experimental, and the output data structures +for many commands is either not implemented in JSON yet, or subject to +change. Only the output from `npm ls --json` is currently valid. + ### link * Default: false @@ -544,6 +586,24 @@ Save installed packages to a package.json file as dependencies. Only works if there is already a package.json file present. +### save-dev + +* Default: false +* Type: Boolean + +Save installed packages to a package.json file as devDependencies. + +Only works if there is already a package.json file present. + +### save-optional + +* Default: false +* Type: Boolean + +Save installed packages to a package.json file as optionalDependencies. + +Only works if there is already a package.json file present. + ### searchopts * Default: "" @@ -682,6 +742,16 @@ If true, output the npm version and exit successfully. Only relevant when specified explicitly on the command line. +### versions + +* Default: false +* Type: boolean + +If true, output the npm version as well as node's `process.versions` +hash, and exit successfully. + +Only relevant when specified explicitly on the command line. + ### viewer * Default: "man" on Posix, "browser" on Windows diff --git a/deps/npm/doc/cli/developers.md b/deps/npm/doc/cli/developers.md index 9123f35a3..7ab905bfa 100644 --- a/deps/npm/doc/cli/developers.md +++ b/deps/npm/doc/cli/developers.md @@ -27,12 +27,23 @@ A package is: * d) a `@` that is published on the registry with (c) * e) a `@` that points to (d) * f) a `` that has a "latest" tag satisfying (e) +* g) a `git` url that, when cloned, results in (a). Even if you never publish your package, you can still get a lot of benefits of using npm if you just want to write a node program (a), and perhaps if you also want to be able to easily install it elsewhere after packing it up into a tarball (b). +Git urls can be of the form: + + git://github.com/user/project.git#commit-ish + git+ssh://user@hostname:project.git#commit-ish + git+http://user@hostname/project/blah.git#commit-ish + git+https://user@hostname/project/blah.git#commit-ish + +The `commit-ish` can be any tag, sha, or branch which can be supplied as +an argument to `git checkout`. The default is `master`. + ## The package.json File You need to have a `package.json` file in the root of your project to do diff --git a/deps/npm/doc/cli/index.md b/deps/npm/doc/cli/index.md index 5a9b99be1..ee88f3d8f 100644 --- a/deps/npm/doc/cli/index.md +++ b/deps/npm/doc/cli/index.md @@ -170,6 +170,10 @@ npm-index(1) -- Index of all npm documentation The semantic versioner for npm +## npm-shrinkwrap(1) + + Lock down dependency versions + ## npm-star(1) Mark your favorite packages @@ -323,6 +327,10 @@ npm-index(1) -- Index of all npm documentation Search for packages +## npm-shrinkwrap(3) + + programmatically generate package shrinkwrap file + ## npm-start(3) Start a package diff --git a/deps/npm/doc/cli/install.md b/deps/npm/doc/cli/install.md index 22eb8234e..cfa95e722 100644 --- a/deps/npm/doc/cli/install.md +++ b/deps/npm/doc/cli/install.md @@ -7,14 +7,17 @@ npm-install(1) -- Install a package npm install npm install npm install - npm install + npm install [--save|--save-dev|--save-optional] npm install @ npm install @ npm install @ + npm install @ ## DESCRIPTION -This command installs a package, and any packages that it depends on. +This command installs a package, and any packages that it depends on. If the +package has a shrinkwrap file, the installation of dependencies will be driven +by that. See npm-shrinkwrap(1). A `package` is: @@ -33,88 +36,116 @@ after packing it up into a tarball (b). * `npm install` (in package directory, no arguments): - Install the dependencies in the local node_modules folder. - In global mode (ie, with `-g` or `--global` appended to the command), - it installs the current package context (ie, the current working - directory) as a global package. + Install the dependencies in the local node_modules folder. + + In global mode (ie, with `-g` or `--global` appended to the command), + it installs the current package context (ie, the current working + directory) as a global package. + * `npm install `: - Install a package that is sitting in a folder on the filesystem. + + Install a package that is sitting in a folder on the filesystem. * `npm install `: - Install a package that is sitting on the filesystem. Note: if you just want - to link a dev directory into your npm root, you can do this more easily by - using `npm link`. - Example: + Install a package that is sitting on the filesystem. Note: if you just want + to link a dev directory into your npm root, you can do this more easily by + using `npm link`. + + Example: - npm install ./package.tgz + npm install ./package.tgz * `npm install `: - Fetch the tarball url, and then install it. In order to distinguish between - this and other options, the argument must start with "http://" or "https://" - Example: + Fetch the tarball url, and then install it. In order to distinguish between + this and other options, the argument must start with "http://" or "https://" + + Example: + + npm install https://github.com/indexzero/forever/tarball/v0.5.6 + +* `npm install [--save|--save-dev|--save-optional]`: + + Do a `@` install, where `` is the "tag" config. (See + `npm-config(1)`.) - npm install https://github.com/indexzero/forever/tarball/v0.5.6 + In most cases, this will install the latest version + of the module published on npm. -* `npm install `: - Do a `@` install, where `` is the "tag" config. (See - `npm-config(1)`) + Example: - Example: + npm install sax - npm install sax + `npm install` takes 3 exclusive, optional flags which save or update + the package version in your main package.json: - **Note**: If there is a file or folder named `` in the current - working directory, then it will try to install that, and only try to - fetch the package by name if it is not valid. + * `--save`: Package will appear in your `dependencies`. + + * `--save-dev`: Package will appear in your `devDependencies`. + + * `--save-optional`: Package will appear in your `optionalDependencies`. + + Examples: + + npm install sax --save + npm install node-tap --save-dev + npm install dtrace-provider --save-optional + + + **Note**: If there is a file or folder named `` in the current + working directory, then it will try to install that, and only try to + fetch the package by name if it is not valid. * `npm install @`: - Install the version of the package that is referenced by the specified tag. - If the tag does not exist in the registry data for that package, then this - will fail. - Example: + Install the version of the package that is referenced by the specified tag. + If the tag does not exist in the registry data for that package, then this + will fail. + + Example: - npm install sax@latest + npm install sax@latest * `npm install @`: - Install the specified version of the package. This will fail if the version - has not been published to the registry. - Example: + Install the specified version of the package. This will fail if the version + has not been published to the registry. - npm install sax@0.1.1 + Example: + + npm install sax@0.1.1 * `npm install @`: - Install a version of the package matching the specified version range. This - will follow the same rules for resolving dependencies described in `npm-json(1)`. - Note that most version ranges must be put in quotes so that your shell will - treat it as a single argument. + Install a version of the package matching the specified version range. This + will follow the same rules for resolving dependencies described in `npm-json(1)`. + + Note that most version ranges must be put in quotes so that your shell will + treat it as a single argument. - Example: + Example: - npm install sax@">=0.1.0 <0.2.0" + npm install sax@">=0.1.0 <0.2.0" * `npm install `: - Install a package by cloning a git remote url. The format of the git - url is: + Install a package by cloning a git remote url. The format of the git + url is: - ://[@][#] + ://[@][#] - `` is one of `git`, `git+ssh`, `git+http`, or - `git+https`. If no `` is specified, then `master` is - used. + `` is one of `git`, `git+ssh`, `git+http`, or + `git+https`. If no `` is specified, then `master` is + used. - Examples: + Examples: - git+ssh://git@github.com:isaacs/npm.git#v1.0.27 - git+https://isaacs@github.com/isaacs/npm.git - git://github.com/isaacs/npm.git#v1.0.27 + git+ssh://git@github.com:isaacs/npm.git#v1.0.27 + git+https://isaacs@github.com/isaacs/npm.git + git://github.com/isaacs/npm.git#v1.0.27 You may combine multiple arguments, and even multiple types of arguments. For example: @@ -199,3 +230,4 @@ affects a real use-case, it will be investigated. * npm-folders(1) * npm-tag(1) * npm-rm(1) +* npm-shrinkwrap(1) diff --git a/deps/npm/doc/cli/json.md b/deps/npm/doc/cli/json.md index 5f6e7ef62..ddd500e3b 100644 --- a/deps/npm/doc/cli/json.md +++ b/deps/npm/doc/cli/json.md @@ -332,6 +332,7 @@ is a semver compatible version identifier. * `""` (just an empty string) Same as `*` * `version1 - version2` Same as `>=version1 <=version2`. * `range1 || range2` Passes if either range1 or range2 are satisfied. +* `git...` See 'Git URLs as Dependencies' below For example, these are all valid: @@ -387,6 +388,18 @@ of a version range. This tarball will be downloaded and installed locally to your package at install time. +### Git URLs as Dependencies + +Git urls can be of the form: + + git://github.com/user/project.git#commit-ish + git+ssh://user@hostname:project.git#commit-ish + git+http://user@hostname/project/blah.git#commit-ish + git+https://user@hostname/project/blah.git#commit-ish + +The `commit-ish` can be any tag, sha, or branch which can be supplied as +an argument to `git checkout`. The default is `master`. + ## devDependencies If someone is planning on downloading and using your module in their @@ -415,7 +428,7 @@ node that your stuff works on: { "engines" : { "node" : ">=0.1.27 <0.1.30" } } And, like with dependencies, if you don't specify the version (or if you -specify "*" as the version), then any version of node will do. +specify "\*" as the version), then any version of node will do. If you specify an "engines" field, then npm will require that "node" be somewhere on that list. If "engines" is omitted, then npm will just assume @@ -426,6 +439,36 @@ are capable of properly installing your program. For example: { "engines" : { "npm" : "~1.0.20" } } +## os + +You can specify which operating systems your +module will run on: + + "os" : [ "darwin", "linux" ] + +You can also blacklist instead of whitelist operating systems, +just prepend the blacklisted os with a '!': + + "os" : [ "!win32" ] + +The host operating system is determined by `process.platform` + +It is allowed to both blacklist, and whitelist, although there isn't any +good reason to do this. + +## cpu + +If your code only runs on certain cpu architectures, +you can specify which ones. + + "cpu" : [ "x64", "ia32" ] + +Like the `os` option, you can also blacklist architectures: + + "cpu" : [ "!arm", "!mips" ] + +The host architecture is determined by `process.arch` + ## preferGlobal If your package is primarily a command-line application that should be @@ -442,7 +485,7 @@ to publish it. This is a way to prevent accidental publication of private repositories. If you would like to ensure that a given package is only ever published -to a speciic registry (for example, an internal registry), +to a specific registry (for example, an internal registry), then use the `publishConfig` hash described below to override the `registry` config param at publish-time. diff --git a/deps/npm/doc/cli/list.md b/deps/npm/doc/cli/list.md index 596349a81..93d86cd83 100644 --- a/deps/npm/doc/cli/list.md +++ b/deps/npm/doc/cli/list.md @@ -22,6 +22,13 @@ When run as `ll` or `la`, it shows extended information by default. ## CONFIGURATION +### json + +* Default: false +* Type: Boolean + +Show information in JSON format. + ### long * Default: false diff --git a/deps/npm/doc/cli/scripts.md b/deps/npm/doc/cli/scripts.md index 64b3ec41a..3d33a8391 100644 --- a/deps/npm/doc/cli/scripts.md +++ b/deps/npm/doc/cli/scripts.md @@ -62,6 +62,20 @@ Package scripts run in an environment where many pieces of information are made available regarding the setup of npm and the current state of the process. + +### path + +If you depend on modules that define executable scripts, like test suites, +then those executables will be added to the `PATH` for executing the scripts. +So, if your package.json has this: + + { "name" : "foo" + , "dependencies" : { "bar" : "0.1.x" } + , "scripts": { "start" : "bar ./test" } } + +then you could run `npm start` to execute the `bar` script, which is exported +into the `node_modules/.bin` directory on `npm install`. + ### package.json vars The package.json fields are tacked onto the `npm_package_` prefix. So, for diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html index c4392671d..2d659898c 100644 --- a/deps/npm/html/api/bin.html +++ b/deps/npm/html/api/bin.html @@ -19,7 +19,7 @@

This function should not be used programmatically. Instead, just refer to the npm.bin member.

- +