diff options
225 files changed, 952 insertions, 648 deletions
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS index 8f78dca48a..8bd425c58d 100644 --- a/deps/npm/AUTHORS +++ b/deps/npm/AUTHORS @@ -61,3 +61,6 @@ Andrew Lunny <alunny@gmail.com> Henrik Hodne <dvyjones@binaryhex.com> Adam Blackburn <regality@gmail.com> Kris Windham <kriswindham@gmail.com> +Jens Grunert <jens.grunert@gmail.com> +Joost-Wim Boekesteijn <joost-wim@boekesteijn.nl> +Dalmais Maxence <github@maxired.fr> diff --git a/deps/npm/doc/cli/config.md b/deps/npm/doc/cli/config.md index 049a51ea4d..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` @@ -358,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: "" @@ -577,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 <tarball file> npm install <tarball url> npm install <folder> - npm install <name> + npm install <name> [--save|--save-dev|--save-optional] npm install <name>@<tag> npm install <name>@<version> npm install <name>@<version range> + npm install <name>@<version range> ## 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 <folder>`: - 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 <tarball file>`: - 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 <tarball url>`: - 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 <name> [--save|--save-dev|--save-optional]`: + + Do a `<name>@<tag>` install, where `<tag>` 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 <name>`: - Do a `<name>@<tag>` install, where `<tag>` 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 `<name>` 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 `<name>` 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 <name>@<tag>`: - 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 <name>@<version>`: - 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 <name>@<version range>`: - 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 <git remote url>`: - 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: - <protocol>://[<user>@]<hostname><separator><path>[#<commit-ish>] + <protocol>://[<user>@]<hostname><separator><path>[#<commit-ish>] - `<protocol>` is one of `git`, `git+ssh`, `git+http`, or - `git+https`. If no `<commit-ish>` is specified, then `master` is - used. + `<protocol>` is one of `git`, `git+ssh`, `git+http`, or + `git+https`. If no `<commit-ish>` 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/doc/cli/json.md b/deps/npm/doc/cli/json.md index 16b2ad931c..ddd500e3b1 100644 --- a/deps/npm/doc/cli/json.md +++ b/deps/npm/doc/cli/json.md @@ -485,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/html/api/bin.html b/deps/npm/html/api/bin.html index 7a5ad81d0a..bec86d5fc7 100644 --- a/deps/npm/html/api/bin.html +++ b/deps/npm/html/api/bin.html @@ -19,7 +19,7 @@ <p>This function should not be used programmatically. Instead, just refer to the <code>npm.bin</code> member.</p> </div> -<p id="footer">bin — npm@1.1.15</p> +<p id="footer">bin — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/bugs.html b/deps/npm/html/api/bugs.html index 51a115c3c9..3dfdec74a1 100644 --- a/deps/npm/html/api/bugs.html +++ b/deps/npm/html/api/bugs.html @@ -25,7 +25,7 @@ optional version number.</p> <p>This command will launch a browser, so this command may not be the most friendly for programmatic use.</p> </div> -<p id="footer">bugs — npm@1.1.15</p> +<p id="footer">bugs — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/commands.html b/deps/npm/html/api/commands.html index 64c597f33c..6f051c6cd3 100644 --- a/deps/npm/html/api/commands.html +++ b/deps/npm/html/api/commands.html @@ -28,7 +28,7 @@ usage, or <code>man 3 npm-<command></code> for programmatic usage.</p> <ul><li><a href="../doc/index.html">index(1)</a></li></ul> </div> -<p id="footer">commands — npm@1.1.15</p> +<p id="footer">commands — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/config.html b/deps/npm/html/api/config.html index 5910453c43..024e1a22ba 100644 --- a/deps/npm/html/api/config.html +++ b/deps/npm/html/api/config.html @@ -33,7 +33,7 @@ functions instead.</p> <ul><li><a href="../api/npm.html">npm(3)</a></li></ul> </div> -<p id="footer">config — npm@1.1.15</p> +<p id="footer">config — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/deprecate.html b/deps/npm/html/api/deprecate.html index e415dea00e..7af3243b04 100644 --- a/deps/npm/html/api/deprecate.html +++ b/deps/npm/html/api/deprecate.html @@ -30,7 +30,7 @@ install the package.</p></li></ul> <ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../api/unpublish.html">unpublish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul> </div> -<p id="footer">deprecate — npm@1.1.15</p> +<p id="footer">deprecate — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/docs.html b/deps/npm/html/api/docs.html index dbed88e6fc..7961070891 100644 --- a/deps/npm/html/api/docs.html +++ b/deps/npm/html/api/docs.html @@ -25,7 +25,7 @@ optional version number.</p> <p>This command will launch a browser, so this command may not be the most friendly for programmatic use.</p> </div> -<p id="footer">docs — npm@1.1.15</p> +<p id="footer">docs — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/edit.html b/deps/npm/html/api/edit.html index 262cf4b802..e013b14fe7 100644 --- a/deps/npm/html/api/edit.html +++ b/deps/npm/html/api/edit.html @@ -30,7 +30,7 @@ to open. The package can optionally have a version number attached.</p> <p>Since this command opens an editor in a new process, be careful about where and how this is used.</p> </div> -<p id="footer">edit — npm@1.1.15</p> +<p id="footer">edit — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/explore.html b/deps/npm/html/api/explore.html index 75d1b2bcb1..f241b0e0da 100644 --- a/deps/npm/html/api/explore.html +++ b/deps/npm/html/api/explore.html @@ -24,7 +24,7 @@ sure to use <code>npm rebuild <pkg></code> if you make any changes.</p> <p>The first element in the 'args' parameter must be a package name. After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p> </div> -<p id="footer">explore — npm@1.1.15</p> +<p id="footer">explore — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/help-search.html b/deps/npm/html/api/help-search.html index f4573f2b7a..7c58bd3061 100644 --- a/deps/npm/html/api/help-search.html +++ b/deps/npm/html/api/help-search.html @@ -32,7 +32,7 @@ Name of the file that matched</li></ul> <p>The silent parameter is not neccessary not used, but it may in the future.</p> </div> -<p id="footer">help-search — npm@1.1.15</p> +<p id="footer">help-search — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/init.html b/deps/npm/html/api/init.html index e69be41cb7..4e039b6a2d 100644 --- a/deps/npm/html/api/init.html +++ b/deps/npm/html/api/init.html @@ -35,7 +35,7 @@ then go ahead and use this programmatically.</p> <p><a href="../doc/json.html">json(1)</a></p> </div> -<p id="footer">init — npm@1.1.15</p> +<p id="footer">init — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/install.html b/deps/npm/html/api/install.html index 6743103c0a..6bcc25abee 100644 --- a/deps/npm/html/api/install.html +++ b/deps/npm/html/api/install.html @@ -25,7 +25,7 @@ the name of a package to be installed.</p> <p>Finally, 'callback' is a function that will be called when all packages have been installed or when an error has been encountered.</p> </div> -<p id="footer">install — npm@1.1.15</p> +<p id="footer">install — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/link.html b/deps/npm/html/api/link.html index 254f70ec7c..4c57a873a1 100644 --- a/deps/npm/html/api/link.html +++ b/deps/npm/html/api/link.html @@ -39,7 +39,7 @@ npm.commands.link('redis', cb) # link-install the package</code></pre> <p>Now, any changes to the redis package will be reflected in the package in the current working directory</p> </div> -<p id="footer">link — npm@1.1.15</p> +<p id="footer">link — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/load.html b/deps/npm/html/api/load.html index 8d434b6bf8..efa09a8b92 100644 --- a/deps/npm/html/api/load.html +++ b/deps/npm/html/api/load.html @@ -32,7 +32,7 @@ config object.</p> <p>For a list of all the available command-line configs, see <code>npm help config</code></p> </div> -<p id="footer">load — npm@1.1.15</p> +<p id="footer">load — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/ls.html b/deps/npm/html/api/ls.html index 2875f67ae7..53b72eaad0 100644 --- a/deps/npm/html/api/ls.html +++ b/deps/npm/html/api/ls.html @@ -59,7 +59,7 @@ project.</p> This means that if a submodule a same dependency as a parent module, then the dependency will only be output once.</p> </div> -<p id="footer">ls — npm@1.1.15</p> +<p id="footer">ls — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/npm.html b/deps/npm/html/api/npm.html index 11ce0eb82b..9c9e4e5029 100644 --- a/deps/npm/html/api/npm.html +++ b/deps/npm/html/api/npm.html @@ -24,7 +24,7 @@ npm.load(configObject, function (er, npm) { <h2 id="VERSION">VERSION</h2> -<p>1.1.15</p> +<p>1.1.18</p> <h2 id="DESCRIPTION">DESCRIPTION</h2> @@ -91,7 +91,7 @@ method names. Use the <code>npm.deref</code> method to find the real name.</p> <pre><code>var cmd = npm.deref("unp") // cmd === "unpublish"</code></pre> </div> -<p id="footer">npm — npm@1.1.15</p> +<p id="footer">npm — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/outdated.html b/deps/npm/html/api/outdated.html index 0f680910d9..906641fb85 100644 --- a/deps/npm/html/api/outdated.html +++ b/deps/npm/html/api/outdated.html @@ -19,7 +19,7 @@ currently outdated.</p> <p>If the 'packages' parameter is left out, npm will check all packages.</p> </div> -<p id="footer">outdated — npm@1.1.15</p> +<p id="footer">outdated — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/owner.html b/deps/npm/html/api/owner.html index fb89223ee2..25646e9ebc 100644 --- a/deps/npm/html/api/owner.html +++ b/deps/npm/html/api/owner.html @@ -34,7 +34,7 @@ that is not implemented at this time.</p> <ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul> </div> -<p id="footer">owner — npm@1.1.15</p> +<p id="footer">owner — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/pack.html b/deps/npm/html/api/pack.html index f21730accb..a8519f873f 100644 --- a/deps/npm/html/api/pack.html +++ b/deps/npm/html/api/pack.html @@ -25,7 +25,7 @@ overwritten the second time.</p> <p>If no arguments are supplied, then npm packs the current package folder.</p> </div> -<p id="footer">pack — npm@1.1.15</p> +<p id="footer">pack — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/prefix.html b/deps/npm/html/api/prefix.html index 3e538e9a8f..e62fad4e15 100644 --- a/deps/npm/html/api/prefix.html +++ b/deps/npm/html/api/prefix.html @@ -21,7 +21,7 @@ <p>This function is not useful programmatically</p> </div> -<p id="footer">prefix — npm@1.1.15</p> +<p id="footer">prefix — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/prune.html b/deps/npm/html/api/prune.html index 1b7b3a8494..e2f4cd9992 100644 --- a/deps/npm/html/api/prune.html +++ b/deps/npm/html/api/prune.html @@ -23,7 +23,7 @@ <p>Extraneous packages are packages that are not listed on the parent package's dependencies list.</p> </div> -<p id="footer">prune — npm@1.1.15</p> +<p id="footer">prune — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/publish.html b/deps/npm/html/api/publish.html index 9404e2c3b3..4fd1e0bc3b 100644 --- a/deps/npm/html/api/publish.html +++ b/deps/npm/html/api/publish.html @@ -32,7 +32,7 @@ the registry. Overwrites when the "force" environment variable is set.</p> <ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../api/owner.html">owner(3)</a></li></ul> </div> -<p id="footer">publish — npm@1.1.15</p> +<p id="footer">publish — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/rebuild.html b/deps/npm/html/api/rebuild.html index 110c63ad8a..2c91060a2a 100644 --- a/deps/npm/html/api/rebuild.html +++ b/deps/npm/html/api/rebuild.html @@ -22,7 +22,7 @@ the new binary. If no 'packages' parameter is specify, every package will be reb <p>See <code>npm help build</code></p> </div> -<p id="footer">rebuild — npm@1.1.15</p> +<p id="footer">rebuild — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/restart.html b/deps/npm/html/api/restart.html index cbb805e4c0..e75d6e8944 100644 --- a/deps/npm/html/api/restart.html +++ b/deps/npm/html/api/restart.html @@ -27,7 +27,7 @@ in the <code>packages</code> parameter.</p> <ul><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul> </div> -<p id="footer">restart — npm@1.1.15</p> +<p id="footer">restart — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/root.html b/deps/npm/html/api/root.html index 52441136a4..f9068f3c6a 100644 --- a/deps/npm/html/api/root.html +++ b/deps/npm/html/api/root.html @@ -21,7 +21,7 @@ <p>This function is not useful programmatically.</p> </div> -<p id="footer">root — npm@1.1.15</p> +<p id="footer">root — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/run-script.html b/deps/npm/html/api/run-script.html index 2a6589c07d..5828e2c458 100644 --- a/deps/npm/html/api/run-script.html +++ b/deps/npm/html/api/run-script.html @@ -29,7 +29,7 @@ assumed to be the command to run. All other elements are ignored.</p> <ul><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../api/test.html">test(3)</a></li><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/restart.html">restart(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul> </div> -<p id="footer">run-script — npm@1.1.15</p> +<p id="footer">run-script — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/search.html b/deps/npm/html/api/search.html index a7af8f4c01..dc429dd583 100644 --- a/deps/npm/html/api/search.html +++ b/deps/npm/html/api/search.html @@ -32,7 +32,7 @@ excluded term (the "searchexclude" config). The search is case insensitive and doesn't try to read your mind (it doesn't do any verb tense matching or the like).</p> </div> -<p id="footer">search — npm@1.1.15</p> +<p id="footer">search — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/shrinkwrap.html b/deps/npm/html/api/shrinkwrap.html index aabd1175bb..8022f043a6 100644 --- a/deps/npm/html/api/shrinkwrap.html +++ b/deps/npm/html/api/shrinkwrap.html @@ -26,7 +26,7 @@ but the shrinkwrap file will still be written.</p> <p>Finally, 'callback' is a function that will be called when the shrinkwrap has been saved.</p> </div> -<p id="footer">shrinkwrap — npm@1.1.15</p> +<p id="footer">shrinkwrap — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/start.html b/deps/npm/html/api/start.html index d6d81c595f..8d126d2b57 100644 --- a/deps/npm/html/api/start.html +++ b/deps/npm/html/api/start.html @@ -19,7 +19,7 @@ <p>npm can run tests on multiple packages. Just specify multiple packages in the <code>packages</code> parameter.</p> </div> -<p id="footer">start — npm@1.1.15</p> +<p id="footer">start — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/stop.html b/deps/npm/html/api/stop.html index a7d9f71294..0f5ae3f4c5 100644 --- a/deps/npm/html/api/stop.html +++ b/deps/npm/html/api/stop.html @@ -19,7 +19,7 @@ <p>npm can run stop on multiple packages. Just specify multiple packages in the <code>packages</code> parameter.</p> </div> -<p id="footer">stop — npm@1.1.15</p> +<p id="footer">stop — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/submodule.html b/deps/npm/html/api/submodule.html index 7f14555403..eb314cb438 100644 --- a/deps/npm/html/api/submodule.html +++ b/deps/npm/html/api/submodule.html @@ -33,7 +33,7 @@ dependencies into the submodule folder.</p> <ul><li>npm help json</li><li>git help submodule</li></ul> </div> -<p id="footer">submodule — npm@1.1.15</p> +<p id="footer">submodule — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/tag.html b/deps/npm/html/api/tag.html index 6f07aac204..b095e836da 100644 --- a/deps/npm/html/api/tag.html +++ b/deps/npm/html/api/tag.html @@ -29,7 +29,7 @@ parameter is missing or falsey (empty), the default froom the config will be used. For more information about how to set this config, check <code>man 3 npm-config</code> for programmatic usage or <code>man npm-config</code> for cli usage.</p> </div> -<p id="footer">tag — npm@1.1.15</p> +<p id="footer">tag — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/test.html b/deps/npm/html/api/test.html index 5f7c403c70..8ecf6512d8 100644 --- a/deps/npm/html/api/test.html +++ b/deps/npm/html/api/test.html @@ -22,7 +22,7 @@ true.</p> <p>npm can run tests on multiple packages. Just specify multiple packages in the <code>packages</code> parameter.</p> </div> -<p id="footer">test — npm@1.1.15</p> +<p id="footer">test — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/uninstall.html b/deps/npm/html/api/uninstall.html index 26c1526e1d..ff023b68b3 100644 --- a/deps/npm/html/api/uninstall.html +++ b/deps/npm/html/api/uninstall.html @@ -22,7 +22,7 @@ the name of a package to be uninstalled.</p> <p>Finally, 'callback' is a function that will be called when all packages have been uninstalled or when an error has been encountered.</p> </div> -<p id="footer">uninstall — npm@1.1.15</p> +<p id="footer">uninstall — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/unpublish.html b/deps/npm/html/api/unpublish.html index 7339c47074..1aef1c3710 100644 --- a/deps/npm/html/api/unpublish.html +++ b/deps/npm/html/api/unpublish.html @@ -26,7 +26,7 @@ is what is meant.</p> <p>If no version is specified, or if all versions are removed then the root package entry is removed from the registry entirely.</p> </div> -<p id="footer">unpublish — npm@1.1.15</p> +<p id="footer">unpublish — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/update.html b/deps/npm/html/api/update.html index b060822d5b..0f4490553e 100644 --- a/deps/npm/html/api/update.html +++ b/deps/npm/html/api/update.html @@ -18,7 +18,7 @@ <p>The 'packages' argument is an array of packages to update. The 'callback' parameter will be called when done or when an error occurs.</p> </div> -<p id="footer">update — npm@1.1.15</p> +<p id="footer">update — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/version.html b/deps/npm/html/api/version.html index 0fc66eea64..84e5618c7b 100644 --- a/deps/npm/html/api/version.html +++ b/deps/npm/html/api/version.html @@ -24,7 +24,7 @@ fail if the repo is not clean.</p> parameter. The difference, however, is this function will fail if it does not have exactly one element. The only element should be a version number.</p> </div> -<p id="footer">version — npm@1.1.15</p> +<p id="footer">version — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/view.html b/deps/npm/html/api/view.html index 21154b97f3..78350def11 100644 --- a/deps/npm/html/api/view.html +++ b/deps/npm/html/api/view.html @@ -99,7 +99,7 @@ the field name.</p> <p>corresponding to the list of fields selected.</p> </div> -<p id="footer">view — npm@1.1.15</p> +<p id="footer">view — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/api/whoami.html b/deps/npm/html/api/whoami.html index 8664dc21c2..de061a7588 100644 --- a/deps/npm/html/api/whoami.html +++ b/deps/npm/html/api/whoami.html @@ -21,7 +21,7 @@ <p>This function is not useful programmatically</p> </div> -<p id="footer">whoami — npm@1.1.15</p> +<p id="footer">whoami — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index cdf2b8d4c6..610356a714 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -267,7 +267,7 @@ will no doubt tell you to put the output in a gist or email.</p> <ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/help.html">help(1)</a></li><li><a href="../doc/index.html">index(1)</a></li></ul> </div> -<p id="footer"><a href="../doc/README.html">README</a> — npm@1.1.15</p> +<p id="footer"><a href="../doc/README.html">README</a> — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/adduser.html b/deps/npm/html/doc/adduser.html index 0334967709..d39098d8b7 100644 --- a/deps/npm/html/doc/adduser.html +++ b/deps/npm/html/doc/adduser.html @@ -39,7 +39,7 @@ authorize on a new machine.</p> <ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/owner.html">owner(1)</a></li><li><a href="../doc/whoami.html">whoami(1)</a></li></ul> </div> -<p id="footer">adduser — npm@1.1.15</p> +<p id="footer">adduser — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/bin.html b/deps/npm/html/doc/bin.html index 9ff69a108e..a3f6d9e6dc 100644 --- a/deps/npm/html/doc/bin.html +++ b/deps/npm/html/doc/bin.html @@ -20,7 +20,7 @@ <ul><li><a href="../doc/prefix.html">prefix(1)</a></li><li><a href="../doc/root.html">root(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul> </div> -<p id="footer">bin — npm@1.1.15</p> +<p id="footer">bin — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/bugs.html b/deps/npm/html/doc/bugs.html index 165ed06b5b..0802ecf387 100644 --- a/deps/npm/html/doc/bugs.html +++ b/deps/npm/html/doc/bugs.html @@ -36,7 +36,7 @@ config param.</p> <ul><li><a href="../doc/docs.html">docs(1)</a></li><li><a href="../doc/view.html">view(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/json.html">json(1)</a></li></ul> </div> -<p id="footer">bugs — npm@1.1.15</p> +<p id="footer">bugs — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/build.html b/deps/npm/html/doc/build.html index 2c411e16e7..7b06b5c2ef 100644 --- a/deps/npm/html/doc/build.html +++ b/deps/npm/html/doc/build.html @@ -25,7 +25,7 @@ A folder containing a <code>package.json</code> file in its root.</li></ul> <ul><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/link.html">link(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/json.html">json(1)</a></li></ul> </div> -<p id="footer">build — npm@1.1.15</p> +<p id="footer">build — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/bundle.html b/deps/npm/html/doc/bundle.html index 960460fd70..8103455f47 100644 --- a/deps/npm/html/doc/bundle.html +++ b/deps/npm/html/doc/bundle.html @@ -20,7 +20,7 @@ install packages into the local space.</p> <ul><li><a href="../doc/install.html">install(1)</a></li></ul> </div> -<p id="footer">bundle — npm@1.1.15</p> +<p id="footer">bundle — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cache.html b/deps/npm/html/doc/cache.html index 67eea99287..fee53f14fa 100644 --- a/deps/npm/html/doc/cache.html +++ b/deps/npm/html/doc/cache.html @@ -66,7 +66,7 @@ they do not make an HTTP request to the registry.</p> <ul><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/pack.html">pack(1)</a></li></ul> </div> -<p id="footer">cache — npm@1.1.15</p> +<p id="footer">cache — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/changelog.html b/deps/npm/html/doc/changelog.html index 165f32e69d..8d8df24f58 100644 --- a/deps/npm/html/doc/changelog.html +++ b/deps/npm/html/doc/changelog.html @@ -65,7 +65,7 @@ <ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li></ul> </div> -<p id="footer">changelog — npm@1.1.15</p> +<p id="footer">changelog — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/coding-style.html b/deps/npm/html/doc/coding-style.html index 63307b18c4..ec6c9f1ee3 100644 --- a/deps/npm/html/doc/coding-style.html +++ b/deps/npm/html/doc/coding-style.html @@ -191,7 +191,7 @@ set to anything."</p> <ul><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li></ul> </div> -<p id="footer">coding-style — npm@1.1.15</p> +<p id="footer">coding-style — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/completion.html b/deps/npm/html/doc/completion.html index 2e4af15040..5964d57183 100644 --- a/deps/npm/html/doc/completion.html +++ b/deps/npm/html/doc/completion.html @@ -33,7 +33,7 @@ completions based on the arguments.</p> <ul><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li></ul> </div> -<p id="footer">completion — npm@1.1.15</p> +<p id="footer">completion — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/config.html b/deps/npm/html/doc/config.html index 9ddcf29105..ae2b8adb32 100644 --- a/deps/npm/html/doc/config.html +++ b/deps/npm/html/doc/config.html @@ -105,7 +105,7 @@ global config.</p> <p>The following shorthands are parsed on the command-line:</p> -<ul><li><code>-v</code>: <code>--version</code></li><li><code>-h</code>, <code>-?</code>, <code>--help</code>, <code>-H</code>: <code>--usage</code></li><li><code>-s</code>, <code>--silent</code>: <code>--loglevel silent</code></li><li><code>-q</code>, <code>--quiet</code>: <code>--loglevel warn</code></li><li><code>-d</code>: <code>--loglevel info</code></li><li><code>-dd</code>, <code>--verbose</code>: <code>--loglevel verbose</code></li><li><code>-ddd</code>: <code>--loglevel silly</code></li><li><code>-g</code>: <code>--global</code></li><li><code>-l</code>: <code>--long</code></li><li><code>-m</code>: <code>--message</code></li><li><code>-p</code>, <code>--porcelain</code>: <code>--parseable</code></li><li><code>-reg</code>: <code>--registry</code></li><li><code>-v</code>: <code>--version</code></li><li><code>-f</code>: <code>--force</code></li><li><code>-l</code>: <code>--long</code></li><li><code>-desc</code>: <code>--description</code></li><li><code>-S</code>: <code>--save</code></li><li><code>-y</code>: <code>--yes</code></li><li><code>-n</code>: <code>--yes false</code></li><li><code>ll</code> and <code>la</code> commands: <code>ls --long</code></li></ul> +<ul><li><code>-v</code>: <code>--version</code></li><li><code>-h</code>, <code>-?</code>, <code>--help</code>, <code>-H</code>: <code>--usage</code></li><li><code>-s</code>, <code>--silent</code>: <code>--loglevel silent</code></li><li><code>-q</code>, <code>--quiet</code>: <code>--loglevel warn</code></li><li><code>-d</code>: <code>--loglevel info</code></li><li><code>-dd</code>, <code>--verbose</code>: <code>--loglevel verbose</code></li><li><code>-ddd</code>: <code>--loglevel silly</code></li><li><code>-g</code>: <code>--global</code></li><li><code>-l</code>: <code>--long</code></li><li><code>-m</code>: <code>--message</code></li><li><code>-p</code>, <code>--porcelain</code>: <code>--parseable</code></li><li><code>-reg</code>: <code>--registry</code></li><li><code>-v</code>: <code>--version</code></li><li><code>-f</code>: <code>--force</code></li><li><code>-l</code>: <code>--long</code></li><li><code>-desc</code>: <code>--description</code></li><li><code>-S</code>: <code>--save</code></li><li><code>-D</code>: <code>--save-dev</code></li><li><code>-O</code>: <code>--save-optional</code></li><li><code>-y</code>: <code>--yes</code></li><li><code>-n</code>: <code>--yes false</code></li><li><code>ll</code> and <code>la</code> commands: <code>ls --long</code></li></ul> <p>If the specified configuration param resolves unambiguously to a known configuration parameter, then it is expanded to that configuration @@ -320,6 +320,12 @@ user.</p> <p>A proxy to use for outgoing https requests.</p> +<h3 id="user-agent">user-agent</h3> + +<ul><li>Default: npm/{npm.version} node/{process.version}</li><li>Type: String</li></ul> + +<p>Sets a User-Agent to the request header</p> + <h3 id="ignore">ignore</h3> <ul><li>Default: ""</li><li>Type: string</li></ul> @@ -510,6 +516,22 @@ this as true.</p> <p>Only works if there is already a package.json file present.</p> +<h3 id="save-dev">save-dev</h3> + +<ul><li>Default: false</li><li>Type: Boolean</li></ul> + +<p>Save installed packages to a package.json file as devDependencies.</p> + +<p>Only works if there is already a package.json file present.</p> + +<h3 id="save-optional">save-optional</h3> + +<ul><li>Default: false</li><li>Type: Boolean</li></ul> + +<p>Save installed packages to a package.json file as optionalDependencies.</p> + +<p>Only works if there is already a package.json file present.</p> + <h3 id="searchopts">searchopts</h3> <ul><li>Default: ""</li><li>Type: String</li></ul> @@ -662,7 +684,7 @@ then answer "no" to any prompt.</p> <ul><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li></ul> </div> -<p id="footer">config — npm@1.1.15</p> +<p id="footer">config — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/deprecate.html b/deps/npm/html/doc/deprecate.html index 19f132e78d..74b053ce84 100644 --- a/deps/npm/html/doc/deprecate.html +++ b/deps/npm/html/doc/deprecate.html @@ -29,7 +29,7 @@ something like this:</p> <ul><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul> </div> -<p id="footer">deprecate — npm@1.1.15</p> +<p id="footer">deprecate — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/developers.html b/deps/npm/html/doc/developers.html index 33c1c1f683..c4765ff9d0 100644 --- a/deps/npm/html/doc/developers.html +++ b/deps/npm/html/doc/developers.html @@ -160,7 +160,7 @@ from a fresh checkout.</p> <ul><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/init.html">init(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul> </div> -<p id="footer">developers — npm@1.1.15</p> +<p id="footer">developers — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/disputes.html b/deps/npm/html/doc/disputes.html index 5954f06ea0..68a626be65 100644 --- a/deps/npm/html/doc/disputes.html +++ b/deps/npm/html/doc/disputes.html @@ -80,7 +80,7 @@ license statement)</li><li>Illegal content.</li></ol> <ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/owner.html">owner(1)</a></li></ul> </div> -<p id="footer">disputes — npm@1.1.15</p> +<p id="footer">disputes — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/docs.html b/deps/npm/html/doc/docs.html index f321bc9ec7..6ebcb41873 100644 --- a/deps/npm/html/doc/docs.html +++ b/deps/npm/html/doc/docs.html @@ -37,7 +37,7 @@ config param.</p> <ul><li><a href="../doc/view.html">view(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/json.html">json(1)</a></li></ul> </div> -<p id="footer">docs — npm@1.1.15</p> +<p id="footer">docs — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/edit.html b/deps/npm/html/doc/edit.html index 0a6f98fded..8c9cc7587d 100644 --- a/deps/npm/html/doc/edit.html +++ b/deps/npm/html/doc/edit.html @@ -37,7 +37,7 @@ or <code>"notepad"</code> on Windows.</li><li>Type: path</li></ul> <ul><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/explore.html">explore(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul> </div> -<p id="footer">edit — npm@1.1.15</p> +<p id="footer">edit — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/explore.html b/deps/npm/html/doc/explore.html index b5959ed1c2..a44d335ec9 100644 --- a/deps/npm/html/doc/explore.html +++ b/deps/npm/html/doc/explore.html @@ -40,7 +40,7 @@ Windows</li><li>Type: path</li></ul> <ul><li><a href="../doc/submodule.html">submodule(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/edit.html">edit(1)</a></li><li><a href="../doc/rebuild.html">rebuild(1)</a></li><li><a href="../doc/build.html">build(1)</a></li><li><a href="../doc/install.html">install(1)</a></li></ul> </div> -<p id="footer">explore — npm@1.1.15</p> +<p id="footer">explore — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/faq.html b/deps/npm/html/doc/faq.html index 77d9268169..aa8fa17a7f 100644 --- a/deps/npm/html/doc/faq.html +++ b/deps/npm/html/doc/faq.html @@ -241,7 +241,7 @@ We'll have someone kick it or something.</p> <ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li></ul> </div> -<p id="footer">faq — npm@1.1.15</p> +<p id="footer">faq — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/folders.html b/deps/npm/html/doc/folders.html index 180851a6b9..b670abf5ec 100644 --- a/deps/npm/html/doc/folders.html +++ b/deps/npm/html/doc/folders.html @@ -205,7 +205,7 @@ cannot be found elsewhere. See <code><a href="../doc/json.html">json(1)</a></co <ul><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/pack.html">pack(1)</a></li><li><a href="../doc/cache.html">cache(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li></ul> </div> -<p id="footer">folders — npm@1.1.15</p> +<p id="footer">folders — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/help-search.html b/deps/npm/html/doc/help-search.html index 3821434035..2dfa34071f 100644 --- a/deps/npm/html/doc/help-search.html +++ b/deps/npm/html/doc/help-search.html @@ -38,7 +38,7 @@ where the terms were found in the documentation.</p> <ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/help.html">help(1)</a></li></ul> </div> -<p id="footer">help-search — npm@1.1.15</p> +<p id="footer">help-search — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/help.html b/deps/npm/html/doc/help.html index 6414a2ec5d..e01dd04721 100644 --- a/deps/npm/html/doc/help.html +++ b/deps/npm/html/doc/help.html @@ -36,7 +36,7 @@ matches are equivalent to specifying a topic name.</p> <ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/README.html">README</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/help-search.html">help-search(1)</a></li><li><a href="../doc/index.html">index(1)</a></li></ul> </div> -<p id="footer">help — npm@1.1.15</p> +<p id="footer">help — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/index.html b/deps/npm/html/doc/index.html index 1ec1953456..5109af4736 100644 --- a/deps/npm/html/doc/index.html +++ b/deps/npm/html/doc/index.html @@ -384,7 +384,7 @@ <p> Display npm username</p> </div> -<p id="footer">index — npm@1.1.15</p> +<p id="footer">index — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/init.html b/deps/npm/html/doc/init.html index 7a245b10ba..afa20aad36 100644 --- a/deps/npm/html/doc/init.html +++ b/deps/npm/html/doc/init.html @@ -29,7 +29,7 @@ without a really good reason to do so.</p> <ul><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/version.html">version(1)</a></li></ul> </div> -<p id="footer">init — npm@1.1.15</p> +<p id="footer">init — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/install.html b/deps/npm/html/doc/install.html index 5bf7d23417..e9ac77dec7 100644 --- a/deps/npm/html/doc/install.html +++ b/deps/npm/html/doc/install.html @@ -14,9 +14,10 @@ npm install <tarball file> npm install <tarball url> npm install <folder> -npm install <name> +npm install <name> [--save|--save-dev|--save-optional] npm install <name>@<tag> npm install <name>@<version> +npm install <name>@<version range> npm install <name>@<version range></code></pre> <h2 id="DESCRIPTION">DESCRIPTION</h2> @@ -34,33 +35,29 @@ 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).</p> -<ul><li><p><code>npm install</code> (in package directory, no arguments): -Install the dependencies in the local node_modules folder.</p><p>In global mode (ie, with <code>-g</code> or <code>--global</code> appended to the command), +<ul><li><p><code>npm install</code> (in package directory, no arguments):</p><p>Install the dependencies in the local node_modules folder.</p><p>In global mode (ie, with <code>-g</code> or <code>--global</code> appended to the command), it installs the current package context (ie, the current working -directory) as a global package.</p></li><li><p><code>npm install <folder></code>: -Install a package that is sitting in a folder on the filesystem.</p></li><li><p><code>npm install <tarball file></code>: -Install a package that is sitting on the filesystem. Note: if you just want +directory) as a global package.</p></li><li><p><code>npm install <folder></code>:</p><p>Install a package that is sitting in a folder on the filesystem.</p></li><li><p><code>npm install <tarball file></code>:</p><p>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 <code>npm link</code>.</p><p>Example:</p><pre><code>npm install ./package.tgz</code></pre></li><li><p><code>npm install <tarball url></code>: -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://"</p><p>Example:</p><pre><code>npm install https://github.com/indexzero/forever/tarball/v0.5.6</code></pre></li><li><p><code>npm install <name></code>: -Do a <code><name>@<tag></code> install, where <code><tag></code> is the "tag" config. (See -<code><a href="../doc/config.html">config(1)</a></code>)</p><p>Example:</p><pre><code>npm install sax</code></pre><p><strong>Note</strong>: If there is a file or folder named <code><name></code> in the current +using <code>npm link</code>.</p><p>Example:</p><pre><code> npm install ./package.tgz</code></pre></li><li><p><code>npm install <tarball url></code>:</p><p>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://"</p><p>Example:</p><pre><code> npm install https://github.com/indexzero/forever/tarball/v0.5.6</code></pre></li><li><p><code>npm install <name> [--save|--save-dev|--save-optional]</code>:</p><p>Do a <code><name>@<tag></code> install, where <code><tag></code> is the "tag" config. (See +<code><a href="../doc/config.html">config(1)</a></code>.)</p><p>In most cases, this will install the latest version +of the module published on npm.</p><p>Example:</p><p> npm install sax</p><p><code>npm install</code> takes 3 exclusive, optional flags which save or update +the package version in your main package.json:</p><ul><li><p><code>--save</code>: Package will appear in your <code>dependencies</code>.</p></li><li><p><code>--save-dev</code>: Package will appear in your <code>devDependencies</code>.</p></li><li><p><code>--save-optional</code>: Package will appear in your <code>optionalDependencies</code>.</p><p>Examples:</p><p> npm install sax --save + npm install node-tap --save-dev + npm install dtrace-provider --save-optional</p><p><strong>Note</strong>: If there is a file or folder named <code><name></code> 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.</p></li><li><p><code>npm install <name>@<tag></code>: -Install the version of the package that is referenced by the specified tag. +fetch the package by name if it is not valid.</p></li></ul></li><li><p><code>npm install <name>@<tag></code>:</p><p>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.</p><p>Example:</p><pre><code>npm install sax@latest</code></pre></li><li><p><code>npm install <name>@<version></code>: -Install the specified version of the package. This will fail if the version -has not been published to the registry.</p><p>Example:</p><pre><code>npm install sax@0.1.1</code></pre></li><li><p><code>npm install <name>@<version range></code>: -Install a version of the package matching the specified version range. This +will fail.</p><p>Example:</p><pre><code> npm install sax@latest</code></pre></li><li><p><code>npm install <name>@<version></code>:</p><p>Install the specified version of the package. This will fail if the version +has not been published to the registry.</p><p>Example:</p><pre><code> npm install sax@0.1.1</code></pre></li><li><p><code>npm install <name>@<version range></code>:</p><p>Install a version of the package matching the specified version range. This will follow the same rules for resolving dependencies described in <code><a href="../doc/json.html">json(1)</a></code>.</p><p>Note that most version ranges must be put in quotes so that your shell will -treat it as a single argument.</p><p>Example:</p><pre><code>npm install sax@">=0.1.0 <0.2.0"</code></pre></li><li><p><code>npm install <git remote url></code>:</p><p>Install a package by cloning a git remote url. The format of the git -url is:</p><pre><code><protocol>://[<user>@]<hostname><separator><path>[#<commit-ish>]</code></pre><p><code><protocol></code> is one of <code>git</code>, <code>git+ssh</code>, <code>git+http</code>, or +treat it as a single argument.</p><p>Example:</p><p> npm install sax@">=0.1.0 <0.2.0"</p></li><li><p><code>npm install <git remote url></code>:</p><p>Install a package by cloning a git remote url. The format of the git +url is:</p><p> <protocol>://[<user>@]<hostname><separator><path>[#<commit-ish>]</p><p><code><protocol></code> is one of <code>git</code>, <code>git+ssh</code>, <code>git+http</code>, or <code>git+https</code>. If no <code><commit-ish></code> is specified, then <code>master</code> is -used.</p><p>Examples:</p><pre><code>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</code></pre></li></ul> +used.</p><p>Examples:</p><pre><code> 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</code></pre></li></ul> <p>You may combine multiple arguments, and even multiple types of arguments. For example:</p> @@ -136,7 +133,7 @@ affects a real use-case, it will be investigated.</p> <ul><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/update.html">update(1)</a></li><li><a href="../doc/link.html">link(1)</a></li><li><a href="../doc/rebuild.html">rebuild(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/build.html">build(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/tag.html">tag(1)</a></li><li><a href="../doc/rm.html">rm(1)</a></li><li><a href="../doc/shrinkwrap.html">shrinkwrap(1)</a></li></ul> </div> -<p id="footer">install — npm@1.1.15</p> +<p id="footer">install — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/json.html b/deps/npm/html/doc/json.html index 6d5a8661fa..686992b0cc 100644 --- a/deps/npm/html/doc/json.html +++ b/deps/npm/html/doc/json.html @@ -457,7 +457,7 @@ to publish it.</p> <p>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 <code>publishConfig</code> hash described below to override the <code>registry</code> config param at publish-time.</p> @@ -478,7 +478,7 @@ overridden.</p> <ul><li><a href="../doc/semver.html">semver(1)</a></li><li><a href="../doc/init.html">init(1)</a></li><li><a href="../doc/version.html">version(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/help.html">help(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/rm.html">rm(1)</a></li></ul> </div> -<p id="footer">json — npm@1.1.15</p> +<p id="footer">json — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/link.html b/deps/npm/html/doc/link.html index d63dbd24c5..10791fe94f 100644 --- a/deps/npm/html/doc/link.html +++ b/deps/npm/html/doc/link.html @@ -58,7 +58,7 @@ installation target into your project's <code>node_modules</code> folder.</p> <ul><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul> </div> -<p id="footer">link — npm@1.1.15</p> +<p id="footer">link — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/list.html b/deps/npm/html/doc/list.html index cbbb7d9eef..74862a6d4e 100644 --- a/deps/npm/html/doc/list.html +++ b/deps/npm/html/doc/list.html @@ -58,7 +58,7 @@ project.</p> <ul><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/link.html">link(1)</a></li><li><a href="../doc/prune.html">prune(1)</a></li><li><a href="../doc/outdated.html">outdated(1)</a></li><li><a href="../doc/update.html">update(1)</a></li></ul> </div> -<p id="footer">list — npm@1.1.15</p> +<p id="footer">list — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/npm.html b/deps/npm/html/doc/npm.html index 0c60d17bf7..1ec20192c5 100644 --- a/deps/npm/html/doc/npm.html +++ b/deps/npm/html/doc/npm.html @@ -14,7 +14,7 @@ <h2 id="VERSION">VERSION</h2> -<p>1.1.15</p> +<p>1.1.18</p> <h2 id="DESCRIPTION">DESCRIPTION</h2> @@ -135,7 +135,7 @@ will no doubt tell you to put the output in a gist or email.</p> <ul><li><a href="../doc/help.html">help(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/README.html">README</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/index.html">index(1)</a></li><li><a href="../api/npm.html">npm(3)</a></li></ul> </div> -<p id="footer">npm — npm@1.1.15</p> +<p id="footer">npm — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/outdated.html b/deps/npm/html/doc/outdated.html index 188f16fc77..e7940fd8e2 100644 --- a/deps/npm/html/doc/outdated.html +++ b/deps/npm/html/doc/outdated.html @@ -21,7 +21,7 @@ packages are currently outdated.</p> <ul><li><a href="../doc/update.html">update(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li></ul> </div> -<p id="footer">outdated — npm@1.1.15</p> +<p id="footer">outdated — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/owner.html b/deps/npm/html/doc/owner.html index 85c45c3e10..1265d51713 100644 --- a/deps/npm/html/doc/owner.html +++ b/deps/npm/html/doc/owner.html @@ -34,7 +34,7 @@ that is not implemented at this time.</p> <ul><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../doc/disputes.html">disputes(1)</a></li></ul> </div> -<p id="footer">owner — npm@1.1.15</p> +<p id="footer">owner — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/pack.html b/deps/npm/html/doc/pack.html index 742903f2ee..d49f2b4588 100644 --- a/deps/npm/html/doc/pack.html +++ b/deps/npm/html/doc/pack.html @@ -29,7 +29,7 @@ overwritten the second time.</p> <ul><li><a href="../doc/cache.html">cache(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul> </div> -<p id="footer">pack — npm@1.1.15</p> +<p id="footer">pack — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/prefix.html b/deps/npm/html/doc/prefix.html index 0aeb01519a..91df87a228 100644 --- a/deps/npm/html/doc/prefix.html +++ b/deps/npm/html/doc/prefix.html @@ -20,7 +20,7 @@ <ul><li><a href="../doc/root.html">root(1)</a></li><li><a href="../doc/bin.html">bin(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul> </div> -<p id="footer">prefix — npm@1.1.15</p> +<p id="footer">prefix — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/prune.html b/deps/npm/html/doc/prune.html index 49bb103b3c..c8ae0c632c 100644 --- a/deps/npm/html/doc/prune.html +++ b/deps/npm/html/doc/prune.html @@ -25,7 +25,7 @@ package's dependencies list.</p> <ul><li><a href="../doc/rm.html">rm(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/list.html">list(1)</a></li></ul> </div> -<p id="footer">prune — npm@1.1.15</p> +<p id="footer">prune — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/publish.html b/deps/npm/html/doc/publish.html index 54af740fbb..523d195d84 100644 --- a/deps/npm/html/doc/publish.html +++ b/deps/npm/html/doc/publish.html @@ -29,7 +29,7 @@ the registry. Overwrites when the "--force" flag is set.</p> <ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../doc/owner.html">owner(1)</a></li><li><a href="../doc/deprecate.html">deprecate(1)</a></li><li><a href="../doc/tag.html">tag(1)</a></li></ul> </div> -<p id="footer">publish — npm@1.1.15</p> +<p id="footer">publish — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/rebuild.html b/deps/npm/html/doc/rebuild.html index 15b66bdb9e..206ac82a4d 100644 --- a/deps/npm/html/doc/rebuild.html +++ b/deps/npm/html/doc/rebuild.html @@ -25,7 +25,7 @@ the new binary.</p> <ul><li><a href="../doc/build.html">build(1)</a></li><li><a href="../doc/install.html">install(1)</a></li></ul> </div> -<p id="footer">rebuild — npm@1.1.15</p> +<p id="footer">rebuild — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/registry.html b/deps/npm/html/doc/registry.html index c594273f73..9748847c52 100644 --- a/deps/npm/html/doc/registry.html +++ b/deps/npm/html/doc/registry.html @@ -97,7 +97,7 @@ ask for help on the <a href="mailto:npm-@googlegroups.com">npm-@googlegroups.com <ul><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/disputes.html">disputes(1)</a></li></ul> </div> -<p id="footer">registry — npm@1.1.15</p> +<p id="footer">registry — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/removing-npm.html b/deps/npm/html/doc/removing-npm.html index 37d614ce4b..0e8bfabddc 100644 --- a/deps/npm/html/doc/removing-npm.html +++ b/deps/npm/html/doc/removing-npm.html @@ -58,7 +58,7 @@ modules. To track those down, you can do the following:</p> <ul><li><a href="../doc/README.html">README</a></li><li><a href="../doc/rm.html">rm(1)</a></li><li><a href="../doc/prune.html">prune(1)</a></li></ul> </div> -<p id="footer">removing-npm — npm@1.1.15</p> +<p id="footer">removing-npm — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/restart.html b/deps/npm/html/doc/restart.html index 3429918c22..44f987fe65 100644 --- a/deps/npm/html/doc/restart.html +++ b/deps/npm/html/doc/restart.html @@ -24,7 +24,7 @@ the "start" script.</p> <ul><li><a href="../doc/run-script.html">run-script(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/test.html">test(1)</a></li><li><a href="../doc/start.html">start(1)</a></li><li><a href="../doc/stop.html">stop(1)</a></li></ul> </div> -<p id="footer">restart — npm@1.1.15</p> +<p id="footer">restart — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/root.html b/deps/npm/html/doc/root.html index b82227d0d9..3cca20a70b 100644 --- a/deps/npm/html/doc/root.html +++ b/deps/npm/html/doc/root.html @@ -20,7 +20,7 @@ <ul><li><a href="../doc/prefix.html">prefix(1)</a></li><li><a href="../doc/bin.html">bin(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul> </div> -<p id="footer">root — npm@1.1.15</p> +<p id="footer">root — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/run-script.html b/deps/npm/html/doc/run-script.html index f7889df605..14ce47ed0b 100644 --- a/deps/npm/html/doc/run-script.html +++ b/deps/npm/html/doc/run-script.html @@ -23,7 +23,7 @@ called directly, as well.</p> <ul><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/test.html">test(1)</a></li><li><a href="../doc/start.html">start(1)</a></li><li><a href="../doc/restart.html">restart(1)</a></li><li><a href="../doc/stop.html">stop(1)</a></li></ul> </div> -<p id="footer">run-script — npm@1.1.15</p> +<p id="footer">run-script — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/scripts.html b/deps/npm/html/doc/scripts.html index b4d473c847..11d75e10a0 100644 --- a/deps/npm/html/doc/scripts.html +++ b/deps/npm/html/doc/scripts.html @@ -177,7 +177,7 @@ will sudo the npm command in question.</li></ul> <ul><li><a href="../doc/run-script.html">run-script(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/install.html">install(1)</a></li></ul> </div> -<p id="footer">scripts — npm@1.1.15</p> +<p id="footer">scripts — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/search.html b/deps/npm/html/doc/search.html index e347f763e3..67f3b6ec44 100644 --- a/deps/npm/html/doc/search.html +++ b/deps/npm/html/doc/search.html @@ -24,7 +24,7 @@ expression characters must be escaped or quoted in most shells.)</p> <ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/view.html">view(1)</a></li></ul> </div> -<p id="footer">search — npm@1.1.15</p> +<p id="footer">search — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/semver.html b/deps/npm/html/doc/semver.html index 8fbe08aa17..583f9b13e5 100644 --- a/deps/npm/html/doc/semver.html +++ b/deps/npm/html/doc/semver.html @@ -104,7 +104,7 @@ that satisfies the range, or null if none of them do.</li></ul> <ul><li><a href="../doc/json.html">json(1)</a></li></ul> </div> -<p id="footer">semver — npm@1.1.15</p> +<p id="footer">semver — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/shrinkwrap.html b/deps/npm/html/doc/shrinkwrap.html index 78a631b7ff..ba6335d818 100644 --- a/deps/npm/html/doc/shrinkwrap.html +++ b/deps/npm/html/doc/shrinkwrap.html @@ -169,7 +169,7 @@ versions.</p> <ul><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/list.html">list(1)</a></li></ul> </div> -<p id="footer">shrinkwrap — npm@1.1.15</p> +<p id="footer">shrinkwrap — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/star.html b/deps/npm/html/doc/star.html index b1312e8c98..a662e11808 100644 --- a/deps/npm/html/doc/star.html +++ b/deps/npm/html/doc/star.html @@ -26,7 +26,7 @@ a vaguely positive way to show that you care.</p> <ul><li><a href="../doc/view.html">view(1)</a></li><li><a href="../doc/whoami.html">whoami(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li></ul> </div> -<p id="footer">star — npm@1.1.15</p> +<p id="footer">star — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/start.html b/deps/npm/html/doc/start.html index 8c377d65db..92613baeab 100644 --- a/deps/npm/html/doc/start.html +++ b/deps/npm/html/doc/start.html @@ -20,7 +20,7 @@ <ul><li><a href="../doc/run-script.html">run-script(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/test.html">test(1)</a></li><li><a href="../doc/restart.html">restart(1)</a></li><li><a href="../doc/stop.html">stop(1)</a></li></ul> </div> -<p id="footer">start — npm@1.1.15</p> +<p id="footer">start — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/stop.html b/deps/npm/html/doc/stop.html index 5fa00f70ce..05e6101309 100644 --- a/deps/npm/html/doc/stop.html +++ b/deps/npm/html/doc/stop.html @@ -20,7 +20,7 @@ <ul><li><a href="../doc/run-script.html">run-script(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/test.html">test(1)</a></li><li><a href="../doc/start.html">start(1)</a></li><li><a href="../doc/restart.html">restart(1)</a></li></ul> </div> -<p id="footer">stop — npm@1.1.15</p> +<p id="footer">stop — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/submodule.html b/deps/npm/html/doc/submodule.html index f58f168ea6..3207241858 100644 --- a/deps/npm/html/doc/submodule.html +++ b/deps/npm/html/doc/submodule.html @@ -33,7 +33,7 @@ dependencies into the submodule folder.</p> <ul><li><a href="../doc/json.html">json(1)</a></li><li>git help submodule</li></ul> </div> -<p id="footer">submodule — npm@1.1.15</p> +<p id="footer">submodule — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/tag.html b/deps/npm/html/doc/tag.html index fbef8bb597..3b299e2b56 100644 --- a/deps/npm/html/doc/tag.html +++ b/deps/npm/html/doc/tag.html @@ -21,7 +21,7 @@ <ul><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul> </div> -<p id="footer">tag — npm@1.1.15</p> +<p id="footer">tag — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/test.html b/deps/npm/html/doc/test.html index 4d8a314b85..2cc4f3dbdc 100644 --- a/deps/npm/html/doc/test.html +++ b/deps/npm/html/doc/test.html @@ -23,7 +23,7 @@ true.</p> <ul><li><a href="../doc/run-script.html">run-script(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/start.html">start(1)</a></li><li><a href="../doc/restart.html">restart(1)</a></li><li><a href="../doc/stop.html">stop(1)</a></li></ul> </div> -<p id="footer">test — npm@1.1.15</p> +<p id="footer">test — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/uninstall.html b/deps/npm/html/doc/uninstall.html index b46fac9fc8..2223c0ca4a 100644 --- a/deps/npm/html/doc/uninstall.html +++ b/deps/npm/html/doc/uninstall.html @@ -22,7 +22,7 @@ on its behalf.</p> <ul><li><a href="../doc/prune.html">prune(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul> </div> -<p id="footer">uninstall — npm@1.1.15</p> +<p id="footer">uninstall — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/unpublish.html b/deps/npm/html/doc/unpublish.html index 4cfb8d9c00..bfae9b8397 100644 --- a/deps/npm/html/doc/unpublish.html +++ b/deps/npm/html/doc/unpublish.html @@ -34,7 +34,7 @@ the root package entry is removed from the registry entirely.</p> <ul><li><a href="../doc/deprecate.html">deprecate(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../doc/owner.html">owner(1)</a></li></ul> </div> -<p id="footer">unpublish — npm@1.1.15</p> +<p id="footer">unpublish — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/update.html b/deps/npm/html/doc/update.html index 0fef986258..98c2e9cd00 100644 --- a/deps/npm/html/doc/update.html +++ b/deps/npm/html/doc/update.html @@ -23,7 +23,7 @@ <ul><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/outdated.html">outdated(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/list.html">list(1)</a></li></ul> </div> -<p id="footer">update — npm@1.1.15</p> +<p id="footer">update — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/version.html b/deps/npm/html/doc/version.html index c65c1cabf7..dbf5b105ff 100644 --- a/deps/npm/html/doc/version.html +++ b/deps/npm/html/doc/version.html @@ -31,7 +31,7 @@ will use it as a commit message when creating a version commit.</p> <ul><li><a href="../doc/init.html">init(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/semver.html">semver(1)</a></li></ul> </div> -<p id="footer">version — npm@1.1.15</p> +<p id="footer">version — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/view.html b/deps/npm/html/doc/view.html index 444d0a9585..0d12ecf4b0 100644 --- a/deps/npm/html/doc/view.html +++ b/deps/npm/html/doc/view.html @@ -88,7 +88,7 @@ the field name.</p> <ul><li><a href="../doc/search.html">search(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/docs.html">docs(1)</a></li></ul> </div> -<p id="footer">view — npm@1.1.15</p> +<p id="footer">view — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/whoami.html b/deps/npm/html/doc/whoami.html index aaa61c8397..e835c716c2 100644 --- a/deps/npm/html/doc/whoami.html +++ b/deps/npm/html/doc/whoami.html @@ -20,7 +20,7 @@ <ul><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li></ul> </div> -<p id="footer">whoami — npm@1.1.15</p> +<p id="footer">whoami — npm@1.1.18</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/index.html b/deps/npm/html/index.html index 9ccf28e57c..4a97cd3e7a 100644 --- a/deps/npm/html/index.html +++ b/deps/npm/html/index.html @@ -59,11 +59,14 @@ code { background:#fff ; outline: 1px solid #ccc; padding:0 2px; } <p>npm is a package manager for <a href="http://nodejs.org/">node</a>. You can use it to install and publish your node programs. It manages dependencies and does other cool stuff.</p> -<h2>One Line Install</h2> +<h2>Easy Zero Line Install</h2> -<code>curl http://npmjs.org/install.sh | sh</code> +<p><a href="http://nodejs.org/#download">Install Node.js</a> <br> +(npm comes with it.)</p> -<h2>More Than One Line Install</h2> +<p>Because a one-line install is one too many.</p> + +<h2>Fancy Install</h2> <ol> <li><a href="https://github.com/isaacs/npm">Get the code.</a> @@ -71,6 +74,12 @@ code { background:#fff ; outline: 1px solid #ccc; padding:0 2px; } says to do. </ol> +<p>There's a pretty thorough install script at +<a href="http://npmjs.org/install.sh">http://npmjs.org/install.sh</a></p> + +<p>For maximum security, make sure to thorougly inspect every +program that you run on your computer!</p> + <h2>Other Cool Stuff</h2> <ul> diff --git a/deps/npm/lib/bugs.js b/deps/npm/lib/bugs.js index a3a017cc02..7982746cfb 100644 --- a/deps/npm/lib/bugs.js +++ b/deps/npm/lib/bugs.js @@ -28,7 +28,7 @@ function bugs (args, cb) { } if (repo) { if (Array.isArray(repo)) repo = repo.shift() - if (repo.url) repo = repo.url + if (repo.hasOwnProperty("url")) repo = repo.url log.verbose(repo, "repository") if (repo && repo.match(/^(https?:\/\/|git(:\/\/|@))github.com/)) { return open(repo.replace(/^git(@|:\/\/)/, "http://") diff --git a/deps/npm/lib/docs.js b/deps/npm/lib/docs.js index de9f71c654..8af4c1bb66 100644 --- a/deps/npm/lib/docs.js +++ b/deps/npm/lib/docs.js @@ -25,7 +25,7 @@ function docs (args, cb) { if (homepage) return open(homepage, cb) if (repo) { if (Array.isArray(repo)) repo = repo.shift() - if (repo.url) repo = repo.url + if (repo.hasOwnProperty("url")) repo = repo.url log.verbose(repo, "repository") if (repo) { return open(repo.replace(/^git(@|:\/\/)/, 'http://') diff --git a/deps/npm/lib/init.js b/deps/npm/lib/init.js index 1c64d97607..7cd7da8e27 100644 --- a/deps/npm/lib/init.js +++ b/deps/npm/lib/init.js @@ -99,7 +99,10 @@ function init_ (data, folder, cb) { , function (er, r) { if (er) return cb(er) if (r !== "none") { - data.repository = (data.repository || {}).url = r + data.repository = (data.repository || {}) + data.repository.url = r + } else { + delete data.repository } cb() } diff --git a/deps/npm/lib/install.js b/deps/npm/lib/install.js index 4da66d3383..5873ca968e 100644 --- a/deps/npm/lib/install.js +++ b/deps/npm/lib/install.js @@ -211,7 +211,7 @@ function readDependencies (context, where, opts, cb) { rv[key] = data[key] }) rv.dependencies = {} - Object.keys(newwrap.dependencies).forEach(function (key) { + Object.keys(newwrap.dependencies || {}).forEach(function (key) { var w = newwrap.dependencies[key] rv.dependencies[key] = w.from || w.version }) @@ -225,7 +225,10 @@ function readDependencies (context, where, opts, cb) { // as dependencies to a package.json file. // This is experimental. function save (where, installed, tree, pretty, cb) { - if (!npm.config.get("save") || npm.config.get("global")) { + if (!npm.config.get("save") && + !npm.config.get("save-dev") && + !npm.config.get("save-optional") || + npm.config.get("global")) { return cb(null, installed, tree, pretty) } @@ -257,13 +260,18 @@ function save (where, installed, tree, pretty, cb) { } catch (ex) { er = ex } - if (er) return cb(null, installed, tree, pretty) + if (er) { + return cb(null, installed, tree, pretty) - var deps = npm.config.get("dev") ? "devDependencies" : "dependencies" - deps = data[deps] = data[deps] || {} + } + + var deps = npm.config.get("save-optional") ? "optionalDependencies" + : npm.config.get("save-dev") ? "devDependencies" + : "dependencies" + data[deps] = data[deps] || {} Object.keys(things).forEach(function (t) { - deps[t] = things[t] + data[deps][t] = things[t] }) data = JSON.stringify(data, null, 2) + "\n" fs.writeFile(saveTarget, data, function (er) { diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js index 456948a29b..2db21e34de 100644 --- a/deps/npm/lib/npm.js +++ b/deps/npm/lib/npm.js @@ -26,10 +26,27 @@ var EventEmitter = require("events").EventEmitter , semver = require("semver") , findPrefix = require("./utils/find-prefix.js") , getUid = require("uid-number") - , mkdir = require("mkdirp") + , mkdirp = require("mkdirp") , slide = require("slide") , chain = slide.chain +// /usr/local is often a read-only fs, which is not +// well handled by node or mkdirp. Just double-check +// in the case of errors when making the prefix dirs. +function mkdir (p, cb) { + mkdirp(p, function (er, made) { + // it could be that we couldn't create it, because it + // already exists, and is on a read-only fs. + if (er) { + return fs.stat(p, function (er2, st) { + if (er2 || !st.isDirectory()) return cb(er) + return cb(null, made) + }) + } + return cb(er, made) + }) +} + npm.commands = {} npm.ELIFECYCLE = {} npm.E404 = {} diff --git a/deps/npm/lib/utils/config-defs.js b/deps/npm/lib/utils/config-defs.js index 39df42f915..18b47ecdb7 100644 --- a/deps/npm/lib/utils/config-defs.js +++ b/deps/npm/lib/utils/config-defs.js @@ -9,6 +9,7 @@ var path = require("path") , os = require("os") , nopt = require("nopt") , log = require("./log.js") + , npm = require("../npm.js") function Octal () {} function validateOctal (data, k, val) { @@ -183,10 +184,13 @@ Object.defineProperty(exports, "defaults", {get: function () { , proxy : process.env.HTTP_PROXY || process.env.http_proxy || null , "https-proxy" : process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy || null + , "user-agent" : "npm/" + npm.version + " node/" + process.version , "rebuild-bundle" : true , registry : "http" + (httpsOk ? "s" : "") + "://registry.npmjs.org/" , rollback : true , save : false + , "save-dev" : false + , "save-optional" : false , searchopts: "" , searchexclude: null , searchsort: "name" @@ -239,6 +243,7 @@ exports.types = , globalignorefile: path , group : [Number, String] , "https-proxy" : [null, url] + , "user-agent" : String , ignore : String , "init.version" : [null, semver] , "init.author.name" : String @@ -266,6 +271,8 @@ exports.types = , registry : [null, url] , rollback : Boolean , save : Boolean + , "save-dev" : Boolean + , "save-optional" : Boolean , searchopts : String , searchexclude: [null, String] , searchsort: [ "name", "-name" @@ -321,6 +328,8 @@ exports.shorthands = , porcelain : ["--parseable"] , g : ["--global"] , S : ["--save"] + , D : ["--save-dev"] + , O : ["--save-optional"] , y : ["--yes"] , n : ["--no-yes"] } diff --git a/deps/npm/lib/utils/fetch.js b/deps/npm/lib/utils/fetch.js index 0ece53cabf..bc1c095cdf 100644 --- a/deps/npm/lib/utils/fetch.js +++ b/deps/npm/lib/utils/fetch.js @@ -59,6 +59,7 @@ function makeRequest (remote, fstr, headers) { , proxy: proxy , strictSSL: npm.config.get("strict-ssl") , ca: remote.host === regHost ? npm.config.get("ca") : undefined + , headers: { "user-agent": npm.config.get("user-agent") } , onResponse: onResponse }).pipe(fstr) function onResponse (er, res) { if (er) return fstr.emit("error", er) diff --git a/deps/npm/lib/utils/npm-registry-client/request.js b/deps/npm/lib/utils/npm-registry-client/request.js index 5213c7966b..d5122629dd 100644 --- a/deps/npm/lib/utils/npm-registry-client/request.js +++ b/deps/npm/lib/utils/npm-registry-client/request.js @@ -94,6 +94,8 @@ function makeRequest (method, remote, where, what, etag, nofollow, cb) { headers.accept = "application/json" + headers["user-agent"] = npm.config.get("user-agent") + opts.proxy = npm.config.get( remote.protocol === "https:" ? "https-proxy" : "proxy" ) diff --git a/deps/npm/lib/utils/read-installed.js b/deps/npm/lib/utils/read-installed.js index 60cbea15c5..ff220943d6 100644 --- a/deps/npm/lib/utils/read-installed.js +++ b/deps/npm/lib/utils/read-installed.js @@ -94,6 +94,7 @@ var npm = require("../npm.js") , semver = require("semver") , readJson = require("./read-json.js") , log = require("./log.js") + , url = require("url") module.exports = readInstalled @@ -254,6 +255,8 @@ function findUnmet (obj) { continue } if ( typeof deps[d] === "string" + // url deps presumed innocent. + && !url.parse(deps[d]).protocol && !semver.satisfies(found.version, deps[d])) { // the bad thing will happen log.warn(obj.path + " requires "+d+"@'"+deps[d] diff --git a/deps/npm/man/man1/README.1 b/deps/npm/man/man1/README.1 index 7815aecf49..d3c019dab9 100644 --- a/deps/npm/man/man1/README.1 +++ b/deps/npm/man/man1/README.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM" "1" "March 2012" "" "" +.TH "NPM" "1" "April 2012" "" "" . .SH "NAME" \fBnpm\fR \-\- node package manager diff --git a/deps/npm/man/man1/adduser.1 b/deps/npm/man/man1/adduser.1 index 40082f9552..082812cc58 100644 --- a/deps/npm/man/man1/adduser.1 +++ b/deps/npm/man/man1/adduser.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ADDUSER" "1" "March 2012" "" "" +.TH "NPM\-ADDUSER" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-adduser\fR \-\- Add a registry user account diff --git a/deps/npm/man/man1/bin.1 b/deps/npm/man/man1/bin.1 index 1f07014936..3f62258d16 100644 --- a/deps/npm/man/man1/bin.1 +++ b/deps/npm/man/man1/bin.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BIN" "1" "March 2012" "" "" +.TH "NPM\-BIN" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-bin\fR \-\- Display npm bin folder diff --git a/deps/npm/man/man1/bugs.1 b/deps/npm/man/man1/bugs.1 index 01e01d63dc..384384511f 100644 --- a/deps/npm/man/man1/bugs.1 +++ b/deps/npm/man/man1/bugs.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUGS" "1" "March 2012" "" "" +.TH "NPM\-BUGS" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-bugs\fR \-\- Bugs for a package in a web browser maybe diff --git a/deps/npm/man/man1/build.1 b/deps/npm/man/man1/build.1 index 541dd494a3..897781a480 100644 --- a/deps/npm/man/man1/build.1 +++ b/deps/npm/man/man1/build.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUILD" "1" "March 2012" "" "" +.TH "NPM\-BUILD" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-build\fR \-\- Build a package diff --git a/deps/npm/man/man1/bundle.1 b/deps/npm/man/man1/bundle.1 index 6ff090817b..3fbe951c96 100644 --- a/deps/npm/man/man1/bundle.1 +++ b/deps/npm/man/man1/bundle.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUNDLE" "1" "March 2012" "" "" +.TH "NPM\-BUNDLE" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-bundle\fR \-\- REMOVED diff --git a/deps/npm/man/man1/cache.1 b/deps/npm/man/man1/cache.1 index f185ea9703..6168b5097e 100644 --- a/deps/npm/man/man1/cache.1 +++ b/deps/npm/man/man1/cache.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CACHE" "1" "March 2012" "" "" +.TH "NPM\-CACHE" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-cache\fR \-\- Manipulates packages cache diff --git a/deps/npm/man/man1/changelog.1 b/deps/npm/man/man1/changelog.1 index 1e5d895878..d972a2955e 100644 --- a/deps/npm/man/man1/changelog.1 +++ b/deps/npm/man/man1/changelog.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CHANGELOG" "1" "March 2012" "" "" +.TH "NPM\-CHANGELOG" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-changelog\fR \-\- Changes diff --git a/deps/npm/man/man1/coding-style.1 b/deps/npm/man/man1/coding-style.1 index 25d53aa77c..8d5c60b3d0 100644 --- a/deps/npm/man/man1/coding-style.1 +++ b/deps/npm/man/man1/coding-style.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CODING\-STYLE" "1" "March 2012" "" "" +.TH "NPM\-CODING\-STYLE" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-coding-style\fR \-\- npm\'s "funny" coding style diff --git a/deps/npm/man/man1/completion.1 b/deps/npm/man/man1/completion.1 index 4acded61a9..3f45893333 100644 --- a/deps/npm/man/man1/completion.1 +++ b/deps/npm/man/man1/completion.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-COMPLETION" "1" "March 2012" "" "" +.TH "NPM\-COMPLETION" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-completion\fR \-\- Tab Completion for npm diff --git a/deps/npm/man/man1/config.1 b/deps/npm/man/man1/config.1 index f1ed9949de..65e09d0c46 100644 --- a/deps/npm/man/man1/config.1 +++ b/deps/npm/man/man1/config.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CONFIG" "1" "March 2012" "" "" +.TH "NPM\-CONFIG" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-config\fR \-\- Manage the npm configuration file @@ -171,6 +171,12 @@ The following shorthands are parsed on the command\-line: \fB\-S\fR: \fB\-\-save\fR . .IP "\(bu" 4 +\fB\-D\fR: \fB\-\-save\-dev\fR +. +.IP "\(bu" 4 +\fB\-O\fR: \fB\-\-save\-optional\fR +. +.IP "\(bu" 4 \fB\-y\fR: \fB\-\-yes\fR . .IP "\(bu" 4 @@ -603,6 +609,19 @@ Type: url .P A proxy to use for outgoing https requests\. . +.SS "user\-agent" +. +.IP "\(bu" 4 +Default: npm/{npm\.version} node/{process\.version} +. +.IP "\(bu" 4 +Type: String +. +.IP "" 0 +. +.P +Sets a User\-Agent to the request header +. .SS "ignore" . .IP "\(bu" 4 @@ -994,6 +1013,38 @@ Save installed packages to a package\.json file as dependencies\. .P Only works if there is already a package\.json file present\. . +.SS "save\-dev" +. +.IP "\(bu" 4 +Default: false +. +.IP "\(bu" 4 +Type: Boolean +. +.IP "" 0 +. +.P +Save installed packages to a package\.json file as devDependencies\. +. +.P +Only works if there is already a package\.json file present\. +. +.SS "save\-optional" +. +.IP "\(bu" 4 +Default: false +. +.IP "\(bu" 4 +Type: Boolean +. +.IP "" 0 +. +.P +Save installed packages to a package\.json file as optionalDependencies\. +. +.P +Only works if there is already a package\.json file present\. +. .SS "searchopts" . .IP "\(bu" 4 diff --git a/deps/npm/man/man1/deprecate.1 b/deps/npm/man/man1/deprecate.1 index 46670bcd02..918fd23243 100644 --- a/deps/npm/man/man1/deprecate.1 +++ b/deps/npm/man/man1/deprecate.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEPRECATE" "1" "March 2012" "" "" +.TH "NPM\-DEPRECATE" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-deprecate\fR \-\- Deprecate a version of a package diff --git a/deps/npm/man/man1/developers.1 b/deps/npm/man/man1/developers.1 index 465b03812a..9d2e759417 100644 --- a/deps/npm/man/man1/developers.1 +++ b/deps/npm/man/man1/developers.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEVELOPERS" "1" "March 2012" "" "" +.TH "NPM\-DEVELOPERS" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-developers\fR \-\- Developer Guide diff --git a/deps/npm/man/man1/disputes.1 b/deps/npm/man/man1/disputes.1 index eb14276444..b74865f106 100644 --- a/deps/npm/man/man1/disputes.1 +++ b/deps/npm/man/man1/disputes.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DISPUTES" "1" "March 2012" "" "" +.TH "NPM\-DISPUTES" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-disputes\fR \-\- Handling Module Name Disputes diff --git a/deps/npm/man/man1/docs.1 b/deps/npm/man/man1/docs.1 index 292042dcf1..00fa391538 100644 --- a/deps/npm/man/man1/docs.1 +++ b/deps/npm/man/man1/docs.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DOCS" "1" "March 2012" "" "" +.TH "NPM\-DOCS" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-docs\fR \-\- Docs for a package in a web browser maybe diff --git a/deps/npm/man/man1/edit.1 b/deps/npm/man/man1/edit.1 index b64f80af87..742353d9a1 100644 --- a/deps/npm/man/man1/edit.1 +++ b/deps/npm/man/man1/edit.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EDIT" "1" "March 2012" "" "" +.TH "NPM\-EDIT" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-edit\fR \-\- Edit an installed package diff --git a/deps/npm/man/man1/explore.1 b/deps/npm/man/man1/explore.1 index 8aa212cb2e..8b24eea66a 100644 --- a/deps/npm/man/man1/explore.1 +++ b/deps/npm/man/man1/explore.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EXPLORE" "1" "March 2012" "" "" +.TH "NPM\-EXPLORE" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-explore\fR \-\- Browse an installed package diff --git a/deps/npm/man/man1/faq.1 b/deps/npm/man/man1/faq.1 index 1443fd784e..1d68c0496a 100644 --- a/deps/npm/man/man1/faq.1 +++ b/deps/npm/man/man1/faq.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-FAQ" "1" "March 2012" "" "" +.TH "NPM\-FAQ" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-faq\fR \-\- Frequently Asked Questions diff --git a/deps/npm/man/man1/folders.1 b/deps/npm/man/man1/folders.1 index f043ce2879..bebd033edc 100644 --- a/deps/npm/man/man1/folders.1 +++ b/deps/npm/man/man1/folders.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-FOLDERS" "1" "March 2012" "" "" +.TH "NPM\-FOLDERS" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-folders\fR \-\- Folder Structures Used by npm diff --git a/deps/npm/man/man1/help-search.1 b/deps/npm/man/man1/help-search.1 index 2dbc634163..da5889bc8c 100644 --- a/deps/npm/man/man1/help-search.1 +++ b/deps/npm/man/man1/help-search.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP\-SEARCH" "1" "March 2012" "" "" +.TH "NPM\-HELP\-SEARCH" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-help-search\fR \-\- Search npm help documentation diff --git a/deps/npm/man/man1/help.1 b/deps/npm/man/man1/help.1 index ce2dd995d2..247122183d 100644 --- a/deps/npm/man/man1/help.1 +++ b/deps/npm/man/man1/help.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP" "1" "March 2012" "" "" +.TH "NPM\-HELP" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-help\fR \-\- Get help on npm diff --git a/deps/npm/man/man1/index.1 b/deps/npm/man/man1/index.1 index 5dc7acbe01..419652ced1 100644 --- a/deps/npm/man/man1/index.1 +++ b/deps/npm/man/man1/index.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INDEX" "1" "March 2012" "" "" +.TH "NPM\-INDEX" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-index\fR \-\- Index of all npm documentation diff --git a/deps/npm/man/man1/init.1 b/deps/npm/man/man1/init.1 index c7c3e211bb..ff4d537cb2 100644 --- a/deps/npm/man/man1/init.1 +++ b/deps/npm/man/man1/init.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INIT" "1" "March 2012" "" "" +.TH "NPM\-INIT" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-init\fR \-\- Interactively create a package\.json file diff --git a/deps/npm/man/man1/install.1 b/deps/npm/man/man1/install.1 index c0069f2306..a9d8431516 100644 --- a/deps/npm/man/man1/install.1 +++ b/deps/npm/man/man1/install.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INSTALL" "1" "March 2012" "" "" +.TH "NPM\-INSTALL" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-install\fR \-\- Install a package @@ -13,10 +13,11 @@ npm install (with no args in a package dir) npm install <tarball file> npm install <tarball url> npm install <folder> -npm install <name> +npm install <name> [\-\-save|\-\-save\-dev|\-\-save\-optional] npm install <name>@<tag> npm install <name>@<version> npm install <name>@<version range> +npm install <name>@<version range> . .fi . @@ -59,6 +60,8 @@ after packing it up into a tarball (b)\. . .IP "\(bu" 4 \fBnpm install\fR (in package directory, no arguments): +. +.IP Install the dependencies in the local node_modules folder\. . .IP @@ -68,10 +71,14 @@ directory) as a global package\. . .IP "\(bu" 4 \fBnpm install <folder>\fR: +. +.IP Install a package that is sitting in a folder on the filesystem\. . .IP "\(bu" 4 \fBnpm install <tarball file>\fR: +. +.IP 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 \fBnpm link\fR\|\. @@ -82,7 +89,7 @@ Example: .IP "" 4 . .nf -npm install \./package\.tgz + npm install \./package\.tgz . .fi . @@ -91,6 +98,8 @@ npm install \./package\.tgz . .IP "\(bu" 4 \fBnpm install <tarball url>\fR: +. +.IP 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://" . @@ -100,7 +109,7 @@ Example: .IP "" 4 . .nf -npm install https://github\.com/indexzero/forever/tarball/v0\.5\.6 + npm install https://github\.com/indexzero/forever/tarball/v0\.5\.6 . .fi . @@ -108,28 +117,54 @@ npm install https://github\.com/indexzero/forever/tarball/v0\.5\.6 . .IP "\(bu" 4 -\fBnpm install <name>\fR: -Do a \fB<name>@<tag>\fR install, where \fB<tag>\fR is the "tag" config\. (See \fBnpm help config\fR) +\fBnpm install <name> [\-\-save|\-\-save\-dev|\-\-save\-optional]\fR: +. +.IP +Do a \fB<name>@<tag>\fR install, where \fB<tag>\fR is the "tag" config\. (See \fBnpm help config\fR\|\.) +. +.IP +In most cases, this will install the latest version +of the module published on npm\. . .IP Example: . -.IP "" 4 +.IP + npm install sax . -.nf -npm install sax +.IP +\fBnpm install\fR takes 3 exclusive, optional flags which save or update +the package version in your main package\.json: . -.fi +.IP "\(bu" 4 +\fB\-\-save\fR: Package will appear in your \fBdependencies\fR\|\. . -.IP "" 0 +.IP "\(bu" 4 +\fB\-\-save\-dev\fR: Package will appear in your \fBdevDependencies\fR\|\. +. +.IP "\(bu" 4 +\fB\-\-save\-optional\fR: Package will appear in your \fBoptionalDependencies\fR\|\. +. +.IP +Examples: +. +.IP + npm install sax \-\-save + npm install node\-tap \-\-save\-dev + npm install dtrace\-provider \-\-save\-optional . .IP \fBNote\fR: If there is a file or folder named \fB<name>\fR 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\. . +.IP "" 0 + +. .IP "\(bu" 4 \fBnpm install <name>@<tag>\fR: +. +.IP 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\. @@ -140,7 +175,7 @@ Example: .IP "" 4 . .nf -npm install sax@latest + npm install sax@latest . .fi . @@ -149,6 +184,8 @@ npm install sax@latest . .IP "\(bu" 4 \fBnpm install <name>@<version>\fR: +. +.IP Install the specified version of the package\. This will fail if the version has not been published to the registry\. . @@ -158,7 +195,7 @@ Example: .IP "" 4 . .nf -npm install sax@0\.1\.1 + npm install sax@0\.1\.1 . .fi . @@ -167,6 +204,8 @@ npm install sax@0\.1\.1 . .IP "\(bu" 4 \fBnpm install <name>@<version range>\fR: +. +.IP Install a version of the package matching the specified version range\. This will follow the same rules for resolving dependencies described in \fBnpm help json\fR\|\. . @@ -177,15 +216,8 @@ treat it as a single argument\. .IP Example: . -.IP "" 4 -. -.nf -npm install sax@">=0\.1\.0 <0\.2\.0" -. -.fi -. -.IP "" 0 - +.IP + npm install sax@">=0\.1\.0 <0\.2\.0" . .IP "\(bu" 4 \fBnpm install <git remote url>\fR: @@ -194,14 +226,8 @@ npm install sax@">=0\.1\.0 <0\.2\.0" Install a package by cloning a git remote url\. The format of the git url is: . -.IP "" 4 -. -.nf -<protocol>://[<user>@]<hostname><separator><path>[#<commit\-ish>] -. -.fi -. -.IP "" 0 +.IP + <protocol>://[<user>@]<hostname><separator><path>[#<commit\-ish>] . .IP \fB<protocol>\fR is one of \fBgit\fR, \fBgit+ssh\fR, \fBgit+http\fR, or \fBgit+https\fR\|\. If no \fB<commit\-ish>\fR is specified, then \fBmaster\fR is @@ -213,9 +239,9 @@ Examples: .IP "" 4 . .nf -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 . .fi . diff --git a/deps/npm/man/man1/json.1 b/deps/npm/man/man1/json.1 index 7d242a4f4b..a2384ac33e 100644 --- a/deps/npm/man/man1/json.1 +++ b/deps/npm/man/man1/json.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-JSON" "1" "March 2012" "" "" +.TH "NPM\-JSON" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-json\fR \-\- Specifics of npm\'s package\.json handling @@ -708,7 +708,7 @@ to publish it\. .P 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 \fBpublishConfig\fR hash described below to override the \fBregistry\fR config param at publish\-time\. . diff --git a/deps/npm/man/man1/link.1 b/deps/npm/man/man1/link.1 index 374d5a8536..1e4ac176f6 100644 --- a/deps/npm/man/man1/link.1 +++ b/deps/npm/man/man1/link.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LINK" "1" "March 2012" "" "" +.TH "NPM\-LINK" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-link\fR \-\- Symlink a package folder diff --git a/deps/npm/man/man1/list.1 b/deps/npm/man/man1/list.1 index df6aae0ae6..a629f7eef6 100644 --- a/deps/npm/man/man1/list.1 +++ b/deps/npm/man/man1/list.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LS" "1" "March 2012" "" "" +.TH "NPM\-LS" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-ls\fR \-\- List installed packages diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1 index a751e94390..b85b940b2c 100644 --- a/deps/npm/man/man1/npm.1 +++ b/deps/npm/man/man1/npm.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM" "1" "March 2012" "" "" +.TH "NPM" "1" "April 2012" "" "" . .SH "NAME" \fBnpm\fR \-\- node package manager @@ -14,7 +14,7 @@ npm <command> [args] .fi . .SH "VERSION" -1.1.15 +1.1.18 . .SH "DESCRIPTION" npm is the package manager for the Node JavaScript platform\. It puts diff --git a/deps/npm/man/man1/outdated.1 b/deps/npm/man/man1/outdated.1 index b693c7ece7..a30dce9a19 100644 --- a/deps/npm/man/man1/outdated.1 +++ b/deps/npm/man/man1/outdated.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OUTDATED" "1" "March 2012" "" "" +.TH "NPM\-OUTDATED" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-outdated\fR \-\- Check for outdated packages diff --git a/deps/npm/man/man1/owner.1 b/deps/npm/man/man1/owner.1 index 017e0b77c0..b91d382314 100644 --- a/deps/npm/man/man1/owner.1 +++ b/deps/npm/man/man1/owner.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OWNER" "1" "March 2012" "" "" +.TH "NPM\-OWNER" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-owner\fR \-\- Manage package owners diff --git a/deps/npm/man/man1/pack.1 b/deps/npm/man/man1/pack.1 index 77928f9d65..56eb667a84 100644 --- a/deps/npm/man/man1/pack.1 +++ b/deps/npm/man/man1/pack.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PACK" "1" "March 2012" "" "" +.TH "NPM\-PACK" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-pack\fR \-\- Create a tarball from a package diff --git a/deps/npm/man/man1/prefix.1 b/deps/npm/man/man1/prefix.1 index c8989a5a87..6284d683c3 100644 --- a/deps/npm/man/man1/prefix.1 +++ b/deps/npm/man/man1/prefix.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PREFIX" "1" "March 2012" "" "" +.TH "NPM\-PREFIX" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-prefix\fR \-\- Display prefix diff --git a/deps/npm/man/man1/prune.1 b/deps/npm/man/man1/prune.1 index adcc29df1c..53fa1aebab 100644 --- a/deps/npm/man/man1/prune.1 +++ b/deps/npm/man/man1/prune.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PRUNE" "1" "March 2012" "" "" +.TH "NPM\-PRUNE" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-prune\fR \-\- Remove extraneous packages diff --git a/deps/npm/man/man1/publish.1 b/deps/npm/man/man1/publish.1 index 8b16883c43..ef16486f54 100644 --- a/deps/npm/man/man1/publish.1 +++ b/deps/npm/man/man1/publish.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PUBLISH" "1" "March 2012" "" "" +.TH "NPM\-PUBLISH" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-publish\fR \-\- Publish a package diff --git a/deps/npm/man/man1/rebuild.1 b/deps/npm/man/man1/rebuild.1 index fe3fe77b1c..4824951c49 100644 --- a/deps/npm/man/man1/rebuild.1 +++ b/deps/npm/man/man1/rebuild.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REBUILD" "1" "March 2012" "" "" +.TH "NPM\-REBUILD" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-rebuild\fR \-\- Rebuild a package diff --git a/deps/npm/man/man1/registry.1 b/deps/npm/man/man1/registry.1 index 92324896c2..757cd47487 100644 --- a/deps/npm/man/man1/registry.1 +++ b/deps/npm/man/man1/registry.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REGISTRY" "1" "March 2012" "" "" +.TH "NPM\-REGISTRY" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-registry\fR \-\- The JavaScript Package Registry diff --git a/deps/npm/man/man1/removing-npm.1 b/deps/npm/man/man1/removing-npm.1 index 9d855060d7..ff8412a9e9 100644 --- a/deps/npm/man/man1/removing-npm.1 +++ b/deps/npm/man/man1/removing-npm.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REMOVAL" "1" "March 2012" "" "" +.TH "NPM\-REMOVAL" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-removal\fR \-\- Cleaning the Slate diff --git a/deps/npm/man/man1/restart.1 b/deps/npm/man/man1/restart.1 index cd5d11e884..804593c5c4 100644 --- a/deps/npm/man/man1/restart.1 +++ b/deps/npm/man/man1/restart.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RESTART" "1" "March 2012" "" "" +.TH "NPM\-RESTART" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-restart\fR \-\- Start a package diff --git a/deps/npm/man/man1/root.1 b/deps/npm/man/man1/root.1 index 28fbc52714..25ba27e7af 100644 --- a/deps/npm/man/man1/root.1 +++ b/deps/npm/man/man1/root.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ROOT" "1" "March 2012" "" "" +.TH "NPM\-ROOT" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-root\fR \-\- Display npm root diff --git a/deps/npm/man/man1/run-script.1 b/deps/npm/man/man1/run-script.1 index 7474610260..041b7018e6 100644 --- a/deps/npm/man/man1/run-script.1 +++ b/deps/npm/man/man1/run-script.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RUN\-SCRIPT" "1" "March 2012" "" "" +.TH "NPM\-RUN\-SCRIPT" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-run-script\fR \-\- Run arbitrary package scripts diff --git a/deps/npm/man/man1/scripts.1 b/deps/npm/man/man1/scripts.1 index d8c5b66b03..4f0b385167 100644 --- a/deps/npm/man/man1/scripts.1 +++ b/deps/npm/man/man1/scripts.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SCRIPTS" "1" "March 2012" "" "" +.TH "NPM\-SCRIPTS" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-scripts\fR \-\- How npm handles the "scripts" field diff --git a/deps/npm/man/man1/search.1 b/deps/npm/man/man1/search.1 index 815452c603..c2015ed6f2 100644 --- a/deps/npm/man/man1/search.1 +++ b/deps/npm/man/man1/search.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SEARCH" "1" "March 2012" "" "" +.TH "NPM\-SEARCH" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-search\fR \-\- Search for packages diff --git a/deps/npm/man/man1/semver.1 b/deps/npm/man/man1/semver.1 index 3cd98ff2c5..6cb1be072d 100644 --- a/deps/npm/man/man1/semver.1 +++ b/deps/npm/man/man1/semver.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SEMVER" "1" "March 2012" "" "" +.TH "NPM\-SEMVER" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-semver\fR \-\- The semantic versioner for npm diff --git a/deps/npm/man/man1/shrinkwrap.1 b/deps/npm/man/man1/shrinkwrap.1 index 37630d9eef..7dab32420f 100644 --- a/deps/npm/man/man1/shrinkwrap.1 +++ b/deps/npm/man/man1/shrinkwrap.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SHRINKWRAP" "1" "March 2012" "" "" +.TH "NPM\-SHRINKWRAP" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-shrinkwrap\fR \-\- Lock down dependency versions diff --git a/deps/npm/man/man1/star.1 b/deps/npm/man/man1/star.1 index cd9204e361..9dd32b7fb5 100644 --- a/deps/npm/man/man1/star.1 +++ b/deps/npm/man/man1/star.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STAR" "1" "March 2012" "" "" +.TH "NPM\-STAR" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-star\fR \-\- Mark your favorite packages diff --git a/deps/npm/man/man1/start.1 b/deps/npm/man/man1/start.1 index 13077070bf..83b0751005 100644 --- a/deps/npm/man/man1/start.1 +++ b/deps/npm/man/man1/start.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-START" "1" "March 2012" "" "" +.TH "NPM\-START" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-start\fR \-\- Start a package diff --git a/deps/npm/man/man1/stop.1 b/deps/npm/man/man1/stop.1 index 188af67492..aace69a708 100644 --- a/deps/npm/man/man1/stop.1 +++ b/deps/npm/man/man1/stop.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STOP" "1" "March 2012" "" "" +.TH "NPM\-STOP" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-stop\fR \-\- Stop a package diff --git a/deps/npm/man/man1/submodule.1 b/deps/npm/man/man1/submodule.1 index cee5f334ef..26a1bd3503 100644 --- a/deps/npm/man/man1/submodule.1 +++ b/deps/npm/man/man1/submodule.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SUBMODULE" "1" "March 2012" "" "" +.TH "NPM\-SUBMODULE" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-submodule\fR \-\- Add a package as a git submodule diff --git a/deps/npm/man/man1/tag.1 b/deps/npm/man/man1/tag.1 index e5ac519229..48e23d4d16 100644 --- a/deps/npm/man/man1/tag.1 +++ b/deps/npm/man/man1/tag.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TAG" "1" "March 2012" "" "" +.TH "NPM\-TAG" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-tag\fR \-\- Tag a published version diff --git a/deps/npm/man/man1/test.1 b/deps/npm/man/man1/test.1 index a24e2d0ddc..c09f456dd0 100644 --- a/deps/npm/man/man1/test.1 +++ b/deps/npm/man/man1/test.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TEST" "1" "March 2012" "" "" +.TH "NPM\-TEST" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-test\fR \-\- Test a package diff --git a/deps/npm/man/man1/uninstall.1 b/deps/npm/man/man1/uninstall.1 index 7005ba1e3e..d779b0bf4c 100644 --- a/deps/npm/man/man1/uninstall.1 +++ b/deps/npm/man/man1/uninstall.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RM" "1" "March 2012" "" "" +.TH "NPM\-RM" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-rm\fR \-\- Remove a package diff --git a/deps/npm/man/man1/unpublish.1 b/deps/npm/man/man1/unpublish.1 index 4b8bc86dfb..4a7b96e89a 100644 --- a/deps/npm/man/man1/unpublish.1 +++ b/deps/npm/man/man1/unpublish.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UNPUBLISH" "1" "March 2012" "" "" +.TH "NPM\-UNPUBLISH" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-unpublish\fR \-\- Remove a package from the registry diff --git a/deps/npm/man/man1/update.1 b/deps/npm/man/man1/update.1 index ba3e8b653e..bdb703633e 100644 --- a/deps/npm/man/man1/update.1 +++ b/deps/npm/man/man1/update.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UPDATE" "1" "March 2012" "" "" +.TH "NPM\-UPDATE" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-update\fR \-\- Update a package diff --git a/deps/npm/man/man1/version.1 b/deps/npm/man/man1/version.1 index 1395591916..80acf696f9 100644 --- a/deps/npm/man/man1/version.1 +++ b/deps/npm/man/man1/version.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VERSION" "1" "March 2012" "" "" +.TH "NPM\-VERSION" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-version\fR \-\- Bump a package version diff --git a/deps/npm/man/man1/view.1 b/deps/npm/man/man1/view.1 index c874ff47ff..0ecd6da51f 100644 --- a/deps/npm/man/man1/view.1 +++ b/deps/npm/man/man1/view.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VIEW" "1" "March 2012" "" "" +.TH "NPM\-VIEW" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-view\fR \-\- View registry info diff --git a/deps/npm/man/man1/whoami.1 b/deps/npm/man/man1/whoami.1 index 06d221d031..f47a0e84a9 100644 --- a/deps/npm/man/man1/whoami.1 +++ b/deps/npm/man/man1/whoami.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-WHOAMI" "1" "March 2012" "" "" +.TH "NPM\-WHOAMI" "1" "April 2012" "" "" . .SH "NAME" \fBnpm-whoami\fR \-\- Display npm username diff --git a/deps/npm/man/man3/bin.3 b/deps/npm/man/man3/bin.3 index 7aaa11b2a2..268f75e6e3 100644 --- a/deps/npm/man/man3/bin.3 +++ b/deps/npm/man/man3/bin.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BIN" "3" "March 2012" "" "" +.TH "NPM\-BIN" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-bin\fR \-\- Display npm bin folder diff --git a/deps/npm/man/man3/bugs.3 b/deps/npm/man/man3/bugs.3 index 6d61dcd467..38ee6a1ca5 100644 --- a/deps/npm/man/man3/bugs.3 +++ b/deps/npm/man/man3/bugs.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUGS" "3" "March 2012" "" "" +.TH "NPM\-BUGS" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-bugs\fR \-\- Bugs for a package in a web browser maybe diff --git a/deps/npm/man/man3/commands.3 b/deps/npm/man/man3/commands.3 index c23016df35..e8b8260e63 100644 --- a/deps/npm/man/man3/commands.3 +++ b/deps/npm/man/man3/commands.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-COMMANDS" "3" "March 2012" "" "" +.TH "NPM\-COMMANDS" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-commands\fR \-\- npm commands diff --git a/deps/npm/man/man3/config.3 b/deps/npm/man/man3/config.3 index d18739b50a..6debd412ee 100644 --- a/deps/npm/man/man3/config.3 +++ b/deps/npm/man/man3/config.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CONFIG" "3" "March 2012" "" "" +.TH "NPM\-CONFIG" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-config\fR \-\- Manage the npm configuration files diff --git a/deps/npm/man/man3/deprecate.3 b/deps/npm/man/man3/deprecate.3 index 2448ab3c7d..b4b91612e0 100644 --- a/deps/npm/man/man3/deprecate.3 +++ b/deps/npm/man/man3/deprecate.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEPRECATE" "3" "March 2012" "" "" +.TH "NPM\-DEPRECATE" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-deprecate\fR \-\- Deprecate a version of a package diff --git a/deps/npm/man/man3/docs.3 b/deps/npm/man/man3/docs.3 index 8373f6d057..a61b0df6c6 100644 --- a/deps/npm/man/man3/docs.3 +++ b/deps/npm/man/man3/docs.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DOCS" "3" "March 2012" "" "" +.TH "NPM\-DOCS" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-docs\fR \-\- Docs for a package in a web browser maybe diff --git a/deps/npm/man/man3/edit.3 b/deps/npm/man/man3/edit.3 index 3f790229e5..dc4b183e97 100644 --- a/deps/npm/man/man3/edit.3 +++ b/deps/npm/man/man3/edit.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EDIT" "3" "March 2012" "" "" +.TH "NPM\-EDIT" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-edit\fR \-\- Edit an installed package diff --git a/deps/npm/man/man3/explore.3 b/deps/npm/man/man3/explore.3 index 0d4ee62fee..8817ce0081 100644 --- a/deps/npm/man/man3/explore.3 +++ b/deps/npm/man/man3/explore.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EXPLORE" "3" "March 2012" "" "" +.TH "NPM\-EXPLORE" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-explore\fR \-\- Browse an installed package diff --git a/deps/npm/man/man3/help-search.3 b/deps/npm/man/man3/help-search.3 index 291037a1c3..d42d68e55e 100644 --- a/deps/npm/man/man3/help-search.3 +++ b/deps/npm/man/man3/help-search.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP\-SEARCH" "3" "March 2012" "" "" +.TH "NPM\-HELP\-SEARCH" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-help-search\fR \-\- Search the help pages diff --git a/deps/npm/man/man3/init.3 b/deps/npm/man/man3/init.3 index 3a4434c500..f751030a6c 100644 --- a/deps/npm/man/man3/init.3 +++ b/deps/npm/man/man3/init.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "INIT" "3" "March 2012" "" "" +.TH "INIT" "3" "April 2012" "" "" . .SH "NAME" \fBinit\fR \-\- Interactively create a package\.json file diff --git a/deps/npm/man/man3/install.3 b/deps/npm/man/man3/install.3 index 0c0ee97696..6a9cea4f1d 100644 --- a/deps/npm/man/man3/install.3 +++ b/deps/npm/man/man3/install.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INSTALL" "3" "March 2012" "" "" +.TH "NPM\-INSTALL" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-install\fR \-\- install a package programmatically diff --git a/deps/npm/man/man3/link.3 b/deps/npm/man/man3/link.3 index 45c15dc230..edc3905a9a 100644 --- a/deps/npm/man/man3/link.3 +++ b/deps/npm/man/man3/link.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LINK" "3" "March 2012" "" "" +.TH "NPM\-LINK" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-link\fR \-\- Symlink a package folder diff --git a/deps/npm/man/man3/load.3 b/deps/npm/man/man3/load.3 index 9d9df2c3ab..c44d9f1167 100644 --- a/deps/npm/man/man3/load.3 +++ b/deps/npm/man/man3/load.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LOAD" "3" "March 2012" "" "" +.TH "NPM\-LOAD" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-load\fR \-\- Load config settings diff --git a/deps/npm/man/man3/ls.3 b/deps/npm/man/man3/ls.3 index 74736d453d..2d45dde312 100644 --- a/deps/npm/man/man3/ls.3 +++ b/deps/npm/man/man3/ls.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LS" "3" "March 2012" "" "" +.TH "NPM\-LS" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-ls\fR \-\- List installed packages diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3 index 294ac18ebf..ed3851ae85 100644 --- a/deps/npm/man/man3/npm.3 +++ b/deps/npm/man/man3/npm.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM" "3" "March 2012" "" "" +.TH "NPM" "3" "April 2012" "" "" . .SH "NAME" \fBnpm\fR \-\- node package manager @@ -21,7 +21,7 @@ npm\.load(configObject, function (er, npm) { .fi . .SH "VERSION" -1.1.15 +1.1.18 . .SH "DESCRIPTION" This is the API documentation for npm\. diff --git a/deps/npm/man/man3/outdated.3 b/deps/npm/man/man3/outdated.3 index 258db10e78..4c0bd4dbe9 100644 --- a/deps/npm/man/man3/outdated.3 +++ b/deps/npm/man/man3/outdated.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OUTDATED" "3" "March 2012" "" "" +.TH "NPM\-OUTDATED" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-outdated\fR \-\- Check for outdated packages diff --git a/deps/npm/man/man3/owner.3 b/deps/npm/man/man3/owner.3 index edb734eced..922769f76d 100644 --- a/deps/npm/man/man3/owner.3 +++ b/deps/npm/man/man3/owner.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OWNER" "3" "March 2012" "" "" +.TH "NPM\-OWNER" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-owner\fR \-\- Manage package owners diff --git a/deps/npm/man/man3/pack.3 b/deps/npm/man/man3/pack.3 index e279d6171f..5c05479963 100644 --- a/deps/npm/man/man3/pack.3 +++ b/deps/npm/man/man3/pack.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PACK" "3" "March 2012" "" "" +.TH "NPM\-PACK" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-pack\fR \-\- Create a tarball from a package diff --git a/deps/npm/man/man3/prefix.3 b/deps/npm/man/man3/prefix.3 index 8a01d637ed..3ba398aa3e 100644 --- a/deps/npm/man/man3/prefix.3 +++ b/deps/npm/man/man3/prefix.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PREFIX" "3" "March 2012" "" "" +.TH "NPM\-PREFIX" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-prefix\fR \-\- Display prefix diff --git a/deps/npm/man/man3/prune.3 b/deps/npm/man/man3/prune.3 index 1aec7d7639..566f57e8a5 100644 --- a/deps/npm/man/man3/prune.3 +++ b/deps/npm/man/man3/prune.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PRUNE" "3" "March 2012" "" "" +.TH "NPM\-PRUNE" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-prune\fR \-\- Remove extraneous packages diff --git a/deps/npm/man/man3/publish.3 b/deps/npm/man/man3/publish.3 index 060c31ebc7..edddf21b97 100644 --- a/deps/npm/man/man3/publish.3 +++ b/deps/npm/man/man3/publish.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PUBLISH" "3" "March 2012" "" "" +.TH "NPM\-PUBLISH" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-publish\fR \-\- Publish a package diff --git a/deps/npm/man/man3/rebuild.3 b/deps/npm/man/man3/rebuild.3 index 7cacbe9a6d..a20d55cedd 100644 --- a/deps/npm/man/man3/rebuild.3 +++ b/deps/npm/man/man3/rebuild.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REBUILD" "3" "March 2012" "" "" +.TH "NPM\-REBUILD" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-rebuild\fR \-\- Rebuild a package diff --git a/deps/npm/man/man3/restart.3 b/deps/npm/man/man3/restart.3 index 2032a7c950..3530cf9192 100644 --- a/deps/npm/man/man3/restart.3 +++ b/deps/npm/man/man3/restart.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RESTART" "3" "March 2012" "" "" +.TH "NPM\-RESTART" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-restart\fR \-\- Start a package diff --git a/deps/npm/man/man3/root.3 b/deps/npm/man/man3/root.3 index a1d629559d..8fa00a0f79 100644 --- a/deps/npm/man/man3/root.3 +++ b/deps/npm/man/man3/root.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ROOT" "3" "March 2012" "" "" +.TH "NPM\-ROOT" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-root\fR \-\- Display npm root diff --git a/deps/npm/man/man3/run-script.3 b/deps/npm/man/man3/run-script.3 index 597f7d9a18..4ace64ed53 100644 --- a/deps/npm/man/man3/run-script.3 +++ b/deps/npm/man/man3/run-script.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RUN\-SCRIPT" "3" "March 2012" "" "" +.TH "NPM\-RUN\-SCRIPT" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-run-script\fR \-\- Run arbitrary package scripts diff --git a/deps/npm/man/man3/search.3 b/deps/npm/man/man3/search.3 index 7626321ff2..9afb739b7d 100644 --- a/deps/npm/man/man3/search.3 +++ b/deps/npm/man/man3/search.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SEARCH" "3" "March 2012" "" "" +.TH "NPM\-SEARCH" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-search\fR \-\- Search for packages diff --git a/deps/npm/man/man3/shrinkwrap.3 b/deps/npm/man/man3/shrinkwrap.3 index 10354ed310..647e4a4306 100644 --- a/deps/npm/man/man3/shrinkwrap.3 +++ b/deps/npm/man/man3/shrinkwrap.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SHRINKWRAP" "3" "March 2012" "" "" +.TH "NPM\-SHRINKWRAP" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-shrinkwrap\fR \-\- programmatically generate package shrinkwrap file diff --git a/deps/npm/man/man3/start.3 b/deps/npm/man/man3/start.3 index 531dfa2c4d..1d05cdee8d 100644 --- a/deps/npm/man/man3/start.3 +++ b/deps/npm/man/man3/start.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-START" "3" "March 2012" "" "" +.TH "NPM\-START" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-start\fR \-\- Start a package diff --git a/deps/npm/man/man3/stop.3 b/deps/npm/man/man3/stop.3 index e139ee9a77..5514b4ee3d 100644 --- a/deps/npm/man/man3/stop.3 +++ b/deps/npm/man/man3/stop.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STOP" "3" "March 2012" "" "" +.TH "NPM\-STOP" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-stop\fR \-\- Stop a package diff --git a/deps/npm/man/man3/submodule.3 b/deps/npm/man/man3/submodule.3 index d691b7c639..24f4c14d42 100644 --- a/deps/npm/man/man3/submodule.3 +++ b/deps/npm/man/man3/submodule.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SUBMODULE" "3" "March 2012" "" "" +.TH "NPM\-SUBMODULE" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-submodule\fR \-\- Add a package as a git submodule diff --git a/deps/npm/man/man3/tag.3 b/deps/npm/man/man3/tag.3 index 855c174e34..e3f7e49162 100644 --- a/deps/npm/man/man3/tag.3 +++ b/deps/npm/man/man3/tag.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TAG" "3" "March 2012" "" "" +.TH "NPM\-TAG" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-tag\fR \-\- Tag a published version diff --git a/deps/npm/man/man3/test.3 b/deps/npm/man/man3/test.3 index 07be782285..9614b92e85 100644 --- a/deps/npm/man/man3/test.3 +++ b/deps/npm/man/man3/test.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TEST" "3" "March 2012" "" "" +.TH "NPM\-TEST" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-test\fR \-\- Test a package diff --git a/deps/npm/man/man3/uninstall.3 b/deps/npm/man/man3/uninstall.3 index 756ddad404..acc26cde17 100644 --- a/deps/npm/man/man3/uninstall.3 +++ b/deps/npm/man/man3/uninstall.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UNINSTALL" "3" "March 2012" "" "" +.TH "NPM\-UNINSTALL" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-uninstall\fR \-\- uninstall a package programmatically diff --git a/deps/npm/man/man3/unpublish.3 b/deps/npm/man/man3/unpublish.3 index d3e3a75bf2..ac35cb83a6 100644 --- a/deps/npm/man/man3/unpublish.3 +++ b/deps/npm/man/man3/unpublish.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UNPUBLISH" "3" "March 2012" "" "" +.TH "NPM\-UNPUBLISH" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-unpublish\fR \-\- Remove a package from the registry diff --git a/deps/npm/man/man3/update.3 b/deps/npm/man/man3/update.3 index d8a096aba0..ded33bd86b 100644 --- a/deps/npm/man/man3/update.3 +++ b/deps/npm/man/man3/update.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UPDATE" "3" "March 2012" "" "" +.TH "NPM\-UPDATE" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-update\fR \-\- Update a package diff --git a/deps/npm/man/man3/version.3 b/deps/npm/man/man3/version.3 index 20ee415074..b9015ebed3 100644 --- a/deps/npm/man/man3/version.3 +++ b/deps/npm/man/man3/version.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VERSION" "3" "March 2012" "" "" +.TH "NPM\-VERSION" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-version\fR \-\- Bump a package version diff --git a/deps/npm/man/man3/view.3 b/deps/npm/man/man3/view.3 index f9c253b231..3e8e4a60f3 100644 --- a/deps/npm/man/man3/view.3 +++ b/deps/npm/man/man3/view.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VIEW" "3" "March 2012" "" "" +.TH "NPM\-VIEW" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-view\fR \-\- View registry info diff --git a/deps/npm/man/man3/whoami.3 b/deps/npm/man/man3/whoami.3 index fd2ee1c7fb..d4beb9ce4f 100644 --- a/deps/npm/man/man3/whoami.3 +++ b/deps/npm/man/man3/whoami.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs/v0.1 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-WHOAMI" "3" "March 2012" "" "" +.TH "NPM\-WHOAMI" "3" "April 2012" "" "" . .SH "NAME" \fBnpm-whoami\fR \-\- Display npm username diff --git a/deps/npm/node_modules/fstream-npm/fstream-npm.js b/deps/npm/node_modules/fstream-npm/fstream-npm.js index 4ad001253d..39429d18ca 100644 --- a/deps/npm/node_modules/fstream-npm/fstream-npm.js +++ b/deps/npm/node_modules/fstream-npm/fstream-npm.js @@ -171,7 +171,17 @@ Packer.prototype.readRules = function (buf, e) { return Ignore.prototype.readRules.call(this, buf, e) } - var p = this.package = JSON.parse(buf.toString()) + buf = buf.toString().trim() + + if (buf.length === 0) return [] + + try { + var p = this.package = JSON.parse(buf) + } catch (er) { + er.file = path.resolve(this.path, e) + this.error(er) + return + } if (this === this.root) { this.bundleLinks = this.bundleLinks || {} @@ -262,7 +272,9 @@ Packer.prototype.emitEntry = function (entry) { } // all *.gyp files are renamed to binding.gyp for node-gyp - if (entry.basename.match(/\.gyp$/)) { + // but only when they are in the same folder as a package.json file. + if (entry.basename.match(/\.gyp$/) && + this.entries.indexOf("package.json") !== -1) { entry.basename = "binding.gyp" entry.path = path.resolve(entry.dirname, entry.basename) } diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json index cc8cde03f2..53f37281ae 100644 --- a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json +++ b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json @@ -35,8 +35,8 @@ "node": "*" }, "_engineSupported": true, - "_npmVersion": "1.1.13", - "_nodeVersion": "v0.7.7-pre", + "_npmVersion": "1.1.16", + "_nodeVersion": "v0.7.8-pre", "_defaultsLoaded": true, "_from": "fstream-ignore@~0.0.5" } diff --git a/deps/npm/node_modules/fstream-npm/package.json b/deps/npm/node_modules/fstream-npm/package.json index 66dc932900..83acd0d82b 100644 --- a/deps/npm/node_modules/fstream-npm/package.json +++ b/deps/npm/node_modules/fstream-npm/package.json @@ -6,7 +6,7 @@ }, "name": "fstream-npm", "description": "fstream class for creating npm packages", - "version": "0.0.4", + "version": "0.0.6", "repository": { "type": "git", "url": "git://github.com/isaacs/fstream-npm.git" @@ -20,15 +20,15 @@ "name": "isaacs", "email": "i@izs.me" }, - "_id": "fstream-npm@0.0.4", + "_id": "fstream-npm@0.0.6", "devDependencies": {}, "optionalDependencies": {}, "engines": { "node": "*" }, "_engineSupported": true, - "_npmVersion": "1.1.13", - "_nodeVersion": "v0.7.7-pre", + "_npmVersion": "1.1.16", + "_nodeVersion": "v0.7.8-pre", "_defaultsLoaded": true, - "_from": "fstream-npm@0 >=0.0.3" + "_from": "fstream-npm@0 >=0.0.5" } diff --git a/deps/npm/node_modules/node-gyp/LICENSE b/deps/npm/node_modules/node-gyp/LICENSE new file mode 100644 index 0000000000..2ea4dc5efb --- /dev/null +++ b/deps/npm/node_modules/node-gyp/LICENSE @@ -0,0 +1,24 @@ +(The MIT License) + +Copyright (c) 2012 Nathan Rajlich <nathan@tootallnate.net> + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/deps/npm/node_modules/node-gyp/bin/node-gyp.js b/deps/npm/node_modules/node-gyp/bin/node-gyp.js index 328e1a94ee..a7347cca50 100755 --- a/deps/npm/node_modules/node-gyp/bin/node-gyp.js +++ b/deps/npm/node_modules/node-gyp/bin/node-gyp.js @@ -16,12 +16,17 @@ var gyp = require('../') , cursor = ansi(process.stderr) /** - * Process and execute the selected command. + * Process and execute the selected commands. */ var prog = gyp() prog.parseArgv(process.argv) +if (prog.todo.length === 0) { + return prog.usageAndExit() +} + + /** * Set up logging handlers. */ @@ -36,6 +41,18 @@ prog.on('info', function () { cursor.write('\n') }) +prog.on('warn', function () { + cursor.fg.yellow().bg.red().write('warn') + .fg.reset().bg.reset().write(' ') + .fg.grey().write(arguments[0]) + .write(' ') + .reset() + for (var i=1, l=arguments.length; i<l; i++) { + cursor.write(arguments[i] + ' ') + } + cursor.write('\n') +}) + if (prog.opts.verbose) { prog.on('verbose', function () { cursor.fg.cyan().write('verb ') @@ -54,48 +71,63 @@ prog.on('spawn', function (command, args, proc) { .reset().write(inspect(args) + '\n') }) +prog.info('it worked if it ends with', 'ok') + /** - * Process and execute the selected command. + * Change dir if -C/--directory was passed. */ -if (!prog.command) { - return prog.usageAndExit() -} - -prog.info('it worked if it ends with', 'ok') - -if (typeof prog.commands[prog.command] != 'function') { - cursor.fg.red().write('ERR! ') - .fg.reset().write('Unknown command "' + prog.command + '"\n') - cursor.fg.red().write('ERR! ') - .fg.reset().write('not ok\n') - process.exit(1) +var dir = prog.opts.directory +if (dir) { + var fs = require('fs') + try { + var stat = fs.statSync(dir) + if (stat.isDirectory()) { + prog.info('chdir:', dir) + process.chdir(dir) + } else { + prog.warn(dir + ' is not a directory') + } + } catch (e) { + prog.warn('directory:', e.message) + } } +// start running the given commands! var completed = false -prog.commands[prog.command](prog.argv, function (err) { - completed = true - if (err) { - cursor.fg.red().write('ERR! ') - .fg.reset().write(err.stack + '\n') - cursor.fg.red().write('ERR! ') - .fg.reset().write('not ok\n') - return process.exit(1) +run() + +function run () { + if (prog.todo.length === 0) { + // done! + completed = true + prog.info('done', 'ok') + return } - if (prog.command == 'list') { - var versions = arguments[1] - if (versions.length > 0) { - versions.forEach(function (version) { - console.log(version) - }) - } else { - prog.info('No node development files installed. Use `node-gyp install` to install a version.') + var command = prog.todo.shift() + prog.commands[command](prog.argv.slice(), function (err) { + if (err) { + cursor.fg.red().write('ERR! ') + .fg.reset().write(err.stack + '\n') + cursor.fg.red().write('ERR! ') + .fg.reset().write('not ok\n') + return process.exit(1) } - } else if (arguments.length >= 2) { - console.log.apply(console, [].slice.call(arguments, 1)) - } - prog.info('done', 'ok') -}) + if (command == 'list') { + var versions = arguments[1] + if (versions.length > 0) { + versions.forEach(function (version) { + console.log(version) + }) + } else { + prog.info('No node development files installed. Use `node-gyp install` to install a version.') + } + } else if (arguments.length >= 2) { + console.log.apply(console, [].slice.call(arguments, 1)) + } + process.nextTick(run) + }) +} process.on('exit', function (code) { if (!completed && !code) { diff --git a/deps/npm/node_modules/node-gyp/legacy/common.gypi b/deps/npm/node_modules/node-gyp/legacy/common.gypi index 6e13b6091a..f67e6da3e2 100644 --- a/deps/npm/node_modules/node-gyp/legacy/common.gypi +++ b/deps/npm/node_modules/node-gyp/legacy/common.gypi @@ -161,6 +161,7 @@ 'GCC_VERSION': '4.2', 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof 'PREBINDING': 'NO', # No -Wl,-prebind + 'MACOSX_DEPLOYMENT_TARGET': '10.5', 'USE_HEADERMAP': 'NO', 'OTHER_CFLAGS': [ '-fno-strict-aliasing', diff --git a/deps/npm/node_modules/node-gyp/lib/build.js b/deps/npm/node_modules/node-gyp/lib/build.js index 3ffc4c7919..92f21336cf 100644 --- a/deps/npm/node_modules/node-gyp/lib/build.js +++ b/deps/npm/node_modules/node-gyp/lib/build.js @@ -5,12 +5,11 @@ module.exports = exports = build * Module dependencies. */ -var fs = require('fs') +var fs = require('graceful-fs') , path = require('path') , glob = require('glob') , which = require('which') - , asyncEmit = require('./util/asyncEmit') - , createHook = require('./util/hook') + , mkdirp = require('./util/mkdirp') , win = process.platform == 'win32' exports.usage = 'Invokes `' + (win ? 'msbuild' : 'make') + '` and builds the module' @@ -21,14 +20,12 @@ function build (gyp, argv, callback) { var command = win ? 'msbuild' : 'make' , buildDir = path.resolve('build') , configPath = path.resolve(buildDir, 'config.gypi') + , buildType , config - , emitter + , arch + , version - createHook('gyp-build.js', function (err, _e) { - if (err) return callback(err) - emitter = _e - loadConfigGypi() - }) + loadConfigGypi() /** * Load the "config.gypi" file that was generated during "configure". @@ -45,6 +42,23 @@ function build (gyp, argv, callback) { return } config = JSON.parse(data.replace(/\#.+\n/, '')) + + // get the 'arch', 'buildType', and 'version' vars from the config + buildType = config.target_defaults.default_configuration + arch = config.variables.target_arch + version = config.variables.target_version + + if ('debug' in gyp.opts) { + buildType = gyp.opts.debug ? 'Debug' : 'Release' + } + if (!buildType) { + buildType = 'Release' + } + + gyp.verbose('build type:', buildType) + gyp.verbose('architecture:', arch) + gyp.verbose('node version:', version) + if (win) { findSolutionFile() } else { @@ -54,7 +68,7 @@ function build (gyp, argv, callback) { } /** - * On Windows, find first build/*.sln file. + * On Windows, find the first build/*.sln file. */ function findSolutionFile () { @@ -69,6 +83,10 @@ function build (gyp, argv, callback) { }) } + /** + * Uses node-which to locate the msbuild / make executable. + */ + function doWhich () { // First make sure we have the build command in the PATH which(command, function (err, execPath) { @@ -83,7 +101,7 @@ function build (gyp, argv, callback) { return } gyp.verbose('`which` succeeded for `' + command + '`', execPath) - build() + copyNodeLib() }) } @@ -109,21 +127,40 @@ function build (gyp, argv, callback) { return } command = msbuild - build() + copyNodeLib() }) } /** - * Actually spawn the process and compile the module. + * Copies the node.lib file for the current target architecture into the + * current proper dev dir location. */ - function build () { - var buildType = config.target_defaults.default_configuration - , platform = config.variables.target_arch == 'x64' ? '64' : '32' + function copyNodeLib () { + if (!win) return doBuild() - if (gyp.opts.debug) { - buildType = 'Debug' - } + var devDir = path.resolve(gyp.devDir, version) + , buildDir = path.resolve(devDir, buildType) + , archNodeLibPath = path.resolve(devDir, arch, 'node.lib') + , buildNodeLibPath = path.resolve(buildDir, 'node.lib') + + mkdirp(buildDir, function (err, isNew) { + if (err) return callback(err) + gyp.verbose('"' + buildType + '" dir needed to be created?', isNew) + var rs = fs.createReadStream(archNodeLibPath) + , ws = fs.createWriteStream(buildNodeLibPath) + rs.pipe(ws) + rs.on('error', callback) + ws.on('error', callback) + rs.on('end', doBuild) + }) + } + + /** + * Actually spawn the process and compile the module. + */ + + function doBuild () { // Enable Verbose build if (!win && gyp.opts.verbose) { @@ -140,7 +177,8 @@ function build (gyp, argv, callback) { // Specify the build type, Release by default if (win) { - argv.push('/p:Configuration=' + buildType + ';Platform=Win' + platform) + var p = arch === 'x64' ? 'x64' : 'Win32' + argv.push('/p:Configuration=' + buildType + ';Platform=' + p) } else { argv.push('BUILDTYPE=' + buildType) // Invoke the Makefile in the 'build' dir. @@ -158,11 +196,8 @@ function build (gyp, argv, callback) { } } - asyncEmit(emitter, 'before', function (err) { - if (err) return callback(err) - var proc = gyp.spawn(command, argv) - proc.on('exit', onExit) - }) + var proc = gyp.spawn(command, argv) + proc.on('exit', onExit) } /** @@ -170,16 +205,13 @@ function build (gyp, argv, callback) { */ function onExit (code, signal) { - asyncEmit(emitter, 'after', function (err) { - if (err) return callback(err) - if (code !== 0) { - return callback(new Error('`' + command + '` failed with exit code: ' + code)) - } - if (signal) { - return callback(new Error('`' + command + '` got signal: ' + signal)) - } - callback() - }) + if (code !== 0) { + return callback(new Error('`' + command + '` failed with exit code: ' + code)) + } + if (signal) { + return callback(new Error('`' + command + '` got signal: ' + signal)) + } + callback() } } diff --git a/deps/npm/node_modules/node-gyp/lib/clean.js b/deps/npm/node_modules/node-gyp/lib/clean.js index a8efc1bd75..1e5611451d 100644 --- a/deps/npm/node_modules/node-gyp/lib/clean.js +++ b/deps/npm/node_modules/node-gyp/lib/clean.js @@ -8,35 +8,14 @@ exports.usage = 'Removes any generated build files and the "out" dir' */ var rm = require('rimraf') - , asyncEmit = require('./util/asyncEmit') - , createHook = require('./util/hook') function clean (gyp, argv, callback) { // Remove the 'build' dir var buildDir = 'build' - , emitter - - createHook('gyp-clean.js', function (err, _e) { - if (err) return callback(err) - emitter = _e - asyncEmit(emitter, 'before', function (err) { - if (err) return callback(err) - doClean() - }) - }) - - function doClean () { - gyp.verbose('removing "build" directory') - rm(buildDir, after) - } - - function after () { - asyncEmit(emitter, 'after', function (err) { - if (err) return callback(err) - callback() - }) - } + + gyp.verbose('removing "build" directory') + rm(buildDir, callback) } diff --git a/deps/npm/node_modules/node-gyp/lib/configure.js b/deps/npm/node_modules/node-gyp/lib/configure.js index c1c99e7d94..c25ad8ff31 100644 --- a/deps/npm/node_modules/node-gyp/lib/configure.js +++ b/deps/npm/node_modules/node-gyp/lib/configure.js @@ -5,34 +5,25 @@ module.exports = exports = configure * Module dependencies. */ -var fs = require('fs') +var fs = require('graceful-fs') , path = require('path') , glob = require('glob') , which = require('which') , semver = require('semver') , mkdirp = require('./util/mkdirp') - , createHook = require('./util/hook') - , asyncEmit = require('./util/asyncEmit') , win = process.platform == 'win32' exports.usage = 'Generates ' + (win ? 'MSVC project files' : 'a Makefile') + ' for the current module' function configure (gyp, argv, callback) { - var python = gyp.opts.python || 'python' + var python = process.env.PYTHON || gyp.opts.python || 'python' , buildDir = path.resolve('build') , configPath - , emitter , versionStr , version - // Very first step is to load up the user-defined 'gyp-configure.js' file if it - // exists. We relay filecycle events using the eventemitter returned from this - createHook('gyp-configure.js', function (err, _e) { - if (err) return callback(err) - emitter = _e - checkPython() - }) + checkPython() // Make sure that Python is in the $PATH function checkPython () { @@ -46,7 +37,7 @@ function configure (gyp, argv, callback) { return } gyp.verbose('`which` succeeded for `' + python + '`', execPath) - getVersion() + getTargetVersion() }) } @@ -54,7 +45,7 @@ function configure (gyp, argv, callback) { // We're gonna glob C:\python2* function guessPython () { gyp.verbose('could not find "' + python + '". guessing location') - var rootDir = process.env.HOMEDIR || process.env.SystemDrive || 'C:\\' + var rootDir = process.env.HOMEDRIVE || process.env.SystemDrive || 'C:\\' if (rootDir[rootDir.length - 1] !== '\\') { rootDir += '\\' } @@ -70,15 +61,19 @@ function configure (gyp, argv, callback) { return } python = pythonPath - getVersion() + getTargetVersion() }) } function failNoPython () { - callback(new Error('Python does not seem to be installed')) + callback(new Error('Can\'t find Python, you can set the PYTHON env variable.')) } - function getVersion () { + function getTargetVersion () { + + // 'python' should be set by now + process.env.PYTHON = python + if (gyp.opts.target) { // if --target was given, then ensure that version is installed versionStr = gyp.opts.target @@ -114,23 +109,65 @@ function configure (gyp, argv, callback) { if (err) return callback(err) gyp.verbose('creating build/config.gypi file') - var config = {} configPath = path.resolve(buildDir, 'config.gypi') - config.target_defaults = { - cflags: [] - , default_configuration: gyp.opts.debug ? 'Debug' : 'Release' - , defines: [] - , include_dirs: [] - , libraries: [] + var config = process.config || {} + , defaults = config.target_defaults + , variables = config.variables + + if (!defaults) { + defaults = config.target_defaults = {} + } + if (!variables) { + variables = config.variables = {} + } + if (!defaults.cflags) { + defaults.cflags = [] + } + if (!defaults.defines) { + defaults.defines = [] + } + if (!defaults.include_dirs) { + defaults.include_dirs = [] + } + if (!defaults.libraries) { + defaults.libraries = [] } - config.variables = { - target_arch: gyp.opts.arch || process.arch || 'ia32' + // set the default_configuration prop + if ('debug' in gyp.opts) { + defaults.default_configuration = gyp.opts.debug ? 'Debug' : 'Release' + } + if (!defaults.default_configuration) { + defaults.default_configuration = 'Release' } + // set the target_arch variable + variables.target_arch = gyp.opts.arch || process.arch || 'ia32' + + // also set the target_version variable + variables.target_version = version + + // loop through the rest of the opts and add the unknown ones as variables. + // this allows for module-specific configure flags like: + // + // $ node-gyp configure --shared-libxml2 + Object.keys(gyp.opts).forEach(function (opt) { + if (opt === 'argv') return + if (opt in gyp.configDefs) return + variables[opt.replace(/-/g, '_')] = gyp.opts[opt] + }) + + // ensures that any boolean values from `process.config` get stringified + function boolsToString (k, v) { + if (typeof v === 'boolean') + return String(v) + return v + } + + // now write out the config.gypi file to the build/ dir var prefix = '# Do not edit. File was generated by node-gyp\'s "configure" step' - , json = JSON.stringify(config, null, 2) + , json = JSON.stringify(config, boolsToString, 2) gyp.verbose('writing out config file', configPath) fs.writeFile(configPath, [prefix, json, ''].join('\n'), runGypAddon) } @@ -138,8 +175,8 @@ function configure (gyp, argv, callback) { function runGypAddon (err) { if (err) return callback(err) - var devDir = path.resolve(process.env.HOME, '.node-gyp', version) - , gyp_addon = path.resolve(devDir, 'tools', 'gyp_addon') + // location of the `gyp_addon` python script for the target node version + var gyp_addon = path.resolve(gyp.devDir, version, 'tools', 'gyp_addon') if (!~argv.indexOf('-f') && !~argv.indexOf('--format')) { if (win) { @@ -176,12 +213,8 @@ function configure (gyp, argv, callback) { // execute `gyp_addon` from the current target node version argv.unshift(gyp_addon) - asyncEmit(emitter, 'before', function (err) { - if (err) return callback(err) - - var cp = gyp.spawn(python, argv) - cp.on('exit', onCpExit) - }) + var cp = gyp.spawn(python, argv) + cp.on('exit', onCpExit) } /** @@ -189,16 +222,12 @@ function configure (gyp, argv, callback) { */ function onCpExit (code, signal) { - asyncEmit(emitter, 'after', function (err) { - if (err) { - callback(err) - } else if (code !== 0) { - callback(new Error('`gyp_addon` failed with exit code: ' + code)) - } else { - // we're done - callback() - } - }) + if (code !== 0) { + callback(new Error('`gyp_addon` failed with exit code: ' + code)) + } else { + // we're done + callback() + } } } diff --git a/deps/npm/node_modules/node-gyp/lib/install.js b/deps/npm/node_modules/node-gyp/lib/install.js index 8ad484d4e4..2cf3993641 100644 --- a/deps/npm/node_modules/node-gyp/lib/install.js +++ b/deps/npm/node_modules/node-gyp/lib/install.js @@ -7,16 +7,16 @@ exports.usage = 'Install node development files for the specified node version.' * Module dependencies. */ -var fs = require('fs') +var fs = require('graceful-fs') , tar = require('tar') , rm = require('rimraf') , path = require('path') , zlib = require('zlib') - , mkdir = require('mkdirp') , semver = require('semver') , fstream = require('fstream') , request = require('request') , minimatch = require('minimatch') + , mkdir = require('./util/mkdirp') , distUrl = 'http://nodejs.org/dist' , win = process.platform == 'win32' @@ -53,7 +53,7 @@ function install (gyp, argv, callback) { gyp.verbose('installing legacy version?', isLegacy) if (semver.lt(versionStr, '0.6.0')) { - return callback(new Error('Minimum target version is `0.6` or greater. Got: ' + versionStr)) + return callback(new Error('Minimum target version is `0.6.0` or greater. Got: ' + versionStr)) } // 0.x.y-pre versions are not published yet. Use previous release. @@ -67,11 +67,10 @@ function install (gyp, argv, callback) { version = version.slice(1, 4).join('.') gyp.verbose('installing version', version) + // the directory where the dev files will be installed + var devDir = path.resolve(gyp.devDir, version) - // TODO: Make ~/.node-gyp configurable - var devDir = path.resolve(process.env.HOME, '.node-gyp', version) - - // If '--ensure' was passed, then don't *always* install the version, + // If '--ensure' was passed, then don't *always* install the version; // check if it is already installed, and only install when needed if (gyp.opts.ensure) { gyp.verbose('--ensure was passed, so won\'t reinstall if already installed') @@ -107,7 +106,7 @@ function install (gyp, argv, callback) { go() } - function download(url,onError) { + function download (url, onError) { gyp.info('downloading:', url) var requestOpts = { uri: url @@ -129,11 +128,14 @@ function install (gyp, argv, callback) { function go () { // first create the dir for the node dev files - mkdir(devDir, function (err) { + mkdir(devDir, function (err, created) { if (err) return cb(err) - // TODO: Detect if it was actually created or if it already existed - gyp.verbose('created:', devDir) + if (created) { + gyp.verbose('created:', devDir) + } else { + gyp.verbose('directory already existed:', devDir) + } // now download the node tarball var tarballUrl = distUrl + '/v' + version + '/node-v' + version + '.tar.gz' @@ -242,40 +244,56 @@ function install (gyp, argv, callback) { function downloadNodeLib (done) { gyp.verbose('on Windows; need to download `node.lib`...') - // TODO: windows 64-bit support - var releaseDir = path.resolve(devDir, 'Release') - , debugDir = path.resolve(devDir, 'Debug') - , nodeLibUrl = distUrl + '/v' + version + '/node.lib' - - gyp.verbose('Release dir', releaseDir) - gyp.verbose('Debug dir', debugDir) - gyp.verbose('`node.lib` url', nodeLibUrl) - // TODO: parallelize mkdirs - mkdir(releaseDir, function (err) { + var dir32 = path.resolve(devDir, 'ia32') + , dir64 = path.resolve(devDir, 'x64') + , nodeLibPath32 = path.resolve(dir32, 'node.lib') + , nodeLibPath64 = path.resolve(dir64, 'node.lib') + , nodeLibUrl32 = distUrl + '/v' + version + '/node.lib' + , nodeLibUrl64 = distUrl + '/v' + version + '/x64/node.lib' + + gyp.verbose('32-bit node.lib dir', dir32) + gyp.verbose('64-bit node.lib dir', dir64) + gyp.verbose('`node.lib` 32-bit url', nodeLibUrl32) + gyp.verbose('`node.lib` 64-bit url', nodeLibUrl64) + + var async = 2 + mkdir(dir32, function (err) { + if (err) return done(err) + gyp.verbose('streaming 32-bit node.lib to:', nodeLibPath32) + + var req = download(nodeLibUrl32) + req.on('error', done) + req.on('response', function (res) { + if (res.statusCode !== 200) { + done(new Error(res.statusCode + ' status code downloading 32-bit node.lib')) + } + }) + req.on('end', function () { + --async || done() + }) + + var ws = fs.createWriteStream(nodeLibPath32) + ws.on('error', cb) + req.pipe(ws) + }) + mkdir(dir64, function (err) { if (err) return done(err) - mkdir(debugDir, function (err) { - if (err) return done(err) - // TODO: clean this mess up, written in a hastemode-9000 - var badDownload = false - var res = download(nodeLibUrl, function (err, res) { - if (err || res.statusCode != 200) { - badDownload = true - done(err || new Error(res.statusCode + ' status code downloading node.lib')) - } - }) - var releaseDirNodeLib = path.resolve(releaseDir, 'node.lib') - , debugDirNodeLib = path.resolve(debugDir, 'node.lib') - , rws = fs.createWriteStream(releaseDirNodeLib) - , dws = fs.createWriteStream(debugDirNodeLib) - gyp.verbose('streaming to', releaseDirNodeLib) - gyp.verbose('streaming to', debugDirNodeLib) - res.pipe(rws) - res.pipe(dws) - res.on('end', function () { - if (badDownload) return - done() - }) + gyp.verbose('streaming 64-bit node.lib to:', nodeLibPath64) + + var req = download(nodeLibUrl64) + req.on('error', done) + req.on('response', function (res) { + if (res.statusCode !== 200) { + done(new Error(res.statusCode + ' status code downloading 64-bit node.lib')) + } }) + req.on('end', function () { + --async || done() + }) + + var ws = fs.createWriteStream(nodeLibPath64) + ws.on('error', cb) + req.pipe(ws) }) } diff --git a/deps/npm/node_modules/node-gyp/lib/list.js b/deps/npm/node_modules/node-gyp/lib/list.js index 6ecf1ba860..64c4ef73f9 100644 --- a/deps/npm/node_modules/node-gyp/lib/list.js +++ b/deps/npm/node_modules/node-gyp/lib/list.js @@ -7,18 +7,15 @@ exports.usage = 'Prints a listing of the currently installed node development fi * Module dependencies. */ -var fs = require('fs') +var fs = require('graceful-fs') , path = require('path') function list (gyp, args, callback) { - // TODO: Make ~/.node-gyp configurable - var nodeGypDir = path.resolve(process.env.HOME, '.node-gyp') - - gyp.verbose('using node-gyp dir', nodeGypDir) + gyp.verbose('using node-gyp dir', gyp.devDir) // readdir the node-gyp dir - fs.readdir(nodeGypDir, onreaddir) + fs.readdir(gyp.devDir, onreaddir) function onreaddir (err, versions) { if (err && err.code != 'ENOENT') { diff --git a/deps/npm/node_modules/node-gyp/lib/node-gyp.js b/deps/npm/node_modules/node-gyp/lib/node-gyp.js index efa53435eb..1b014e6cd8 100644 --- a/deps/npm/node_modules/node-gyp/lib/node-gyp.js +++ b/deps/npm/node_modules/node-gyp/lib/node-gyp.js @@ -5,7 +5,7 @@ module.exports = exports = gyp * Module dependencies. */ -var fs = require('fs') +var fs = require('graceful-fs') , path = require('path') , nopt = require('nopt') , child_process = require('child_process') @@ -38,13 +38,24 @@ function gyp () { function Gyp () { var me = this + // set the dir where node-gyp dev files get installed + // TODO: make this configurable? + // see: https://github.com/TooTallNate/node-gyp/issues/21 + var homeDir = process.env.HOME || process.env.USERPROFILE + this.devDir = path.resolve(homeDir, '.node-gyp') + this.commands = {} + commands.forEach(function (command) { me.commands[command] = function (argv, callback) { me.verbose('command', command, argv) return require('./' + command)(me, argv, callback) } }) + + Object.keys(aliases).forEach(function (alias) { + me.commands[alias] = me.commands[aliases[alias]] + }) } inherits(Gyp, EE) exports.Gyp = Gyp @@ -56,9 +67,14 @@ var proto = Gyp.prototype proto.package = require('../package') +/** + * nopt configuration definitions + */ + proto.configDefs = { help: Boolean // everywhere , arch: String // 'configure' + , directory: String // bin , msvs_version: String // 'configure' , debug: Boolean // 'build' , ensure: Boolean // 'install' @@ -67,14 +83,33 @@ proto.configDefs = { , proxy: String // 'install' } -proto.shorthands = {} +/** + * nopt shorthands + */ + +proto.shorthands = { + release: '--no-debug' + , C: '--directory' +} + +/** + * Parses the given argv array and sets the 'opts', + * 'argv' and 'command' properties. + */ proto.parseArgv = function parseOpts (argv) { this.opts = nopt(this.configDefs, this.shorthands, argv) this.argv = this.opts.argv.remain.slice() - var command = this.argv.shift() - this.command = aliases[command] || command + var commands = [] + this.argv.slice().forEach(function (arg) { + if (arg in this.commands) { + this.argv.splice(this.argv.indexOf(arg), 1) + commands.push(arg) + } + }, this) + + this.todo = commands } /** @@ -100,6 +135,11 @@ proto.info = function info () { args.unshift('info') this.emit.apply(this, args) } +proto.warn = function warn () { + var args = Array.prototype.slice.call(arguments) + args.unshift('warn') + this.emit.apply(this, args) +} proto.verbose = function verbose () { var args = Array.prototype.slice.call(arguments) diff --git a/deps/npm/node_modules/node-gyp/lib/remove.js b/deps/npm/node_modules/node-gyp/lib/remove.js index a194040667..2844ec06fb 100644 --- a/deps/npm/node_modules/node-gyp/lib/remove.js +++ b/deps/npm/node_modules/node-gyp/lib/remove.js @@ -14,10 +14,7 @@ var fs = require('fs') function remove (gyp, argv, callback) { - // TODO: Make ~/.node-gyp configurable - var nodeGypDir = path.resolve(process.env.HOME, '.node-gyp') - - gyp.verbose('using node-gyp dir', nodeGypDir) + gyp.verbose('using node-gyp dir', gyp.devDir) // get the user-specified version to remove var v = argv[0] || gyp.opts.target @@ -36,7 +33,7 @@ function remove (gyp, argv, callback) { // flatten the version Array into a String version = version.slice(1, 4).join('.') - var versionPath = path.resolve(nodeGypDir, version) + var versionPath = path.resolve(gyp.devDir, version) gyp.verbose('removing development files for version', version) // first check if its even installed diff --git a/deps/npm/node_modules/node-gyp/lib/util/asyncEmit.js b/deps/npm/node_modules/node-gyp/lib/util/asyncEmit.js deleted file mode 100644 index eb3d29ffc6..0000000000 --- a/deps/npm/node_modules/node-gyp/lib/util/asyncEmit.js +++ /dev/null @@ -1,61 +0,0 @@ - -/** - * An `asyncEmit()` function that accepts an EventEmitter, an Array of args, and - * a callback function. If the emitter listener function has an arity - * > args.length then there is an assumed callback function on the emitter, which - * means that it is doing some async work. We have to wait for the callbacks for - * any async listener functions. - * - * It works like this: - * - * var emitter = new EventEmitter - * - * // this is an async listener - * emitter.on('something', function (val, done) { - * // val may be any number of input arguments - * setTimeout(function () { - * done() - * }, 1000) - * }) - * - * // this is a sync listener, no callback function - * emitter.on('something', function (val) { - * - * }) - * - * asyncEmit(emitter, 'something', [ 5 ], function (err) { - * if (err) throw err - * console.log('DONE!') - * }) - */ - -module.exports = asyncEmit -function asyncEmit (emitter, eventName, args, callback) { - - if (typeof args == 'function') { - callback = args - args = [] - } - - var async = emitter.listeners(eventName).filter(function (func) { - return func.length > args.length - }).length - - var argv = [ eventName ].concat(args) - - // callback function - argv.push(function (err) { - if (err && !callback.called) { - callback.called = true - callback(err) - } - --async || callback() - }) - - // no async listeners - if (async === 0) { - process.nextTick(callback) - } - - return emitter.emit.apply(emitter, argv) -} diff --git a/deps/npm/node_modules/node-gyp/lib/util/hook.js b/deps/npm/node_modules/node-gyp/lib/util/hook.js deleted file mode 100644 index d31cc2e8aa..0000000000 --- a/deps/npm/node_modules/node-gyp/lib/util/hook.js +++ /dev/null @@ -1,48 +0,0 @@ - -/** - * This is our "Hook" class that allows a script to hook into the lifecyle of the - * "configure", "build" and "clean" commands. It's basically a hack into the - * module.js file to allow custom hooks into the module-space, specifically to - * make the global scope act as an EventEmitter. - */ - -var fs = require('fs') - , path = require('path') - , Module = require('module') - , EventEmitter = require('events').EventEmitter - , functions = Object.keys(EventEmitter.prototype).filter(function (k) { - return typeof EventEmitter.prototype[k] == 'function' - }) - , boilerplate = functions.map(function (k) { - return 'var ' + k + ' = module.emitter.' + k + '.bind(module.emitter);' - }).join('') - -module.exports = createHook -function createHook (filename, callback) { - - var emitter = new EventEmitter - - // first read the file contents - fs.readFile(filename, 'utf8', function (err, code) { - if (err) { - if (err.code == 'ENOENT') { - // hook file doesn't exist, oh well - callback(null, emitter) - } else { - callback(err) - } - return - } - // got a hook file, now execute it - var mod = new Module(filename) - mod.filename = filename - mod.paths = Module._nodeModulePaths(filename) - mod.emitter = emitter - try { - mod._compile(boilerplate + code, filename) - } catch (e) { - return callback(e) - } - callback(null, emitter) - }) -} diff --git a/deps/npm/node_modules/node-gyp/node_modules/ansi/package.json b/deps/npm/node_modules/node-gyp/node_modules/ansi/package.json index 259382f829..9352a0ba22 100644 --- a/deps/npm/node_modules/node-gyp/node_modules/ansi/package.json +++ b/deps/npm/node_modules/node-gyp/node_modules/ansi/package.json @@ -41,8 +41,8 @@ "dependencies": {}, "optionalDependencies": {}, "_engineSupported": true, - "_npmVersion": "1.1.13", - "_nodeVersion": "v0.7.7-pre", + "_npmVersion": "1.1.16", + "_nodeVersion": "v0.7.8-pre", "_defaultsLoaded": true, "_from": "ansi@0.0.x" } diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/package.json index 952ea1b95b..83e88f623f 100644 --- a/deps/npm/node_modules/node-gyp/node_modules/glob/package.json +++ b/deps/npm/node_modules/node-gyp/node_modules/glob/package.json @@ -36,8 +36,8 @@ "_id": "glob@3.1.9", "optionalDependencies": {}, "_engineSupported": true, - "_npmVersion": "1.1.13", - "_nodeVersion": "v0.7.7-pre", + "_npmVersion": "1.1.16", + "_nodeVersion": "v0.7.8-pre", "_defaultsLoaded": true, "_from": "glob@3" } diff --git a/deps/npm/node_modules/node-gyp/package.json b/deps/npm/node_modules/node-gyp/package.json index 3dc04578f5..19628593a0 100644 --- a/deps/npm/node_modules/node-gyp/package.json +++ b/deps/npm/node_modules/node-gyp/package.json @@ -10,8 +10,8 @@ "bindings", "gyp" ], - "version": "0.3.9", - "installVersion": 5, + "version": "0.4.1", + "installVersion": 7, "author": { "name": "Nathan Rajlich", "email": "nathan@tootallnate.net", @@ -47,15 +47,15 @@ "name": "isaacs", "email": "i@izs.me" }, - "_id": "node-gyp@0.3.9", + "_id": "node-gyp@0.4.1", "devDependencies": {}, "optionalDependencies": {}, "_engineSupported": true, - "_npmVersion": "1.1.13", - "_nodeVersion": "v0.7.7-pre", + "_npmVersion": "1.1.16", + "_nodeVersion": "v0.7.8-pre", "_defaultsLoaded": true, "dist": { - "shasum": "78c01d4b662c55607e7220b8c8e2a1f25390474a" + "shasum": "05a017b115527b63fdec1321d0b5888bc5d7b04f" }, - "_from": "node-gyp@~0.3.7" + "_from": "node-gyp@latest" } diff --git a/deps/npm/node_modules/read/LICENCE b/deps/npm/node_modules/read/LICENCE new file mode 100644 index 0000000000..74489e2e26 --- /dev/null +++ b/deps/npm/node_modules/read/LICENCE @@ -0,0 +1,25 @@ +Copyright (c) Isaac Z. Schlueter +All rights reserved. + +The BSD License + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/deps/npm/node_modules/read/lib/read.js b/deps/npm/node_modules/read/lib/read.js index 246044bcd9..ba2ef0ae78 100644 --- a/deps/npm/node_modules/read/lib/read.js +++ b/deps/npm/node_modules/read/lib/read.js @@ -5,6 +5,14 @@ var buffer = "" , tty = require("tty") , StringDecoder = require("string_decoder").StringDecoder +function raw (mode) { + try { + process.stdin.setRawMode(mode) + } catch (e) { + tty.setRawMode(mode) + } +} + function read (opts, cb) { if (!cb) cb = opts, opts = {} @@ -25,7 +33,7 @@ function read (opts, cb) { cb = (function (cb) { var called = false var t = setTimeout(function () { - tty.setRawMode(false) + raw(false) process.stdout.write("\n") if (def) done(null, def) else done(new Error("timeout")) @@ -109,7 +117,7 @@ function rawRead (def, timeout, delim, silent, num, cb) { , val = "" , decoder = new StringDecoder - tty.setRawMode(true) + raw(true) stdin.resume() stdin.on("error", cb) stdin.on("data", function D (c) { @@ -122,7 +130,7 @@ function rawRead (def, timeout, delim, silent, num, cb) { case "\u0004": // EOF case delim: - tty.setRawMode(false) + raw(false) stdin.removeListener("data", D) stdin.removeListener("error", cb) val = val.trim() || def @@ -131,7 +139,7 @@ function rawRead (def, timeout, delim, silent, num, cb) { return cb(null, val) case "\u0003": case "\0": // ^C or other signal abort - tty.setRawMode(false) + raw(false) stdin.removeListener("data", D) stdin.removeListener("error", cb) stdin.pause() diff --git a/deps/npm/node_modules/read/package.json b/deps/npm/node_modules/read/package.json index bc05577aac..f206a719b3 100644 --- a/deps/npm/node_modules/read/package.json +++ b/deps/npm/node_modules/read/package.json @@ -1,16 +1,28 @@ { "name": "read", - "version": "0.0.1", + "version": "0.0.2", "main": "lib/read.js", "dependencies": {}, "devDependencies": {}, "engines": { "node": ">=0.6" }, - "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)", + "author": { + "name": "Isaac Z. Schlueter", + "email": "i@izs.me", + "url": "http://blog.izs.me/" + }, "description": "read(1) for node programs", "repository": { "type": "git", "url": "git://github.com/isaacs/read.git" - } + }, + "license": "BSD", + "_id": "read@0.0.2", + "optionalDependencies": {}, + "_engineSupported": true, + "_npmVersion": "1.1.15", + "_nodeVersion": "v0.7.7", + "_defaultsLoaded": true, + "_from": "read@0" } diff --git a/deps/npm/package.json b/deps/npm/package.json index d7cdd1cfff..87be4559dc 100644 --- a/deps/npm/package.json +++ b/deps/npm/package.json @@ -10,7 +10,7 @@ "install", "package.json" ], - "version": "1.1.15", + "version": "1.1.18", "preferGlobal": true, "config": { "publishtest": false @@ -53,8 +53,8 @@ "mkdirp": "0.3", "read": "0", "lru-cache": "1", - "node-gyp": "~0.3.7", - "fstream-npm": "0 >=0.0.4", + "node-gyp": "~0.4.1", + "fstream-npm": "0 >=0.0.5", "uid-number": "0", "archy": "0", "chownr": "0" @@ -77,7 +77,6 @@ "block-stream", "inherits", "mkdirp", - "fast-list", "read", "lru-cache", "node-gyp", diff --git a/deps/npm/scripts/index-build.js b/deps/npm/scripts/index-build.js index b3c19a03a1..551bb1d563 100755 --- a/deps/npm/scripts/index-build.js +++ b/deps/npm/scripts/index-build.js @@ -12,6 +12,7 @@ fs.readdir(api, done("api")) function done (which) { return function (er, docs) { if (er) throw er + docs.sort() if (which === "api") apidocs = docs else clidocs = docs |