From 1ac05cc5ad6d464d7ae56953006e6aa2f0d599fb Mon Sep 17 00:00:00 2001 From: isaacs Date: Fri, 27 Apr 2012 15:01:31 -0700 Subject: [PATCH 01/23] Upgrade npm to 1.1.18 --- deps/npm/AUTHORS | 1 + deps/npm/doc/cli/config.md | 20 +++ deps/npm/doc/cli/install.md | 125 +++++++++++------- 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 | 2 +- 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 | 2 +- deps/npm/html/doc/coding-style.html | 2 +- deps/npm/html/doc/completion.html | 2 +- deps/npm/html/doc/config.html | 20 ++- deps/npm/html/doc/deprecate.html | 2 +- deps/npm/html/doc/developers.html | 2 +- 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 | 2 +- deps/npm/html/doc/init.html | 2 +- deps/npm/html/doc/install.html | 43 +++--- deps/npm/html/doc/json.html | 2 +- deps/npm/html/doc/link.html | 2 +- deps/npm/html/doc/list.html | 2 +- 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 | 2 +- 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/html/n-64.png | Bin 679 -> 0 bytes deps/npm/html/n-large.png | Bin 699 -> 0 bytes deps/npm/html/npm-16.png | Bin 145 -> 0 bytes deps/npm/html/npm-256-square.png | Bin 3290 -> 0 bytes deps/npm/html/npm-256w.png | Bin 3169 -> 0 bytes deps/npm/html/npm-64-square.png | Bin 2908 -> 0 bytes deps/npm/html/npm-fin.png | Bin 47789 -> 0 bytes deps/npm/html/npm-large.png | Bin 483909 -> 0 bytes deps/npm/html/npm.png | Bin 1164 -> 0 bytes deps/npm/lib/install.js | 20 ++- deps/npm/lib/npm.js | 19 ++- deps/npm/lib/utils/config-defs.js | 6 + deps/npm/lib/utils/exec.js | 19 ++- deps/npm/lib/utils/read-installed.js | 3 + deps/npm/man/man1/config.1 | 38 ++++++ deps/npm/man/man1/install.1 | 90 ++++++++----- deps/npm/man/man1/npm.1 | 2 +- deps/npm/man/man3/npm.3 | 2 +- .../node_modules/fstream-npm/fstream-npm.js | 16 ++- .../node_modules/fstream-ignore/package.json | 4 +- .../npm/node_modules/fstream-npm/package.json | 10 +- deps/npm/node_modules/node-gyp/LICENSE | 24 ++++ .../npm/node_modules/node-gyp/bin/node-gyp.js | 102 +++++++++----- .../node_modules/node-gyp/legacy/common.gypi | 1 + deps/npm/node_modules/node-gyp/lib/build.js | 102 +++++++++----- deps/npm/node_modules/node-gyp/lib/clean.js | 27 +--- .../node_modules/node-gyp/lib/configure.js | 119 ++++++++++------- deps/npm/node_modules/node-gyp/lib/install.js | 104 +++++++++------ deps/npm/node_modules/node-gyp/lib/list.js | 9 +- .../npm/node_modules/node-gyp/lib/node-gyp.js | 48 ++++++- deps/npm/node_modules/node-gyp/lib/remove.js | 7 +- .../node-gyp/lib/util/asyncEmit.js | 61 --------- .../node_modules/node-gyp/lib/util/hook.js | 48 ------- .../node-gyp/node_modules/ansi/package.json | 4 +- .../node-gyp/node_modules/glob/package.json | 4 +- deps/npm/node_modules/node-gyp/package.json | 14 +- deps/npm/package.json | 7 +- 135 files changed, 779 insertions(+), 543 deletions(-) delete mode 100644 deps/npm/html/n-64.png delete mode 100644 deps/npm/html/n-large.png delete mode 100644 deps/npm/html/npm-16.png delete mode 100644 deps/npm/html/npm-256-square.png delete mode 100644 deps/npm/html/npm-256w.png delete mode 100644 deps/npm/html/npm-64-square.png delete mode 100644 deps/npm/html/npm-fin.png delete mode 100644 deps/npm/html/npm-large.png delete mode 100644 deps/npm/html/npm.png create mode 100644 deps/npm/node_modules/node-gyp/LICENSE delete mode 100644 deps/npm/node_modules/node-gyp/lib/util/asyncEmit.js delete mode 100644 deps/npm/node_modules/node-gyp/lib/util/hook.js diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS index 340c4bdbcb..8bd425c58d 100644 --- a/deps/npm/AUTHORS +++ b/deps/npm/AUTHORS @@ -63,3 +63,4 @@ Adam Blackburn Kris Windham Jens Grunert Joost-Wim Boekesteijn +Dalmais Maxence diff --git a/deps/npm/doc/cli/config.md b/deps/npm/doc/cli/config.md index 8cd03a7692..3fd9cb8269 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` @@ -584,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: "" diff --git a/deps/npm/doc/cli/install.md b/deps/npm/doc/cli/install.md index 903844a413..cfa95e7229 100644 --- a/deps/npm/doc/cli/install.md +++ b/deps/npm/doc/cli/install.md @@ -7,10 +7,11 @@ 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 @@ -35,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: diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html index c5d56c12ed..6def10fd66 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.

- +