diff options
316 files changed, 2423 insertions, 1555 deletions
@@ -310,6 +310,27 @@ * console: `console.dir()` bypasses inspect() methods (Nathan Rajlich) +2013.10.18, Version 0.10.21 (Stable), e2da042844a830fafb8031f6c477eb4f96195210 + +* uv: Upgrade to v0.10.18 + +* crypto: clear errors from verify failure (Timothy J Fontaine) + +* dtrace: interpret two byte strings (Dave Pacheco) + +* fs: fix fs.truncate() file content zeroing bug (Ben Noordhuis) + +* http: provide backpressure for pipeline flood (isaacs) + +* tls: fix premature connection termination (Ben Noordhuis) + + +2013.09.30, Version 0.10.20 (Stable), d7234c8d50a1af73f60d2d3c0cc7eed17429a481 + +* tls: fix sporadic hang and partial reads (Fedor Indutny) + - fixes "npm ERR! cb() never called!" + + 2013.09.24, Version 0.10.19 (Stable), 6b5e6a5a3ec8d994c9aab3b800b9edbf1b287904 * uv: Upgrade to v0.10.17 @@ -33,6 +33,19 @@ Windows: vcbuild nosign +You can download pre-built binaries for various operating systems from +[http://nodejs.org/download/](http://nodejs.org/download/). The Windows +and OS X installers will prompt you for the location to install to. +The tarballs are self-contained; you can extract them to a local directory +with: + + tar xzf /path/to/node-<version>-<platform>-<arch>.tar.gz + +Or system-wide with: + + cd /usr/local && tar --strip-components 1 -xzf \ + /path/to/node-<version>-<platform>-<arch>.tar.gz + ### To run the tests: Unix/Macintosh: diff --git a/deps/npm/Makefile b/deps/npm/Makefile index 28c7ff6b3f..326d6f0d50 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -71,7 +71,7 @@ link: uninstall node cli.js link -f clean: ronnclean doc-clean uninstall - rm npmrc + rm -rf npmrc node cli.js cache clean uninstall: @@ -154,13 +154,13 @@ html/doc/misc/%.html: doc/misc/%.md $(html_docdeps) ronn: node_modules/.bin/ronn node_modules/.bin/ronn: - node cli.js install ronn + node cli.js install ronn --no-global doc: man man: $(cli_docs) $(api_docs) -test: +test: doc node cli.js test publish: link doc diff --git a/deps/npm/doc/cli/npm-cache.md b/deps/npm/doc/cli/npm-cache.md index 90a55d9b2a..af3cfac4da 100644 --- a/deps/npm/doc/cli/npm-cache.md +++ b/deps/npm/doc/cli/npm-cache.md @@ -33,9 +33,9 @@ Used to add, list, or clear the npm cache folder. ## DETAILS -npm stores cache data in `$HOME/.npm`. For each package that is added -to the cache, three pieces of information are stored in -`{cache}/{name}/{version}`: +npm stores cache data in the directory specified in `npm config get cache`. +For each package that is added to the cache, three pieces of information are +stored in `{cache}/{name}/{version}`: * .../package/: A folder containing the package contents as they appear in the tarball. @@ -57,7 +57,7 @@ they do not make an HTTP request to the registry. ### cache -Default: `$HOME/.npm` on Posix, or `$HOME/npm-cache` on Windows. +Default: `~/.npm` on Posix, or `%AppData%/npm-cache` on Windows. The root cache folder. diff --git a/deps/npm/doc/cli/npm-dedupe.md b/deps/npm/doc/cli/npm-dedupe.md index 849d98f20a..d3be01050c 100644 --- a/deps/npm/doc/cli/npm-dedupe.md +++ b/deps/npm/doc/cli/npm-dedupe.md @@ -47,6 +47,10 @@ registry. This feature is experimental, and may change in future versions. +The `--tag` argument will apply to all of the affected dependencies. If a +tag with the given name exists, the tagged version is preferred over newer +versions. + ## SEE ALSO * npm-ls(1) diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md index 07ba2b03f9..a537bb878d 100644 --- a/deps/npm/doc/cli/npm-install.md +++ b/deps/npm/doc/cli/npm-install.md @@ -152,7 +152,9 @@ For example: npm install sax@">=0.1.0 <0.2.0" bench supervisor -The `--tag` argument will apply to all of the specified install targets. +The `--tag` argument will apply to all of the specified install targets. If a +tag with the given name exists, the tagged version is preferred over newer +versions. The `--force` argument will force npm to fetch remote resources even if a local copy exists on disk. diff --git a/deps/npm/doc/cli/npm-outdated.md b/deps/npm/doc/cli/npm-outdated.md index 25269eb8c0..4d58353787 100644 --- a/deps/npm/doc/cli/npm-outdated.md +++ b/deps/npm/doc/cli/npm-outdated.md @@ -10,6 +10,10 @@ npm-outdated(1) -- Check for outdated packages This command will check the registry to see if any (or, specific) installed packages are currently outdated. +The resulting field 'wanted' shows the latest version according to the +version specified in the package.json, the field 'latest' the very latest +version of the package. + ## SEE ALSO * npm-update(1) diff --git a/deps/npm/doc/cli/npm-prune.md b/deps/npm/doc/cli/npm-prune.md index 0410214d8d..88c54754bb 100644 --- a/deps/npm/doc/cli/npm-prune.md +++ b/deps/npm/doc/cli/npm-prune.md @@ -4,6 +4,7 @@ npm-prune(1) -- Remove extraneous packages ## SYNOPSIS npm prune [<name> [<name ...]] + npm prune [<name> [<name ...]] [--production] ## DESCRIPTION @@ -14,6 +15,9 @@ removed. Extraneous packages are packages that are not listed on the parent package's dependencies list. +If the `--production` flag is specified, this command will remove the +packages specified in your `devDependencies`. + ## SEE ALSO * npm-rm(1) diff --git a/deps/npm/doc/cli/npm-tag.md b/deps/npm/doc/cli/npm-tag.md index 597c42f27c..3e1d1051bd 100644 --- a/deps/npm/doc/cli/npm-tag.md +++ b/deps/npm/doc/cli/npm-tag.md @@ -10,9 +10,24 @@ npm-tag(1) -- Tag a published version Tags the specified version of the package with the specified tag, or the `--tag` config if not specified. +A tag can be used when installing packages as a reference to a version instead +of using a specific version number: + + npm install <name>@<tag> + +When installing dependencies, a preferred tagged version may be specified: + + npm install --tag <tag> + +This also applies to `npm dedupe`. + +Publishing a package always sets the "latest" tag to the published version. + ## SEE ALSO * npm-publish(1) +* npm-install(1) +* npm-dedupe(1) * npm-registry(7) * npm-config(1) * npm-config(7) diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md index 19eaf9347e..750b80972c 100644 --- a/deps/npm/doc/misc/npm-config.md +++ b/deps/npm/doc/misc/npm-config.md @@ -146,7 +146,7 @@ See also the `strict-ssl` config. ### cache -* Default: Windows: `%APPDATA%\npm-cache`, Posix: `~/.npm` +* Default: Windows: `%AppData%\npm-cache`, Posix: `~/.npm` * Type: path The location of npm's cache directory. See `npm-cache(1)` diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index 94f7abc340..b17848121b 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -239,7 +239,7 @@ will no doubt tell you to put the output in a gist or email.</p> <ul><li><a href="cli/npm.html">npm(1)</a></li><li><a href="misc/npm-faq.html">npm-faq(7)</a></li><li><a href="cli/npm-help.html">npm-help(1)</a></li><li><a href="misc/npm-index.html">npm-index(7)</a></li></ul> </div> -<p id="footer"><a href="../doc/README.html">README</a> — npm@1.3.11</p> +<p id="footer"><a href="../doc/README.html">README</a> — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-bin.html b/deps/npm/html/doc/api/npm-bin.html index 89928adb30..0a93916c9d 100644 --- a/deps/npm/html/doc/api/npm-bin.html +++ b/deps/npm/html/doc/api/npm-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">npm-bin — npm@1.3.11</p> +<p id="footer">npm-bin — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-bugs.html b/deps/npm/html/doc/api/npm-bugs.html index c6e641dd55..e7cb217582 100644 --- a/deps/npm/html/doc/api/npm-bugs.html +++ b/deps/npm/html/doc/api/npm-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">npm-bugs — npm@1.3.11</p> +<p id="footer">npm-bugs — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-commands.html b/deps/npm/html/doc/api/npm-commands.html index 91d08fa38b..4579855abd 100644 --- a/deps/npm/html/doc/api/npm-commands.html +++ b/deps/npm/html/doc/api/npm-commands.html @@ -28,7 +28,7 @@ usage, or <code>man 3 npm-<command></code> for programmatic usage.</p> <ul><li><a href="../misc/npm-index.html">npm-index(7)</a></li></ul> </div> -<p id="footer">npm-commands — npm@1.3.11</p> +<p id="footer">npm-commands — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-config.html b/deps/npm/html/doc/api/npm-config.html index 5fd9f62ed1..93e03dd358 100644 --- a/deps/npm/html/doc/api/npm-config.html +++ b/deps/npm/html/doc/api/npm-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">npm-config — npm@1.3.11</p> +<p id="footer">npm-config — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-deprecate.html b/deps/npm/html/doc/api/npm-deprecate.html index 60721d24c3..4d1c339fd5 100644 --- a/deps/npm/html/doc/api/npm-deprecate.html +++ b/deps/npm/html/doc/api/npm-deprecate.html @@ -32,7 +32,7 @@ install the package.</p></li></ul> <ul><li><a href="../api/npm-publish.html">npm-publish(3)</a></li><li><a href="../api/npm-unpublish.html">npm-unpublish(3)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li></ul> </div> -<p id="footer">npm-deprecate — npm@1.3.11</p> +<p id="footer">npm-deprecate — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-docs.html b/deps/npm/html/doc/api/npm-docs.html index 0be72b3039..1a937f5fc1 100644 --- a/deps/npm/html/doc/api/npm-docs.html +++ b/deps/npm/html/doc/api/npm-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">npm-docs — npm@1.3.11</p> +<p id="footer">npm-docs — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-edit.html b/deps/npm/html/doc/api/npm-edit.html index 919ece1b53..fc93d8ab52 100644 --- a/deps/npm/html/doc/api/npm-edit.html +++ b/deps/npm/html/doc/api/npm-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">npm-edit — npm@1.3.11</p> +<p id="footer">npm-edit — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-explore.html b/deps/npm/html/doc/api/npm-explore.html index 75719c4757..56e48f8ff2 100644 --- a/deps/npm/html/doc/api/npm-explore.html +++ b/deps/npm/html/doc/api/npm-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">npm-explore — npm@1.3.11</p> +<p id="footer">npm-explore — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-help-search.html b/deps/npm/html/doc/api/npm-help-search.html index cb904b0f6c..94779431b8 100644 --- a/deps/npm/html/doc/api/npm-help-search.html +++ b/deps/npm/html/doc/api/npm-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">npm-help-search — npm@1.3.11</p> +<p id="footer">npm-help-search — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-init.html b/deps/npm/html/doc/api/npm-init.html index 6bab28dce4..3f5e588e88 100644 --- a/deps/npm/html/doc/api/npm-init.html +++ b/deps/npm/html/doc/api/npm-init.html @@ -35,7 +35,7 @@ then go ahead and use this programmatically.</p> <p><a href="../files/package.json.html">package.json(5)</a></p> </div> -<p id="footer">npm-init — npm@1.3.11</p> +<p id="footer">npm-init — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-install.html b/deps/npm/html/doc/api/npm-install.html index 0e2c848ea6..42d5240c39 100644 --- a/deps/npm/html/doc/api/npm-install.html +++ b/deps/npm/html/doc/api/npm-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">npm-install — npm@1.3.11</p> +<p id="footer">npm-install — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-link.html b/deps/npm/html/doc/api/npm-link.html index 0136ea840b..59923feae8 100644 --- a/deps/npm/html/doc/api/npm-link.html +++ b/deps/npm/html/doc/api/npm-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">npm-link — npm@1.3.11</p> +<p id="footer">npm-link — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-load.html b/deps/npm/html/doc/api/npm-load.html index 59dd74011c..cc52727465 100644 --- a/deps/npm/html/doc/api/npm-load.html +++ b/deps/npm/html/doc/api/npm-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">npm-load — npm@1.3.11</p> +<p id="footer">npm-load — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-ls.html b/deps/npm/html/doc/api/npm-ls.html index ff0ecdcca2..f71a4ba427 100644 --- a/deps/npm/html/doc/api/npm-ls.html +++ b/deps/npm/html/doc/api/npm-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">npm-ls — npm@1.3.11</p> +<p id="footer">npm-ls — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-outdated.html b/deps/npm/html/doc/api/npm-outdated.html index 38f9d6bc1a..f3865ec3f6 100644 --- a/deps/npm/html/doc/api/npm-outdated.html +++ b/deps/npm/html/doc/api/npm-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">npm-outdated — npm@1.3.11</p> +<p id="footer">npm-outdated — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-owner.html b/deps/npm/html/doc/api/npm-owner.html index ea2f6e6f68..044188396a 100644 --- a/deps/npm/html/doc/api/npm-owner.html +++ b/deps/npm/html/doc/api/npm-owner.html @@ -34,7 +34,7 @@ that is not implemented at this time.</p> <ul><li><a href="../api/npm-publish.html">npm-publish(3)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li></ul> </div> -<p id="footer">npm-owner — npm@1.3.11</p> +<p id="footer">npm-owner — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-pack.html b/deps/npm/html/doc/api/npm-pack.html index 58c9051c0d..b83a8f4687 100644 --- a/deps/npm/html/doc/api/npm-pack.html +++ b/deps/npm/html/doc/api/npm-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">npm-pack — npm@1.3.11</p> +<p id="footer">npm-pack — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-prefix.html b/deps/npm/html/doc/api/npm-prefix.html index 8ebc410674..2bb12d96a0 100644 --- a/deps/npm/html/doc/api/npm-prefix.html +++ b/deps/npm/html/doc/api/npm-prefix.html @@ -21,7 +21,7 @@ <p>This function is not useful programmatically</p> </div> -<p id="footer">npm-prefix — npm@1.3.11</p> +<p id="footer">npm-prefix — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-prune.html b/deps/npm/html/doc/api/npm-prune.html index 86b21861c1..60d6bae487 100644 --- a/deps/npm/html/doc/api/npm-prune.html +++ b/deps/npm/html/doc/api/npm-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">npm-prune — npm@1.3.11</p> +<p id="footer">npm-prune — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-publish.html b/deps/npm/html/doc/api/npm-publish.html index 7b36ffbcbb..176161d0c9 100644 --- a/deps/npm/html/doc/api/npm-publish.html +++ b/deps/npm/html/doc/api/npm-publish.html @@ -32,7 +32,7 @@ the registry. Overwrites when the "force" environment variable is set <ul><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li><li><a href="../api/npm-owner.html">npm-owner(3)</a></li></ul> </div> -<p id="footer">npm-publish — npm@1.3.11</p> +<p id="footer">npm-publish — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-rebuild.html b/deps/npm/html/doc/api/npm-rebuild.html index 658edd1fef..ee14a3f4bd 100644 --- a/deps/npm/html/doc/api/npm-rebuild.html +++ b/deps/npm/html/doc/api/npm-rebuild.html @@ -22,7 +22,7 @@ the new binary. If no 'packages' parameter is specify, every package wil <p>See <code>npm help build</code></p> </div> -<p id="footer">npm-rebuild — npm@1.3.11</p> +<p id="footer">npm-rebuild — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-restart.html b/deps/npm/html/doc/api/npm-restart.html index 0b9e0f42b2..7eacb0dc9f 100644 --- a/deps/npm/html/doc/api/npm-restart.html +++ b/deps/npm/html/doc/api/npm-restart.html @@ -27,7 +27,7 @@ in the <code>packages</code> parameter.</p> <ul><li><a href="../api/npm-start.html">npm-start(3)</a></li><li><a href="../api/npm-stop.html">npm-stop(3)</a></li></ul> </div> -<p id="footer">npm-restart — npm@1.3.11</p> +<p id="footer">npm-restart — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-root.html b/deps/npm/html/doc/api/npm-root.html index 5519e5df99..708bee1e2d 100644 --- a/deps/npm/html/doc/api/npm-root.html +++ b/deps/npm/html/doc/api/npm-root.html @@ -21,7 +21,7 @@ <p>This function is not useful programmatically.</p> </div> -<p id="footer">npm-root — npm@1.3.11</p> +<p id="footer">npm-root — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-run-script.html b/deps/npm/html/doc/api/npm-run-script.html index a005f89fd9..db532343a4 100644 --- a/deps/npm/html/doc/api/npm-run-script.html +++ b/deps/npm/html/doc/api/npm-run-script.html @@ -29,7 +29,7 @@ assumed to be the command to run. All other elements are ignored.</p> <ul><li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li><li><a href="../api/npm-test.html">npm-test(3)</a></li><li><a href="../api/npm-start.html">npm-start(3)</a></li><li><a href="../api/npm-restart.html">npm-restart(3)</a></li><li><a href="../api/npm-stop.html">npm-stop(3)</a></li></ul> </div> -<p id="footer">npm-run-script — npm@1.3.11</p> +<p id="footer">npm-run-script — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-search.html b/deps/npm/html/doc/api/npm-search.html index ef2f38b90b..366c2b4299 100644 --- a/deps/npm/html/doc/api/npm-search.html +++ b/deps/npm/html/doc/api/npm-search.html @@ -32,7 +32,7 @@ excluded term (the "searchexclude" config). The search is case insensi and doesn't try to read your mind (it doesn't do any verb tense matching or the like).</p> </div> -<p id="footer">npm-search — npm@1.3.11</p> +<p id="footer">npm-search — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-shrinkwrap.html b/deps/npm/html/doc/api/npm-shrinkwrap.html index 30ca6b8e08..385990de2a 100644 --- a/deps/npm/html/doc/api/npm-shrinkwrap.html +++ b/deps/npm/html/doc/api/npm-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">npm-shrinkwrap — npm@1.3.11</p> +<p id="footer">npm-shrinkwrap — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-start.html b/deps/npm/html/doc/api/npm-start.html index d90c7df85f..9358be407d 100644 --- a/deps/npm/html/doc/api/npm-start.html +++ b/deps/npm/html/doc/api/npm-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">npm-start — npm@1.3.11</p> +<p id="footer">npm-start — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-stop.html b/deps/npm/html/doc/api/npm-stop.html index d0967515cd..e9efdc7a4e 100644 --- a/deps/npm/html/doc/api/npm-stop.html +++ b/deps/npm/html/doc/api/npm-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">npm-stop — npm@1.3.11</p> +<p id="footer">npm-stop — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-submodule.html b/deps/npm/html/doc/api/npm-submodule.html index c93e0d3427..65ec0d30e2 100644 --- a/deps/npm/html/doc/api/npm-submodule.html +++ b/deps/npm/html/doc/api/npm-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">npm-submodule — npm@1.3.11</p> +<p id="footer">npm-submodule — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-tag.html b/deps/npm/html/doc/api/npm-tag.html index 3a2e6f7e98..a5ab8d4494 100644 --- a/deps/npm/html/doc/api/npm-tag.html +++ b/deps/npm/html/doc/api/npm-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">npm-tag — npm@1.3.11</p> +<p id="footer">npm-tag — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-test.html b/deps/npm/html/doc/api/npm-test.html index 0b996e8731..bc4e48c78a 100644 --- a/deps/npm/html/doc/api/npm-test.html +++ b/deps/npm/html/doc/api/npm-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">npm-test — npm@1.3.11</p> +<p id="footer">npm-test — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-uninstall.html b/deps/npm/html/doc/api/npm-uninstall.html index 2bb0318f71..3813e2d7ab 100644 --- a/deps/npm/html/doc/api/npm-uninstall.html +++ b/deps/npm/html/doc/api/npm-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">npm-uninstall — npm@1.3.11</p> +<p id="footer">npm-uninstall — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-unpublish.html b/deps/npm/html/doc/api/npm-unpublish.html index 3f20fa5c7e..d9623978d6 100644 --- a/deps/npm/html/doc/api/npm-unpublish.html +++ b/deps/npm/html/doc/api/npm-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">npm-unpublish — npm@1.3.11</p> +<p id="footer">npm-unpublish — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-update.html b/deps/npm/html/doc/api/npm-update.html index 2770d1f092..5f858bd20a 100644 --- a/deps/npm/html/doc/api/npm-update.html +++ b/deps/npm/html/doc/api/npm-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">npm-update — npm@1.3.11</p> +<p id="footer">npm-update — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-version.html b/deps/npm/html/doc/api/npm-version.html index 3601c2122c..a0797a819c 100644 --- a/deps/npm/html/doc/api/npm-version.html +++ b/deps/npm/html/doc/api/npm-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">npm-version — npm@1.3.11</p> +<p id="footer">npm-version — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-view.html b/deps/npm/html/doc/api/npm-view.html index 0ab690e18e..e9db16c701 100644 --- a/deps/npm/html/doc/api/npm-view.html +++ b/deps/npm/html/doc/api/npm-view.html @@ -99,7 +99,7 @@ the field name.</p> <p>corresponding to the list of fields selected.</p> </div> -<p id="footer">npm-view — npm@1.3.11</p> +<p id="footer">npm-view — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm-whoami.html b/deps/npm/html/doc/api/npm-whoami.html index b895c915b2..f804b45e20 100644 --- a/deps/npm/html/doc/api/npm-whoami.html +++ b/deps/npm/html/doc/api/npm-whoami.html @@ -21,7 +21,7 @@ <p>This function is not useful programmatically</p> </div> -<p id="footer">npm-whoami — npm@1.3.11</p> +<p id="footer">npm-whoami — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/npm.html b/deps/npm/html/doc/api/npm.html index 4d6a4049e0..2177d77073 100644 --- a/deps/npm/html/doc/api/npm.html +++ b/deps/npm/html/doc/api/npm.html @@ -24,7 +24,7 @@ npm.load([configObject], function (er, npm) { <h2 id="VERSION">VERSION</h2> -<p>1.3.11</p> +<p>1.3.12</p> <h2 id="DESCRIPTION">DESCRIPTION</h2> @@ -92,7 +92,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.3.11</p> +<p id="footer">npm — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/api/repo.html b/deps/npm/html/doc/api/repo.html index 4b247bfc98..d236bb5af5 100644 --- a/deps/npm/html/doc/api/repo.html +++ b/deps/npm/html/doc/api/repo.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">repo — npm@1.3.11</p> +<p id="footer">repo — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-adduser.html b/deps/npm/html/doc/cli/npm-adduser.html index a23ee290c5..1ca9805ac3 100644 --- a/deps/npm/html/doc/cli/npm-adduser.html +++ b/deps/npm/html/doc/cli/npm-adduser.html @@ -39,7 +39,7 @@ authorize on a new machine.</p> <ul><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../cli/npm-owner.html">npm-owner(1)</a></li><li><a href="../cli/npm-whoami.html">npm-whoami(1)</a></li></ul> </div> -<p id="footer">npm-adduser — npm@1.3.11</p> +<p id="footer">npm-adduser — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-bin.html b/deps/npm/html/doc/cli/npm-bin.html index 0bd871723e..bc887f7192 100644 --- a/deps/npm/html/doc/cli/npm-bin.html +++ b/deps/npm/html/doc/cli/npm-bin.html @@ -20,7 +20,7 @@ <ul><li><a href="../cli/npm-prefix.html">npm-prefix(1)</a></li><li><a href="../cli/npm-root.html">npm-root(1)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li></ul> </div> -<p id="footer">npm-bin — npm@1.3.11</p> +<p id="footer">npm-bin — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-bugs.html b/deps/npm/html/doc/cli/npm-bugs.html index defabb0223..75dc0a9e84 100644 --- a/deps/npm/html/doc/cli/npm-bugs.html +++ b/deps/npm/html/doc/cli/npm-bugs.html @@ -36,7 +36,7 @@ config param.</p> <ul><li><a href="../cli/npm-docs.html">npm-docs(1)</a></li><li><a href="../cli/npm-view.html">npm-view(1)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li></ul> </div> -<p id="footer">npm-bugs — npm@1.3.11</p> +<p id="footer">npm-bugs — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-build.html b/deps/npm/html/doc/cli/npm-build.html index 022fc1b590..a2dce4401e 100644 --- a/deps/npm/html/doc/cli/npm-build.html +++ b/deps/npm/html/doc/cli/npm-build.html @@ -25,7 +25,7 @@ A folder containing a <code>package.json</code> file in its root.</li></ul> <ul><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-link.html">npm-link(1)</a></li><li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li></ul> </div> -<p id="footer">npm-build — npm@1.3.11</p> +<p id="footer">npm-build — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-bundle.html b/deps/npm/html/doc/cli/npm-bundle.html index 4295dbccf9..a5e37f9275 100644 --- a/deps/npm/html/doc/cli/npm-bundle.html +++ b/deps/npm/html/doc/cli/npm-bundle.html @@ -20,7 +20,7 @@ install packages into the local space.</p> <ul><li><a href="../cli/npm-install.html">npm-install(1)</a></li></ul> </div> -<p id="footer">npm-bundle — npm@1.3.11</p> +<p id="footer">npm-bundle — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-cache.html b/deps/npm/html/doc/cli/npm-cache.html index e159a12f58..35d662d958 100644 --- a/deps/npm/html/doc/cli/npm-cache.html +++ b/deps/npm/html/doc/cli/npm-cache.html @@ -36,9 +36,9 @@ the entire cache is cleared.</p></li></ul> <h2 id="DETAILS">DETAILS</h2> -<p>npm stores cache data in <code>$HOME/.npm</code>. For each package that is added -to the cache, three pieces of information are stored in -<code>{cache}/{name}/{version}</code>:</p> +<p>npm stores cache data in the directory specified in <code>npm config get cache</code>. +For each package that is added to the cache, three pieces of information are +stored in <code>{cache}/{name}/{version}</code>:</p> <ul><li>.../package/: A folder containing the package contents as they appear in the tarball.</li><li>.../package.json: @@ -58,7 +58,7 @@ they do not make an HTTP request to the registry.</p> <h3 id="cache">cache</h3> -<p>Default: <code>$HOME/.npm</code> on Posix, or <code>$HOME/npm-cache</code> on Windows.</p> +<p>Default: <code>~/.npm</code> on Posix, or <code>%AppData%/npm-cache</code> on Windows.</p> <p>The root cache folder.</p> @@ -66,7 +66,7 @@ they do not make an HTTP request to the registry.</p> <ul><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../cli/npm-pack.html">npm-pack(1)</a></li></ul> </div> -<p id="footer">npm-cache — npm@1.3.11</p> +<p id="footer">npm-cache — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-completion.html b/deps/npm/html/doc/cli/npm-completion.html index e095c83a42..41c6057776 100644 --- a/deps/npm/html/doc/cli/npm-completion.html +++ b/deps/npm/html/doc/cli/npm-completion.html @@ -33,7 +33,7 @@ completions based on the arguments.</p> <ul><li><a href="../misc/npm-developers.html">npm-developers(7)</a></li><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../cli/npm.html">npm(1)</a></li></ul> </div> -<p id="footer">npm-completion — npm@1.3.11</p> +<p id="footer">npm-completion — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-config.html b/deps/npm/html/doc/cli/npm-config.html index 96d499a2d4..ddc8ca3f20 100644 --- a/deps/npm/html/doc/cli/npm-config.html +++ b/deps/npm/html/doc/cli/npm-config.html @@ -73,7 +73,7 @@ global config.</p> <ul><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../cli/npm.html">npm(1)</a></li></ul> </div> -<p id="footer">npm-config — npm@1.3.11</p> +<p id="footer">npm-config — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-dedupe.html b/deps/npm/html/doc/cli/npm-dedupe.html index 22233e2c99..b246fc5359 100644 --- a/deps/npm/html/doc/cli/npm-dedupe.html +++ b/deps/npm/html/doc/cli/npm-dedupe.html @@ -54,11 +54,15 @@ registry.</p> <p>This feature is experimental, and may change in future versions.</p> +<p>The <code>--tag</code> argument will apply to all of the affected dependencies. If a +tag with the given name exists, the tagged version is preferred over newer +versions.</p> + <h2 id="SEE-ALSO">SEE ALSO</h2> <ul><li><a href="../cli/npm-ls.html">npm-ls(1)</a></li><li><a href="../cli/npm-update.html">npm-update(1)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li></ul> </div> -<p id="footer">npm-dedupe — npm@1.3.11</p> +<p id="footer">npm-dedupe — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-deprecate.html b/deps/npm/html/doc/cli/npm-deprecate.html index 2780be421b..f1c0a4718d 100644 --- a/deps/npm/html/doc/cli/npm-deprecate.html +++ b/deps/npm/html/doc/cli/npm-deprecate.html @@ -31,7 +31,7 @@ something like this:</p> <ul><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li></ul> </div> -<p id="footer">npm-deprecate — npm@1.3.11</p> +<p id="footer">npm-deprecate — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-docs.html b/deps/npm/html/doc/cli/npm-docs.html index cb20c569d2..71243f3930 100644 --- a/deps/npm/html/doc/cli/npm-docs.html +++ b/deps/npm/html/doc/cli/npm-docs.html @@ -37,7 +37,7 @@ config param.</p> <ul><li><a href="../cli/npm-view.html">npm-view(1)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li></ul> </div> -<p id="footer">npm-docs — npm@1.3.11</p> +<p id="footer">npm-docs — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-edit.html b/deps/npm/html/doc/cli/npm-edit.html index 3fdcd45a35..96f858fa44 100644 --- a/deps/npm/html/doc/cli/npm-edit.html +++ b/deps/npm/html/doc/cli/npm-edit.html @@ -37,7 +37,7 @@ or <code>"notepad"</code> on Windows.</li><li>Type: path</li></ul> <ul><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-explore.html">npm-explore(1)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li></ul> </div> -<p id="footer">npm-edit — npm@1.3.11</p> +<p id="footer">npm-edit — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-explore.html b/deps/npm/html/doc/cli/npm-explore.html index f2d5418fdd..a8d6d93269 100644 --- a/deps/npm/html/doc/cli/npm-explore.html +++ b/deps/npm/html/doc/cli/npm-explore.html @@ -40,7 +40,7 @@ Windows</li><li>Type: path</li></ul> <ul><li><a href="../cli/npm-submodule.html">npm-submodule(1)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-edit.html">npm-edit(1)</a></li><li><a href="../cli/npm-rebuild.html">npm-rebuild(1)</a></li><li><a href="../cli/npm-build.html">npm-build(1)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li></ul> </div> -<p id="footer">npm-explore — npm@1.3.11</p> +<p id="footer">npm-explore — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-help-search.html b/deps/npm/html/doc/cli/npm-help-search.html index 1d6e358bb4..fdfde26587 100644 --- a/deps/npm/html/doc/cli/npm-help-search.html +++ b/deps/npm/html/doc/cli/npm-help-search.html @@ -38,7 +38,7 @@ where the terms were found in the documentation.</p> <ul><li><a href="../cli/npm.html">npm(1)</a></li><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../cli/npm-help.html">npm-help(1)</a></li></ul> </div> -<p id="footer">npm-help-search — npm@1.3.11</p> +<p id="footer">npm-help-search — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-help.html b/deps/npm/html/doc/cli/npm-help.html index 58d6f26dd2..6ca54202f9 100644 --- a/deps/npm/html/doc/cli/npm-help.html +++ b/deps/npm/html/doc/cli/npm-help.html @@ -36,7 +36,7 @@ matches are equivalent to specifying a topic name.</p> <ul><li><a href="../cli/npm.html">npm(1)</a></li><li><a href="../../doc/README.html">README</a></li><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../cli/npm-help-search.html">npm-help-search(1)</a></li><li><a href="../misc/npm-index.html">npm-index(7)</a></li></ul> </div> -<p id="footer">npm-help — npm@1.3.11</p> +<p id="footer">npm-help — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-init.html b/deps/npm/html/doc/cli/npm-init.html index e6a15f235c..b213e8fea8 100644 --- a/deps/npm/html/doc/cli/npm-init.html +++ b/deps/npm/html/doc/cli/npm-init.html @@ -29,7 +29,7 @@ without a really good reason to do so.</p> <ul><li><a href="https://github.com/isaacs/init-package-json">https://github.com/isaacs/init-package-json</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../cli/npm-version.html">npm-version(1)</a></li></ul> </div> -<p id="footer">npm-init — npm@1.3.11</p> +<p id="footer">npm-init — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-install.html b/deps/npm/html/doc/cli/npm-install.html index 39043f4dba..422461d461 100644 --- a/deps/npm/html/doc/cli/npm-install.html +++ b/deps/npm/html/doc/cli/npm-install.html @@ -64,7 +64,9 @@ For example:</p> <pre><code>npm install sax@">=0.1.0 <0.2.0" bench supervisor</code></pre> -<p>The <code>--tag</code> argument will apply to all of the specified install targets.</p> +<p>The <code>--tag</code> argument will apply to all of the specified install targets. If a +tag with the given name exists, the tagged version is preferred over newer +versions.</p> <p>The <code>--force</code> argument will force npm to fetch remote resources even if a local copy exists on disk.</p> @@ -142,7 +144,7 @@ affects a real use-case, it will be investigated.</p> <ul><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-update.html">npm-update(1)</a></li><li><a href="../cli/npm-link.html">npm-link(1)</a></li><li><a href="../cli/npm-rebuild.html">npm-rebuild(1)</a></li><li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li><li><a href="../cli/npm-build.html">npm-build(1)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-tag.html">npm-tag(1)</a></li><li><a href="../cli/npm-rm.html">npm-rm(1)</a></li><li><a href="../cli/npm-shrinkwrap.html">npm-shrinkwrap(1)</a></li></ul> </div> -<p id="footer">npm-install — npm@1.3.11</p> +<p id="footer">npm-install — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-link.html b/deps/npm/html/doc/cli/npm-link.html index 88b03cca82..fababe1a5e 100644 --- a/deps/npm/html/doc/cli/npm-link.html +++ b/deps/npm/html/doc/cli/npm-link.html @@ -62,7 +62,7 @@ installation target into your project's <code>node_modules</code> folder.</p <ul><li><a href="../misc/npm-developers.html">npm-developers(7)</a></li><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li></ul> </div> -<p id="footer">npm-link — npm@1.3.11</p> +<p id="footer">npm-link — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-ls.html b/deps/npm/html/doc/cli/npm-ls.html index 63a3c1ba2a..8e834f789c 100644 --- a/deps/npm/html/doc/cli/npm-ls.html +++ b/deps/npm/html/doc/cli/npm-ls.html @@ -25,7 +25,7 @@ limit the results to only the paths to the packages named. Note that nested packages will <em>also</em> show the paths to the specified packages. For example, running <code>npm ls promzard</code> in npm's source tree will show:</p> -<pre><code>npm@1.3.11 /path/to/npm +<pre><code>npm@1.3.12 /path/to/npm └─┬ init-package-json@0.0.4 └── promzard@0.1.5</code></pre> @@ -68,7 +68,7 @@ project.</p> <ul><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-link.html">npm-link(1)</a></li><li><a href="../cli/npm-prune.html">npm-prune(1)</a></li><li><a href="../cli/npm-outdated.html">npm-outdated(1)</a></li><li><a href="../cli/npm-update.html">npm-update(1)</a></li></ul> </div> -<p id="footer">npm-ls — npm@1.3.11</p> +<p id="footer">npm-ls — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-outdated.html b/deps/npm/html/doc/cli/npm-outdated.html index 5b54fc453f..cb838808c5 100644 --- a/deps/npm/html/doc/cli/npm-outdated.html +++ b/deps/npm/html/doc/cli/npm-outdated.html @@ -17,11 +17,15 @@ <p>This command will check the registry to see if any (or, specific) installed packages are currently outdated.</p> +<p>The resulting field 'wanted' shows the latest version according to the +version specified in the package.json, the field 'latest' the very latest +version of the package.</p> + <h2 id="SEE-ALSO">SEE ALSO</h2> <ul><li><a href="../cli/npm-update.html">npm-update(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li></ul> </div> -<p id="footer">npm-outdated — npm@1.3.11</p> +<p id="footer">npm-outdated — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-owner.html b/deps/npm/html/doc/cli/npm-owner.html index 8b7d875fb5..03605a7d03 100644 --- a/deps/npm/html/doc/cli/npm-owner.html +++ b/deps/npm/html/doc/cli/npm-owner.html @@ -34,7 +34,7 @@ that is not implemented at this time.</p> <ul><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li><li><a href="../misc/npm-disputes.html">npm-disputes(7)</a></li></ul> </div> -<p id="footer">npm-owner — npm@1.3.11</p> +<p id="footer">npm-owner — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-pack.html b/deps/npm/html/doc/cli/npm-pack.html index 5c89f7fff1..3233864b33 100644 --- a/deps/npm/html/doc/cli/npm-pack.html +++ b/deps/npm/html/doc/cli/npm-pack.html @@ -29,7 +29,7 @@ overwritten the second time.</p> <ul><li><a href="../cli/npm-cache.html">npm-cache(1)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li></ul> </div> -<p id="footer">npm-pack — npm@1.3.11</p> +<p id="footer">npm-pack — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-prefix.html b/deps/npm/html/doc/cli/npm-prefix.html index cb8fce9172..a6ab1f602e 100644 --- a/deps/npm/html/doc/cli/npm-prefix.html +++ b/deps/npm/html/doc/cli/npm-prefix.html @@ -20,7 +20,7 @@ <ul><li><a href="../cli/npm-root.html">npm-root(1)</a></li><li><a href="../cli/npm-bin.html">npm-bin(1)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li></ul> </div> -<p id="footer">npm-prefix — npm@1.3.11</p> +<p id="footer">npm-prefix — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-prune.html b/deps/npm/html/doc/cli/npm-prune.html index 79a9252ab7..cda9f134c0 100644 --- a/deps/npm/html/doc/cli/npm-prune.html +++ b/deps/npm/html/doc/cli/npm-prune.html @@ -10,7 +10,8 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2> -<pre><code>npm prune [<name> [<name ...]]</code></pre> +<pre><code>npm prune [<name> [<name ...]] +npm prune [<name> [<name ...]] [--production]</code></pre> <h2 id="DESCRIPTION">DESCRIPTION</h2> @@ -21,11 +22,14 @@ removed.</p> <p>Extraneous packages are packages that are not listed on the parent package's dependencies list.</p> +<p>If the <code>--production</code> flag is specified, this command will remove the +packages specified in your <code>devDependencies</code>.</p> + <h2 id="SEE-ALSO">SEE ALSO</h2> <ul><li><a href="../cli/npm-rm.html">npm-rm(1)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-ls.html">npm-ls(1)</a></li></ul> </div> -<p id="footer">npm-prune — npm@1.3.11</p> +<p id="footer">npm-prune — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-publish.html b/deps/npm/html/doc/cli/npm-publish.html index 92b785e2e7..6a4d9afa72 100644 --- a/deps/npm/html/doc/cli/npm-publish.html +++ b/deps/npm/html/doc/cli/npm-publish.html @@ -29,7 +29,7 @@ the registry. Overwrites when the "--force" flag is set.</p> <ul><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li><li><a href="../cli/npm-owner.html">npm-owner(1)</a></li><li><a href="../cli/npm-deprecate.html">npm-deprecate(1)</a></li><li><a href="../cli/npm-tag.html">npm-tag(1)</a></li></ul> </div> -<p id="footer">npm-publish — npm@1.3.11</p> +<p id="footer">npm-publish — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-rebuild.html b/deps/npm/html/doc/cli/npm-rebuild.html index 140aadc531..34711bdf70 100644 --- a/deps/npm/html/doc/cli/npm-rebuild.html +++ b/deps/npm/html/doc/cli/npm-rebuild.html @@ -26,7 +26,7 @@ the new binary.</p> <ul><li><a href="../cli/npm-build.html">npm-build(1)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li></ul> </div> -<p id="footer">npm-rebuild — npm@1.3.11</p> +<p id="footer">npm-rebuild — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-restart.html b/deps/npm/html/doc/cli/npm-restart.html index 480af1e117..b6ed8830a6 100644 --- a/deps/npm/html/doc/cli/npm-restart.html +++ b/deps/npm/html/doc/cli/npm-restart.html @@ -24,7 +24,7 @@ the "start" script.</p> <ul><li><a href="../cli/npm-run-script.html">npm-run-script(1)</a></li><li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li><li><a href="../cli/npm-test.html">npm-test(1)</a></li><li><a href="../cli/npm-start.html">npm-start(1)</a></li><li><a href="../cli/npm-stop.html">npm-stop(1)</a></li></ul> </div> -<p id="footer">npm-restart — npm@1.3.11</p> +<p id="footer">npm-restart — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-rm.html b/deps/npm/html/doc/cli/npm-rm.html index b2d4fdf358..560a4ace07 100644 --- a/deps/npm/html/doc/cli/npm-rm.html +++ b/deps/npm/html/doc/cli/npm-rm.html @@ -24,7 +24,7 @@ on its behalf.</p> <ul><li><a href="../cli/npm-prune.html">npm-prune(1)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li></ul> </div> -<p id="footer">npm-rm — npm@1.3.11</p> +<p id="footer">npm-rm — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-root.html b/deps/npm/html/doc/cli/npm-root.html index cff181d420..8d3d3e0bff 100644 --- a/deps/npm/html/doc/cli/npm-root.html +++ b/deps/npm/html/doc/cli/npm-root.html @@ -20,7 +20,7 @@ <ul><li><a href="../cli/npm-prefix.html">npm-prefix(1)</a></li><li><a href="../cli/npm-bin.html">npm-bin(1)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li></ul> </div> -<p id="footer">npm-root — npm@1.3.11</p> +<p id="footer">npm-root — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-run-script.html b/deps/npm/html/doc/cli/npm-run-script.html index 2527e05bc9..ea9c399063 100644 --- a/deps/npm/html/doc/cli/npm-run-script.html +++ b/deps/npm/html/doc/cli/npm-run-script.html @@ -23,7 +23,7 @@ called directly, as well.</p> <ul><li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li><li><a href="../cli/npm-test.html">npm-test(1)</a></li><li><a href="../cli/npm-start.html">npm-start(1)</a></li><li><a href="../cli/npm-restart.html">npm-restart(1)</a></li><li><a href="../cli/npm-stop.html">npm-stop(1)</a></li></ul> </div> -<p id="footer">npm-run-script — npm@1.3.11</p> +<p id="footer">npm-run-script — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-search.html b/deps/npm/html/doc/cli/npm-search.html index c468502210..a23ebb17c5 100644 --- a/deps/npm/html/doc/cli/npm-search.html +++ b/deps/npm/html/doc/cli/npm-search.html @@ -26,7 +26,7 @@ expression characters must be escaped or quoted in most shells.)</p> <ul><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../cli/npm-view.html">npm-view(1)</a></li></ul> </div> -<p id="footer">npm-search — npm@1.3.11</p> +<p id="footer">npm-search — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-shrinkwrap.html b/deps/npm/html/doc/cli/npm-shrinkwrap.html index 479193dfe9..8580169c58 100644 --- a/deps/npm/html/doc/cli/npm-shrinkwrap.html +++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html @@ -183,7 +183,7 @@ contents rather than versions.</p> <ul><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../cli/npm-ls.html">npm-ls(1)</a></li></ul> </div> -<p id="footer">npm-shrinkwrap — npm@1.3.11</p> +<p id="footer">npm-shrinkwrap — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-star.html b/deps/npm/html/doc/cli/npm-star.html index 7779dad57a..a0ba205339 100644 --- a/deps/npm/html/doc/cli/npm-star.html +++ b/deps/npm/html/doc/cli/npm-star.html @@ -26,7 +26,7 @@ a vaguely positive way to show that you care.</p> <ul><li><a href="../cli/npm-view.html">npm-view(1)</a></li><li><a href="../cli/npm-whoami.html">npm-whoami(1)</a></li><li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li></ul> </div> -<p id="footer">npm-star — npm@1.3.11</p> +<p id="footer">npm-star — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-stars.html b/deps/npm/html/doc/cli/npm-stars.html index 640dbcbcba..bb95f3a449 100644 --- a/deps/npm/html/doc/cli/npm-stars.html +++ b/deps/npm/html/doc/cli/npm-stars.html @@ -25,7 +25,7 @@ you will most certainly enjoy this command.</p> <ul><li><a href="../cli/npm-star.html">npm-star(1)</a></li><li><a href="../cli/npm-view.html">npm-view(1)</a></li><li><a href="../cli/npm-whoami.html">npm-whoami(1)</a></li><li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li></ul> </div> -<p id="footer">npm-stars — npm@1.3.11</p> +<p id="footer">npm-stars — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-start.html b/deps/npm/html/doc/cli/npm-start.html index 6416f918af..4cbd2fb09e 100644 --- a/deps/npm/html/doc/cli/npm-start.html +++ b/deps/npm/html/doc/cli/npm-start.html @@ -20,7 +20,7 @@ <ul><li><a href="../cli/npm-run-script.html">npm-run-script(1)</a></li><li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li><li><a href="../cli/npm-test.html">npm-test(1)</a></li><li><a href="../cli/npm-restart.html">npm-restart(1)</a></li><li><a href="../cli/npm-stop.html">npm-stop(1)</a></li></ul> </div> -<p id="footer">npm-start — npm@1.3.11</p> +<p id="footer">npm-start — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-stop.html b/deps/npm/html/doc/cli/npm-stop.html index 376cbc4693..eff837854d 100644 --- a/deps/npm/html/doc/cli/npm-stop.html +++ b/deps/npm/html/doc/cli/npm-stop.html @@ -20,7 +20,7 @@ <ul><li><a href="../cli/npm-run-script.html">npm-run-script(1)</a></li><li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li><li><a href="../cli/npm-test.html">npm-test(1)</a></li><li><a href="../cli/npm-start.html">npm-start(1)</a></li><li><a href="../cli/npm-restart.html">npm-restart(1)</a></li></ul> </div> -<p id="footer">npm-stop — npm@1.3.11</p> +<p id="footer">npm-stop — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-submodule.html b/deps/npm/html/doc/cli/npm-submodule.html index 37679f3d2c..835f3fb6b9 100644 --- a/deps/npm/html/doc/cli/npm-submodule.html +++ b/deps/npm/html/doc/cli/npm-submodule.html @@ -33,7 +33,7 @@ dependencies into the submodule folder.</p> <ul><li><a href="../files/package.json.html">package.json(5)</a></li><li>git help submodule</li></ul> </div> -<p id="footer">npm-submodule — npm@1.3.11</p> +<p id="footer">npm-submodule — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-tag.html b/deps/npm/html/doc/cli/npm-tag.html index 627aff0a67..9aaab6504b 100644 --- a/deps/npm/html/doc/cli/npm-tag.html +++ b/deps/npm/html/doc/cli/npm-tag.html @@ -17,11 +17,24 @@ <p>Tags the specified version of the package with the specified tag, or the <code>--tag</code> config if not specified.</p> +<p>A tag can be used when installing packages as a reference to a version instead +of using a specific version number:</p> + +<pre><code>npm install <name>@<tag></code></pre> + +<p>When installing dependencies, a preferred tagged version may be specified:</p> + +<pre><code>npm install --tag <tag></code></pre> + +<p>This also applies to <code>npm dedupe</code>.</p> + +<p>Publishing a package always sets the "latest" tag to the published version.</p> + <h2 id="SEE-ALSO">SEE ALSO</h2> -<ul><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li></ul> +<ul><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-dedupe.html">npm-dedupe(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li></ul> </div> -<p id="footer">npm-tag — npm@1.3.11</p> +<p id="footer">npm-tag — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-test.html b/deps/npm/html/doc/cli/npm-test.html index eb0e7481d0..6530099f98 100644 --- a/deps/npm/html/doc/cli/npm-test.html +++ b/deps/npm/html/doc/cli/npm-test.html @@ -24,7 +24,7 @@ true.</p> <ul><li><a href="../cli/npm-run-script.html">npm-run-script(1)</a></li><li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li><li><a href="../cli/npm-start.html">npm-start(1)</a></li><li><a href="../cli/npm-restart.html">npm-restart(1)</a></li><li><a href="../cli/npm-stop.html">npm-stop(1)</a></li></ul> </div> -<p id="footer">npm-test — npm@1.3.11</p> +<p id="footer">npm-test — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-uninstall.html b/deps/npm/html/doc/cli/npm-uninstall.html index 4042b10b71..15d57209d4 100644 --- a/deps/npm/html/doc/cli/npm-uninstall.html +++ b/deps/npm/html/doc/cli/npm-uninstall.html @@ -22,7 +22,7 @@ on its behalf.</p> <ul><li><a href="../cli/npm-prune.html">npm-prune(1)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li></ul> </div> -<p id="footer">npm-uninstall — npm@1.3.11</p> +<p id="footer">npm-uninstall — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-unpublish.html b/deps/npm/html/doc/cli/npm-unpublish.html index 5ed32e8ab7..010e260a1a 100644 --- a/deps/npm/html/doc/cli/npm-unpublish.html +++ b/deps/npm/html/doc/cli/npm-unpublish.html @@ -34,7 +34,7 @@ the root package entry is removed from the registry entirely.</p> <ul><li><a href="../cli/npm-deprecate.html">npm-deprecate(1)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li><li><a href="../cli/npm-owner.html">npm-owner(1)</a></li></ul> </div> -<p id="footer">npm-unpublish — npm@1.3.11</p> +<p id="footer">npm-unpublish — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-update.html b/deps/npm/html/doc/cli/npm-update.html index f214812678..8020e336c9 100644 --- a/deps/npm/html/doc/cli/npm-update.html +++ b/deps/npm/html/doc/cli/npm-update.html @@ -26,7 +26,7 @@ If no package name is specified, all packages in the specified location (global <ul><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-outdated.html">npm-outdated(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-ls.html">npm-ls(1)</a></li></ul> </div> -<p id="footer">npm-update — npm@1.3.11</p> +<p id="footer">npm-update — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-version.html b/deps/npm/html/doc/cli/npm-version.html index 6ea244bc0c..15afc50fc7 100644 --- a/deps/npm/html/doc/cli/npm-version.html +++ b/deps/npm/html/doc/cli/npm-version.html @@ -49,7 +49,7 @@ Enter passphrase:</code></pre> <ul><li><a href="../cli/npm-init.html">npm-init(1)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../misc/semver.html">semver(7)</a></li></ul> </div> -<p id="footer">npm-version — npm@1.3.11</p> +<p id="footer">npm-version — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-view.html b/deps/npm/html/doc/cli/npm-view.html index bba637fe95..bc62eabde0 100644 --- a/deps/npm/html/doc/cli/npm-view.html +++ b/deps/npm/html/doc/cli/npm-view.html @@ -91,7 +91,7 @@ the field name.</p> <ul><li><a href="../cli/npm-search.html">npm-search(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../cli/npm-docs.html">npm-docs(1)</a></li></ul> </div> -<p id="footer">npm-view — npm@1.3.11</p> +<p id="footer">npm-view — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm-whoami.html b/deps/npm/html/doc/cli/npm-whoami.html index 2086787215..e4591c5689 100644 --- a/deps/npm/html/doc/cli/npm-whoami.html +++ b/deps/npm/html/doc/cli/npm-whoami.html @@ -20,7 +20,7 @@ <ul><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li></ul> </div> -<p id="footer">npm-whoami — npm@1.3.11</p> +<p id="footer">npm-whoami — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/npm.html b/deps/npm/html/doc/cli/npm.html index 6853bb9632..fb8186d57c 100644 --- a/deps/npm/html/doc/cli/npm.html +++ b/deps/npm/html/doc/cli/npm.html @@ -14,7 +14,7 @@ <h2 id="VERSION">VERSION</h2> -<p>1.3.11</p> +<p>1.3.12</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="../cli/npm-help.html">npm-help(1)</a></li><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../../doc/README.html">README</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../misc/npm-index.html">npm-index(7)</a></li><li><a href="../api/npm.html">npm(3)</a></li></ul> </div> -<p id="footer">npm — npm@1.3.11</p> +<p id="footer">npm — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/cli/repo.html b/deps/npm/html/doc/cli/repo.html index 82163efaab..ce6b94e587 100644 --- a/deps/npm/html/doc/cli/repo.html +++ b/deps/npm/html/doc/cli/repo.html @@ -30,7 +30,7 @@ config param.</p> <ul><li><a href="../cli/npm-docs.html">npm-docs(1)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li></ul> </div> -<p id="footer">repo — npm@1.3.11</p> +<p id="footer">repo — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/files/npm-folders.html b/deps/npm/html/doc/files/npm-folders.html index 6264bf9c15..8e56bcc60d 100644 --- a/deps/npm/html/doc/files/npm-folders.html +++ b/deps/npm/html/doc/files/npm-folders.html @@ -205,7 +205,7 @@ cannot be found elsewhere. See <code><a href="../files/package.json.html">packa <ul><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-pack.html">npm-pack(1)</a></li><li><a href="../cli/npm-cache.html">npm-cache(1)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li></ul> </div> -<p id="footer">npm-folders — npm@1.3.11</p> +<p id="footer">npm-folders — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/files/npm-global.html b/deps/npm/html/doc/files/npm-global.html index 6264bf9c15..8e56bcc60d 100644 --- a/deps/npm/html/doc/files/npm-global.html +++ b/deps/npm/html/doc/files/npm-global.html @@ -205,7 +205,7 @@ cannot be found elsewhere. See <code><a href="../files/package.json.html">packa <ul><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-pack.html">npm-pack(1)</a></li><li><a href="../cli/npm-cache.html">npm-cache(1)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li></ul> </div> -<p id="footer">npm-folders — npm@1.3.11</p> +<p id="footer">npm-folders — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/files/npm-json.html b/deps/npm/html/doc/files/npm-json.html index 10f789b568..b08f18f024 100644 --- a/deps/npm/html/doc/files/npm-json.html +++ b/deps/npm/html/doc/files/npm-json.html @@ -550,7 +550,7 @@ overridden.</p> <ul><li><a href="../misc/semver.html">semver(7)</a></li><li><a href="../cli/npm-init.html">npm-init(1)</a></li><li><a href="../cli/npm-version.html">npm-version(1)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../cli/npm-help.html">npm-help(1)</a></li><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../cli/npm-rm.html">npm-rm(1)</a></li></ul> </div> -<p id="footer">package.json — npm@1.3.11</p> +<p id="footer">package.json — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html index 8e7ed5d1bb..a11909343c 100644 --- a/deps/npm/html/doc/files/npmrc.html +++ b/deps/npm/html/doc/files/npmrc.html @@ -59,7 +59,7 @@ manner.</p> <ul><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../cli/npm.html">npm(1)</a></li></ul> </div> -<p id="footer">npmrc — npm@1.3.11</p> +<p id="footer">npmrc — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html index 10f789b568..b08f18f024 100644 --- a/deps/npm/html/doc/files/package.json.html +++ b/deps/npm/html/doc/files/package.json.html @@ -550,7 +550,7 @@ overridden.</p> <ul><li><a href="../misc/semver.html">semver(7)</a></li><li><a href="../cli/npm-init.html">npm-init(1)</a></li><li><a href="../cli/npm-version.html">npm-version(1)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../cli/npm-help.html">npm-help(1)</a></li><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../cli/npm-rm.html">npm-rm(1)</a></li></ul> </div> -<p id="footer">package.json — npm@1.3.11</p> +<p id="footer">package.json — npm@1.3.12</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 8c0fd239cf..05f368fafe 100644 --- a/deps/npm/html/doc/index.html +++ b/deps/npm/html/doc/index.html @@ -416,7 +416,7 @@ <p>The semantic versioner for npm</p> </div> -<p id="footer">npm-index — npm@1.3.11</p> +<p id="footer">npm-index — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html index 3d1acda907..349be543a5 100644 --- a/deps/npm/html/doc/misc/npm-coding-style.html +++ b/deps/npm/html/doc/misc/npm-coding-style.html @@ -182,7 +182,7 @@ set to anything."</p> <ul><li><a href="../misc/npm-developers.html">npm-developers(7)</a></li><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../cli/npm.html">npm(1)</a></li></ul> </div> -<p id="footer">npm-coding-style — npm@1.3.11</p> +<p id="footer">npm-coding-style — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html index 9c95a872c7..d0ce004a9e 100644 --- a/deps/npm/html/doc/misc/npm-config.html +++ b/deps/npm/html/doc/misc/npm-config.html @@ -126,7 +126,7 @@ to trust only that specific signing authority.</p> <h3 id="cache">cache</h3> -<ul><li>Default: Windows: <code>%APPDATA%\npm-cache</code>, Posix: <code>~/.npm</code></li><li>Type: path</li></ul> +<ul><li>Default: Windows: <code>%AppData%\npm-cache</code>, Posix: <code>~/.npm</code></li><li>Type: path</li></ul> <p>The location of npm's cache directory. See <code><a href="../cli/npm-cache.html">npm-cache(1)</a></code></p> @@ -717,7 +717,7 @@ then answer "no" to any prompt.</p> <ul><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li><li><a href="../cli/npm.html">npm(1)</a></li></ul> </div> -<p id="footer">npm-config — npm@1.3.11</p> +<p id="footer">npm-config — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html index cf88e4ab54..290ac9e8cd 100644 --- a/deps/npm/html/doc/misc/npm-developers.html +++ b/deps/npm/html/doc/misc/npm-developers.html @@ -174,7 +174,7 @@ from a fresh checkout.</p> <ul><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../cli/npm.html">npm(1)</a></li><li><a href="../cli/npm-init.html">npm-init(1)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li></ul> </div> -<p id="footer">npm-developers — npm@1.3.11</p> +<p id="footer">npm-developers — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html index 69e37f3f31..385699f48a 100644 --- a/deps/npm/html/doc/misc/npm-disputes.html +++ b/deps/npm/html/doc/misc/npm-disputes.html @@ -91,7 +91,7 @@ things into it.</li></ol> <ul><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-owner.html">npm-owner(1)</a></li></ul> </div> -<p id="footer">npm-disputes — npm@1.3.11</p> +<p id="footer">npm-disputes — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/misc/npm-faq.html b/deps/npm/html/doc/misc/npm-faq.html index 9e5ea97d59..0185d46ceb 100644 --- a/deps/npm/html/doc/misc/npm-faq.html +++ b/deps/npm/html/doc/misc/npm-faq.html @@ -340,7 +340,7 @@ There is not sufficient need to impose namespace rules on everyone.</p> <ul><li><a href="../cli/npm.html">npm(1)</a></li><li><a href="../misc/npm-developers.html">npm-developers(7)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npm-folders.html">npm-folders(5)</a></li></ul> </div> -<p id="footer">npm-faq — npm@1.3.11</p> +<p id="footer">npm-faq — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html index 28002604ec..b2ba06c0ec 100644 --- a/deps/npm/html/doc/misc/npm-index.html +++ b/deps/npm/html/doc/misc/npm-index.html @@ -416,7 +416,7 @@ <p>The semantic versioner for npm</p> </div> -<p id="footer">npm-index — npm@1.3.11</p> +<p id="footer">npm-index — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html index 7dec703852..6c6857722c 100644 --- a/deps/npm/html/doc/misc/npm-registry.html +++ b/deps/npm/html/doc/misc/npm-registry.html @@ -71,7 +71,7 @@ effectively implement the entire CouchDB API anyway.</p> <ul><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../misc/npm-developers.html">npm-developers(7)</a></li><li><a href="../misc/npm-disputes.html">npm-disputes(7)</a></li></ul> </div> -<p id="footer">npm-registry — npm@1.3.11</p> +<p id="footer">npm-registry — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html index bda77b912f..15253af9d8 100644 --- a/deps/npm/html/doc/misc/npm-scripts.html +++ b/deps/npm/html/doc/misc/npm-scripts.html @@ -223,7 +223,7 @@ the user will sudo the npm command in question.</li></ul> <ul><li><a href="../cli/npm-run-script.html">npm-run-script(1)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../misc/npm-developers.html">npm-developers(7)</a></li><li><a href="../cli/npm-install.html">npm-install(1)</a></li></ul> </div> -<p id="footer">npm-scripts — npm@1.3.11</p> +<p id="footer">npm-scripts — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html index 21ea83d53c..5e2afae01d 100644 --- a/deps/npm/html/doc/misc/removing-npm.html +++ b/deps/npm/html/doc/misc/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="../cli/npm-rm.html">npm-rm(1)</a></li><li><a href="../cli/npm-prune.html">npm-prune(1)</a></li></ul> </div> -<p id="footer">removing-npm — npm@1.3.11</p> +<p id="footer">removing-npm — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html index ff4da2d144..ccb547a93a 100644 --- a/deps/npm/html/doc/misc/semver.html +++ b/deps/npm/html/doc/misc/semver.html @@ -94,7 +94,7 @@ in descending order when passed to Array.sort().</li></ul> range.</li><li>maxSatisfying(versions, range): Return the highest version in the list that satisfies the range, or null if none of them do.</li></ul> </div> -<p id="footer">semver — npm@1.3.11</p> +<p id="footer">semver — npm@1.3.12</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") diff --git a/deps/npm/lib/cache.js b/deps/npm/lib/cache.js index a8bd6b388f..a576a8f29c 100644 --- a/deps/npm/lib/cache.js +++ b/deps/npm/lib/cache.js @@ -1122,7 +1122,10 @@ function addLocalDirectory (p, name, shasum, cb) { getCacheStat(function (er, cs) { mkdir(path.dirname(tgz), function (er, made) { if (er) return cb(er) - tar.pack(tgz, p, data, false, function (er) { + + var fancy = p.indexOf(npm.tmp) !== 0 + && p.indexOf(npm.cache) !== 0 + tar.pack(tgz, p, data, fancy, function (er) { if (er) { log.error( "addLocalDirectory", "Could not pack %j to %j" , p, tgz ) diff --git a/deps/npm/lib/dedupe.js b/deps/npm/lib/dedupe.js index 648397b7ac..34e71177c7 100644 --- a/deps/npm/lib/dedupe.js +++ b/deps/npm/lib/dedupe.js @@ -248,7 +248,14 @@ function findVersions (npm, summary, cb) { npm.registry.get(name, function (er, data) { var regVersions = er ? [] : Object.keys(data.versions) var locMatch = bestMatch(versions, ranges) - var regMatch = bestMatch(regVersions, ranges) + var regMatch; + var tag = npm.config.get("tag"); + var distTags = data["dist-tags"]; + if (distTags && distTags[tag] && data.versions[distTags[tag]]) { + regMatch = distTags[tag] + } else { + regMatch = bestMatch(regVersions, ranges) + } cb(null, [[name, has, loc, locMatch, regMatch, locs]]) }) diff --git a/deps/npm/lib/docs.js b/deps/npm/lib/docs.js index ff2e381f8d..78e8d3eaac 100644 --- a/deps/npm/lib/docs.js +++ b/deps/npm/lib/docs.js @@ -1,4 +1,3 @@ - module.exports = docs docs.usage = "npm docs <pkgname>" @@ -17,9 +16,16 @@ var npm = require("./npm.js") function docs (args, cb) { if (!args.length) return cb(docs.usage) - var n = args[0].split("@").shift() - registry.get(n + "/latest", 3600, function (er, d) { - if (er) return cb(er) + var project = args[0] + var npmName = project.split("@").shift() + registry.get(project + "/latest", 3600, function (er, d) { + if (er) { + if (project.split("/").length !== 2) return cb(er) + + var url = "https://github.com/" + project + "#readme" + return opener(url, { command: npm.config.get("browser") }, cb) + } + var homepage = d.homepage , repo = d.repository || d.repositories , url = homepage ? homepage diff --git a/deps/npm/lib/ls.js b/deps/npm/lib/ls.js index 842b612cca..194aae6354 100644 --- a/deps/npm/lib/ls.js +++ b/deps/npm/lib/ls.js @@ -63,6 +63,8 @@ function ls (args, silent, cb) { } console.log(out) + if (args.length && !data._found) process.exitCode = 1 + // if any errors were found, then complain and exit status 1 if (lite.problems && lite.problems.length) { er = lite.problems.join('\n') diff --git a/deps/npm/lib/outdated.js b/deps/npm/lib/outdated.js index d9ef3ca0b9..2624844b5f 100644 --- a/deps/npm/lib/outdated.js +++ b/deps/npm/lib/outdated.js @@ -45,6 +45,7 @@ function makePretty (p) { , dir = path.resolve(p[0], "node_modules", dep) , has = p[2] , want = p[3] + , latest = p[4] // XXX add --json support // Should match (more or less) the output of ls --json @@ -61,8 +62,10 @@ function makePretty (p) { if (!npm.config.get("global")) { dir = path.relative(process.cwd(), dir) } - return dep + "@" + want + " " + dir + return dep + " " + dir + " current=" + (has || "MISSING") + + " wanted=" + want + + " latest=" + latest } function outdated_ (args, dir, parentHas, cb) { @@ -78,6 +81,17 @@ function outdated_ (args, dir, parentHas, cb) { readJson(path.resolve(dir, "package.json"), function (er, d) { if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er) deps = (er) ? true : (d.dependencies || {}) + var doUpdate = npm.config.get("dev") || + (!npm.config.get("production") && + !Object.keys(parentHas).length && + !npm.config.get("global")) + if (!er && d && doUpdate) { + Object.keys(d.devDependencies || {}).forEach(function (k) { + if (!(k in parentHas)) { + deps[k] = d.devDependencies[k] + } + }) + } return next() }) @@ -143,29 +157,35 @@ function shouldUpdate (args, dir, dep, has, req, cb) { , cb ) } - function doIt (shouldHave) { - cb(null, [[ dir, dep, curr && curr.version, shouldHave, req ]]) + function doIt (wanted, latest) { + cb(null, [[ dir, dep, curr && curr.version, wanted, latest, req ]]) } if (args.length && args.indexOf(dep) === -1) { return skip() } - // so, we can conceivably update this. find out if we need to. - cache.add(dep, req, function (er, d) { - // if this fails, then it means we can't update this thing. - // it's probably a thing that isn't published. - if (er) return skip() - - // check that the url origin hasn't changed (#1727) and that - // there is no newer version available - var dFromUrl = d._from && url.parse(d._from).protocol - var cFromUrl = curr && curr.from && url.parse(curr.from).protocol - - if (!curr || dFromUrl && cFromUrl && d._from !== curr.from - || d.version !== curr.version) - doIt(d.version) - else - skip() + var registry = npm.registry + // search for the latest package + registry.get(dep + "/latest", function (er, l) { + if (er) return cb() + // so, we can conceivably update this. find out if we need to. + cache.add(dep, req, function (er, d) { + // if this fails, then it means we can't update this thing. + // it's probably a thing that isn't published. + if (er) return skip() + + // check that the url origin hasn't changed (#1727) and that + // there is no newer version available + var dFromUrl = d._from && url.parse(d._from).protocol + var cFromUrl = curr && curr.from && url.parse(curr.from).protocol + + if (!curr || dFromUrl && cFromUrl && d._from !== curr.from + || d.version !== curr.version + || d.version !== l.version) + doIt(d.version, l.version) + else + skip() + }) }) } diff --git a/deps/npm/lib/repo.js b/deps/npm/lib/repo.js index 19066c8228..c91e593bfd 100644 --- a/deps/npm/lib/repo.js +++ b/deps/npm/lib/repo.js @@ -15,6 +15,7 @@ var npm = require("./npm.js") , log = require("npmlog") , opener = require("opener") , github = require('github-url-from-git') + , githubUserRepo = require("github-url-from-username-repo") function repo (args, cb) { if (!args.length) return cb(repo.usage) @@ -23,7 +24,14 @@ function repo (args, cb) { if (er) return cb(er) var r = d.repository; if (!r) return cb(new Error('no repository')); - var url = github(r.url); + // XXX remove this when npm@v1.3.10 from node 0.10 is deprecated + // from https://github.com/isaacs/npm-www/issues/418 + if (githubUserRepo(r.url)) + r.url = githubUserRepo(r.url) + + var url = github(r.url) + if (!url) + return cb(new Error('no repository: could not get url')) opener(url, { command: npm.config.get("browser") }, cb) }) } diff --git a/deps/npm/lib/unbuild.js b/deps/npm/lib/unbuild.js index ec34d5688c..57688f0692 100644 --- a/deps/npm/lib/unbuild.js +++ b/deps/npm/lib/unbuild.js @@ -20,7 +20,10 @@ function unbuild (args, silent, cb) { asyncMap(args, unbuild_(silent), cb) } -function unbuild_ (silent) { return function (folder, cb) { +function unbuild_ (silent) { return function (folder, cb_) { + function cb (er) { + cb_(er, path.relative(npm.root, folder)) + } folder = path.resolve(folder) delete build._didBuild[folder] log.info(folder, "unbuild") diff --git a/deps/npm/lib/utils/error-handler.js b/deps/npm/lib/utils/error-handler.js index 8637592ab1..a82f97ec1d 100644 --- a/deps/npm/lib/utils/error-handler.js +++ b/deps/npm/lib/utils/error-handler.js @@ -44,7 +44,7 @@ process.on("exit", function (code) { }) function exit (code, noLog) { - exitCode = exitCode || code + exitCode = exitCode || process.exitCode || code var doExit = npm.config.get("_exit") log.verbose("exit", [code, doExit]) diff --git a/deps/npm/lib/utils/lifecycle.js b/deps/npm/lib/utils/lifecycle.js index 1f9da46716..32fb28f367 100644 --- a/deps/npm/lib/utils/lifecycle.js +++ b/deps/npm/lib/utils/lifecycle.js @@ -8,9 +8,9 @@ var log = require("npmlog") , path = require("path") , fs = require("graceful-fs") , chain = require("slide").chain - , constants = require("constants") , Stream = require("stream").Stream , PATH = "PATH" + , uidNumber = require("uid-number") // windows calls it's path "Path" usually, but this is not guaranteed. if (process.platform === "win32") { @@ -132,38 +132,68 @@ function validWd (d, cb) { function runPackageLifecycle (pkg, env, wd, unsafe, cb) { // run package lifecycle scripts in the package root, or the nearest parent. var stage = env.npm_lifecycle_event - , user = unsafe ? null : npm.config.get("user") - , group = unsafe ? null : npm.config.get("group") , cmd = env.npm_lifecycle_script - , sh = "sh" - , shFlag = "-c" + + var note = "\n> " + pkg._id + " " + stage + " " + wd + + "\n> " + cmd + "\n" + console.log(note) + runCmd(cmd, pkg, env, stage, wd, unsafe, cb) +} + +function runCmd (cmd, pkg, env, stage, wd, unsafe, cb) { + var user = unsafe ? null : npm.config.get("user") + , group = unsafe ? null : npm.config.get("group") + + log.verbose("unsafe-perm in lifecycle", unsafe) + + if (process.platform === "win32") { + unsafe = true + } + + if (unsafe) { + runCmd_(cmd, pkg, env, wd, stage, unsafe, 0, 0, cb) + } else { + uidNumber(user, group, function (er, uid, gid) { + runCmd_(cmd, pkg, env, wd, stage, unsafe, uid, gid, cb) + }) + } +} + +function runCmd_ (cmd, pkg, env, wd, stage, unsafe, uid, gid, cb) { + var sh = "sh" + var shFlag = "-c" if (process.platform === "win32") { sh = "cmd" shFlag = "/c" } - log.verbose("unsafe-perm in lifecycle", unsafe) - - var note = "\n> " + pkg._id + " " + stage + " " + wd - + "\n> " + cmd + "\n" + var conf = { cwd: wd + , env: env + , stdio: [ 0, 1, 2 ] + } - console.log(note) + if (!unsafe) { + conf.uid = uid + conf.gid = gid + } - var conf = { cwd: wd, env: env, customFds: [ 0, 1, 2] } var proc = spawn(sh, [shFlag, cmd], conf) - proc.on("close", function (er, stdout, stderr) { + proc.on("close", function (code) { + if (code) { + var er = new Error("Exit status " + code) + } if (er && !npm.ROLLBACK) { log.info(pkg._id, "Failed to exec "+stage+" script") er.message = pkg._id + " " - + stage + ": `" + env.npm_lifecycle_script+"`\n" + + stage + ": `" + cmd +"`\n" + er.message if (er.code !== "EPERM") { er.code = "ELIFECYCLE" } er.pkgid = pkg._id er.stage = stage - er.script = env.npm_lifecycle_script + er.script = cmd er.pkgname = pkg.name return cb(er) } else if (er) { @@ -175,6 +205,7 @@ function runPackageLifecycle (pkg, env, wd, unsafe, cb) { }) } + function runHookLifecycle (pkg, env, wd, unsafe, cb) { // check for a hook script, run if present. var stage = env.npm_lifecycle_event @@ -185,17 +216,7 @@ function runHookLifecycle (pkg, env, wd, unsafe, cb) { fs.stat(hook, function (er) { if (er) return cb() - - var conf = { cwd: wd, env: env, customFds: [ 0, 1, 2] } - var proc = spawn("sh", ["-c", cmd], conf) - proc.on("close", function (er) { - if (er) { - er.message += "\nFailed to exec "+stage+" hook script" - log.info(pkg._id, er) - } - if (npm.ROLLBACK) return cb() - cb(er) - }) + runCmd(hook, pkg, env, stage, wd, unsafe, cb) }) } diff --git a/deps/npm/make.bat b/deps/npm/make.bat new file mode 100644 index 0000000000..7d71f0f925 --- /dev/null +++ b/deps/npm/make.bat @@ -0,0 +1,3 @@ +:: The tests run "make doc" in the prepublish script, +:: so this file gives windows something that'll exit +:: successfully, without having to install make. diff --git a/deps/npm/man/man1/npm-README.1 b/deps/npm/man/man1/npm-README.1 index d50f9eb9d1..0e7ccb3eb4 100644 --- a/deps/npm/man/man1/npm-README.1 +++ b/deps/npm/man/man1/npm-README.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM" "1" "September 2013" "" "" +.TH "NPM" "1" "October 2013" "" "" . .SH "NAME" \fBnpm\fR \-\- node package manager diff --git a/deps/npm/man/man1/npm-adduser.1 b/deps/npm/man/man1/npm-adduser.1 index d65430f20a..f43e5bc703 100644 --- a/deps/npm/man/man1/npm-adduser.1 +++ b/deps/npm/man/man1/npm-adduser.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ADDUSER" "1" "September 2013" "" "" +.TH "NPM\-ADDUSER" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-adduser\fR \-\- Add a registry user account diff --git a/deps/npm/man/man1/npm-bin.1 b/deps/npm/man/man1/npm-bin.1 index 5df576e61a..d458aae747 100644 --- a/deps/npm/man/man1/npm-bin.1 +++ b/deps/npm/man/man1/npm-bin.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BIN" "1" "September 2013" "" "" +.TH "NPM\-BIN" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-bin\fR \-\- Display npm bin folder diff --git a/deps/npm/man/man1/npm-bugs.1 b/deps/npm/man/man1/npm-bugs.1 index 7390f84774..b74504ea0f 100644 --- a/deps/npm/man/man1/npm-bugs.1 +++ b/deps/npm/man/man1/npm-bugs.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUGS" "1" "September 2013" "" "" +.TH "NPM\-BUGS" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-bugs\fR \-\- Bugs for a package in a web browser maybe diff --git a/deps/npm/man/man1/npm-build.1 b/deps/npm/man/man1/npm-build.1 index 9703ca192a..5bd2851fe4 100644 --- a/deps/npm/man/man1/npm-build.1 +++ b/deps/npm/man/man1/npm-build.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUILD" "1" "September 2013" "" "" +.TH "NPM\-BUILD" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-build\fR \-\- Build a package diff --git a/deps/npm/man/man1/npm-bundle.1 b/deps/npm/man/man1/npm-bundle.1 index 49fc44d629..9175936dd5 100644 --- a/deps/npm/man/man1/npm-bundle.1 +++ b/deps/npm/man/man1/npm-bundle.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUNDLE" "1" "September 2013" "" "" +.TH "NPM\-BUNDLE" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-bundle\fR \-\- REMOVED diff --git a/deps/npm/man/man1/npm-cache.1 b/deps/npm/man/man1/npm-cache.1 index 28ee1dd874..e66c85b28f 100644 --- a/deps/npm/man/man1/npm-cache.1 +++ b/deps/npm/man/man1/npm-cache.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CACHE" "1" "September 2013" "" "" +.TH "NPM\-CACHE" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-cache\fR \-\- Manipulates packages cache @@ -41,8 +41,9 @@ the entire cache is cleared\. .IP "" 0 . .SH "DETAILS" -npm stores cache data in \fB$HOME/\.npm\fR\|\. For each package that is added -to the cache, three pieces of information are stored in \fB{cache}/{name}/{version}\fR: +npm stores cache data in the directory specified in \fBnpm config get cache\fR\|\. +For each package that is added to the cache, three pieces of information are +stored in \fB{cache}/{name}/{version}\fR: . .IP "\(bu" 4 \|\.\.\./package/: @@ -71,7 +72,7 @@ they do not make an HTTP request to the registry\. .SH "CONFIGURATION" . .SS "cache" -Default: \fB$HOME/\.npm\fR on Posix, or \fB$HOME/npm\-cache\fR on Windows\. +Default: \fB~/\.npm\fR on Posix, or \fB%AppData%/npm\-cache\fR on Windows\. . .P The root cache folder\. diff --git a/deps/npm/man/man1/npm-completion.1 b/deps/npm/man/man1/npm-completion.1 index f5e77f1a3b..4619d4eb93 100644 --- a/deps/npm/man/man1/npm-completion.1 +++ b/deps/npm/man/man1/npm-completion.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-COMPLETION" "1" "September 2013" "" "" +.TH "NPM\-COMPLETION" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-completion\fR \-\- Tab Completion for npm diff --git a/deps/npm/man/man1/npm-config.1 b/deps/npm/man/man1/npm-config.1 index 44519dbd4b..deff5bb5e6 100644 --- a/deps/npm/man/man1/npm-config.1 +++ b/deps/npm/man/man1/npm-config.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CONFIG" "1" "September 2013" "" "" +.TH "NPM\-CONFIG" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-config\fR \-\- Manage the npm configuration files diff --git a/deps/npm/man/man1/npm-dedupe.1 b/deps/npm/man/man1/npm-dedupe.1 index 8efe650ac0..d0dc8d0445 100644 --- a/deps/npm/man/man1/npm-dedupe.1 +++ b/deps/npm/man/man1/npm-dedupe.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEDUPE" "1" "September 2013" "" "" +.TH "NPM\-DEDUPE" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-dedupe\fR \-\- Reduce duplication @@ -76,6 +76,11 @@ registry\. .P This feature is experimental, and may change in future versions\. . +.P +The \fB\-\-tag\fR argument will apply to all of the affected dependencies\. If a +tag with the given name exists, the tagged version is preferred over newer +versions\. +. .SH "SEE ALSO" . .IP "\(bu" 4 diff --git a/deps/npm/man/man1/npm-deprecate.1 b/deps/npm/man/man1/npm-deprecate.1 index c16e86c296..b5597a8987 100644 --- a/deps/npm/man/man1/npm-deprecate.1 +++ b/deps/npm/man/man1/npm-deprecate.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEPRECATE" "1" "September 2013" "" "" +.TH "NPM\-DEPRECATE" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-deprecate\fR \-\- Deprecate a version of a package diff --git a/deps/npm/man/man1/npm-docs.1 b/deps/npm/man/man1/npm-docs.1 index 4ecfcd3c88..a4c7e5b4ee 100644 --- a/deps/npm/man/man1/npm-docs.1 +++ b/deps/npm/man/man1/npm-docs.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DOCS" "1" "September 2013" "" "" +.TH "NPM\-DOCS" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-docs\fR \-\- Docs for a package in a web browser maybe diff --git a/deps/npm/man/man1/npm-edit.1 b/deps/npm/man/man1/npm-edit.1 index 976cb26250..6ac6770484 100644 --- a/deps/npm/man/man1/npm-edit.1 +++ b/deps/npm/man/man1/npm-edit.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EDIT" "1" "September 2013" "" "" +.TH "NPM\-EDIT" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-edit\fR \-\- Edit an installed package diff --git a/deps/npm/man/man1/npm-explore.1 b/deps/npm/man/man1/npm-explore.1 index 1fd6e5afe5..8ff45b19a4 100644 --- a/deps/npm/man/man1/npm-explore.1 +++ b/deps/npm/man/man1/npm-explore.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EXPLORE" "1" "September 2013" "" "" +.TH "NPM\-EXPLORE" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-explore\fR \-\- Browse an installed package diff --git a/deps/npm/man/man1/npm-help-search.1 b/deps/npm/man/man1/npm-help-search.1 index 3dc545f662..ff21645225 100644 --- a/deps/npm/man/man1/npm-help-search.1 +++ b/deps/npm/man/man1/npm-help-search.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP\-SEARCH" "1" "September 2013" "" "" +.TH "NPM\-HELP\-SEARCH" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-help-search\fR \-\- Search npm help documentation diff --git a/deps/npm/man/man1/npm-help.1 b/deps/npm/man/man1/npm-help.1 index 9c02adfe20..0116278bbf 100644 --- a/deps/npm/man/man1/npm-help.1 +++ b/deps/npm/man/man1/npm-help.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP" "1" "September 2013" "" "" +.TH "NPM\-HELP" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-help\fR \-\- Get help on npm diff --git a/deps/npm/man/man1/npm-init.1 b/deps/npm/man/man1/npm-init.1 index 1462b47d8d..0893f02b64 100644 --- a/deps/npm/man/man1/npm-init.1 +++ b/deps/npm/man/man1/npm-init.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INIT" "1" "September 2013" "" "" +.TH "NPM\-INIT" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-init\fR \-\- Interactively create a package\.json file diff --git a/deps/npm/man/man1/npm-install.1 b/deps/npm/man/man1/npm-install.1 index dac2934368..4015e3190b 100644 --- a/deps/npm/man/man1/npm-install.1 +++ b/deps/npm/man/man1/npm-install.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INSTALL" "1" "September 2013" "" "" +.TH "NPM\-INSTALL" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-install\fR \-\- Install a package @@ -264,7 +264,9 @@ npm install sax@">=0\.1\.0 <0\.2\.0" bench supervisor .IP "" 0 . .P -The \fB\-\-tag\fR argument will apply to all of the specified install targets\. +The \fB\-\-tag\fR argument will apply to all of the specified install targets\. If a +tag with the given name exists, the tagged version is preferred over newer +versions\. . .P The \fB\-\-force\fR argument will force npm to fetch remote resources even if a diff --git a/deps/npm/man/man1/npm-link.1 b/deps/npm/man/man1/npm-link.1 index 027d6d7d3a..990a61f56e 100644 --- a/deps/npm/man/man1/npm-link.1 +++ b/deps/npm/man/man1/npm-link.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LINK" "1" "September 2013" "" "" +.TH "NPM\-LINK" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-link\fR \-\- Symlink a package folder diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1 index f85c4f0b32..db0ba044e4 100644 --- a/deps/npm/man/man1/npm-ls.1 +++ b/deps/npm/man/man1/npm-ls.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LS" "1" "September 2013" "" "" +.TH "NPM\-LS" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-ls\fR \-\- List installed packages @@ -29,7 +29,7 @@ For example, running \fBnpm ls promzard\fR in npm\'s source tree will show: .IP "" 4 . .nf -npm@1.3.11 /path/to/npm +npm@1.3.12 /path/to/npm └─┬ init\-package\-json@0\.0\.4 └── promzard@0\.1\.5 . diff --git a/deps/npm/man/man1/npm-outdated.1 b/deps/npm/man/man1/npm-outdated.1 index e102fa1b7f..5892da99a4 100644 --- a/deps/npm/man/man1/npm-outdated.1 +++ b/deps/npm/man/man1/npm-outdated.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OUTDATED" "1" "September 2013" "" "" +.TH "NPM\-OUTDATED" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-outdated\fR \-\- Check for outdated packages @@ -17,6 +17,11 @@ npm outdated [<name> [<name> \.\.\.]] This command will check the registry to see if any (or, specific) installed packages are currently outdated\. . +.P +The resulting field \'wanted\' shows the latest version according to the +version specified in the package\.json, the field \'latest\' the very latest +version of the package\. +. .SH "SEE ALSO" . .IP "\(bu" 4 diff --git a/deps/npm/man/man1/npm-owner.1 b/deps/npm/man/man1/npm-owner.1 index 6447105c27..c58ae907cf 100644 --- a/deps/npm/man/man1/npm-owner.1 +++ b/deps/npm/man/man1/npm-owner.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OWNER" "1" "September 2013" "" "" +.TH "NPM\-OWNER" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-owner\fR \-\- Manage package owners diff --git a/deps/npm/man/man1/npm-pack.1 b/deps/npm/man/man1/npm-pack.1 index c9f6f1add4..397831563e 100644 --- a/deps/npm/man/man1/npm-pack.1 +++ b/deps/npm/man/man1/npm-pack.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PACK" "1" "September 2013" "" "" +.TH "NPM\-PACK" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-pack\fR \-\- Create a tarball from a package diff --git a/deps/npm/man/man1/npm-prefix.1 b/deps/npm/man/man1/npm-prefix.1 index 7362214b24..89f38e50a7 100644 --- a/deps/npm/man/man1/npm-prefix.1 +++ b/deps/npm/man/man1/npm-prefix.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PREFIX" "1" "September 2013" "" "" +.TH "NPM\-PREFIX" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-prefix\fR \-\- Display prefix diff --git a/deps/npm/man/man1/npm-prune.1 b/deps/npm/man/man1/npm-prune.1 index 134e33586a..92b9569456 100644 --- a/deps/npm/man/man1/npm-prune.1 +++ b/deps/npm/man/man1/npm-prune.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PRUNE" "1" "September 2013" "" "" +.TH "NPM\-PRUNE" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-prune\fR \-\- Remove extraneous packages @@ -10,6 +10,7 @@ . .nf npm prune [<name> [<name \.\.\.]] +npm prune [<name> [<name \.\.\.]] [\-\-production] . .fi . @@ -22,6 +23,10 @@ removed\. Extraneous packages are packages that are not listed on the parent package\'s dependencies list\. . +.P +If the \fB\-\-production\fR flag is specified, this command will remove the +packages specified in your \fBdevDependencies\fR\|\. +. .SH "SEE ALSO" . .IP "\(bu" 4 diff --git a/deps/npm/man/man1/npm-publish.1 b/deps/npm/man/man1/npm-publish.1 index b67cb84f0a..1036666f0b 100644 --- a/deps/npm/man/man1/npm-publish.1 +++ b/deps/npm/man/man1/npm-publish.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PUBLISH" "1" "September 2013" "" "" +.TH "NPM\-PUBLISH" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-publish\fR \-\- Publish a package diff --git a/deps/npm/man/man1/npm-rebuild.1 b/deps/npm/man/man1/npm-rebuild.1 index 052b3a76d2..0911cbfbd5 100644 --- a/deps/npm/man/man1/npm-rebuild.1 +++ b/deps/npm/man/man1/npm-rebuild.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REBUILD" "1" "September 2013" "" "" +.TH "NPM\-REBUILD" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-rebuild\fR \-\- Rebuild a package diff --git a/deps/npm/man/man1/npm-restart.1 b/deps/npm/man/man1/npm-restart.1 index 77d3c9ffe2..ec0b158efd 100644 --- a/deps/npm/man/man1/npm-restart.1 +++ b/deps/npm/man/man1/npm-restart.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RESTART" "1" "September 2013" "" "" +.TH "NPM\-RESTART" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-restart\fR \-\- Start a package diff --git a/deps/npm/man/man1/npm-rm.1 b/deps/npm/man/man1/npm-rm.1 index 249c494969..4b2dc63cbd 100644 --- a/deps/npm/man/man1/npm-rm.1 +++ b/deps/npm/man/man1/npm-rm.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RM" "1" "September 2013" "" "" +.TH "NPM\-RM" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-rm\fR \-\- Remove a package diff --git a/deps/npm/man/man1/npm-root.1 b/deps/npm/man/man1/npm-root.1 index fd27abe1ba..e897d9eb89 100644 --- a/deps/npm/man/man1/npm-root.1 +++ b/deps/npm/man/man1/npm-root.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ROOT" "1" "September 2013" "" "" +.TH "NPM\-ROOT" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-root\fR \-\- Display npm root diff --git a/deps/npm/man/man1/npm-run-script.1 b/deps/npm/man/man1/npm-run-script.1 index faac056ae3..baf20e4959 100644 --- a/deps/npm/man/man1/npm-run-script.1 +++ b/deps/npm/man/man1/npm-run-script.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RUN\-SCRIPT" "1" "September 2013" "" "" +.TH "NPM\-RUN\-SCRIPT" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-run-script\fR \-\- Run arbitrary package scripts diff --git a/deps/npm/man/man1/npm-search.1 b/deps/npm/man/man1/npm-search.1 index 3c07a31fc7..664ac10226 100644 --- a/deps/npm/man/man1/npm-search.1 +++ b/deps/npm/man/man1/npm-search.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SEARCH" "1" "September 2013" "" "" +.TH "NPM\-SEARCH" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-search\fR \-\- Search for packages diff --git a/deps/npm/man/man1/npm-shrinkwrap.1 b/deps/npm/man/man1/npm-shrinkwrap.1 index 9d97144cfb..1c3339f13b 100644 --- a/deps/npm/man/man1/npm-shrinkwrap.1 +++ b/deps/npm/man/man1/npm-shrinkwrap.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SHRINKWRAP" "1" "September 2013" "" "" +.TH "NPM\-SHRINKWRAP" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-shrinkwrap\fR \-\- Lock down dependency versions diff --git a/deps/npm/man/man1/npm-star.1 b/deps/npm/man/man1/npm-star.1 index 80dde2ad7d..8fb8129462 100644 --- a/deps/npm/man/man1/npm-star.1 +++ b/deps/npm/man/man1/npm-star.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STAR" "1" "September 2013" "" "" +.TH "NPM\-STAR" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-star\fR \-\- Mark your favorite packages diff --git a/deps/npm/man/man1/npm-stars.1 b/deps/npm/man/man1/npm-stars.1 index 48ae0fc2de..32025bd5ac 100644 --- a/deps/npm/man/man1/npm-stars.1 +++ b/deps/npm/man/man1/npm-stars.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STARS" "1" "September 2013" "" "" +.TH "NPM\-STARS" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-stars\fR \-\- View packages marked as favorites diff --git a/deps/npm/man/man1/npm-start.1 b/deps/npm/man/man1/npm-start.1 index 951064575e..2abeb57137 100644 --- a/deps/npm/man/man1/npm-start.1 +++ b/deps/npm/man/man1/npm-start.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-START" "1" "September 2013" "" "" +.TH "NPM\-START" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-start\fR \-\- Start a package diff --git a/deps/npm/man/man1/npm-stop.1 b/deps/npm/man/man1/npm-stop.1 index 04ab24adc0..f2d6829d15 100644 --- a/deps/npm/man/man1/npm-stop.1 +++ b/deps/npm/man/man1/npm-stop.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STOP" "1" "September 2013" "" "" +.TH "NPM\-STOP" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-stop\fR \-\- Stop a package diff --git a/deps/npm/man/man1/npm-submodule.1 b/deps/npm/man/man1/npm-submodule.1 index 7a79e22f1c..11f9b9ab5c 100644 --- a/deps/npm/man/man1/npm-submodule.1 +++ b/deps/npm/man/man1/npm-submodule.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SUBMODULE" "1" "September 2013" "" "" +.TH "NPM\-SUBMODULE" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-submodule\fR \-\- Add a package as a git submodule diff --git a/deps/npm/man/man1/npm-tag.1 b/deps/npm/man/man1/npm-tag.1 index 2d29f660cb..a80e7cd18d 100644 --- a/deps/npm/man/man1/npm-tag.1 +++ b/deps/npm/man/man1/npm-tag.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TAG" "1" "September 2013" "" "" +.TH "NPM\-TAG" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-tag\fR \-\- Tag a published version @@ -16,12 +16,49 @@ npm tag <name>@<version> [<tag>] .SH "DESCRIPTION" Tags the specified version of the package with the specified tag, or the \fB\-\-tag\fR config if not specified\. . +.P +A tag can be used when installing packages as a reference to a version instead +of using a specific version number: +. +.IP "" 4 +. +.nf +npm install <name>@<tag> +. +.fi +. +.IP "" 0 +. +.P +When installing dependencies, a preferred tagged version may be specified: +. +.IP "" 4 +. +.nf +npm install \-\-tag <tag> +. +.fi +. +.IP "" 0 +. +.P +This also applies to \fBnpm dedupe\fR\|\. +. +.P +Publishing a package always sets the "latest" tag to the published version\. +. .SH "SEE ALSO" . .IP "\(bu" 4 npm help publish . .IP "\(bu" 4 +npm help install +. +.IP "\(bu" 4 +npm help dedupe +. +.IP "\(bu" 4 npm help registry . .IP "\(bu" 4 diff --git a/deps/npm/man/man1/npm-test.1 b/deps/npm/man/man1/npm-test.1 index 33a10e3e4c..4d68e4a975 100644 --- a/deps/npm/man/man1/npm-test.1 +++ b/deps/npm/man/man1/npm-test.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TEST" "1" "September 2013" "" "" +.TH "NPM\-TEST" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-test\fR \-\- Test a package diff --git a/deps/npm/man/man1/npm-uninstall.1 b/deps/npm/man/man1/npm-uninstall.1 index 7cdee2b349..f89a9312de 100644 --- a/deps/npm/man/man1/npm-uninstall.1 +++ b/deps/npm/man/man1/npm-uninstall.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RM" "1" "September 2013" "" "" +.TH "NPM\-RM" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-rm\fR \-\- Remove a package diff --git a/deps/npm/man/man1/npm-unpublish.1 b/deps/npm/man/man1/npm-unpublish.1 index 3b2c0e3088..4fe4cd8ca8 100644 --- a/deps/npm/man/man1/npm-unpublish.1 +++ b/deps/npm/man/man1/npm-unpublish.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UNPUBLISH" "1" "September 2013" "" "" +.TH "NPM\-UNPUBLISH" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-unpublish\fR \-\- Remove a package from the registry diff --git a/deps/npm/man/man1/npm-update.1 b/deps/npm/man/man1/npm-update.1 index bdb59eb504..2bd94995a5 100644 --- a/deps/npm/man/man1/npm-update.1 +++ b/deps/npm/man/man1/npm-update.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UPDATE" "1" "September 2013" "" "" +.TH "NPM\-UPDATE" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-update\fR \-\- Update a package diff --git a/deps/npm/man/man1/npm-version.1 b/deps/npm/man/man1/npm-version.1 index 6ee28e8907..531ae97c3b 100644 --- a/deps/npm/man/man1/npm-version.1 +++ b/deps/npm/man/man1/npm-version.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VERSION" "1" "September 2013" "" "" +.TH "NPM\-VERSION" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-version\fR \-\- Bump a package version diff --git a/deps/npm/man/man1/npm-view.1 b/deps/npm/man/man1/npm-view.1 index fe4e1e1a50..47ebf307ae 100644 --- a/deps/npm/man/man1/npm-view.1 +++ b/deps/npm/man/man1/npm-view.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VIEW" "1" "September 2013" "" "" +.TH "NPM\-VIEW" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-view\fR \-\- View registry info diff --git a/deps/npm/man/man1/npm-whoami.1 b/deps/npm/man/man1/npm-whoami.1 index b08221897f..a471ba6ec1 100644 --- a/deps/npm/man/man1/npm-whoami.1 +++ b/deps/npm/man/man1/npm-whoami.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-WHOAMI" "1" "September 2013" "" "" +.TH "NPM\-WHOAMI" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-whoami\fR \-\- Display npm username diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1 index 7a060361d8..b3c2351019 100644 --- a/deps/npm/man/man1/npm.1 +++ b/deps/npm/man/man1/npm.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM" "1" "September 2013" "" "" +.TH "NPM" "1" "October 2013" "" "" . .SH "NAME" \fBnpm\fR \-\- node package manager @@ -14,7 +14,7 @@ npm <command> [args] .fi . .SH "VERSION" -1.3.11 +1.3.12 . .SH "DESCRIPTION" npm is the package manager for the Node JavaScript platform\. It puts diff --git a/deps/npm/man/man1/repo.1 b/deps/npm/man/man1/repo.1 index 10751c8287..8c0cc88bc6 100644 --- a/deps/npm/man/man1/repo.1 +++ b/deps/npm/man/man1/repo.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REPO" "1" "September 2013" "" "" +.TH "NPM\-REPO" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-repo\fR \-\- Open package repository page in the browser diff --git a/deps/npm/man/man3/npm-bin.3 b/deps/npm/man/man3/npm-bin.3 index 2960a11a67..e926082ade 100644 --- a/deps/npm/man/man3/npm-bin.3 +++ b/deps/npm/man/man3/npm-bin.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BIN" "3" "September 2013" "" "" +.TH "NPM\-BIN" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-bin\fR \-\- Display npm bin folder diff --git a/deps/npm/man/man3/npm-bugs.3 b/deps/npm/man/man3/npm-bugs.3 index d1bafcc90d..b9236d43f6 100644 --- a/deps/npm/man/man3/npm-bugs.3 +++ b/deps/npm/man/man3/npm-bugs.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUGS" "3" "September 2013" "" "" +.TH "NPM\-BUGS" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-bugs\fR \-\- Bugs for a package in a web browser maybe diff --git a/deps/npm/man/man3/npm-commands.3 b/deps/npm/man/man3/npm-commands.3 index cf76fd9d65..006ff0295e 100644 --- a/deps/npm/man/man3/npm-commands.3 +++ b/deps/npm/man/man3/npm-commands.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-COMMANDS" "3" "September 2013" "" "" +.TH "NPM\-COMMANDS" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-commands\fR \-\- npm commands diff --git a/deps/npm/man/man3/npm-config.3 b/deps/npm/man/man3/npm-config.3 index 87e4a49b64..a31f7f90e6 100644 --- a/deps/npm/man/man3/npm-config.3 +++ b/deps/npm/man/man3/npm-config.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CONFIG" "3" "September 2013" "" "" +.TH "NPM\-CONFIG" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-config\fR \-\- Manage the npm configuration files diff --git a/deps/npm/man/man3/npm-deprecate.3 b/deps/npm/man/man3/npm-deprecate.3 index 71aa7beb8b..0b441c34c5 100644 --- a/deps/npm/man/man3/npm-deprecate.3 +++ b/deps/npm/man/man3/npm-deprecate.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEPRECATE" "3" "September 2013" "" "" +.TH "NPM\-DEPRECATE" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-deprecate\fR \-\- Deprecate a version of a package diff --git a/deps/npm/man/man3/npm-docs.3 b/deps/npm/man/man3/npm-docs.3 index 31d09655e3..e7274075b0 100644 --- a/deps/npm/man/man3/npm-docs.3 +++ b/deps/npm/man/man3/npm-docs.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DOCS" "3" "September 2013" "" "" +.TH "NPM\-DOCS" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-docs\fR \-\- Docs for a package in a web browser maybe diff --git a/deps/npm/man/man3/npm-edit.3 b/deps/npm/man/man3/npm-edit.3 index 5e5aea7c86..58c97ee969 100644 --- a/deps/npm/man/man3/npm-edit.3 +++ b/deps/npm/man/man3/npm-edit.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EDIT" "3" "September 2013" "" "" +.TH "NPM\-EDIT" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-edit\fR \-\- Edit an installed package diff --git a/deps/npm/man/man3/npm-explore.3 b/deps/npm/man/man3/npm-explore.3 index 3793665794..4d5043c779 100644 --- a/deps/npm/man/man3/npm-explore.3 +++ b/deps/npm/man/man3/npm-explore.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EXPLORE" "3" "September 2013" "" "" +.TH "NPM\-EXPLORE" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-explore\fR \-\- Browse an installed package diff --git a/deps/npm/man/man3/npm-help-search.3 b/deps/npm/man/man3/npm-help-search.3 index b0822143ab..7c40a614d0 100644 --- a/deps/npm/man/man3/npm-help-search.3 +++ b/deps/npm/man/man3/npm-help-search.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP\-SEARCH" "3" "September 2013" "" "" +.TH "NPM\-HELP\-SEARCH" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-help-search\fR \-\- Search the help pages diff --git a/deps/npm/man/man3/npm-init.3 b/deps/npm/man/man3/npm-init.3 index d4087f8092..20bb8fb016 100644 --- a/deps/npm/man/man3/npm-init.3 +++ b/deps/npm/man/man3/npm-init.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "INIT" "3" "September 2013" "" "" +.TH "INIT" "3" "October 2013" "" "" . .SH "NAME" \fBinit\fR \-\- Interactively create a package\.json file diff --git a/deps/npm/man/man3/npm-install.3 b/deps/npm/man/man3/npm-install.3 index a8a02cc1e9..822e2cf2b7 100644 --- a/deps/npm/man/man3/npm-install.3 +++ b/deps/npm/man/man3/npm-install.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INSTALL" "3" "September 2013" "" "" +.TH "NPM\-INSTALL" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-install\fR \-\- install a package programmatically diff --git a/deps/npm/man/man3/npm-link.3 b/deps/npm/man/man3/npm-link.3 index 35dcf0d523..1496615d19 100644 --- a/deps/npm/man/man3/npm-link.3 +++ b/deps/npm/man/man3/npm-link.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LINK" "3" "September 2013" "" "" +.TH "NPM\-LINK" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-link\fR \-\- Symlink a package folder diff --git a/deps/npm/man/man3/npm-load.3 b/deps/npm/man/man3/npm-load.3 index 97e51d0bd2..a7e9825152 100644 --- a/deps/npm/man/man3/npm-load.3 +++ b/deps/npm/man/man3/npm-load.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LOAD" "3" "September 2013" "" "" +.TH "NPM\-LOAD" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-load\fR \-\- Load config settings diff --git a/deps/npm/man/man3/npm-ls.3 b/deps/npm/man/man3/npm-ls.3 index da8881bee4..46b17c8869 100644 --- a/deps/npm/man/man3/npm-ls.3 +++ b/deps/npm/man/man3/npm-ls.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LS" "3" "September 2013" "" "" +.TH "NPM\-LS" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-ls\fR \-\- List installed packages diff --git a/deps/npm/man/man3/npm-outdated.3 b/deps/npm/man/man3/npm-outdated.3 index 1555224ee7..69ec28ac23 100644 --- a/deps/npm/man/man3/npm-outdated.3 +++ b/deps/npm/man/man3/npm-outdated.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OUTDATED" "3" "September 2013" "" "" +.TH "NPM\-OUTDATED" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-outdated\fR \-\- Check for outdated packages diff --git a/deps/npm/man/man3/npm-owner.3 b/deps/npm/man/man3/npm-owner.3 index bfa9f563d5..8d48d06375 100644 --- a/deps/npm/man/man3/npm-owner.3 +++ b/deps/npm/man/man3/npm-owner.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OWNER" "3" "September 2013" "" "" +.TH "NPM\-OWNER" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-owner\fR \-\- Manage package owners diff --git a/deps/npm/man/man3/npm-pack.3 b/deps/npm/man/man3/npm-pack.3 index 95e6f75c4b..8c7efe8dd4 100644 --- a/deps/npm/man/man3/npm-pack.3 +++ b/deps/npm/man/man3/npm-pack.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PACK" "3" "September 2013" "" "" +.TH "NPM\-PACK" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-pack\fR \-\- Create a tarball from a package diff --git a/deps/npm/man/man3/npm-prefix.3 b/deps/npm/man/man3/npm-prefix.3 index e377d7495a..8f0fde2bdd 100644 --- a/deps/npm/man/man3/npm-prefix.3 +++ b/deps/npm/man/man3/npm-prefix.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PREFIX" "3" "September 2013" "" "" +.TH "NPM\-PREFIX" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-prefix\fR \-\- Display prefix diff --git a/deps/npm/man/man3/npm-prune.3 b/deps/npm/man/man3/npm-prune.3 index 8fd28ea392..92fbec5fd2 100644 --- a/deps/npm/man/man3/npm-prune.3 +++ b/deps/npm/man/man3/npm-prune.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PRUNE" "3" "September 2013" "" "" +.TH "NPM\-PRUNE" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-prune\fR \-\- Remove extraneous packages diff --git a/deps/npm/man/man3/npm-publish.3 b/deps/npm/man/man3/npm-publish.3 index 03009cb51c..d40ae8f7ee 100644 --- a/deps/npm/man/man3/npm-publish.3 +++ b/deps/npm/man/man3/npm-publish.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PUBLISH" "3" "September 2013" "" "" +.TH "NPM\-PUBLISH" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-publish\fR \-\- Publish a package diff --git a/deps/npm/man/man3/npm-rebuild.3 b/deps/npm/man/man3/npm-rebuild.3 index 1112a71a50..89b0e7fee9 100644 --- a/deps/npm/man/man3/npm-rebuild.3 +++ b/deps/npm/man/man3/npm-rebuild.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REBUILD" "3" "September 2013" "" "" +.TH "NPM\-REBUILD" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-rebuild\fR \-\- Rebuild a package diff --git a/deps/npm/man/man3/npm-restart.3 b/deps/npm/man/man3/npm-restart.3 index 5cdecdeedd..cd1ae98dc8 100644 --- a/deps/npm/man/man3/npm-restart.3 +++ b/deps/npm/man/man3/npm-restart.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RESTART" "3" "September 2013" "" "" +.TH "NPM\-RESTART" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-restart\fR \-\- Start a package diff --git a/deps/npm/man/man3/npm-root.3 b/deps/npm/man/man3/npm-root.3 index c87d45c61b..dcdd06003c 100644 --- a/deps/npm/man/man3/npm-root.3 +++ b/deps/npm/man/man3/npm-root.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ROOT" "3" "September 2013" "" "" +.TH "NPM\-ROOT" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-root\fR \-\- Display npm root diff --git a/deps/npm/man/man3/npm-run-script.3 b/deps/npm/man/man3/npm-run-script.3 index f91155966e..d8071d607f 100644 --- a/deps/npm/man/man3/npm-run-script.3 +++ b/deps/npm/man/man3/npm-run-script.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RUN\-SCRIPT" "3" "September 2013" "" "" +.TH "NPM\-RUN\-SCRIPT" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-run-script\fR \-\- Run arbitrary package scripts diff --git a/deps/npm/man/man3/npm-search.3 b/deps/npm/man/man3/npm-search.3 index 70780935f9..2bf2406f2f 100644 --- a/deps/npm/man/man3/npm-search.3 +++ b/deps/npm/man/man3/npm-search.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SEARCH" "3" "September 2013" "" "" +.TH "NPM\-SEARCH" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-search\fR \-\- Search for packages diff --git a/deps/npm/man/man3/npm-shrinkwrap.3 b/deps/npm/man/man3/npm-shrinkwrap.3 index b9021d35c1..2ee953f53b 100644 --- a/deps/npm/man/man3/npm-shrinkwrap.3 +++ b/deps/npm/man/man3/npm-shrinkwrap.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SHRINKWRAP" "3" "September 2013" "" "" +.TH "NPM\-SHRINKWRAP" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-shrinkwrap\fR \-\- programmatically generate package shrinkwrap file diff --git a/deps/npm/man/man3/npm-start.3 b/deps/npm/man/man3/npm-start.3 index b523b1ee96..803ff58818 100644 --- a/deps/npm/man/man3/npm-start.3 +++ b/deps/npm/man/man3/npm-start.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-START" "3" "September 2013" "" "" +.TH "NPM\-START" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-start\fR \-\- Start a package diff --git a/deps/npm/man/man3/npm-stop.3 b/deps/npm/man/man3/npm-stop.3 index ae3462a665..5073844217 100644 --- a/deps/npm/man/man3/npm-stop.3 +++ b/deps/npm/man/man3/npm-stop.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STOP" "3" "September 2013" "" "" +.TH "NPM\-STOP" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-stop\fR \-\- Stop a package diff --git a/deps/npm/man/man3/npm-submodule.3 b/deps/npm/man/man3/npm-submodule.3 index 6051a292e5..03eb3d3f3f 100644 --- a/deps/npm/man/man3/npm-submodule.3 +++ b/deps/npm/man/man3/npm-submodule.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SUBMODULE" "3" "September 2013" "" "" +.TH "NPM\-SUBMODULE" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-submodule\fR \-\- Add a package as a git submodule diff --git a/deps/npm/man/man3/npm-tag.3 b/deps/npm/man/man3/npm-tag.3 index f074387c8a..18433368e1 100644 --- a/deps/npm/man/man3/npm-tag.3 +++ b/deps/npm/man/man3/npm-tag.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TAG" "3" "September 2013" "" "" +.TH "NPM\-TAG" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-tag\fR \-\- Tag a published version diff --git a/deps/npm/man/man3/npm-test.3 b/deps/npm/man/man3/npm-test.3 index c0fe706088..fab84e08ca 100644 --- a/deps/npm/man/man3/npm-test.3 +++ b/deps/npm/man/man3/npm-test.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TEST" "3" "September 2013" "" "" +.TH "NPM\-TEST" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-test\fR \-\- Test a package diff --git a/deps/npm/man/man3/npm-uninstall.3 b/deps/npm/man/man3/npm-uninstall.3 index 8efe7ff2c9..fc695481cc 100644 --- a/deps/npm/man/man3/npm-uninstall.3 +++ b/deps/npm/man/man3/npm-uninstall.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UNINSTALL" "3" "September 2013" "" "" +.TH "NPM\-UNINSTALL" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-uninstall\fR \-\- uninstall a package programmatically diff --git a/deps/npm/man/man3/npm-unpublish.3 b/deps/npm/man/man3/npm-unpublish.3 index dd14610a33..8d6b30a713 100644 --- a/deps/npm/man/man3/npm-unpublish.3 +++ b/deps/npm/man/man3/npm-unpublish.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UNPUBLISH" "3" "September 2013" "" "" +.TH "NPM\-UNPUBLISH" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-unpublish\fR \-\- Remove a package from the registry diff --git a/deps/npm/man/man3/npm-update.3 b/deps/npm/man/man3/npm-update.3 index b94f583f33..cffd28a038 100644 --- a/deps/npm/man/man3/npm-update.3 +++ b/deps/npm/man/man3/npm-update.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UPDATE" "3" "September 2013" "" "" +.TH "NPM\-UPDATE" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-update\fR \-\- Update a package diff --git a/deps/npm/man/man3/npm-version.3 b/deps/npm/man/man3/npm-version.3 index d1c4b2e496..7a82b6b3b6 100644 --- a/deps/npm/man/man3/npm-version.3 +++ b/deps/npm/man/man3/npm-version.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VERSION" "3" "September 2013" "" "" +.TH "NPM\-VERSION" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-version\fR \-\- Bump a package version diff --git a/deps/npm/man/man3/npm-view.3 b/deps/npm/man/man3/npm-view.3 index 5507a4d7cf..374342bfe1 100644 --- a/deps/npm/man/man3/npm-view.3 +++ b/deps/npm/man/man3/npm-view.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VIEW" "3" "September 2013" "" "" +.TH "NPM\-VIEW" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-view\fR \-\- View registry info diff --git a/deps/npm/man/man3/npm-whoami.3 b/deps/npm/man/man3/npm-whoami.3 index 5f09226ece..629bfe554c 100644 --- a/deps/npm/man/man3/npm-whoami.3 +++ b/deps/npm/man/man3/npm-whoami.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-WHOAMI" "3" "September 2013" "" "" +.TH "NPM\-WHOAMI" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-whoami\fR \-\- Display npm username diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3 index f7eb24c60d..8997ec9cdd 100644 --- a/deps/npm/man/man3/npm.3 +++ b/deps/npm/man/man3/npm.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM" "3" "September 2013" "" "" +.TH "NPM" "3" "October 2013" "" "" . .SH "NAME" \fBnpm\fR \-\- node package manager @@ -21,7 +21,7 @@ npm\.load([configObject], function (er, npm) { .fi . .SH "VERSION" -1.3.11 +1.3.12 . .SH "DESCRIPTION" This is the API documentation for npm\. diff --git a/deps/npm/man/man3/repo.3 b/deps/npm/man/man3/repo.3 index de0e466248..c7a8e47797 100644 --- a/deps/npm/man/man3/repo.3 +++ b/deps/npm/man/man3/repo.3 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REPO" "3" "September 2013" "" "" +.TH "NPM\-REPO" "3" "October 2013" "" "" . .SH "NAME" \fBnpm-repo\fR \-\- Open package repository page in the browser diff --git a/deps/npm/man/man5/npm-folders.5 b/deps/npm/man/man5/npm-folders.5 index be03e1778f..ebe2ac93be 100644 --- a/deps/npm/man/man5/npm-folders.5 +++ b/deps/npm/man/man5/npm-folders.5 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-FOLDERS" "5" "September 2013" "" "" +.TH "NPM\-FOLDERS" "5" "October 2013" "" "" . .SH "NAME" \fBnpm-folders\fR \-\- Folder Structures Used by npm diff --git a/deps/npm/man/man5/npm-global.5 b/deps/npm/man/man5/npm-global.5 index be03e1778f..ebe2ac93be 100644 --- a/deps/npm/man/man5/npm-global.5 +++ b/deps/npm/man/man5/npm-global.5 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-FOLDERS" "5" "September 2013" "" "" +.TH "NPM\-FOLDERS" "5" "October 2013" "" "" . .SH "NAME" \fBnpm-folders\fR \-\- Folder Structures Used by npm diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5 index 38763523bc..0d609f5dc3 100644 --- a/deps/npm/man/man5/npm-json.5 +++ b/deps/npm/man/man5/npm-json.5 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "PACKAGE\.JSON" "5" "September 2013" "" "" +.TH "PACKAGE\.JSON" "5" "October 2013" "" "" . .SH "NAME" \fBpackage.json\fR \-\- Specifics of npm\'s package\.json handling diff --git a/deps/npm/man/man5/npmrc.5 b/deps/npm/man/man5/npmrc.5 index 516bfe97bb..7b2f2500f5 100644 --- a/deps/npm/man/man5/npmrc.5 +++ b/deps/npm/man/man5/npmrc.5 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPMRC" "5" "September 2013" "" "" +.TH "NPMRC" "5" "October 2013" "" "" . .SH "NAME" \fBnpmrc\fR \-\- The npm config files diff --git a/deps/npm/man/man5/package.json.5 b/deps/npm/man/man5/package.json.5 index 38763523bc..0d609f5dc3 100644 --- a/deps/npm/man/man5/package.json.5 +++ b/deps/npm/man/man5/package.json.5 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "PACKAGE\.JSON" "5" "September 2013" "" "" +.TH "PACKAGE\.JSON" "5" "October 2013" "" "" . .SH "NAME" \fBpackage.json\fR \-\- Specifics of npm\'s package\.json handling diff --git a/deps/npm/man/man7/npm-coding-style.7 b/deps/npm/man/man7/npm-coding-style.7 index 52f6414361..cbb09b2efa 100644 --- a/deps/npm/man/man7/npm-coding-style.7 +++ b/deps/npm/man/man7/npm-coding-style.7 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CODING\-STYLE" "7" "September 2013" "" "" +.TH "NPM\-CODING\-STYLE" "7" "October 2013" "" "" . .SH "NAME" \fBnpm-coding-style\fR \-\- npm\'s "funny" coding style diff --git a/deps/npm/man/man7/npm-config.7 b/deps/npm/man/man7/npm-config.7 index d2d7e20de2..5b8f78d858 100644 --- a/deps/npm/man/man7/npm-config.7 +++ b/deps/npm/man/man7/npm-config.7 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CONFIG" "7" "September 2013" "" "" +.TH "NPM\-CONFIG" "7" "October 2013" "" "" . .SH "NAME" \fBnpm-config\fR \-\- More than you probably want to know about npm configuration @@ -263,7 +263,7 @@ See also the \fBstrict\-ssl\fR config\. .SS "cache" . .IP "\(bu" 4 -Default: Windows: \fB%APPDATA%\\npm\-cache\fR, Posix: \fB~/\.npm\fR +Default: Windows: \fB%AppData%\\npm\-cache\fR, Posix: \fB~/\.npm\fR . .IP "\(bu" 4 Type: path diff --git a/deps/npm/man/man7/npm-developers.7 b/deps/npm/man/man7/npm-developers.7 index 32378c6471..33f3e24305 100644 --- a/deps/npm/man/man7/npm-developers.7 +++ b/deps/npm/man/man7/npm-developers.7 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEVELOPERS" "7" "September 2013" "" "" +.TH "NPM\-DEVELOPERS" "7" "October 2013" "" "" . .SH "NAME" \fBnpm-developers\fR \-\- Developer Guide diff --git a/deps/npm/man/man7/npm-disputes.7 b/deps/npm/man/man7/npm-disputes.7 index cd37d21308..271fa10f4e 100644 --- a/deps/npm/man/man7/npm-disputes.7 +++ b/deps/npm/man/man7/npm-disputes.7 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DISPUTES" "7" "September 2013" "" "" +.TH "NPM\-DISPUTES" "7" "October 2013" "" "" . .SH "NAME" \fBnpm-disputes\fR \-\- Handling Module Name Disputes diff --git a/deps/npm/man/man7/npm-faq.7 b/deps/npm/man/man7/npm-faq.7 index b7f646b7fc..630c2d88ea 100644 --- a/deps/npm/man/man7/npm-faq.7 +++ b/deps/npm/man/man7/npm-faq.7 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-FAQ" "7" "September 2013" "" "" +.TH "NPM\-FAQ" "7" "October 2013" "" "" . .SH "NAME" \fBnpm-faq\fR \-\- Frequently Asked Questions diff --git a/deps/npm/man/man7/npm-index.7 b/deps/npm/man/man7/npm-index.7 index a9361571d1..f7ab030b05 100644 --- a/deps/npm/man/man7/npm-index.7 +++ b/deps/npm/man/man7/npm-index.7 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INDEX" "7" "September 2013" "" "" +.TH "NPM\-INDEX" "7" "October 2013" "" "" . .SH "NAME" \fBnpm-index\fR \-\- Index of all npm documentation diff --git a/deps/npm/man/man7/npm-registry.7 b/deps/npm/man/man7/npm-registry.7 index 557bc4ebec..fa7d3e3b6a 100644 --- a/deps/npm/man/man7/npm-registry.7 +++ b/deps/npm/man/man7/npm-registry.7 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REGISTRY" "7" "September 2013" "" "" +.TH "NPM\-REGISTRY" "7" "October 2013" "" "" . .SH "NAME" \fBnpm-registry\fR \-\- The JavaScript Package Registry diff --git a/deps/npm/man/man7/npm-scripts.7 b/deps/npm/man/man7/npm-scripts.7 index 6b1e182fe8..317d424292 100644 --- a/deps/npm/man/man7/npm-scripts.7 +++ b/deps/npm/man/man7/npm-scripts.7 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SCRIPTS" "7" "September 2013" "" "" +.TH "NPM\-SCRIPTS" "7" "October 2013" "" "" . .SH "NAME" \fBnpm-scripts\fR \-\- How npm handles the "scripts" field diff --git a/deps/npm/man/man7/removing-npm.7 b/deps/npm/man/man7/removing-npm.7 index b2112e7ecb..6436cf3011 100644 --- a/deps/npm/man/man7/removing-npm.7 +++ b/deps/npm/man/man7/removing-npm.7 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REMOVAL" "1" "September 2013" "" "" +.TH "NPM\-REMOVAL" "1" "October 2013" "" "" . .SH "NAME" \fBnpm-removal\fR \-\- Cleaning the Slate diff --git a/deps/npm/man/man7/semver.7 b/deps/npm/man/man7/semver.7 index 832fd9f16c..22de9cf2d2 100644 --- a/deps/npm/man/man7/semver.7 +++ b/deps/npm/man/man7/semver.7 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "SEMVER" "7" "September 2013" "" "" +.TH "SEMVER" "7" "October 2013" "" "" . .SH "NAME" \fBsemver\fR \-\- The semantic versioner for npm diff --git a/deps/npm/node_modules/ansi/README.md b/deps/npm/node_modules/ansi/README.md index 7b427fe4cd..2f9bb140a8 100644 --- a/deps/npm/node_modules/ansi/README.md +++ b/deps/npm/node_modules/ansi/README.md @@ -2,8 +2,6 @@ ansi.js ========= ### Advanced ANSI formatting tool for Node.js - - `ansi.js` is a module for Node.js that provides an easy-to-use API for writing ANSI escape codes to `Stream` instances. ANSI escape codes are used to do fancy things in a terminal window, like render text in colors, delete characters, @@ -91,9 +89,3 @@ 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. - ----------- - -Additionally: - - * The `yoshi.png` file inside `examples/imgcat` is copyright to Nintendo, Inc. diff --git a/deps/npm/node_modules/ansi/color-spaces.pl b/deps/npm/node_modules/ansi/color-spaces.pl new file mode 100644 index 0000000000..8774c04469 --- /dev/null +++ b/deps/npm/node_modules/ansi/color-spaces.pl @@ -0,0 +1,67 @@ +#!/usr/bin/perl +# Author: Todd Larason <jtl@molehill.org> +# $XFree86: xc/programs/xterm/vttests/256colors2.pl,v 1.1 1999/07/11 08:49:54 dawes Exp $ + +print "256 color mode\n\n"; + +# display back ground colors + +for ($fgbg = 38; $fgbg <= 48; $fgbg +=10) { + +# first the system ones: +print "System colors:\n"; +for ($color = 0; $color < 8; $color++) { + print "\x1b[${fgbg};5;${color}m::"; +} +print "\x1b[0m\n"; +for ($color = 8; $color < 16; $color++) { + print "\x1b[${fgbg};5;${color}m::"; +} +print "\x1b[0m\n\n"; + +# now the color cube +print "Color cube, 6x6x6:\n"; +for ($green = 0; $green < 6; $green++) { + for ($red = 0; $red < 6; $red++) { + for ($blue = 0; $blue < 6; $blue++) { + $color = 16 + ($red * 36) + ($green * 6) + $blue; + print "\x1b[${fgbg};5;${color}m::"; + } + print "\x1b[0m "; + } + print "\n"; +} + +# now the grayscale ramp +print "Grayscale ramp:\n"; +for ($color = 232; $color < 256; $color++) { + print "\x1b[${fgbg};5;${color}m::"; +} +print "\x1b[0m\n\n"; + +} + +print "Examples for the 3-byte color mode\n\n"; + +for ($fgbg = 38; $fgbg <= 48; $fgbg +=10) { + +# now the color cube +print "Color cube\n"; +for ($green = 0; $green < 256; $green+=51) { + for ($red = 0; $red < 256; $red+=51) { + for ($blue = 0; $blue < 256; $blue+=51) { + print "\x1b[${fgbg};2;${red};${green};${blue}m::"; + } + print "\x1b[0m "; + } + print "\n"; +} + +# now the grayscale ramp +print "Grayscale ramp:\n"; +for ($gray = 8; $gray < 256; $gray+=10) { + print "\x1b[${fgbg};2;${gray};${gray};${gray}m::"; +} +print "\x1b[0m\n\n"; + +} diff --git a/deps/npm/node_modules/ansi/examples/cursorPosition.js b/deps/npm/node_modules/ansi/examples/cursorPosition.js index 0f45bdbe58..50f964490e 100755 --- a/deps/npm/node_modules/ansi/examples/cursorPosition.js +++ b/deps/npm/node_modules/ansi/examples/cursorPosition.js @@ -5,7 +5,7 @@ var cursor = require('../')(process.stdout) // listen for the queryPosition report on stdin process.stdin.resume() -tty.setRawMode(true) +raw(true) process.stdin.once('data', function (b) { var match = /\[(\d+)\;(\d+)R$/.exec(b.toString()) @@ -15,10 +15,18 @@ process.stdin.once('data', function (b) { } // cleanup and close stdin - tty.setRawMode(false) + raw(false) process.stdin.pause() }) // send the query position request code to stdout cursor.queryPosition() + +function raw (mode) { + if (process.stdin.setRawMode) { + process.stdin.setRawMode(mode) + } else { + tty.setRawMode(mode) + } +} diff --git a/deps/npm/node_modules/ansi/examples/imgcat/index.js b/deps/npm/node_modules/ansi/examples/imgcat/index.js deleted file mode 100755 index 5ff2c13943..0000000000 --- a/deps/npm/node_modules/ansi/examples/imgcat/index.js +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env node - -process.title = 'imgcat' - -var ansi = require('../../') - , cursor = ansi(process.stdout, { enabled: true }) - , tty = require('tty') - , Canvas = require('canvas') - , imageFile = process.argv[2] || __dirname + '/yoshi.png' - , screenWidth = process.stdout.isTTY ? process.stdout.getWindowSize()[0] : Infinity - , maxWidth = parseInt(process.argv[3], 10) || screenWidth - , image = require('fs').readFileSync(imageFile) - , pixel = ' ' - , alphaThreshold = 0 - -var img = new Canvas.Image(); -img.src = image; - -function draw () { - var width = maxWidth / pixel.length - , scaleW = img.width > width ? width / img.width : 1 - , w = Math.floor(img.width * scaleW) - , h = Math.floor(img.height * scaleW); - - var canvas = new Canvas(w, h) - , ctx = canvas.getContext('2d'); - - ctx.drawImage(img, 0, 0, w, h); - - var data = ctx.getImageData(0, 0, w, h).data; - - for (var i=0, l=data.length; i<l; i+=4) { - var r = data[i] - , g = data[i+1] - , b = data[i+2] - , alpha = data[i+3]; - if (alpha > alphaThreshold) { - cursor.bg.rgb(r, g, b); - } else { - cursor.bg.reset(); - } - process.stdout.write(pixel); - if ((i/4|0) % w === (w-1)) { - cursor.bg.reset(); - process.stdout.write('\n'); - } - } -} - -draw(); diff --git a/deps/npm/node_modules/ansi/examples/imgcat/yoshi.png b/deps/npm/node_modules/ansi/examples/imgcat/yoshi.png Binary files differdeleted file mode 100644 index 267ede2541..0000000000 --- a/deps/npm/node_modules/ansi/examples/imgcat/yoshi.png +++ /dev/null diff --git a/deps/npm/node_modules/ansi/examples/starwars.js b/deps/npm/node_modules/ansi/examples/starwars.js index a1fcad42a6..06f8ba8477 100755 --- a/deps/npm/node_modules/ansi/examples/starwars.js +++ b/deps/npm/node_modules/ansi/examples/starwars.js @@ -9,6 +9,7 @@ process.title = 'starwars' var net = require('net') , cursor = require('../')(process.stdout) + , color = process.argv[2] // enable "raw mode" so that keystrokes aren't visible process.stdin.resume() @@ -22,6 +23,9 @@ if (process.stdin.setRawMode) { var socket = net.connect(23, 'towel.blinkenlights.nl') socket.on('connect', function () { + if (color in cursor.fg) { + cursor.fg[color]() + } cursor.hide() socket.pipe(process.stdout) }) @@ -35,5 +39,8 @@ process.stdin.on('data', function (data) { }) process.on('exit', function () { - cursor.show().write('\n') + cursor + .show() + .fg.reset() + .write('\n') }) diff --git a/deps/npm/node_modules/ansi/lib/ansi.js b/deps/npm/node_modules/ansi/lib/ansi.js index cc883e8d8d..52fc8ec8be 100644 --- a/deps/npm/node_modules/ansi/lib/ansi.js +++ b/deps/npm/node_modules/ansi/lib/ansi.js @@ -12,7 +12,7 @@ */ var emitNewlineEvents = require('./newlines') - , prefix = '\033[' // For all escape codes + , prefix = '\x1b[' // For all escape codes , suffix = 'm' // Only for color codes /** @@ -120,6 +120,11 @@ function Cursor (stream, options) { } this.enabled = !!this.enabled + // then `buffering` is true, then `write()` calls are buffered in + // memory until `flush()` is invoked + this.buffering = !!(options && options.buffering) + this._buffer = [] + // controls the foreground and background colors this.fg = this.foreground = new Colorer(this, 0) this.bg = this.background = new Colorer(this, 10) @@ -145,8 +150,40 @@ exports.Cursor = Cursor * the chaining going. */ -Cursor.prototype.write = function () { - this.stream.write.apply(this.stream, arguments) +Cursor.prototype.write = function (data) { + if (this.buffering) { + this._buffer.push(arguments) + } else { + this.stream.write.apply(this.stream, arguments) + } + return this +} + +/** + * Buffer `write()` calls into memory. + * + * @api public + */ + +Cursor.prototype.buffer = function () { + this.buffering = true + return this +} + +/** + * Write out the in-memory buffer. + * + * @api public + */ + +Cursor.prototype.flush = function () { + this.buffering = false + var str = this._buffer.map(function (args) { + if (args.length != 1) throw new Error('unexpected args length! ' + args.length); + return args[0]; + }).join(''); + this._buffer.splice(0); // empty + this.write(str); return this } @@ -237,7 +274,7 @@ Object.keys(colors).forEach(function (color) { */ Cursor.prototype.beep = function () { - this.enabled && this.write('\007') + this.enabled && this.write('\x07') return this } diff --git a/deps/npm/node_modules/ansi/package.json b/deps/npm/node_modules/ansi/package.json index d449d827ea..e7cde26047 100644 --- a/deps/npm/node_modules/ansi/package.json +++ b/deps/npm/node_modules/ansi/package.json @@ -11,7 +11,7 @@ "256", "stream" ], - "version": "0.1.2", + "version": "0.2.1", "author": { "name": "Nathan Rajlich", "email": "nathan@tootallnate.net", @@ -25,32 +25,26 @@ "bin": { "beep": "./examples/beep/index.js", "clear": "./examples/clear/index.js", - "imgcat": "./examples/imgcat/index.js", "starwars": "./examples/starwars.js" }, "scripts": { "test": "mocha --reporter spec" }, "devDependencies": { - "mocha": "*", - "canvas": "*" + "mocha": "*" }, "engines": { "node": "*" }, - "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" - }, - "_id": "ansi@0.1.2", - "dependencies": {}, - "optionalDependencies": {}, - "_engineSupported": true, - "_npmVersion": "1.1.24", - "_nodeVersion": "v0.7.10-pre", - "_defaultsLoaded": true, + "readme": "ansi.js\n=========\n### Advanced ANSI formatting tool for Node.js\n\n`ansi.js` is a module for Node.js that provides an easy-to-use API for\nwriting ANSI escape codes to `Stream` instances. ANSI escape codes are used to do\nfancy things in a terminal window, like render text in colors, delete characters,\nlines, the entire window, or hide and show the cursor, and lots more!\n\nThe code for the example in the screenshot above can be found in the\n`examples/imgcat` directory.\n\n#### Features:\n\n * 256 color support for the terminal!\n * Make a beep sound from your terminal!\n * Works with *any* writable `Stream` instance.\n * Allows you to move the cursor anywhere on the terminal window.\n * Allows you to delete existing contents from the terminal window.\n * Allows you to hide and show the cursor.\n * Converts CSS color codes and RGB values into ANSI escape codes.\n * Low-level; you are in control of when escape codes are used, it's not abstracted.\n\n\nInstallation\n------------\n\nInstall with `npm`:\n\n``` bash\n$ npm install ansi\n```\n\n\nExample\n-------\n\n``` js\nvar ansi = require('ansi')\n , cursor = ansi(process.stdout)\n\n// You can chain your calls forever:\ncursor\n .red() // Set font color to red\n .bg.grey() // Set background color to grey\n .write('Hello World!') // Write 'Hello World!' to stdout\n .bg.reset() // Reset the bgcolor before writing the trailing \\n,\n // to avoid Terminal glitches\n .write('\\n') // And a final \\n to wrap things up\n\n// Rendering modes are persistent:\ncursor.hex('#660000').bold().underline()\n\n// You can use the regular logging functions, text will be green\nconsole.log('This is blood red, bold text')\n\n// To reset just the foreground color:\ncursor.fg.reset()\n\nconsole.log('This will still be bold')\n\n// Clean up after yourself!\ncursor.reset()\n```\n\n\nLicense\n-------\n\n(The MIT License)\n\nCopyright (c) 2012 Nathan Rajlich <nathan@tootallnate.net>\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "readmeFilename": "README.md", + "bugs": { + "url": "https://github.com/TooTallNate/ansi.js/issues" + }, + "_id": "ansi@0.2.1", "dist": { - "shasum": "6139b23459bcd74b04572cf56b36102983d0a7d4" + "shasum": "76961682ac06d5ea0729af53295ea8f953a0cb21" }, - "_from": "ansi@~0.1.2" + "_from": "ansi@latest", + "_resolved": "https://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz" } diff --git a/deps/npm/node_modules/cmd-shim/.npmignore b/deps/npm/node_modules/cmd-shim/.npmignore index 699b5d4f13..69f75d26c4 100644 --- a/deps/npm/node_modules/cmd-shim/.npmignore +++ b/deps/npm/node_modules/cmd-shim/.npmignore @@ -1,16 +1,16 @@ -lib-cov -*.seed -*.log -*.csv -*.dat -*.out -*.pid -*.gz - -pids -logs -results - -npm-debug.log - -node_modules +lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
+npm-debug.log
+
+node_modules
diff --git a/deps/npm/node_modules/cmd-shim/.travis.yml b/deps/npm/node_modules/cmd-shim/.travis.yml new file mode 100644 index 0000000000..97e4515832 --- /dev/null +++ b/deps/npm/node_modules/cmd-shim/.travis.yml @@ -0,0 +1,4 @@ +language: node_js
+node_js:
+ - "0.10"
+ - "0.8"
\ No newline at end of file diff --git a/deps/npm/node_modules/cmd-shim/LICENSE b/deps/npm/node_modules/cmd-shim/LICENSE index 0c44ae716d..6e93978e0e 100644 --- a/deps/npm/node_modules/cmd-shim/LICENSE +++ b/deps/npm/node_modules/cmd-shim/LICENSE @@ -1,27 +1,27 @@ -Copyright (c) Isaac Z. Schlueter ("Author") -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 AUTHOR 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 AUTHOR 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. +Copyright (c) Isaac Z. Schlueter ("Author")
+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 AUTHOR 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 AUTHOR 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/cmd-shim/README.md b/deps/npm/node_modules/cmd-shim/README.md index 081d957cc4..fb997d5db2 100644 --- a/deps/npm/node_modules/cmd-shim/README.md +++ b/deps/npm/node_modules/cmd-shim/README.md @@ -1,40 +1,42 @@ -# cmd-shim - -The cmd-shim used in npm to create executable scripts on Windows, -since symlinks are not suitable for this purpose there. - -On Unix systems, you should use a symbolic link instead. - -## Installation - -``` -npm install cmd-shim -``` - -## API - -### cmdShim(from, to, cb) - -Create a cmd shim at `to` for the command line program at `from`. -e.g. - -```javascript -var cmdShim = require('cmd-shim'); -cmdShim(__dirname + '/cli.js', '/usr/bin/command-name', function (err) { - if (err) throw err; -}); -``` - -### cmdShim.ifExists(from, to, cb) - -The same as above, but will just continue if the file does not exist. -Source: - -```javascript -function cmdShimIfExists (from, to, cb) { - fs.stat(from, function (er) { - if (er) return cb() - cmdShim(from, to, cb) - }) -} -``` +# cmd-shim
+
+The cmd-shim used in npm to create executable scripts on Windows,
+since symlinks are not suitable for this purpose there.
+
+On Unix systems, you should use a symbolic link instead.
+
+[](https://travis-ci.org/ForbesLindesay/cmd-shim) [](https://gemnasium.com/ForbesLindesay/cmd-shim)
+
+## Installation
+
+```
+npm install cmd-shim
+```
+
+## API
+
+### cmdShim(from, to, cb)
+
+Create a cmd shim at `to` for the command line program at `from`.
+e.g.
+
+```javascript
+var cmdShim = require('cmd-shim');
+cmdShim(__dirname + '/cli.js', '/usr/bin/command-name', function (err) {
+ if (err) throw err;
+});
+```
+
+### cmdShim.ifExists(from, to, cb)
+
+The same as above, but will just continue if the file does not exist.
+Source:
+
+```javascript
+function cmdShimIfExists (from, to, cb) {
+ fs.stat(from, function (er) {
+ if (er) return cb()
+ cmdShim(from, to, cb)
+ })
+}
+```
diff --git a/deps/npm/node_modules/cmd-shim/index.js b/deps/npm/node_modules/cmd-shim/index.js index e6a736bdbf..1cfd24edc5 100644 --- a/deps/npm/node_modules/cmd-shim/index.js +++ b/deps/npm/node_modules/cmd-shim/index.js @@ -1,180 +1,180 @@ -// On windows, create a .cmd file. -// Read the #! in the file to see what it uses. The vast majority -// of the time, this will be either: -// "#!/usr/bin/env <prog> <args...>" -// or: -// "#!<prog> <args...>" -// -// Write a binroot/pkg.bin + ".cmd" file that has this line in it: -// @<prog> <args...> %~dp0<target> %* - -module.exports = cmdShim -cmdShim.ifExists = cmdShimIfExists - -try { - var fs = require("graceful-fs") -} catch (e) { - var fs = require("fs") -} - -var mkdir = require("mkdirp") - , path = require("path") - , shebangExpr = /^#\!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+)(.*)$/ - -function cmdShimIfExists (from, to, cb) { - fs.stat(from, function (er) { - if (er) return cb() - cmdShim(from, to, cb) - }) -} - -// Try to unlink, but ignore errors. -// Any problems will surface later. -function rm (path, cb) { - fs.unlink(path, function(er) { - cb() - }) -} - -function cmdShim (from, to, cb) { - fs.stat(from, function (er, stat) { - if (er) - return cb(er) - - cmdShim_(from, to, cb) - }) -} - -function cmdShim_ (from, to, cb) { - var then = times(2, next, cb) - rm(to, then) - rm(to + ".cmd", then) - - function next(er) { - writeShim(from, to, cb) - } -} - -function writeShim (from, to, cb) { - // make a cmd file and a sh script - // First, check if the bin is a #! of some sort. - // If not, then assume it's something that'll be compiled, or some other - // sort of script, and just call it directly. - mkdir(path.dirname(to), function (er) { - if (er) - return cb(er) - fs.readFile(from, "utf8", function (er, data) { - if (er) return writeShim_(from, to, null, null, cb) - var firstLine = data.trim().split(/\r*\n/)[0] - , shebang = firstLine.match(shebangExpr) - if (!shebang) return writeShim_(from, to, null, null, cb) - var prog = shebang[1] - , args = shebang[2] || "" - return writeShim_(from, to, prog, args, cb) - }) - }) -} - -function writeShim_ (from, to, prog, args, cb) { - var shTarget = path.relative(path.dirname(to), from) - , target = shTarget.split("/").join("\\") - , longProg - , shProg = prog && prog.split("\\").join("/") - , shLongProg - shTarget = shTarget.split("\\").join("/") - args = args || "" - if (!prog) { - prog = "\"%~dp0\\" + target + "\"" - shProg = "\"$basedir/" + shTarget + "\"" - args = "" - target = "" - shTarget = "" - } else { - longProg = "\"%~dp0\\" + prog + ".exe\"" - shLongProg = "\"$basedir/" + prog + "\"" - target = "\"%~dp0\\" + target + "\"" - shTarget = "\"$basedir/" + shTarget + "\"" - } - - // @IF EXIST "%~dp0\node.exe" ( - // "%~dp0\node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* - // ) ELSE ( - // node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* - // ) - var cmd - if (longProg) { - cmd = "@IF EXIST " + longProg + " (\r\n" - + " " + longProg + " " + args + " " + target + " %*\r\n" - + ") ELSE (\r\n" - + " " + prog + " " + args + " " + target + " %*\r\n" - + ")" - } else { - cmd = prog + " " + args + " " + target + " %*\r\n" - } - - // #!/bin/sh - // basedir=`dirname "$0"` - // - // case `uname` in - // *CYGWIN*) basedir=`cygpath -w "$basedir"`;; - // esac - // - // if [ -x "$basedir/node.exe" ]; then - // "$basedir/node.exe" "$basedir/node_modules/npm/bin/npm-cli.js" "$@" - // ret=$? - // else - // node "$basedir/node_modules/npm/bin/npm-cli.js" "$@" - // ret=$? - // fi - // exit $ret - - var sh = "#!/bin/sh\n" - - if (shLongProg) { - sh = sh - + "basedir=`dirname \"$0\"`\n" - + "\n" - + "case `uname` in\n" - + " *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;\n" - + "esac\n" - + "\n" - - sh = sh - + "if [ -x "+shLongProg+" ]; then\n" - + " " + shLongProg + " " + args + " " + shTarget + " \"$@\"\n" - + " ret=$?\n" - + "else \n" - + " " + shProg + " " + args + " " + shTarget + " \"$@\"\n" - + " ret=$?\n" - + "fi\n" - + "exit $ret\n" - } else { - sh = shProg + " " + args + " " + shTarget + " \"$@\"\n" - + "exit $?\n" - } - - var then = times(2, next, cb) - fs.writeFile(to + ".cmd", cmd, "utf8", then) - fs.writeFile(to, sh, "utf8", then) - function next () { - chmodShim(to, cb) - } -} - -function chmodShim (to, cb) { - var then = times(2, cb, cb) - fs.chmod(to, 0755, then) - fs.chmod(to + ".cmd", 0755, then) -} - -function times(n, ok, cb) { - var errState = null - return function(er) { - if (!errState) { - if (er) - cb(errState = er) - else if (--n === 0) - ok() - } - } -} +// On windows, create a .cmd file.
+// Read the #! in the file to see what it uses. The vast majority
+// of the time, this will be either:
+// "#!/usr/bin/env <prog> <args...>"
+// or:
+// "#!<prog> <args...>"
+//
+// Write a binroot/pkg.bin + ".cmd" file that has this line in it:
+// @<prog> <args...> %~dp0<target> %*
+
+module.exports = cmdShim
+cmdShim.ifExists = cmdShimIfExists
+
+try {
+ var fs = require("graceful-fs")
+} catch (e) {
+ var fs = require("fs")
+}
+
+var mkdir = require("mkdirp")
+ , path = require("path")
+ , shebangExpr = /^#\!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+)(.*)$/
+
+function cmdShimIfExists (from, to, cb) {
+ fs.stat(from, function (er) {
+ if (er) return cb()
+ cmdShim(from, to, cb)
+ })
+}
+
+// Try to unlink, but ignore errors.
+// Any problems will surface later.
+function rm (path, cb) {
+ fs.unlink(path, function(er) {
+ cb()
+ })
+}
+
+function cmdShim (from, to, cb) {
+ fs.stat(from, function (er, stat) {
+ if (er)
+ return cb(er)
+
+ cmdShim_(from, to, cb)
+ })
+}
+
+function cmdShim_ (from, to, cb) {
+ var then = times(2, next, cb)
+ rm(to, then)
+ rm(to + ".cmd", then)
+
+ function next(er) {
+ writeShim(from, to, cb)
+ }
+}
+
+function writeShim (from, to, cb) {
+ // make a cmd file and a sh script
+ // First, check if the bin is a #! of some sort.
+ // If not, then assume it's something that'll be compiled, or some other
+ // sort of script, and just call it directly.
+ mkdir(path.dirname(to), function (er) {
+ if (er)
+ return cb(er)
+ fs.readFile(from, "utf8", function (er, data) {
+ if (er) return writeShim_(from, to, null, null, cb)
+ var firstLine = data.trim().split(/\r*\n/)[0]
+ , shebang = firstLine.match(shebangExpr)
+ if (!shebang) return writeShim_(from, to, null, null, cb)
+ var prog = shebang[1]
+ , args = shebang[2] || ""
+ return writeShim_(from, to, prog, args, cb)
+ })
+ })
+}
+
+function writeShim_ (from, to, prog, args, cb) {
+ var shTarget = path.relative(path.dirname(to), from)
+ , target = shTarget.split("/").join("\\")
+ , longProg
+ , shProg = prog && prog.split("\\").join("/")
+ , shLongProg
+ shTarget = shTarget.split("\\").join("/")
+ args = args || ""
+ if (!prog) {
+ prog = "\"%~dp0\\" + target + "\""
+ shProg = "\"$basedir/" + shTarget + "\""
+ args = ""
+ target = ""
+ shTarget = ""
+ } else {
+ longProg = "\"%~dp0\\" + prog + ".exe\""
+ shLongProg = "\"$basedir/" + prog + "\""
+ target = "\"%~dp0\\" + target + "\""
+ shTarget = "\"$basedir/" + shTarget + "\""
+ }
+
+ // @IF EXIST "%~dp0\node.exe" (
+ // "%~dp0\node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
+ // ) ELSE (
+ // node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
+ // )
+ var cmd
+ if (longProg) {
+ cmd = "@IF EXIST " + longProg + " (\r\n"
+ + " " + longProg + " " + args + " " + target + " %*\r\n"
+ + ") ELSE (\r\n"
+ + " " + prog + " " + args + " " + target + " %*\r\n"
+ + ")"
+ } else {
+ cmd = prog + " " + args + " " + target + " %*\r\n"
+ }
+
+ // #!/bin/sh
+ // basedir=`dirname "$0"`
+ //
+ // case `uname` in
+ // *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ // esac
+ //
+ // if [ -x "$basedir/node.exe" ]; then
+ // "$basedir/node.exe" "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
+ // ret=$?
+ // else
+ // node "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
+ // ret=$?
+ // fi
+ // exit $ret
+
+ var sh = "#!/bin/sh\n"
+
+ if (shLongProg) {
+ sh = sh
+ + "basedir=`dirname \"$0\"`\n"
+ + "\n"
+ + "case `uname` in\n"
+ + " *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;\n"
+ + "esac\n"
+ + "\n"
+
+ sh = sh
+ + "if [ -x "+shLongProg+" ]; then\n"
+ + " " + shLongProg + " " + args + " " + shTarget + " \"$@\"\n"
+ + " ret=$?\n"
+ + "else \n"
+ + " " + shProg + " " + args + " " + shTarget + " \"$@\"\n"
+ + " ret=$?\n"
+ + "fi\n"
+ + "exit $ret\n"
+ } else {
+ sh = shProg + " " + args + " " + shTarget + " \"$@\"\n"
+ + "exit $?\n"
+ }
+
+ var then = times(2, next, cb)
+ fs.writeFile(to + ".cmd", cmd, "utf8", then)
+ fs.writeFile(to, sh, "utf8", then)
+ function next () {
+ chmodShim(to, cb)
+ }
+}
+
+function chmodShim (to, cb) {
+ var then = times(2, cb, cb)
+ fs.chmod(to, 0755, then)
+ fs.chmod(to + ".cmd", 0755, then)
+}
+
+function times(n, ok, cb) {
+ var errState = null
+ return function(er) {
+ if (!errState) {
+ if (er)
+ cb(errState = er)
+ else if (--n === 0)
+ ok()
+ }
+ }
+}
diff --git a/deps/npm/node_modules/cmd-shim/package.json b/deps/npm/node_modules/cmd-shim/package.json index e9e941105e..cf6c9525db 100644 --- a/deps/npm/node_modules/cmd-shim/package.json +++ b/deps/npm/node_modules/cmd-shim/package.json @@ -1,6 +1,6 @@ { "name": "cmd-shim", - "version": "1.0.1", + "version": "1.1.1", "description": "Used in npm for command line application support", "scripts": { "test": "tap test/*.js" @@ -21,11 +21,15 @@ "tap": "~0.4.1", "rimraf": "~2.1.4" }, - "readme": "# cmd-shim\n\nThe cmd-shim used in npm to create executable scripts on Windows,\nsince symlinks are not suitable for this purpose there.\n\nOn Unix systems, you should use a symbolic link instead.\n\n## Installation\n\n```\nnpm install cmd-shim\n```\n\n## API\n\n### cmdShim(from, to, cb)\n\nCreate a cmd shim at `to` for the command line program at `from`.\ne.g.\n\n```javascript\nvar cmdShim = require('cmd-shim');\ncmdShim(__dirname + '/cli.js', '/usr/bin/command-name', function (err) {\n if (err) throw err;\n});\n```\n\n### cmdShim.ifExists(from, to, cb)\n\nThe same as above, but will just continue if the file does not exist.\nSource:\n\n```javascript\nfunction cmdShimIfExists (from, to, cb) {\n fs.stat(from, function (er) {\n if (er) return cb()\n cmdShim(from, to, cb)\n })\n}\n```\n", + "readme": "# cmd-shim\r\n\r\nThe cmd-shim used in npm to create executable scripts on Windows,\r\nsince symlinks are not suitable for this purpose there.\r\n\r\nOn Unix systems, you should use a symbolic link instead.\r\n\r\n[](https://travis-ci.org/ForbesLindesay/cmd-shim) [](https://gemnasium.com/ForbesLindesay/cmd-shim)\r\n\r\n## Installation\r\n\r\n```\r\nnpm install cmd-shim\r\n```\r\n\r\n## API\r\n\r\n### cmdShim(from, to, cb)\r\n\r\nCreate a cmd shim at `to` for the command line program at `from`.\r\ne.g.\r\n\r\n```javascript\r\nvar cmdShim = require('cmd-shim');\r\ncmdShim(__dirname + '/cli.js', '/usr/bin/command-name', function (err) {\r\n if (err) throw err;\r\n});\r\n```\r\n\r\n### cmdShim.ifExists(from, to, cb)\r\n\r\nThe same as above, but will just continue if the file does not exist.\r\nSource:\r\n\r\n```javascript\r\nfunction cmdShimIfExists (from, to, cb) {\r\n fs.stat(from, function (er) {\r\n if (er) return cb()\r\n cmdShim(from, to, cb)\r\n })\r\n}\r\n```\r\n", "readmeFilename": "README.md", "bugs": { "url": "https://github.com/ForbesLindesay/cmd-shim/issues" }, - "_id": "cmd-shim@1.0.1", - "_from": "cmd-shim@latest" + "_id": "cmd-shim@1.1.1", + "dist": { + "shasum": "87741e2a8b6307ea1ea8bf1f65287cb4a9ca977a" + }, + "_from": "cmd-shim@latest", + "_resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.1.tgz" } diff --git a/deps/npm/node_modules/cmd-shim/test/00-setup.js b/deps/npm/node_modules/cmd-shim/test/00-setup.js index 073d19d9e6..f2689e6f4d 100644 --- a/deps/npm/node_modules/cmd-shim/test/00-setup.js +++ b/deps/npm/node_modules/cmd-shim/test/00-setup.js @@ -1,36 +1,34 @@ -var test = require('tap').test -var mkdirp = require('mkdirp') -var fs = require('fs') -var path = require('path') -var fixtures = path.resolve(__dirname, 'fixtures') -var which = require('which') -var whichTap = which.sync('tap') - -var froms = { - 'from.exe': 'exe', - 'from.env': '#!/usr/bin/env node\nconsole.log(/hi/)\n', - 'from.env.args': '#!/usr/bin/env node --expose_gc\ngc()\n', - 'from.sh': '#!/usr/bin/sh\necho hi\n', - 'from.sh.args': '#!/usr/bin/sh -x\necho hi\n' -} - -var cmdShim = require('../') - -test('create fixture', function (t) { - mkdirp(fixtures, function (er) { - if (er) - throw er - t.pass('made dir') - Object.keys(froms).forEach(function (f) { - t.test('write ' + f, function (t) { - fs.writeFile(path.resolve(fixtures, f), froms[f], function (er) { - if (er) - throw er - t.pass('wrote ' + f) - t.end() - }) - }) - }) - t.end() - }) -}) +var test = require('tap').test
+var mkdirp = require('mkdirp')
+var fs = require('fs')
+var path = require('path')
+var fixtures = path.resolve(__dirname, 'fixtures')
+
+var froms = {
+ 'from.exe': 'exe',
+ 'from.env': '#!/usr/bin/env node\nconsole.log(/hi/)\n',
+ 'from.env.args': '#!/usr/bin/env node --expose_gc\ngc()\n',
+ 'from.sh': '#!/usr/bin/sh\necho hi\n',
+ 'from.sh.args': '#!/usr/bin/sh -x\necho hi\n'
+}
+
+var cmdShim = require('../')
+
+test('create fixture', function (t) {
+ mkdirp(fixtures, function (er) {
+ if (er)
+ throw er
+ t.pass('made dir')
+ Object.keys(froms).forEach(function (f) {
+ t.test('write ' + f, function (t) {
+ fs.writeFile(path.resolve(fixtures, f), froms[f], function (er) {
+ if (er)
+ throw er
+ t.pass('wrote ' + f)
+ t.end()
+ })
+ })
+ })
+ t.end()
+ })
+})
diff --git a/deps/npm/node_modules/cmd-shim/test/basic.js b/deps/npm/node_modules/cmd-shim/test/basic.js index 8f79dca5ee..93da5ea26e 100755..100644 --- a/deps/npm/node_modules/cmd-shim/test/basic.js +++ b/deps/npm/node_modules/cmd-shim/test/basic.js @@ -1,169 +1,167 @@ -var test = require('tap').test -var mkdirp = require('mkdirp') -var fs = require('fs') -var path = require('path') -var fixtures = path.resolve(__dirname, 'fixtures') -var which = require('which') -var whichTap = which.sync('tap') - -var cmdShim = require('../') - -test('no shebang', function (t) { - var from = path.resolve(fixtures, 'from.exe') - var to = path.resolve(fixtures, 'exe.shim') - cmdShim(from, to, function(er) { - if (er) - throw er - t.equal(fs.readFileSync(to, 'utf8'), - "\"$basedir/from.exe\" \"$@\"\nexit $?\n") - t.equal(fs.readFileSync(to + '.cmd', 'utf8'), - "\"%~dp0\\from.exe\" %*\r\n") - t.end() - }) -}) - -test('env shebang', function (t) { - var from = path.resolve(fixtures, 'from.env') - var to = path.resolve(fixtures, 'env.shim') - cmdShim(from, to, function(er) { - if (er) - throw er - console.error('%j', fs.readFileSync(to, 'utf8')) - console.error('%j', fs.readFileSync(to + '.cmd', 'utf8')) - - t.equal(fs.readFileSync(to, 'utf8'), - "#!/bin/sh"+ - "\nbasedir=`dirname \"$0\"`"+ - "\n"+ - "\ncase `uname` in"+ - "\n *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+ - "\nesac"+ - "\n"+ - "\nif [ -x \"$basedir/node\" ]; then"+ - "\n \"$basedir/node\" \"$basedir/from.env\" \"$@\""+ - "\n ret=$?"+ - "\nelse "+ - "\n node \"$basedir/from.env\" \"$@\""+ - "\n ret=$?"+ - "\nfi"+ - "\nexit $ret"+ - "\n") - t.equal(fs.readFileSync(to + '.cmd', 'utf8'), - "@IF EXIST \"%~dp0\\node.exe\" (\r"+ - "\n \"%~dp0\\node.exe\" \"%~dp0\\from.env\" %*\r"+ - "\n) ELSE (\r"+ - "\n node \"%~dp0\\from.env\" %*\r"+ - "\n)") - t.end() - }) -}) - -test('env shebang with args', function (t) { - var from = path.resolve(fixtures, 'from.env.args') - var to = path.resolve(fixtures, 'env.args.shim') - cmdShim(from, to, function(er) { - if (er) - throw er - console.error('%j', fs.readFileSync(to, 'utf8')) - console.error('%j', fs.readFileSync(to + '.cmd', 'utf8')) - - t.equal(fs.readFileSync(to, 'utf8'), - "#!/bin/sh"+ - "\nbasedir=`dirname \"$0\"`"+ - "\n"+ - "\ncase `uname` in"+ - "\n *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+ - "\nesac"+ - "\n"+ - "\nif [ -x \"$basedir/node\" ]; then"+ - "\n \"$basedir/node\" --expose_gc \"$basedir/from.env.args\" \"$@\""+ - "\n ret=$?"+ - "\nelse "+ - "\n node --expose_gc \"$basedir/from.env.args\" \"$@\""+ - "\n ret=$?"+ - "\nfi"+ - "\nexit $ret"+ - "\n") - t.equal(fs.readFileSync(to + '.cmd', 'utf8'), - "@IF EXIST \"%~dp0\\node.exe\" (\r"+ - "\n \"%~dp0\\node.exe\" --expose_gc \"%~dp0\\from.env.args\" %*\r"+ - "\n) ELSE (\r"+ - "\n node --expose_gc \"%~dp0\\from.env.args\" %*\r"+ - "\n)") - t.end() - }) -}) - -test('explicit shebang', function (t) { - var from = path.resolve(fixtures, 'from.sh') - var to = path.resolve(fixtures, 'sh.shim') - cmdShim(from, to, function(er) { - if (er) - throw er - console.error('%j', fs.readFileSync(to, 'utf8')) - console.error('%j', fs.readFileSync(to + '.cmd', 'utf8')) - - t.equal(fs.readFileSync(to, 'utf8'), - "#!/bin/sh" + - "\nbasedir=`dirname \"$0\"`" + - "\n" + - "\ncase `uname` in" + - "\n *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" + - "\nesac" + - "\n" + - "\nif [ -x \"$basedir//usr/bin/sh\" ]; then" + - "\n \"$basedir//usr/bin/sh\" \"$basedir/from.sh\" \"$@\"" + - "\n ret=$?" + - "\nelse " + - "\n /usr/bin/sh \"$basedir/from.sh\" \"$@\"" + - "\n ret=$?" + - "\nfi" + - "\nexit $ret" + - "\n") - - t.equal(fs.readFileSync(to + '.cmd', 'utf8'), - "@IF EXIST \"%~dp0\\/usr/bin/sh.exe\" (\r" + - "\n \"%~dp0\\/usr/bin/sh.exe\" \"%~dp0\\from.sh\" %*\r" + - "\n) ELSE (\r" + - "\n /usr/bin/sh \"%~dp0\\from.sh\" %*\r" + - "\n)") - t.end() - }) -}) - -test('explicit shebang with args', function (t) { - var from = path.resolve(fixtures, 'from.sh.args') - var to = path.resolve(fixtures, 'sh.args.shim') - cmdShim(from, to, function(er) { - if (er) - throw er - console.error('%j', fs.readFileSync(to, 'utf8')) - console.error('%j', fs.readFileSync(to + '.cmd', 'utf8')) - - t.equal(fs.readFileSync(to, 'utf8'), - "#!/bin/sh" + - "\nbasedir=`dirname \"$0\"`" + - "\n" + - "\ncase `uname` in" + - "\n *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" + - "\nesac" + - "\n" + - "\nif [ -x \"$basedir//usr/bin/sh\" ]; then" + - "\n \"$basedir//usr/bin/sh\" -x \"$basedir/from.sh.args\" \"$@\"" + - "\n ret=$?" + - "\nelse " + - "\n /usr/bin/sh -x \"$basedir/from.sh.args\" \"$@\"" + - "\n ret=$?" + - "\nfi" + - "\nexit $ret" + - "\n") - - t.equal(fs.readFileSync(to + '.cmd', 'utf8'), - "@IF EXIST \"%~dp0\\/usr/bin/sh.exe\" (\r" + - "\n \"%~dp0\\/usr/bin/sh.exe\" -x \"%~dp0\\from.sh.args\" %*\r" + - "\n) ELSE (\r" + - "\n /usr/bin/sh -x \"%~dp0\\from.sh.args\" %*\r" + - "\n)") - t.end() - }) -}) +var test = require('tap').test
+var mkdirp = require('mkdirp')
+var fs = require('fs')
+var path = require('path')
+var fixtures = path.resolve(__dirname, 'fixtures')
+
+var cmdShim = require('../')
+
+test('no shebang', function (t) {
+ var from = path.resolve(fixtures, 'from.exe')
+ var to = path.resolve(fixtures, 'exe.shim')
+ cmdShim(from, to, function(er) {
+ if (er)
+ throw er
+ t.equal(fs.readFileSync(to, 'utf8'),
+ "\"$basedir/from.exe\" \"$@\"\nexit $?\n")
+ t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
+ "\"%~dp0\\from.exe\" %*\r\n")
+ t.end()
+ })
+})
+
+test('env shebang', function (t) {
+ var from = path.resolve(fixtures, 'from.env')
+ var to = path.resolve(fixtures, 'env.shim')
+ cmdShim(from, to, function(er) {
+ if (er)
+ throw er
+ console.error('%j', fs.readFileSync(to, 'utf8'))
+ console.error('%j', fs.readFileSync(to + '.cmd', 'utf8'))
+
+ t.equal(fs.readFileSync(to, 'utf8'),
+ "#!/bin/sh"+
+ "\nbasedir=`dirname \"$0\"`"+
+ "\n"+
+ "\ncase `uname` in"+
+ "\n *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+
+ "\nesac"+
+ "\n"+
+ "\nif [ -x \"$basedir/node\" ]; then"+
+ "\n \"$basedir/node\" \"$basedir/from.env\" \"$@\""+
+ "\n ret=$?"+
+ "\nelse "+
+ "\n node \"$basedir/from.env\" \"$@\""+
+ "\n ret=$?"+
+ "\nfi"+
+ "\nexit $ret"+
+ "\n")
+ t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
+ "@IF EXIST \"%~dp0\\node.exe\" (\r"+
+ "\n \"%~dp0\\node.exe\" \"%~dp0\\from.env\" %*\r"+
+ "\n) ELSE (\r"+
+ "\n node \"%~dp0\\from.env\" %*\r"+
+ "\n)")
+ t.end()
+ })
+})
+
+test('env shebang with args', function (t) {
+ var from = path.resolve(fixtures, 'from.env.args')
+ var to = path.resolve(fixtures, 'env.args.shim')
+ cmdShim(from, to, function(er) {
+ if (er)
+ throw er
+ console.error('%j', fs.readFileSync(to, 'utf8'))
+ console.error('%j', fs.readFileSync(to + '.cmd', 'utf8'))
+
+ t.equal(fs.readFileSync(to, 'utf8'),
+ "#!/bin/sh"+
+ "\nbasedir=`dirname \"$0\"`"+
+ "\n"+
+ "\ncase `uname` in"+
+ "\n *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+
+ "\nesac"+
+ "\n"+
+ "\nif [ -x \"$basedir/node\" ]; then"+
+ "\n \"$basedir/node\" --expose_gc \"$basedir/from.env.args\" \"$@\""+
+ "\n ret=$?"+
+ "\nelse "+
+ "\n node --expose_gc \"$basedir/from.env.args\" \"$@\""+
+ "\n ret=$?"+
+ "\nfi"+
+ "\nexit $ret"+
+ "\n")
+ t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
+ "@IF EXIST \"%~dp0\\node.exe\" (\r"+
+ "\n \"%~dp0\\node.exe\" --expose_gc \"%~dp0\\from.env.args\" %*\r"+
+ "\n) ELSE (\r"+
+ "\n node --expose_gc \"%~dp0\\from.env.args\" %*\r"+
+ "\n)")
+ t.end()
+ })
+})
+
+test('explicit shebang', function (t) {
+ var from = path.resolve(fixtures, 'from.sh')
+ var to = path.resolve(fixtures, 'sh.shim')
+ cmdShim(from, to, function(er) {
+ if (er)
+ throw er
+ console.error('%j', fs.readFileSync(to, 'utf8'))
+ console.error('%j', fs.readFileSync(to + '.cmd', 'utf8'))
+
+ t.equal(fs.readFileSync(to, 'utf8'),
+ "#!/bin/sh" +
+ "\nbasedir=`dirname \"$0\"`" +
+ "\n" +
+ "\ncase `uname` in" +
+ "\n *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" +
+ "\nesac" +
+ "\n" +
+ "\nif [ -x \"$basedir//usr/bin/sh\" ]; then" +
+ "\n \"$basedir//usr/bin/sh\" \"$basedir/from.sh\" \"$@\"" +
+ "\n ret=$?" +
+ "\nelse " +
+ "\n /usr/bin/sh \"$basedir/from.sh\" \"$@\"" +
+ "\n ret=$?" +
+ "\nfi" +
+ "\nexit $ret" +
+ "\n")
+
+ t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
+ "@IF EXIST \"%~dp0\\/usr/bin/sh.exe\" (\r" +
+ "\n \"%~dp0\\/usr/bin/sh.exe\" \"%~dp0\\from.sh\" %*\r" +
+ "\n) ELSE (\r" +
+ "\n /usr/bin/sh \"%~dp0\\from.sh\" %*\r" +
+ "\n)")
+ t.end()
+ })
+})
+
+test('explicit shebang with args', function (t) {
+ var from = path.resolve(fixtures, 'from.sh.args')
+ var to = path.resolve(fixtures, 'sh.args.shim')
+ cmdShim(from, to, function(er) {
+ if (er)
+ throw er
+ console.error('%j', fs.readFileSync(to, 'utf8'))
+ console.error('%j', fs.readFileSync(to + '.cmd', 'utf8'))
+
+ t.equal(fs.readFileSync(to, 'utf8'),
+ "#!/bin/sh" +
+ "\nbasedir=`dirname \"$0\"`" +
+ "\n" +
+ "\ncase `uname` in" +
+ "\n *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" +
+ "\nesac" +
+ "\n" +
+ "\nif [ -x \"$basedir//usr/bin/sh\" ]; then" +
+ "\n \"$basedir//usr/bin/sh\" -x \"$basedir/from.sh.args\" \"$@\"" +
+ "\n ret=$?" +
+ "\nelse " +
+ "\n /usr/bin/sh -x \"$basedir/from.sh.args\" \"$@\"" +
+ "\n ret=$?" +
+ "\nfi" +
+ "\nexit $ret" +
+ "\n")
+
+ t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
+ "@IF EXIST \"%~dp0\\/usr/bin/sh.exe\" (\r" +
+ "\n \"%~dp0\\/usr/bin/sh.exe\" -x \"%~dp0\\from.sh.args\" %*\r" +
+ "\n) ELSE (\r" +
+ "\n /usr/bin/sh -x \"%~dp0\\from.sh.args\" %*\r" +
+ "\n)")
+ t.end()
+ })
+})
diff --git a/deps/npm/node_modules/cmd-shim/test/zz-cleanup.js b/deps/npm/node_modules/cmd-shim/test/zz-cleanup.js index 9425031001..47b7899616 100644 --- a/deps/npm/node_modules/cmd-shim/test/zz-cleanup.js +++ b/deps/npm/node_modules/cmd-shim/test/zz-cleanup.js @@ -1,13 +1,13 @@ -var test = require('tap').test -var path = require('path') -var fixtures = path.resolve(__dirname, 'fixtures') -var rimraf = require('rimraf') - -test('cleanup', function(t) { - rimraf(fixtures, function(er) { - if (er) - throw er - t.pass('cleaned up') - t.end() - }) -}) +var test = require('tap').test
+var path = require('path')
+var fixtures = path.resolve(__dirname, 'fixtures')
+var rimraf = require('rimraf')
+
+test('cleanup', function(t) {
+ rimraf(fixtures, function(er) {
+ if (er)
+ throw er
+ t.pass('cleaned up')
+ t.end()
+ })
+})
diff --git a/deps/npm/node_modules/editor/LICENSE b/deps/npm/node_modules/editor/LICENSE new file mode 100644 index 0000000000..ee27ba4b44 --- /dev/null +++ b/deps/npm/node_modules/editor/LICENSE @@ -0,0 +1,18 @@ +This software is released under the MIT license: + +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/editor/package.json b/deps/npm/node_modules/editor/package.json index cbeada3778..36e5f7efae 100644 --- a/deps/npm/node_modules/editor/package.json +++ b/deps/npm/node_modules/editor/package.json @@ -1,16 +1,15 @@ { "name": "editor", - "version": "0.0.4", + "version": "0.0.5", "description": "launch $EDITOR in your program", "main": "index.js", - "bin": {}, "directories": { "example": "example", "test": "test" }, "dependencies": {}, "devDependencies": { - "tap": "~0.2.5" + "tap": "~0.4.4" }, "scripts": { "test": "tap test/*.js" @@ -39,6 +38,6 @@ "bugs": { "url": "https://github.com/substack/node-editor/issues" }, - "_id": "editor@0.0.4", - "_from": "editor@" + "_id": "editor@0.0.5", + "_from": "editor@latest" } diff --git a/deps/npm/node_modules/fstream-npm/fstream-npm.js b/deps/npm/node_modules/fstream-npm/fstream-npm.js index 23e3fce3ca..ca05880a67 100644 --- a/deps/npm/node_modules/fstream-npm/fstream-npm.js +++ b/deps/npm/node_modules/fstream-npm/fstream-npm.js @@ -143,7 +143,7 @@ Packer.prototype.applyIgnores = function (entry, partial, entryObj) { // since it's *not* a symbolic link, if we're *already* in a bundle, // then we should include everything. - if (pp && pp.package) { + if (pp && pp.package && pp.basename === "node_modules") { return true } 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 ed3e41c3dd..fcf03f281e 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 @@ -32,5 +32,9 @@ "url": "https://github.com/isaacs/fstream-ignore/issues" }, "_id": "fstream-ignore@0.0.7", - "_from": "fstream-ignore@~0.0.5" + "dist": { + "shasum": "eea3033f0c3728139de7b57ab1b0d6d89c353c63" + }, + "_from": "fstream-ignore@~0.0.5", + "_resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz" } diff --git a/deps/npm/node_modules/fstream-npm/package.json b/deps/npm/node_modules/fstream-npm/package.json index 4535b89ecd..7769921d88 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.1.5", + "version": "0.1.6", "repository": { "type": "git", "url": "git://github.com/isaacs/fstream-npm.git" @@ -22,6 +22,6 @@ "bugs": { "url": "https://github.com/isaacs/fstream-npm/issues" }, - "_id": "fstream-npm@0.1.5", - "_from": "fstream-npm@~0.1.3" + "_id": "fstream-npm@0.1.6", + "_from": "fstream-npm@latest" } diff --git a/deps/npm/node_modules/github-url-from-username-repo/.npmignore b/deps/npm/node_modules/github-url-from-username-repo/.npmignore new file mode 100644 index 0000000000..39747c08b4 --- /dev/null +++ b/deps/npm/node_modules/github-url-from-username-repo/.npmignore @@ -0,0 +1,13 @@ +*.swp +.*.swp + +.DS_Store +*~ +.project +.settings +npm-debug.log +coverage.html +.idea +lib-cov + +node_modules
\ No newline at end of file diff --git a/deps/npm/node_modules/github-url-from-username-repo/.travis.yml b/deps/npm/node_modules/github-url-from-username-repo/.travis.yml new file mode 100644 index 0000000000..a12e3f0fde --- /dev/null +++ b/deps/npm/node_modules/github-url-from-username-repo/.travis.yml @@ -0,0 +1,4 @@ +language: node_js +node_js: + - "0.8" + - "0.10"
\ No newline at end of file diff --git a/deps/npm/node_modules/github-url-from-username-repo/LICENSE b/deps/npm/node_modules/github-url-from-username-repo/LICENSE new file mode 100644 index 0000000000..44c152ba75 --- /dev/null +++ b/deps/npm/node_modules/github-url-from-username-repo/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) Robert Kowalski ("Author") +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 AUTHOR 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 AUTHOR 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.
\ No newline at end of file diff --git a/deps/npm/node_modules/github-url-from-username-repo/README.md b/deps/npm/node_modules/github-url-from-username-repo/README.md new file mode 100644 index 0000000000..27c4054b26 --- /dev/null +++ b/deps/npm/node_modules/github-url-from-username-repo/README.md @@ -0,0 +1,14 @@ +[](https://travis-ci.org/robertkowalski/github-url-from-username-repo) +[](https://gemnasium.com/robertkowalski/github-url-from-username-repo) + + +# github-url-from-username-repo + +## Usage + +```javascript + +var getUrl = require("github-url-from-username-repo") +getUrl("visionmedia/express") // git://github.com/visionmedia/express + +```
\ No newline at end of file diff --git a/deps/npm/node_modules/github-url-from-username-repo/index.js b/deps/npm/node_modules/github-url-from-username-repo/index.js new file mode 100644 index 0000000000..8af2c4f831 --- /dev/null +++ b/deps/npm/node_modules/github-url-from-username-repo/index.js @@ -0,0 +1,9 @@ +module.exports = getUrl + +function getUrl (r) { + if (!r) return + if (/^[\w-]+\/[\w-]+$/.test(r)) + return "git://github.com/" + r + else + return null +}
\ No newline at end of file diff --git a/deps/npm/node_modules/github-url-from-username-repo/package.json b/deps/npm/node_modules/github-url-from-username-repo/package.json new file mode 100644 index 0000000000..d0e241dbf5 --- /dev/null +++ b/deps/npm/node_modules/github-url-from-username-repo/package.json @@ -0,0 +1,33 @@ +{ + "name": "github-url-from-username-repo", + "version": "0.0.2", + "description": "Create urls from username/repo", + "main": "index.js", + "scripts": { + "test": "mocha -R spec" + }, + "devDependencies": { + "mocha": "~1.13.0" + }, + "repository": { + "type": "git", + "url": "git@github.com:robertkowalski/github-url-from-username-repo.git" + }, + "author": { + "name": "Robert Kowalski", + "email": "rok@kowalski.gd" + }, + "license": "BSD-2-Clause", + "bugs": { + "url": "https://github.com/robertkowalski/github-url-from-username-repo/issues" + }, + "keywords": [ + "git", + "github", + "repo" + ], + "readme": "[](https://travis-ci.org/robertkowalski/github-url-from-username-repo)\n[](https://gemnasium.com/robertkowalski/github-url-from-username-repo)\n\n\n# github-url-from-username-repo\n\n## Usage\n\n```javascript\n\nvar getUrl = require(\"github-url-from-username-repo\")\ngetUrl(\"visionmedia/express\") // git://github.com/visionmedia/express\n\n```", + "readmeFilename": "README.md", + "_id": "github-url-from-username-repo@0.0.2", + "_from": "github-url-from-username-repo@" +} diff --git a/deps/npm/node_modules/github-url-from-username-repo/test/index.js b/deps/npm/node_modules/github-url-from-username-repo/test/index.js new file mode 100644 index 0000000000..782a95ceaf --- /dev/null +++ b/deps/npm/node_modules/github-url-from-username-repo/test/index.js @@ -0,0 +1,21 @@ +var assert = require("assert") +var getUrl = require("../") + +describe("github url from username/repo", function () { + it("returns a github url for the username/repo", function () { + var url = getUrl("visionmedia/express") + assert.equal("git://github.com/visionmedia/express", url) + }) + it("works with -", function () { + var url = getUrl("vision-media/express-package") + assert.equal("git://github.com/vision-media/express-package", url) + }) + it("returns null if it does not match", function () { + var url = getUrl("package") + assert.deepEqual(null, url) + }) + it("returns undefined if no repo/user was given", function () { + var url = getUrl() + assert.deepEqual(undefined, url) + }) +})
\ No newline at end of file diff --git a/deps/npm/node_modules/mkdirp/package.json b/deps/npm/node_modules/mkdirp/package.json index 54cd699bde..aea8cb4971 100644 --- a/deps/npm/node_modules/mkdirp/package.json +++ b/deps/npm/node_modules/mkdirp/package.json @@ -25,10 +25,9 @@ "license": "MIT", "readme": "# mkdirp\n\nLike `mkdir -p`, but in node.js!\n\n[](http://travis-ci.org/substack/node-mkdirp)\n\n# example\n\n## pow.js\n\n```js\nvar mkdirp = require('mkdirp');\n \nmkdirp('/tmp/foo/bar/baz', function (err) {\n if (err) console.error(err)\n else console.log('pow!')\n});\n```\n\nOutput\n\n```\npow!\n```\n\nAnd now /tmp/foo/bar/baz exists, huzzah!\n\n# methods\n\n```js\nvar mkdirp = require('mkdirp');\n```\n\n## mkdirp(dir, mode, cb)\n\nCreate a new directory and any necessary subdirectories at `dir` with octal\npermission string `mode`.\n\nIf `mode` isn't specified, it defaults to `0777 & (~process.umask())`.\n\n`cb(err, made)` fires with the error or the first directory `made`\nthat had to be created, if any.\n\n## mkdirp.sync(dir, mode)\n\nSynchronously create a new directory and any necessary subdirectories at `dir`\nwith octal permission string `mode`.\n\nIf `mode` isn't specified, it defaults to `0777 & (~process.umask())`.\n\nReturns the first directory that had to be created, if any.\n\n# install\n\nWith [npm](http://npmjs.org) do:\n\n```\nnpm install mkdirp\n```\n\n# license\n\nMIT\n", "readmeFilename": "readme.markdown", - "_id": "mkdirp@0.3.5", - "dist": { - "shasum": "35715a113218b4fa49dc9b69326afcf7f9b2948e" + "bugs": { + "url": "https://github.com/substack/node-mkdirp/issues" }, - "_from": "mkdirp@0.3.5", - "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + "_id": "mkdirp@0.3.5", + "_from": "mkdirp@latest" } diff --git a/deps/npm/node_modules/npmconf/node_modules/config-chain/index.js b/deps/npm/node_modules/npmconf/node_modules/config-chain/index.js index 523b2eb39d..0ef3a91f73 100755 --- a/deps/npm/node_modules/npmconf/node_modules/config-chain/index.js +++ b/deps/npm/node_modules/npmconf/node_modules/config-chain/index.js @@ -141,7 +141,7 @@ ConfigChain.prototype.get = function (key, where) { if (where) { where = this.sources[where] if (where) where = where.data - if (where && where.hasOwnProperty(key)) return where[key] + if (where && Object.hasOwnProperty.call(where, key)) return where[key] return undefined } return this.list[0][key] diff --git a/deps/npm/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json b/deps/npm/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json index 9b9d3d7e8b..1d73d658fe 100644 --- a/deps/npm/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json +++ b/deps/npm/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json @@ -27,6 +27,7 @@ "bugs": { "url": "https://github.com/isaacs/proto-list/issues" }, + "homepage": "https://github.com/isaacs/proto-list", "_id": "proto-list@1.2.2", "_from": "proto-list@~1.2.1" } diff --git a/deps/npm/node_modules/npmconf/node_modules/config-chain/package.json b/deps/npm/node_modules/npmconf/node_modules/config-chain/package.json index d0d24eaae8..10e9b4c4bd 100644 --- a/deps/npm/node_modules/npmconf/node_modules/config-chain/package.json +++ b/deps/npm/node_modules/npmconf/node_modules/config-chain/package.json @@ -1,6 +1,6 @@ { "name": "config-chain", - "version": "1.1.7", + "version": "1.1.8", "description": "HANDLE CONFIGURATION ONCE AND FOR ALL", "homepage": "http://github.com/dominictarr/config-chain", "repository": { @@ -27,6 +27,6 @@ "bugs": { "url": "https://github.com/dominictarr/config-chain/issues" }, - "_id": "config-chain@1.1.7", - "_from": "config-chain@~1.1.1" + "_id": "config-chain@1.1.8", + "_from": "config-chain@~1.1.8" } diff --git a/deps/npm/node_modules/npmconf/node_modules/config-chain/test/get.js b/deps/npm/node_modules/npmconf/node_modules/config-chain/test/get.js new file mode 100644 index 0000000000..d6fd79f74b --- /dev/null +++ b/deps/npm/node_modules/npmconf/node_modules/config-chain/test/get.js @@ -0,0 +1,15 @@ +var cc = require("../"); + +var chain = cc() + , name = "forFun"; + +chain + .add({ + __sample:"for fun only" + }, name) + .on("load", function() { + //It throw exception here + console.log(chain.get("__sample", name)); + //But if I drop the name param, it run normally and return as expected: "for fun only" + //console.log(chain.get("__sample")); + }); diff --git a/deps/npm/node_modules/npmconf/package.json b/deps/npm/node_modules/npmconf/package.json index 2f188df37d..740568e175 100644 --- a/deps/npm/node_modules/npmconf/package.json +++ b/deps/npm/node_modules/npmconf/package.json @@ -1,15 +1,15 @@ { "name": "npmconf", - "version": "0.1.3", + "version": "0.1.5", "description": "The config thing npm uses", "main": "npmconf.js", "directories": { "test": "test" }, "dependencies": { - "config-chain": "~1.1.1", + "config-chain": "~1.1.8", "inherits": "~2.0.0", - "once": "~1.1.1", + "once": "~1.3.0", "mkdirp": "~0.3.3", "osenv": "0.0.3", "nopt": "2", @@ -44,6 +44,7 @@ "bugs": { "url": "https://github.com/isaacs/npmconf/issues" }, - "_id": "npmconf@0.1.3", + "homepage": "https://github.com/isaacs/npmconf", + "_id": "npmconf@0.1.5", "_from": "npmconf@latest" } diff --git a/deps/npm/node_modules/npmlog/package.json b/deps/npm/node_modules/npmlog/package.json index e46b6e250a..28b444cca8 100644 --- a/deps/npm/node_modules/npmlog/package.json +++ b/deps/npm/node_modules/npmlog/package.json @@ -6,7 +6,7 @@ }, "name": "npmlog", "description": "logger for npm", - "version": "0.0.4", + "version": "0.0.6", "repository": { "type": "git", "url": "git://github.com/isaacs/npmlog.git" @@ -16,7 +16,7 @@ "test": "tap test/*.js" }, "dependencies": { - "ansi": "~0.1.2" + "ansi": "~0.2.1" }, "devDependencies": { "tap": "" @@ -27,6 +27,6 @@ "bugs": { "url": "https://github.com/isaacs/npmlog/issues" }, - "_id": "npmlog@0.0.4", + "_id": "npmlog@0.0.6", "_from": "npmlog@latest" } diff --git a/deps/npm/node_modules/npmlog/test/basic.js b/deps/npm/node_modules/npmlog/test/basic.js index 80c8c3184c..1afcabd1c6 100644 --- a/deps/npm/node_modules/npmlog/test/basic.js +++ b/deps/npm/node_modules/npmlog/test/basic.js @@ -9,254 +9,21 @@ var logPrefixEvents = [] var util = require('util') var resultExpect = -[ '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[7m', - 'sill', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - 'silly prefix', - '\u001b[0m', - ' x = {"foo":{"bar":"baz"}}\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[34m', - '\u001b[40m', - 'verb', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - 'verbose prefix', - '\u001b[0m', - ' x = {"foo":{"bar":"baz"}}\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[32m', - '\u001b[7m', - 'info', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - 'info prefix', - '\u001b[0m', - ' x = {"foo":{"bar":"baz"}}\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[32m', - 'http', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - 'http prefix', - '\u001b[0m', - ' x = {"foo":{"bar":"baz"}}\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[30m', - '\u001b[41m', - 'WARN', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[33m', - 'warn prefix', - '\u001b[0m', - ' x = {"foo":{"bar":"baz"}}\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[31m', - '\u001b[40m', - 'ERR!', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - 'error prefix', - '\u001b[0m', - ' x = {"foo":{"bar":"baz"}}\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[32m', - '\u001b[7m', - 'info', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - 'info prefix', - '\u001b[0m', - ' x = {"foo":{"bar":"baz"}}\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[32m', - 'http', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - 'http prefix', - '\u001b[0m', - ' x = {"foo":{"bar":"baz"}}\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[30m', - '\u001b[41m', - 'WARN', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - 'warn prefix', - '\u001b[0m', - ' x = {"foo":{"bar":"baz"}}\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[31m', - '\u001b[40m', - 'ERR!', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - 'error prefix', - '\u001b[0m', - ' x = {"foo":{"bar":"baz"}}\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[31m', - '\u001b[40m', - 'ERR!', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - '404', - '\u001b[0m', - ' This is a longer\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[31m', - '\u001b[40m', - 'ERR!', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - '404', - '\u001b[0m', - ' message, with some details\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[31m', - '\u001b[40m', - 'ERR!', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - '404', - '\u001b[0m', - ' and maybe a stack.\n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[31m', - '\u001b[40m', - 'ERR!', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u001b[35m', - '404', - '\u001b[0m', - ' \n', - '\u001b[0m', - '\u001b[37m', - '\u001b[40m', - 'npm', - '\u001b[0m', - ' ', - '\u001b[0m', - '\u0007', - 'noise', - '\u001b[0m', - '\u001b[35m', - '', - '\u001b[0m', - ' LOUD NOISES\n', +[ '\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[7msill\u001b[0m \u001b[0m\u001b[35msilly prefix\u001b[0m x = {"foo":{"bar":"baz"}}\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[34m\u001b[40mverb\u001b[0m \u001b[0m\u001b[35mverbose prefix\u001b[0m x = {"foo":{"bar":"baz"}}\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[32minfo\u001b[0m \u001b[0m\u001b[35minfo prefix\u001b[0m x = {"foo":{"bar":"baz"}}\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[32m\u001b[40mhttp\u001b[0m \u001b[0m\u001b[35mhttp prefix\u001b[0m x = {"foo":{"bar":"baz"}}\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[30m\u001b[43mWARN\u001b[0m \u001b[0m\u001b[35mwarn prefix\u001b[0m x = {"foo":{"bar":"baz"}}\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[31m\u001b[40mERR!\u001b[0m \u001b[0m\u001b[35merror prefix\u001b[0m x = {"foo":{"bar":"baz"}}\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[32minfo\u001b[0m \u001b[0m\u001b[35minfo prefix\u001b[0m x = {"foo":{"bar":"baz"}}\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[32m\u001b[40mhttp\u001b[0m \u001b[0m\u001b[35mhttp prefix\u001b[0m x = {"foo":{"bar":"baz"}}\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[30m\u001b[43mWARN\u001b[0m \u001b[0m\u001b[35mwarn prefix\u001b[0m x = {"foo":{"bar":"baz"}}\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[31m\u001b[40mERR!\u001b[0m \u001b[0m\u001b[35merror prefix\u001b[0m x = {"foo":{"bar":"baz"}}\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[31m\u001b[40mERR!\u001b[0m \u001b[0m\u001b[35m404\u001b[0m This is a longer\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[31m\u001b[40mERR!\u001b[0m \u001b[0m\u001b[35m404\u001b[0m message, with some details\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[31m\u001b[40mERR!\u001b[0m \u001b[0m\u001b[35m404\u001b[0m and maybe a stack.\n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u001b[31m\u001b[40mERR!\u001b[0m \u001b[0m\u001b[35m404\u001b[0m \n', + '\u001b[0m\u001b[37m\u001b[40mnpm\u001b[0m \u001b[0m\u0007noise\u001b[0m\u001b[35m\u001b[0m LOUD NOISES\n', '\u001b[0m' ] var logPrefixEventsExpect = @@ -451,7 +218,7 @@ tap.test('basic', function (t) { log.addLevel('noise', 10000, {beep: true}) log.noise(false, 'LOUD NOISES') - t.deepEqual(result, resultExpect, 'result') + t.deepEqual(result.join('').trim(), resultExpect.join('').trim(), 'result') t.deepEqual(log.record, logEventsExpect, 'record') t.deepEqual(logEvents, logEventsExpect, 'logEvents') t.deepEqual(logInfoEvents, logInfoEventsExpect, 'logInfoEvents') diff --git a/deps/npm/node_modules/once/README.md b/deps/npm/node_modules/once/README.md index e833b83d22..a2981ea070 100644 --- a/deps/npm/node_modules/once/README.md +++ b/deps/npm/node_modules/once/README.md @@ -31,3 +31,21 @@ function load (file, cb) { Ironically, the prototype feature makes this module twice as complicated as necessary. + +To check whether you function has been called, use `fn.called`. Once the +function is called for the first time the return value of the original +function is saved in `fn.value` and subsequent calls will continue to +return this value. + +```javascript +var once = require('once') + +function load (cb) { + cb = once(cb) + var stream = createStream() + stream.once('data', cb) + stream.once('end', function () { + if (!cb.called) cb(new Error('not found')) + }) +} +``` diff --git a/deps/npm/node_modules/once/once.js b/deps/npm/node_modules/once/once.js index effc50a475..0770a73cda 100644 --- a/deps/npm/node_modules/once/once.js +++ b/deps/npm/node_modules/once/once.js @@ -10,10 +10,11 @@ once.proto = once(function () { }) function once (fn) { - var called = false - return function () { - if (called) return - called = true - return fn.apply(this, arguments) + var f = function () { + if (f.called) return f.value + f.called = true + return f.value = fn.apply(this, arguments) } + f.called = false + return f } diff --git a/deps/npm/node_modules/once/package.json b/deps/npm/node_modules/once/package.json index 22671632ef..96af3dedfe 100644 --- a/deps/npm/node_modules/once/package.json +++ b/deps/npm/node_modules/once/package.json @@ -1,6 +1,6 @@ { "name": "once", - "version": "1.1.1", + "version": "1.3.0", "description": "Run a function exactly one time", "main": "once.js", "directories": { @@ -29,7 +29,11 @@ "url": "http://blog.izs.me/" }, "license": "BSD", - "readme": "# once\n\nOnly call a function once.\n\n## usage\n\n```javascript\nvar once = require('once')\n\nfunction load (file, cb) {\n cb = once(cb)\n loader.load('file')\n loader.once('load', cb)\n loader.once('error', cb)\n}\n```\n\nOr add to the Function.prototype in a responsible way:\n\n```javascript\n// only has to be done once\nrequire('once').proto()\n\nfunction load (file, cb) {\n cb = cb.once()\n loader.load('file')\n loader.once('load', cb)\n loader.once('error', cb)\n}\n```\n\nIronically, the prototype feature makes this module twice as\ncomplicated as necessary.\n", - "_id": "once@1.1.1", - "_from": "once" + "readme": "# once\n\nOnly call a function once.\n\n## usage\n\n```javascript\nvar once = require('once')\n\nfunction load (file, cb) {\n cb = once(cb)\n loader.load('file')\n loader.once('load', cb)\n loader.once('error', cb)\n}\n```\n\nOr add to the Function.prototype in a responsible way:\n\n```javascript\n// only has to be done once\nrequire('once').proto()\n\nfunction load (file, cb) {\n cb = cb.once()\n loader.load('file')\n loader.once('load', cb)\n loader.once('error', cb)\n}\n```\n\nIronically, the prototype feature makes this module twice as\ncomplicated as necessary.\n\nTo check whether you function has been called, use `fn.called`. Once the\nfunction is called for the first time the return value of the original\nfunction is saved in `fn.value` and subsequent calls will continue to\nreturn this value.\n\n```javascript\nvar once = require('once')\n\nfunction load (cb) {\n cb = once(cb)\n var stream = createStream()\n stream.once('data', cb)\n stream.once('end', function () {\n if (!cb.called) cb(new Error('not found'))\n })\n}\n```\n", + "readmeFilename": "README.md", + "bugs": { + "url": "https://github.com/isaacs/once/issues" + }, + "_id": "once@1.3.0", + "_from": "once@latest" } diff --git a/deps/npm/node_modules/once/test/once.js b/deps/npm/node_modules/once/test/once.js index f0291a44f0..a77951f110 100644 --- a/deps/npm/node_modules/once/test/once.js +++ b/deps/npm/node_modules/once/test/once.js @@ -8,10 +8,12 @@ test('once', function (t) { f ++ return f + g + this }) + t.notOk(foo.called) for (var i = 0; i < 1E3; i++) { t.same(f, i === 0 ? 0 : 1) var g = foo.call(1, 1) - t.same(g, i === 0 ? 3 : undefined) + t.ok(foo.called) + t.same(g, 3) t.same(f, 1) } t.end() diff --git a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/AUTHORS b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/AUTHORS index c64debf745..10860f72bc 100644 --- a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/AUTHORS +++ b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/AUTHORS @@ -1,3 +1,4 @@ # Names sorted by how much code was originally theirs. Isaac Z. Schlueter <i@izs.me> -Meryn Stol <merynstol@gmail.com>
\ No newline at end of file +Meryn Stol <merynstol@gmail.com> +Robert Kowalski <rok@kowalski.gd>
\ No newline at end of file diff --git a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/README.md b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/README.md index ee1d72d811..9b9adcc2d1 100644 --- a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/README.md +++ b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/README.md @@ -70,11 +70,13 @@ If the supplied data has an invalid name or version vield, `normalizeData` will * The values in `optionalDependencies` get added to `dependencies`. The `optionalDependencies` array is left untouched. * If `description` field does not exists, but `readme` field does, then (more or less) the first paragraph of text that's found in the readme is taken as value for `description`. * If `repository` field is a string, it will become an object with `url` set to the original string value, and `type` set to `"git"`. +* If `repository.url` is not a valid url, but in the style of "[owner-name]/[repo-name]", `repository.url` will be set to git://github.com/[owner-name]/[repo-name] * If `bugs` field is a string, the value of `bugs` field is changed into an object with `url` set to the original string value. * If `bugs` field does not exist, but `repository` field points to a repository hosted on GitHub, the value of the `bugs` field gets set to an url in the form of https://github.com/[owner-name]/[repo-name]/issues . If the repository field points to a GitHub Gist repo url, the associated http url is chosen. * If `bugs` field is an object, the resulting value only has email and url properties. If email and url properties are not strings, they are ignored. If no valid values for either email or url is found, bugs field will be removed. * If `homepage` field is not a string, it will be removed. * If the url in the `homepage` field does not specify a protocol, then http is assumed. For example, `myproject.org` will be changed to `http://myproject.org`. +* If `homepage` field does not exist, but `repository` field points to a repository hosted on GitHub, the value of the `homepage` field gets set to an url in the form of https://github.com/[owner-name]/[repo-name]/ . If the repository field points to a GitHub Gist repo url, the associated http url is chosen. ### Rules for name field diff --git a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/core_module_names.json b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/core_module_names.json new file mode 100644 index 0000000000..637c2f0734 --- /dev/null +++ b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/core_module_names.json @@ -0,0 +1,29 @@ +[ +"http", +"events", +"util", +"domain", +"cluster", +"buffer", +"stream", +"crypto", +"tls", +"fs", +"string_decoder", +"path", +"net", +"dgram", +"dns", +"https", +"url", +"punycode", +"readline", +"repl", +"vm", +"child_process", +"assert", +"zlib", +"tty", +"os", +"querystring" +] diff --git a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/extract_description.js b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/extract_description.js index dbeef218bf..83f10aa0a7 100644 --- a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/extract_description.js +++ b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/extract_description.js @@ -3,6 +3,7 @@ module.exports = extractDescription // Extracts description from contents of a readme file in markdown format function extractDescription (d) { if (!d) return; + if (d === "ERROR: No README data found!") return; // the first block of text before the first heading // that isn't the first line heading d = d.trim().split('\n') diff --git a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/fixer.js b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/fixer.js index 7477b0839e..eeb5bbd786 100644 --- a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/fixer.js +++ b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/fixer.js @@ -4,6 +4,7 @@ var depTypes = ["dependencies","devDependencies","optionalDependencies"] var extractDescription = require("./extract_description") var url = require("url") var typos = require("./typos") +var coreModuleNames = require("./core_module_names") var fixer = module.exports = { // default warning function @@ -183,8 +184,8 @@ var fixer = module.exports = { , fixPeople: function(data) { modifyPeople(data, unParsePerson) - modifyPeople(data, parsePerson) - } + modifyPeople(data, parsePerson) + } , fixNameField: function(data, strict) { if (!data.name && !strict) { @@ -197,8 +198,10 @@ var fixer = module.exports = { if (!strict) data.name = data.name.trim() ensureValidName(data.name, strict) + if (coreModuleNames.indexOf(data.name) !== -1) + this.warn(data.name + " is also the name of a node core module.") } - + , fixDescriptionField: function (data) { if (data.description && typeof data.description !== 'string') { @@ -207,16 +210,17 @@ var fixer = module.exports = { } if (data.readme && !data.description) data.description = extractDescription(data.readme) + if(data.description === undefined) delete data.description; if (!data.description) this.warn('No description') } - + , fixReadmeField: function (data) { if (!data.readme) { this.warn("No README data") data.readme = "ERROR: No README data found!" } } - + , fixBugsField: function(data) { if (!data.bugs && data.repository && data.repository.url) { var gh = parseGitHubURL(data.repository.url) @@ -261,8 +265,16 @@ var fixer = module.exports = { } } -, fixHomepageField: function(data) { - if(!data.homepage) return true; +, fixHomepageField: function(data) { + if (!data.homepage && data.repository && data.repository.url) { + var gh = parseGitHubURL(data.repository.url) + if (gh) + data.homepage = gh + else + return true + } else if (!data.homepage) + return true + if(typeof data.homepage !== "string") { this.warn("homepage field must be a string url. Deleted.") return delete data.homepage @@ -323,19 +335,20 @@ function addOptionalDepsToDeps (data, warn) { Object.keys(o).forEach(function (k) { d[k] = o[k] }) - data.dependencies = d + data.dependencies = d } -function depObjectify (deps) { +function depObjectify (deps, type, warn) { if (!deps) return {} if (typeof deps === "string") { deps = deps.trim().split(/[\n\r\s\t ,]+/) } if (!Array.isArray(deps)) return deps + warn("specifying " + type + " as array is deprecated") var o = {} deps.filter(function (d) { return typeof d === "string" - }).forEach(function(d) { + }).forEach(function(d) { d = d.trim().split(/(:?[@\s><=])/) var dn = d.shift() var dv = d.join("") @@ -349,7 +362,7 @@ function depObjectify (deps) { function objectifyDeps (data, warn) { depTypes.forEach(function (type) { if (!data[type]) return; - data[type] = depObjectify(data[type]) + data[type] = depObjectify(data[type], type, warn) }) } diff --git a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/package.json b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/package.json index 91509b7fa2..049a1094fd 100644 --- a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/package.json +++ b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/package.json @@ -1,6 +1,6 @@ { "name": "normalize-package-data", - "version": "0.2.2", + "version": "0.2.6", "author": { "name": "Meryn Stol", "email": "merynstol@gmail.com" @@ -31,17 +31,17 @@ { "name": "Meryn Stol", "email": "merynstol@gmail.com" + }, + { + "name": "Robert Kowalski", + "email": "rok@kowalski.gd" } ], - "readme": "# normalize-package-data [](https://travis-ci.org/meryn/normalize-package-data)\n\nnormalize-package data exports a function that normalizes package metadata. This data is typically found in a package.json file, but in principle could come from any source - for example the npm registry.\n\nnormalize-package-data is used by [read-package-json](https://npmjs.org/package/read-package-json) to normalize the data it reads from a package.json file. In turn, read-package-json is used by [npm](https://npmjs.org/package/npm) and various npm-related tools.\n\n## Installation\n\n```\nnpm install normalize-package-data\n```\n\n## Usage\n\nBasic usage is really simple. You call the function that normalize-package-data exports. Let's call it `normalizeData`.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readfileSync(\"package.json\")\nnormalizeData(packageData)\n// packageData is now normalized\n```\n\n#### Strict mode\n\nYou may activate strict validation by passing true as the second argument.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readfileSync(\"package.json\")\nwarnFn = function(msg) { console.error(msg) }\nnormalizeData(packageData, true)\n// packageData is now normalized\n```\n\nIf strict mode is activated, only Semver 2.0 version strings are accepted. Otherwise, Semver 1.0 strings are accepted as well. Packages must have a name, and the name field must not have contain leading or trailing whitespace.\n\n#### Warnings\n\nOptionally, you may pass a \"warning\" function. It gets called whenever the `normalizeData` function encounters something that doesn't look right. It indicates less than perfect input data.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readfileSync(\"package.json\")\nwarnFn = function(msg) { console.error(msg) }\nnormalizeData(packageData, warnFn)\n// packageData is now normalized. Any number of warnings may have been logged.\n```\n\nYou may combine strict validation with warnings by passing `true` as the second argument, and `warnFn` as third.\n\nWhen `private` field is set to `true`, warnings will be suppressed.\n\n### Potential exceptions\n\nIf the supplied data has an invalid name or version vield, `normalizeData` will throw an error. Depending on where you call `normalizeData`, you may want to catch these errors so can pass them to a callback.\n\n## What normalization (currently) entails\n\n* The value of `name` field gets trimmed (unless in strict mode).\n* The value of the `version` field gets cleaned by `semver.clean`. See [documentation for the semver module](https://github.com/isaacs/node-semver).\n* If `name` and/or `version` fields are missing, they are set to empty strings.\n* If `files` field is not an array, it will be removed.\n* If `bin` field is a string, then `bin` field will become an object with `name` set to the value of the `name` field, and `bin` set to the original string value.\n* If `man` field is a string, it will become an array with the original string as its sole member.\n* If `keywords` field is string, it is considered to be a list of keywords separated by one or more white-space characters. It gets converted to an array by splitting on `\\s+`.\n* All people fields (`author`, `maintainers`, `contributors`) get converted into objects with name, email and url properties.\n* If `bundledDependencies` field (a typo) exists and `bundleDependencies` field does not, `bundledDependencies` will get renamed to `bundleDependencies`.\n* If the value of any of the dependencies fields (`dependencies`, `devDependencies`, `optionalDependencies`) is a string, it gets converted into an object with familiar `name=>value` pairs.\n* The values in `optionalDependencies` get added to `dependencies`. The `optionalDependencies` array is left untouched.\n* If `description` field does not exists, but `readme` field does, then (more or less) the first paragraph of text that's found in the readme is taken as value for `description`.\n* If `repository` field is a string, it will become an object with `url` set to the original string value, and `type` set to `\"git\"`.\n* If `bugs` field is a string, the value of `bugs` field is changed into an object with `url` set to the original string value.\n* If `bugs` field does not exist, but `repository` field points to a repository hosted on GitHub, the value of the `bugs` field gets set to an url in the form of https://github.com/[owner-name]/[repo-name]/issues . If the repository field points to a GitHub Gist repo url, the associated http url is chosen.\n* If `bugs` field is an object, the resulting value only has email and url properties. If email and url properties are not strings, they are ignored. If no valid values for either email or url is found, bugs field will be removed.\n* If `homepage` field is not a string, it will be removed.\n* If the url in the `homepage` field does not specify a protocol, then http is assumed. For example, `myproject.org` will be changed to `http://myproject.org`.\n\n### Rules for name field\n\nIf `name` field is given, the value of the name field must be a string. The string may not:\n\n* start with a period.\n* contain the following characters: `/@\\s+%`\n* contain and characters that would need to be encoded for use in urls.\n* resemble the word `node_modules` or `favicon.ico` (case doesn't matter).\n\n### Rules for version field\n\nIf `version` field is given, the value of the version field must be a valid *semver* string, as determined by the `semver.valid` method. See [documentation for the semver module](https://github.com/isaacs/node-semver).\n\n## Credits\n\nThis package contains code based on read-package-json written by Isaac Z. Schlueter. Used with permisson.\n\n## License\n\nnormalize-package-data is released under the [BSD 2-Clause License](http://opensource.org/licenses/MIT). \nCopyright (c) 2013 Meryn Stol ", + "readme": "# normalize-package-data [](https://travis-ci.org/meryn/normalize-package-data)\n\nnormalize-package data exports a function that normalizes package metadata. This data is typically found in a package.json file, but in principle could come from any source - for example the npm registry.\n\nnormalize-package-data is used by [read-package-json](https://npmjs.org/package/read-package-json) to normalize the data it reads from a package.json file. In turn, read-package-json is used by [npm](https://npmjs.org/package/npm) and various npm-related tools.\n\n## Installation\n\n```\nnpm install normalize-package-data\n```\n\n## Usage\n\nBasic usage is really simple. You call the function that normalize-package-data exports. Let's call it `normalizeData`.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readfileSync(\"package.json\")\nnormalizeData(packageData)\n// packageData is now normalized\n```\n\n#### Strict mode\n\nYou may activate strict validation by passing true as the second argument.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readfileSync(\"package.json\")\nwarnFn = function(msg) { console.error(msg) }\nnormalizeData(packageData, true)\n// packageData is now normalized\n```\n\nIf strict mode is activated, only Semver 2.0 version strings are accepted. Otherwise, Semver 1.0 strings are accepted as well. Packages must have a name, and the name field must not have contain leading or trailing whitespace.\n\n#### Warnings\n\nOptionally, you may pass a \"warning\" function. It gets called whenever the `normalizeData` function encounters something that doesn't look right. It indicates less than perfect input data.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readfileSync(\"package.json\")\nwarnFn = function(msg) { console.error(msg) }\nnormalizeData(packageData, warnFn)\n// packageData is now normalized. Any number of warnings may have been logged.\n```\n\nYou may combine strict validation with warnings by passing `true` as the second argument, and `warnFn` as third.\n\nWhen `private` field is set to `true`, warnings will be suppressed.\n\n### Potential exceptions\n\nIf the supplied data has an invalid name or version vield, `normalizeData` will throw an error. Depending on where you call `normalizeData`, you may want to catch these errors so can pass them to a callback.\n\n## What normalization (currently) entails\n\n* The value of `name` field gets trimmed (unless in strict mode).\n* The value of the `version` field gets cleaned by `semver.clean`. See [documentation for the semver module](https://github.com/isaacs/node-semver).\n* If `name` and/or `version` fields are missing, they are set to empty strings.\n* If `files` field is not an array, it will be removed.\n* If `bin` field is a string, then `bin` field will become an object with `name` set to the value of the `name` field, and `bin` set to the original string value.\n* If `man` field is a string, it will become an array with the original string as its sole member.\n* If `keywords` field is string, it is considered to be a list of keywords separated by one or more white-space characters. It gets converted to an array by splitting on `\\s+`.\n* All people fields (`author`, `maintainers`, `contributors`) get converted into objects with name, email and url properties.\n* If `bundledDependencies` field (a typo) exists and `bundleDependencies` field does not, `bundledDependencies` will get renamed to `bundleDependencies`.\n* If the value of any of the dependencies fields (`dependencies`, `devDependencies`, `optionalDependencies`) is a string, it gets converted into an object with familiar `name=>value` pairs.\n* The values in `optionalDependencies` get added to `dependencies`. The `optionalDependencies` array is left untouched.\n* If `description` field does not exists, but `readme` field does, then (more or less) the first paragraph of text that's found in the readme is taken as value for `description`.\n* If `repository` field is a string, it will become an object with `url` set to the original string value, and `type` set to `\"git\"`.\n* If `repository.url` is not a valid url, but in the style of \"[owner-name]/[repo-name]\", `repository.url` will be set to git://github.com/[owner-name]/[repo-name]\n* If `bugs` field is a string, the value of `bugs` field is changed into an object with `url` set to the original string value.\n* If `bugs` field does not exist, but `repository` field points to a repository hosted on GitHub, the value of the `bugs` field gets set to an url in the form of https://github.com/[owner-name]/[repo-name]/issues . If the repository field points to a GitHub Gist repo url, the associated http url is chosen.\n* If `bugs` field is an object, the resulting value only has email and url properties. If email and url properties are not strings, they are ignored. If no valid values for either email or url is found, bugs field will be removed.\n* If `homepage` field is not a string, it will be removed.\n* If the url in the `homepage` field does not specify a protocol, then http is assumed. For example, `myproject.org` will be changed to `http://myproject.org`.\n* If `homepage` field does not exist, but `repository` field points to a repository hosted on GitHub, the value of the `homepage` field gets set to an url in the form of https://github.com/[owner-name]/[repo-name]/ . If the repository field points to a GitHub Gist repo url, the associated http url is chosen.\n\n### Rules for name field\n\nIf `name` field is given, the value of the name field must be a string. The string may not:\n\n* start with a period.\n* contain the following characters: `/@\\s+%`\n* contain and characters that would need to be encoded for use in urls.\n* resemble the word `node_modules` or `favicon.ico` (case doesn't matter).\n\n### Rules for version field\n\nIf `version` field is given, the value of the version field must be a valid *semver* string, as determined by the `semver.valid` method. See [documentation for the semver module](https://github.com/isaacs/node-semver).\n\n## Credits\n\nThis package contains code based on read-package-json written by Isaac Z. Schlueter. Used with permisson.\n\n## License\n\nnormalize-package-data is released under the [BSD 2-Clause License](http://opensource.org/licenses/MIT). \nCopyright (c) 2013 Meryn Stol ", "readmeFilename": "README.md", "bugs": { "url": "https://github.com/meryn/normalize-package-data/issues" }, - "_id": "normalize-package-data@0.2.2", - "dist": { - "shasum": "ff276c97296154b99ca2af9cefbe3a6a3bde07bb" - }, - "_from": "normalize-package-data@~0.2", - "_resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.2.tgz" + "_id": "normalize-package-data@0.2.6", + "_from": "normalize-package-data@~0.2" } diff --git a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/consistency.js b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/consistency.js index 8ae6b27301..4082be25cc 100644 --- a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/consistency.js +++ b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/consistency.js @@ -24,7 +24,7 @@ tap.test("consistent normalization", function(t) { clonedData = _.clone(data) normalize(data, warn) t.deepEqual(clonedData, data, - "Normalization of " + entryName + "is consistent.") + "Normalization of " + entryName + " is consistent.") next(null) }) // fs.readFile } // verifyConsistency diff --git a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/fixtures/no-description.json b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/fixtures/no-description.json new file mode 100644 index 0000000000..9ea70b6bf8 --- /dev/null +++ b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/fixtures/no-description.json @@ -0,0 +1,4 @@ +{ + "name": "foo-bar-package", + "version": "0.0.1" +}
\ No newline at end of file diff --git a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/normalize.js b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/normalize.js index 1178fc6479..6e96e6dc97 100644 --- a/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/normalize.js +++ b/deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/test/normalize.js @@ -55,6 +55,30 @@ tap.test("empty object", function(t) { t.end() }) +tap.test("core module name", function(t) { + var warnings = [] + function warn(m) { + warnings.push(m) + } + var a + normalize(a={ + name: "http", + readme: "read yourself how about", + homepage: 123, + bugs: "what is this i don't even", + repository: "Hello." + }, warn) + + var expect = [ + "http is also the name of a node core module.", + "Bug string field must be url, email, or {email,url}", + "Normalized value of bugs field is an empty object. Deleted.", + "homepage field must be a string url. Deleted." + ] + t.same(warnings, expect) + t.end() +}) + tap.test("urls required", function(t) { var warnings = [] function warn(w) { @@ -143,6 +167,50 @@ tap.test("treat isaacs/node-graceful-fs as github repo", function(t) { t.end() }); +tap.test("homepage field will set to github url if repository is a github repo", function(t) { + var a + normalize(a={ + repository: { type: "git", url: "git://github.com/isaacs/node-graceful-fs" } + }) + t.same(a.homepage, 'https://github.com/isaacs/node-graceful-fs') + t.end() +}) + +tap.test("homepage field will set to github gist url if repository is a gist", function(t) { + var a + normalize(a={ + repository: { type: "git", url: "git@gist.github.com:123456.git" } + }) + t.same(a.homepage, 'https://gist.github.com/123456') + t.end() +}) + +tap.test("homepage field will set to github gist url if repository is a shorthand reference", function(t) { + var a + normalize(a={ + repository: { type: "git", url: "sindresorhus/chalk" } + }) + t.same(a.homepage, 'https://github.com/sindresorhus/chalk') + t.end() +}) + +tap.test("deprecation warning for array in dependencies fields", function(t) { + var a + var warnings = [] + function warn(w) { + warnings.push(w) + } + normalize(a={ + dependencies: [], + devDependencies: [], + optionalDependencies: [] + }, warn) + t.ok(~warnings.indexOf("specifying dependencies as array is deprecated"), "deprecation warning") + t.ok(~warnings.indexOf("specifying devDependencies as array is deprecated"), "deprecation warning") + t.ok(~warnings.indexOf("specifying optionalDependencies as array is deprecated"), "deprecation warning") + t.end() +}) + tap.test('no new globals', function(t) { t.same(Object.keys(global), globals) t.end() diff --git a/deps/npm/node_modules/read-package-json/package.json b/deps/npm/node_modules/read-package-json/package.json index 0e7e107db0..58e8d5908b 100644 --- a/deps/npm/node_modules/read-package-json/package.json +++ b/deps/npm/node_modules/read-package-json/package.json @@ -34,9 +34,5 @@ "url": "https://github.com/isaacs/read-package-json/issues" }, "_id": "read-package-json@1.1.3", - "dist": { - "shasum": "0c2fbf428e324026e29812eebdfbacfe729a4c71" - }, - "_from": "read-package-json@~1.1.3", - "_resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.1.3.tgz" + "_from": "read-package-json@latest" } diff --git a/deps/npm/node_modules/slide/package.json b/deps/npm/node_modules/slide/package.json index f433955ee0..cc74411825 100644 --- a/deps/npm/node_modules/slide/package.json +++ b/deps/npm/node_modules/slide/package.json @@ -31,5 +31,5 @@ "url": "https://github.com/isaacs/slide-flow-control/issues" }, "_id": "slide@1.1.5", - "_from": "slide@~1.1.4" + "_from": "slide@latest" } diff --git a/deps/npm/package.json b/deps/npm/package.json index d181514d6f..14c4a2b25a 100644 --- a/deps/npm/package.json +++ b/deps/npm/package.json @@ -1,5 +1,5 @@ { - "version": "1.3.11", + "version": "1.3.12", "name": "npm", "publishConfig": { "proprietary-attribs": false @@ -47,16 +47,16 @@ "tar": "~0.1.18", "fstream": "~0.1.23", "block-stream": "0.0.7", - "mkdirp": "~0.3.3", + "mkdirp": "~0.3.5", "read": "~1.0.4", "lru-cache": "~2.3.1", "node-gyp": "~0.10.10", - "fstream-npm": "~0.1.3", + "fstream-npm": "~0.1.6", "uid-number": "0", "archy": "0", "chownr": "0", - "npmlog": "0.0.4", - "ansi": "~0.1.2", + "npmlog": "0.0.6", + "ansi": "~0.2.1", "npm-registry-client": "~0.2.28", "read-package-json": "~1.1.3", "read-installed": "~0.2.2", @@ -65,16 +65,17 @@ "osenv": "0", "lockfile": "~0.4.0", "retry": "~0.6.0", - "once": "~1.1.1", - "npmconf": "~0.1.2", + "once": "~1.3.0", + "npmconf": "~0.1.5", "opener": "~1.3.0", "chmodr": "~0.1.0", - "cmd-shim": "~1.0.1", + "cmd-shim": "~1.1.1", "sha": "~1.2.1", - "editor": "0.0.4", + "editor": "0.0.5", "child-process-close": "~0.1.1", "npm-user-validate": "0.0.3", - "github-url-from-git": "1.1.1" + "github-url-from-git": "1.1.1", + "github-url-from-username-repo": "0.0.2" }, "bundleDependencies": [ "semver", @@ -118,12 +119,13 @@ "child-process-close", "editor", "npm-user-validate", - "github-url-from-git" + "github-url-from-git", + "github-url-from-username-repo" ], "devDependencies": { "ronn": "~0.3.6", "tap": "~0.4.0", - "npm-registry-mock": "~0.3.0" + "npm-registry-mock": "~0.5.3" }, "engines": { "node": ">=0.6", @@ -132,7 +134,7 @@ "scripts": { "test": "node ./test/run.js && tap test/tap/*.js", "tap": "tap test/tap/*.js", - "prepublish": "node bin/npm-cli.js prune ; rm -rf test/*/*/node_modules ; make -j4 doc", + "prepublish": "node bin/npm-cli.js prune --prefix=. --no-global && rm -rf test/*/*/node_modules && make -j4 doc", "dumpconf": "env | grep npm | sort | uniq", "echo": "node bin/npm-cli.js" }, diff --git a/deps/npm/test/packages/npm-test-peer-deps/npm-ls.json b/deps/npm/test/packages/npm-test-peer-deps/npm-ls.json index 25a3ce747f..79bf5ac6c7 100644 --- a/deps/npm/test/packages/npm-test-peer-deps/npm-ls.json +++ b/deps/npm/test/packages/npm-test-peer-deps/npm-ls.json @@ -1,8 +1,8 @@ { "npm-test-peer-deps-file": { "version": "1.2.3", - "from": "https://raw.github.com/gist/3971128/3f6aa37b4fa1186c2f47da9b77dcc4ec496e3483/index.js", - "resolved": "https://raw.github.com/gist/3971128/3f6aa37b4fa1186c2f47da9b77dcc4ec496e3483/index.js", + "from": "https://gist.github.com/domenic/3971128/raw/7472b26a013ceb174c2d726314e9fa97465729bb/index.js", + "resolved": "https://gist.github.com/domenic/3971128/raw/7472b26a013ceb174c2d726314e9fa97465729bb/index.js", "dependencies": { "opener": { "version": "1.3.0", diff --git a/deps/npm/test/packages/npm-test-peer-deps/package.json b/deps/npm/test/packages/npm-test-peer-deps/package.json index a132fe1b27..d98f53bd04 100644 --- a/deps/npm/test/packages/npm-test-peer-deps/package.json +++ b/deps/npm/test/packages/npm-test-peer-deps/package.json @@ -3,7 +3,7 @@ "name": "npm-test-peer-deps", "version": "0.0.0", "dependencies": { - "npm-test-peer-deps-file": "https://raw.github.com/gist/3971128/3f6aa37b4fa1186c2f47da9b77dcc4ec496e3483/index.js" + "npm-test-peer-deps-file": "https://gist.github.com/domenic/3971128/raw/7472b26a013ceb174c2d726314e9fa97465729bb/index.js" }, "scripts": { "test": "node test.js" diff --git a/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json b/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json index db5da040c1..09a034141f 100644 --- a/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json +++ b/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json @@ -4,7 +4,7 @@ "dependencies": { "npm-test-single-file": { "version": "1.2.3", - "resolved": "https://raw.github.com/gist/1837112/index.js" + "resolved": "https://gist.github.com/isaacs/1837112/raw/9ef57a59fc22aeb1d1ca346b68826dcb638b8416/index.js" }, "glob": { "version": "3.1.5", diff --git a/deps/npm/test/packages/npm-test-shrinkwrap/package.json b/deps/npm/test/packages/npm-test-shrinkwrap/package.json index bbabe89db9..a5d446e2d1 100644 --- a/deps/npm/test/packages/npm-test-shrinkwrap/package.json +++ b/deps/npm/test/packages/npm-test-shrinkwrap/package.json @@ -3,7 +3,7 @@ "name": "npm-test-shrinkwrap", "version": "0.0.0", "dependencies": { - "npm-test-single-file": "https://raw.github.com/gist/1837112/index.js", + "npm-test-single-file": "https://gist.github.com/isaacs/1837112/raw/9ef57a59fc22aeb1d1ca346b68826dcb638b8416/index.js", "glob": "git://github.com/isaacs/node-glob.git#npm-test", "minimatch": "~0.1.0" }, diff --git a/deps/npm/test/tap/fixtures/underscore-1-3-3.json b/deps/npm/test/tap/fixtures/underscore-1-3-3.json deleted file mode 100644 index 01da300276..0000000000 --- a/deps/npm/test/tap/fixtures/underscore-1-3-3.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.3.3","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"_id":"underscore@1.3.3","dependencies":{},"devDependencies":{},"optionalDependencies":{},"engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.1.1","_nodeVersion":"v0.6.11","_defaultsLoaded":true,"dist":{"shasum":"47ac53683daf832bfa952e1774417da47817ae42","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.3.3.tgz"},"readme":" __ \n /\\ \\ __ \n __ __ ___ \\_\\ \\ __ _ __ ____ ___ ___ _ __ __ /\\_\\ ____ \n /\\ \\/\\ \\ /' _ `\\ /'_ \\ /'__`\\/\\ __\\/ ,__\\ / ___\\ / __`\\/\\ __\\/'__`\\ \\/\\ \\ /',__\\ \n \\ \\ \\_\\ \\/\\ \\/\\ \\/\\ \\ \\ \\/\\ __/\\ \\ \\//\\__, `\\/\\ \\__//\\ \\ \\ \\ \\ \\//\\ __/ __ \\ \\ \\/\\__, `\\\n \\ \\____/\\ \\_\\ \\_\\ \\___,_\\ \\____\\\\ \\_\\\\/\\____/\\ \\____\\ \\____/\\ \\_\\\\ \\____\\/\\_\\ _\\ \\ \\/\\____/\n \\/___/ \\/_/\\/_/\\/__,_ /\\/____/ \\/_/ \\/___/ \\/____/\\/___/ \\/_/ \\/____/\\/_//\\ \\_\\ \\/___/ \n \\ \\____/ \n \\/___/\n \nUnderscore.js is a utility-belt library for JavaScript that provides \nsupport for the usual functional suspects (each, map, reduce, filter...) \nwithout extending any core JavaScript objects.\n\nFor Docs, License, Tests, and pre-packed downloads, see:\nhttp://documentcloud.github.com/underscore/\n\nMany thanks to our contributors:\nhttps://github.com/documentcloud/underscore/contributors\n","maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}}
\ No newline at end of file diff --git a/deps/npm/test/tap/fixtures/underscore.json b/deps/npm/test/tap/fixtures/underscore.json deleted file mode 100644 index 32c2bde8f8..0000000000 --- a/deps/npm/test/tap/fixtures/underscore.json +++ /dev/null @@ -1 +0,0 @@ -{"_id":"underscore","_rev":"119-a5be0bcbbb6f45bd345730eca56c65e9","name":"underscore","description":"JavaScript's functional programming helper library.","dist-tags":{"latest":"1.4.4","stable":"1.4.4"},"versions":{"1.0.3":{"name":"underscore","description":"Functional programming aid for JavaScript. Works well with jQuery.","url":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"lib":".","main":"underscore","version":"1.0.3","_id":"underscore@1.0.3","engines":{"node":"*"},"_nodeSupported":true,"_npmVersion":"0.2.7-2","_nodeVersion":"v0.3.1-pre","dist":{"tarball":"http://registry.npmjs.org/underscore/-/underscore-1.0.3.tgz","shasum":"7793a6f776dffa491d224eaf1d819824d4dc288a"},"directories":{},"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}]},"1.0.4":{"name":"underscore","description":"Functional programming aid for JavaScript. Works well with jQuery.","url":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"lib":".","main":"underscore","version":"1.0.4","_id":"underscore@1.0.4","engines":{"node":"*"},"_nodeSupported":true,"_npmVersion":"0.2.7-2","_nodeVersion":"v0.3.1-pre","dist":{"tarball":"http://registry.npmjs.org/underscore/-/underscore-1.0.4.tgz","shasum":"563141126b4e412f6c12c2ae2fb44ef0edd23fb2"},"directories":{},"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}]},"1.1.0":{"name":"underscore","description":"Functional programming aid for JavaScript. Works well with jQuery.","url":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"lib":".","main":"underscore","version":"1.1.0","_id":"underscore@1.1.0","engines":{"node":"*"},"_nodeSupported":true,"_npmVersion":"0.2.7-2","_nodeVersion":"v0.3.1-pre","dist":{"tarball":"http://registry.npmjs.org/underscore/-/underscore-1.1.0.tgz","shasum":"8bf44d9cc8c3a614d7940035522e1f95b682b071"},"directories":{},"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}]},"1.1.1":{"name":"underscore","description":"Functional programming aid for JavaScript. Works well with jQuery.","url":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"lib":".","main":"underscore","version":"1.1.1","_id":"underscore@1.1.1","engines":{"node":"*"},"_nodeSupported":true,"_npmVersion":"0.2.7-2","_nodeVersion":"v0.3.1-pre","dist":{"tarball":"http://registry.npmjs.org/underscore/-/underscore-1.1.1.tgz","shasum":"65dddb8cd0ee3f0094f46db72ea269d5a4f5fca4"},"directories":{},"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}]},"1.1.2":{"name":"underscore","description":"Functional programming aid for JavaScript. Works well with jQuery.","url":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"lib":".","main":"underscore","version":"1.1.2","_id":"underscore@1.1.2","engines":{"node":"*"},"_nodeSupported":true,"_npmVersion":"0.2.7-2","_nodeVersion":"v0.3.1-pre","dist":{"tarball":"http://registry.npmjs.org/underscore/-/underscore-1.1.2.tgz","shasum":"8cf4ae3900c32f3e3f06579d473a45ad768251e8"},"directories":{},"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}]},"1.1.3":{"name":"underscore","description":"Functional programming aid for JavaScript. Works well with jQuery.","url":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"lib":".","main":"underscore","version":"1.1.3","_id":"underscore@1.1.3","engines":{"node":"*"},"_nodeSupported":true,"_npmVersion":"0.2.8-1","_nodeVersion":"v0.2.5","dist":{"tarball":"http://registry.npmjs.org/underscore/-/underscore-1.1.3.tgz","shasum":"6bd1969042a65bd3966d8924c14909f2284631dd"},"directories":{},"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}]},"1.1.4":{"name":"underscore","description":"Functional programming aid for JavaScript. Works well with jQuery.","url":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"lib":".","main":"underscore.js","version":"1.1.4","_id":"underscore@1.1.4","engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"0.3.9","_nodeVersion":"v0.5.0-pre","dist":{"shasum":"9e82274902865625b3a6d4c315a38ffd80047dae","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.1.4.tgz"},"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.1.5":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.1.5","_id":"underscore@1.1.5","engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"0.3.16","_nodeVersion":"v0.4.2","directories":{},"files":[""],"_defaultsLoaded":true,"dist":{"shasum":"23601d62c75619998b2f0db24938102793336a56","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.1.5.tgz"},"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}]},"1.1.6":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.1.6","_id":"underscore@1.1.6","engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"0.3.18","_nodeVersion":"v0.4.2","directories":{},"files":[""],"_defaultsLoaded":true,"dist":{"shasum":"6868da1bdd72d75285be0b4e50f228e70d001a2c","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.1.6.tgz"},"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}]},"1.1.7":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.1.7","devDependencies":{},"_id":"underscore@1.1.7","engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.0.3","_nodeVersion":"v0.4.7","_defaultsLoaded":true,"dist":{"shasum":"40bab84bad19d230096e8d6ef628bff055d83db0","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.1.7.tgz"},"scripts":{},"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.2.0":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.2.0","_npmJsonOpts":{"file":"/Users/jashkenas/.npm/underscore/1.2.0/package/package.json","wscript":false,"contributors":false,"serverjs":false},"_id":"underscore@1.2.0","devDependencies":{},"engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.0.22","_nodeVersion":"v0.4.10","_defaultsLoaded":true,"dist":{"shasum":"b32ce32c8c118caa8031c10b54c7f65ab3b557fd","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.2.0.tgz"},"scripts":{},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"directories":{}},"1.2.1":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.2.1","_npmJsonOpts":{"file":"/Users/jashkenas/.npm/underscore/1.2.1/package/package.json","wscript":false,"contributors":false,"serverjs":false},"_id":"underscore@1.2.1","devDependencies":{},"engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.0.22","_nodeVersion":"v0.4.10","_defaultsLoaded":true,"dist":{"shasum":"fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"},"scripts":{},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"directories":{}},"1.2.2":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.2.2","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"_id":"underscore@1.2.2","devDependencies":{},"engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.0.104","_nodeVersion":"v0.6.0","_defaultsLoaded":true,"dist":{"shasum":"74dd40e9face84e724eb2edae945b8aedc233ba3","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.2.2.tgz"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.2.3":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"dependencies":{},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.2.3","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"_id":"underscore@1.2.3","devDependencies":{},"engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.0.104","_nodeVersion":"v0.6.0","_defaultsLoaded":true,"dist":{"shasum":"11b874da70f4683d7d48bba2b44be1e600d2f6cf","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.2.3.tgz"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.2.4":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.2.4","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"_id":"underscore@1.2.4","dependencies":{},"devDependencies":{},"engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.0.104","_nodeVersion":"v0.6.6","_defaultsLoaded":true,"dist":{"shasum":"e8da6241aa06f64df2473bb2590b8c17c84c3c7e","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.2.4.tgz"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.3.0":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"contributors":[],"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.3.0","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"_id":"underscore@1.3.0","dependencies":{},"devDependencies":{},"engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.0.104","_nodeVersion":"v0.6.6","_defaultsLoaded":true,"dist":{"shasum":"253b2d79b7bb67943ced0fc744eb18267963ede8","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.3.0.tgz"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.3.1":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.3.1","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"_id":"underscore@1.3.1","dependencies":{},"devDependencies":{},"engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.0.104","_nodeVersion":"v0.6.6","_defaultsLoaded":true,"dist":{"shasum":"6cb8aad0e77eb5dbbfb54b22bcd8697309cf9641","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.3.1.tgz"},"maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.3.2":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.3.2","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"_id":"underscore@1.3.2","dependencies":{},"devDependencies":{},"optionalDependencies":{},"engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.1.1","_nodeVersion":"v0.6.11","_defaultsLoaded":true,"dist":{"shasum":"1b4e455089ab1d1d38ab6794ffe6cf08f764394a","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.3.2.tgz"},"readme":" __ \n /\\ \\ __ \n __ __ ___ \\_\\ \\ __ _ __ ____ ___ ___ _ __ __ /\\_\\ ____ \n /\\ \\/\\ \\ /' _ `\\ /'_ \\ /'__`\\/\\ __\\/ ,__\\ / ___\\ / __`\\/\\ __\\/'__`\\ \\/\\ \\ /',__\\ \n \\ \\ \\_\\ \\/\\ \\/\\ \\/\\ \\ \\ \\/\\ __/\\ \\ \\//\\__, `\\/\\ \\__//\\ \\ \\ \\ \\ \\//\\ __/ __ \\ \\ \\/\\__, `\\\n \\ \\____/\\ \\_\\ \\_\\ \\___,_\\ \\____\\\\ \\_\\\\/\\____/\\ \\____\\ \\____/\\ \\_\\\\ \\____\\/\\_\\ _\\ \\ \\/\\____/\n \\/___/ \\/_/\\/_/\\/__,_ /\\/____/ \\/_/ \\/___/ \\/____/\\/___/ \\/_/ \\/____/\\/_//\\ \\_\\ \\/___/ \n \\ \\____/ \n \\/___/\n \nUnderscore.js is a utility-belt library for JavaScript that provides \nsupport for the usual functional suspects (each, map, reduce, filter...) \nwithout extending any core JavaScript objects.\n\nFor Docs, License, Tests, and pre-packed downloads, see:\nhttp://documentcloud.github.com/underscore/\n\nMany thanks to our contributors:\nhttps://github.com/documentcloud/underscore/contributors\n","maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.3.3":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://documentcloud.github.com/underscore/","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.3.3","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"_id":"underscore@1.3.3","dependencies":{},"devDependencies":{},"optionalDependencies":{},"engines":{"node":"*"},"_engineSupported":true,"_npmVersion":"1.1.1","_nodeVersion":"v0.6.11","_defaultsLoaded":true,"dist":{"shasum":"47ac53683daf832bfa952e1774417da47817ae42","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.3.3.tgz"},"readme":" __ \n /\\ \\ __ \n __ __ ___ \\_\\ \\ __ _ __ ____ ___ ___ _ __ __ /\\_\\ ____ \n /\\ \\/\\ \\ /' _ `\\ /'_ \\ /'__`\\/\\ __\\/ ,__\\ / ___\\ / __`\\/\\ __\\/'__`\\ \\/\\ \\ /',__\\ \n \\ \\ \\_\\ \\/\\ \\/\\ \\/\\ \\ \\ \\/\\ __/\\ \\ \\//\\__, `\\/\\ \\__//\\ \\ \\ \\ \\ \\//\\ __/ __ \\ \\ \\/\\__, `\\\n \\ \\____/\\ \\_\\ \\_\\ \\___,_\\ \\____\\\\ \\_\\\\/\\____/\\ \\____\\ \\____/\\ \\_\\\\ \\____\\/\\_\\ _\\ \\ \\/\\____/\n \\/___/ \\/_/\\/_/\\/__,_ /\\/____/ \\/_/ \\/___/ \\/____/\\/___/ \\/_/ \\/____/\\/_//\\ \\_\\ \\/___/ \n \\ \\____/ \n \\/___/\n \nUnderscore.js is a utility-belt library for JavaScript that provides \nsupport for the usual functional suspects (each, map, reduce, filter...) \nwithout extending any core JavaScript objects.\n\nFor Docs, License, Tests, and pre-packed downloads, see:\nhttp://documentcloud.github.com/underscore/\n\nMany thanks to our contributors:\nhttps://github.com/documentcloud/underscore/contributors\n","maintainers":[{"name":"documentcloud","email":"jeremy@documentcloud.org"},{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.4.0":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://underscorejs.org","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.4.0","readme":" __\n /\\ \\ __\n __ __ ___ \\_\\ \\ __ _ __ ____ ___ ___ _ __ __ /\\_\\ ____\n /\\ \\/\\ \\ /' _ `\\ /'_ \\ /'__`\\/\\ __\\/ ,__\\ / ___\\ / __`\\/\\ __\\/'__`\\ \\/\\ \\ /',__\\\n \\ \\ \\_\\ \\/\\ \\/\\ \\/\\ \\ \\ \\/\\ __/\\ \\ \\//\\__, `\\/\\ \\__//\\ \\ \\ \\ \\ \\//\\ __/ __ \\ \\ \\/\\__, `\\\n \\ \\____/\\ \\_\\ \\_\\ \\___,_\\ \\____\\\\ \\_\\\\/\\____/\\ \\____\\ \\____/\\ \\_\\\\ \\____\\/\\_\\ _\\ \\ \\/\\____/\n \\/___/ \\/_/\\/_/\\/__,_ /\\/____/ \\/_/ \\/___/ \\/____/\\/___/ \\/_/ \\/____/\\/_//\\ \\_\\ \\/___/\n \\ \\____/\n \\/___/\n\nUnderscore.js is a utility-belt library for JavaScript that provides\nsupport for the usual functional suspects (each, map, reduce, filter...)\nwithout extending any core JavaScript objects.\n\nFor Docs, License, Tests, and pre-packed downloads, see:\nhttp://underscorejs.org\n\nMany thanks to our contributors:\nhttps://github.com/documentcloud/underscore/contributors\n","_id":"underscore@1.4.0","dist":{"shasum":"caaf510c272cbb53748a225dcfd906e5f5a5ccdd","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.4.0.tgz"},"_npmVersion":"1.1.49","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.4.1":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://underscorejs.org","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.4.1","readme":" __\n /\\ \\ __\n __ __ ___ \\_\\ \\ __ _ __ ____ ___ ___ _ __ __ /\\_\\ ____\n /\\ \\/\\ \\ /' _ `\\ /'_ \\ /'__`\\/\\ __\\/ ,__\\ / ___\\ / __`\\/\\ __\\/'__`\\ \\/\\ \\ /',__\\\n \\ \\ \\_\\ \\/\\ \\/\\ \\/\\ \\ \\ \\/\\ __/\\ \\ \\//\\__, `\\/\\ \\__//\\ \\ \\ \\ \\ \\//\\ __/ __ \\ \\ \\/\\__, `\\\n \\ \\____/\\ \\_\\ \\_\\ \\___,_\\ \\____\\\\ \\_\\\\/\\____/\\ \\____\\ \\____/\\ \\_\\\\ \\____\\/\\_\\ _\\ \\ \\/\\____/\n \\/___/ \\/_/\\/_/\\/__,_ /\\/____/ \\/_/ \\/___/ \\/____/\\/___/ \\/_/ \\/____/\\/_//\\ \\_\\ \\/___/\n \\ \\____/\n \\/___/\n\nUnderscore.js is a utility-belt library for JavaScript that provides\nsupport for the usual functional suspects (each, map, reduce, filter...)\nwithout extending any core JavaScript objects.\n\nFor Docs, License, Tests, and pre-packed downloads, see:\nhttp://underscorejs.org\n\nMany thanks to our contributors:\nhttps://github.com/documentcloud/underscore/contributors\n","_id":"underscore@1.4.1","dist":{"shasum":"f6a25ffe5d6d3ed4fe8fef37c3a9bfe689b16bb9","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.4.1.tgz"},"_npmVersion":"1.1.49","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.4.2":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://underscorejs.org","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.4.2","readme":" __\n /\\ \\ __\n __ __ ___ \\_\\ \\ __ _ __ ____ ___ ___ _ __ __ /\\_\\ ____\n /\\ \\/\\ \\ /' _ `\\ /'_ \\ /'__`\\/\\ __\\/ ,__\\ / ___\\ / __`\\/\\ __\\/'__`\\ \\/\\ \\ /',__\\\n \\ \\ \\_\\ \\/\\ \\/\\ \\/\\ \\ \\ \\/\\ __/\\ \\ \\//\\__, `\\/\\ \\__//\\ \\ \\ \\ \\ \\//\\ __/ __ \\ \\ \\/\\__, `\\\n \\ \\____/\\ \\_\\ \\_\\ \\___,_\\ \\____\\\\ \\_\\\\/\\____/\\ \\____\\ \\____/\\ \\_\\\\ \\____\\/\\_\\ _\\ \\ \\/\\____/\n \\/___/ \\/_/\\/_/\\/__,_ /\\/____/ \\/_/ \\/___/ \\/____/\\/___/ \\/_/ \\/____/\\/_//\\ \\_\\ \\/___/\n \\ \\____/\n \\/___/\n\nUnderscore.js is a utility-belt library for JavaScript that provides\nsupport for the usual functional suspects (each, map, reduce, filter...)\nwithout extending any core JavaScript objects.\n\nFor Docs, License, Tests, and pre-packed downloads, see:\nhttp://underscorejs.org\n\nMany thanks to our contributors:\nhttps://github.com/documentcloud/underscore/contributors\n","_id":"underscore@1.4.2","dist":{"shasum":"cb2aae6a7999a89fd55aaee75bce0311698cebfb","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.4.2.tgz"},"_npmVersion":"1.1.49","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.4.3":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://underscorejs.org","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.4.3","readme":" __\n /\\ \\ __\n __ __ ___ \\_\\ \\ __ _ __ ____ ___ ___ _ __ __ /\\_\\ ____\n /\\ \\/\\ \\ /' _ `\\ /'_ \\ /'__`\\/\\ __\\/ ,__\\ / ___\\ / __`\\/\\ __\\/'__`\\ \\/\\ \\ /',__\\\n \\ \\ \\_\\ \\/\\ \\/\\ \\/\\ \\ \\ \\/\\ __/\\ \\ \\//\\__, `\\/\\ \\__//\\ \\ \\ \\ \\ \\//\\ __/ __ \\ \\ \\/\\__, `\\\n \\ \\____/\\ \\_\\ \\_\\ \\___,_\\ \\____\\\\ \\_\\\\/\\____/\\ \\____\\ \\____/\\ \\_\\\\ \\____\\/\\_\\ _\\ \\ \\/\\____/\n \\/___/ \\/_/\\/_/\\/__,_ /\\/____/ \\/_/ \\/___/ \\/____/\\/___/ \\/_/ \\/____/\\/_//\\ \\_\\ \\/___/\n \\ \\____/\n \\/___/\n\nUnderscore.js is a utility-belt library for JavaScript that provides\nsupport for the usual functional suspects (each, map, reduce, filter...)\nwithout extending any core JavaScript objects.\n\nFor Docs, License, Tests, and pre-packed downloads, see:\nhttp://underscorejs.org\n\nMany thanks to our contributors:\nhttps://github.com/documentcloud/underscore/contributors\n","_id":"underscore@1.4.3","dist":{"shasum":"b3d0aaa1ee74d886ea4f2648021a4f8ad779ed1d","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.4.3.tgz"},"_npmVersion":"1.1.63","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}},"1.4.4":{"name":"underscore","description":"JavaScript's functional programming helper library.","homepage":"http://underscorejs.org","keywords":["util","functional","server","client","browser"],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"main":"underscore.js","version":"1.4.4","devDependencies":{"phantomjs":"0.2.2"},"scripts":{"test":"phantomjs test/vendor/runner.js test/index.html?noglobals=true"},"readme":" __\n /\\ \\ __\n __ __ ___ \\_\\ \\ __ _ __ ____ ___ ___ _ __ __ /\\_\\ ____\n /\\ \\/\\ \\ /' _ `\\ /'_ \\ /'__`\\/\\ __\\/ ,__\\ / ___\\ / __`\\/\\ __\\/'__`\\ \\/\\ \\ /',__\\\n \\ \\ \\_\\ \\/\\ \\/\\ \\/\\ \\ \\ \\/\\ __/\\ \\ \\//\\__, `\\/\\ \\__//\\ \\ \\ \\ \\ \\//\\ __/ __ \\ \\ \\/\\__, `\\\n \\ \\____/\\ \\_\\ \\_\\ \\___,_\\ \\____\\\\ \\_\\\\/\\____/\\ \\____\\ \\____/\\ \\_\\\\ \\____\\/\\_\\ _\\ \\ \\/\\____/\n \\/___/ \\/_/\\/_/\\/__,_ /\\/____/ \\/_/ \\/___/ \\/____/\\/___/ \\/_/ \\/____/\\/_//\\ \\_\\ \\/___/\n \\ \\____/\n \\/___/\n\nUnderscore.js is a utility-belt library for JavaScript that provides\nsupport for the usual functional suspects (each, map, reduce, filter...)\nwithout extending any core JavaScript objects.\n\nFor Docs, License, Tests, and pre-packed downloads, see:\nhttp://underscorejs.org\n\nMany thanks to our contributors:\nhttps://github.com/documentcloud/underscore/contributors\n","_id":"underscore@1.4.4","dist":{"shasum":"61a6a32010622afa07963bf325203cf12239d604","tarball":"http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"},"_npmVersion":"1.1.63","_npmUser":{"name":"jashkenas","email":"jashkenas@gmail.com"},"maintainers":[{"name":"jashkenas","email":"jashkenas@gmail.com"}],"directories":{}}},"maintainers":[{"name":"jashkenas","email":"jashkenas@gmail.com"}],"author":{"name":"Jeremy Ashkenas","email":"jeremy@documentcloud.org"},"time":{"1.0.3":"2011-12-07T15:12:18.045Z","1.0.4":"2011-12-07T15:12:18.045Z","1.1.0":"2011-12-07T15:12:18.045Z","1.1.1":"2011-12-07T15:12:18.045Z","1.1.2":"2011-12-07T15:12:18.045Z","1.1.3":"2011-12-07T15:12:18.045Z","1.1.4":"2011-12-07T15:12:18.045Z","1.1.5":"2011-12-07T15:12:18.045Z","1.1.6":"2011-12-07T15:12:18.045Z","1.1.7":"2011-12-07T15:12:18.045Z","1.2.0":"2011-12-07T15:12:18.045Z","1.2.1":"2011-12-07T15:12:18.045Z","1.2.2":"2011-11-14T20:28:47.115Z","1.2.3":"2011-12-07T15:12:18.045Z","1.2.4":"2012-01-09T17:23:14.818Z","1.3.0":"2012-01-11T16:41:38.459Z","1.3.1":"2012-01-23T22:57:36.474Z","1.3.2":"2012-04-09T18:38:14.345Z","1.3.3":"2012-04-10T14:43:48.089Z","1.4.0":"2012-09-27T22:02:55.267Z","1.4.1":"2012-10-01T17:20:22.595Z","1.4.2":"2012-10-07T03:05:02.986Z","1.4.3":"2012-12-04T18:47:36.401Z","1.4.4":"2013-01-30T02:12:42.969Z"},"repository":{"type":"git","url":"git://github.com/documentcloud/underscore.git"},"users":{"vesln":true,"mvolkmann":true,"lancehunt":true,"mikl":true,"linus":true,"vasc":true,"bat":true,"dmalam":true,"mbrevoort":true,"danielr":true,"rsimoes":true,"thlorenz":true,"jharding":true,"tellnes":true,"fgribreau":true,"pid":true,"tylerstalder":true,"graemef":true,"gillesruppert":true,"travishorn":true,"m42am":true,"af":true,"bencevans":true,"Scryptonite":true,"konklone":true,"esp":true,"bryanburgers":true,"ehershey":true,"freethenation":true,"dannydulai":true,"megadrive":true,"lupomontero":true,"cj.nichols":true,"dbrockman":true,"maxmaximov":true,"hyqhyq_3":true,"zonetti":true,"cparker15":true,"lemulot":true,"mlowe":true,"chilts":true},"_attachments":{"underscore-1.4.4.tgz":{"content_type":"application/octet-stream","revpos":104,"digest":"md5-s/MrjCiRarwh7tZ9DX+RyA==","length":41763,"stub":true},"underscore-1.4.3.tgz":{"content_type":"application/octet-stream","revpos":97,"digest":"md5-SbGx702k/T8yuag+j/VjCg==","length":62294,"stub":true},"underscore-1.4.2.tgz":{"content_type":"application/octet-stream","revpos":91,"digest":"md5-vSAO6RpJID3UCJkAWMEIjg==","length":61836,"stub":true},"underscore-1.4.1.tgz":{"content_type":"application/octet-stream","revpos":88,"digest":"md5-O72hIvWp7cVwkiA/2eF6rg==","length":61692,"stub":true},"underscore-1.4.0.tgz":{"content_type":"application/octet-stream","revpos":85,"digest":"md5-26PeH3uwZlxMzfzwS4LmMg==","length":61579,"stub":true},"underscore-1.3.3.tgz":{"content_type":"application/octet-stream","revpos":69,"digest":"md5-lRWlaQvCPiUt9CVTCTbZqQ==","length":58692,"stub":true},"underscore-1.3.2.tgz":{"content_type":"application/octet-stream","revpos":66,"digest":"md5-yS3kcu5U31CO0KAJcBJ9yA==","length":58699,"stub":true},"underscore-1.3.1.tgz":{"content_type":"application/octet-stream","revpos":60,"digest":"md5-Y4Z1Vvv7gZoZtJ9mTz0zSQ==","length":61440,"stub":true},"underscore-1.3.0.tgz":{"content_type":"application/octet-stream","revpos":56,"digest":"md5-eIPIVGdK7Fzup3CU/AMO4g==","length":61440,"stub":true},"underscore-1.2.4.tgz":{"content_type":"application/octet-stream","revpos":54,"digest":"md5-jCUzsaWc+tlE/lQNsuLQBA==","length":61440,"stub":true},"underscore-1.2.3.tgz":{"content_type":"application/octet-stream","revpos":41,"digest":"md5-bP9hXPsRRpFAWlmUNIY+jA==","length":40960,"stub":true},"underscore-1.2.2.tgz":{"content_type":"application/octet-stream","revpos":38,"digest":"md5-78/kFlhnF2WL94pdo/dfww==","length":40960,"stub":true},"underscore-1.2.1.tgz":{"content_type":"application/octet-stream","revpos":35,"digest":"md5-gNzWgJppZn3xUj8LCQcJ+Q==","length":31879,"stub":true},"underscore-1.2.0.tgz":{"content_type":"application/octet-stream","revpos":33,"digest":"md5-WYSTx/McoA2yFB6GmQ5KnA==","length":31310,"stub":true},"underscore-1.1.7.tgz":{"content_type":"application/octet-stream","revpos":29,"digest":"md5-BxaNPc3JexY2qLOK3gDhgw==","length":29052,"stub":true},"underscore-1.1.6.tgz":{"content_type":"application/octet-stream","revpos":27,"digest":"md5-U11VsMTDu6BEZDKJlZidTw==","length":25592,"stub":true},"underscore-1.1.5.tgz":{"content_type":"application/octet-stream","revpos":25,"digest":"md5-rpLusI4XejA3uVROFAZg1A==","length":25038,"stub":true},"underscore-1.1.4.tgz":{"content_type":"application/octet-stream","revpos":23,"digest":"md5-VrXC+bUYmxwzr2CQH4oq0w==","length":86233,"stub":true},"underscore-1.1.3.tgz":{"content_type":"application/octet-stream","revpos":17,"digest":"md5-sdTV7zbtYfhAAanQLEcziw==","length":86107,"stub":true},"underscore-1.1.2.tgz":{"content_type":"application/octet-stream","revpos":11,"digest":"md5-SSm/3w/usRqR+0SrSyCr8A==","length":85482,"stub":true},"underscore-1.1.1.tgz":{"content_type":"application/octet-stream","revpos":9,"digest":"md5-UW8pTfPbkrRFTiwM6AFlVA==","length":85214,"stub":true},"underscore-1.1.0.tgz":{"content_type":"application/octet-stream","revpos":7,"digest":"md5-YJcA44Oj1Dm2imfD7dHLag==","length":71266,"stub":true},"underscore-1.0.4.tgz":{"content_type":"application/octet-stream","revpos":5,"digest":"md5-nRJu+q0L17u8DZqPxVvQKQ==","length":71018,"stub":true},"underscore-1.0.3.tgz":{"content_type":"application/octet-stream","revpos":3,"digest":"md5-pwgll4db7l4cg7fPTrgVTw==","length":70285,"stub":true}}}
\ No newline at end of file diff --git a/deps/npm/test/tap/ls-no-results.js b/deps/npm/test/tap/ls-no-results.js new file mode 100644 index 0000000000..9792774c69 --- /dev/null +++ b/deps/npm/test/tap/ls-no-results.js @@ -0,0 +1,12 @@ +var test = require('tap').test +var spawn = require('child_process').spawn +var node = process.execPath +var npm = require.resolve('../../') +var args = [ npm, 'ls', 'ceci n’est pas une package' ] +test('ls exits non-zero when nothing found', function (t) { + var child = spawn(node, args) + child.on('exit', function (code) { + t.notEqual(code, 0) + t.end() + }) +}) diff --git a/deps/npm/test/tap/outdated-include-devdependencies.js b/deps/npm/test/tap/outdated-include-devdependencies.js new file mode 100644 index 0000000000..dbc204d743 --- /dev/null +++ b/deps/npm/test/tap/outdated-include-devdependencies.js @@ -0,0 +1,23 @@ +var test = require("tap").test +var npm = require("../../") + +var mr = require("npm-registry-mock") + +// config +var port = 1331 +var address = "http://localhost:" + port +var pkg = __dirname + '/outdated-include-devdependencies' + + +test("includes devDependencies in outdated", function (t) { + process.chdir(pkg) + mr(port, function (s) { + npm.load({registry: address}, function () { + npm.outdated(function (er, d) { + t.equal("1.5.1", d[0][3]) + s.close() + t.end() + }) + }) + }) +})
\ No newline at end of file diff --git a/deps/npm/test/tap/outdated-include-devdependencies/package.json b/deps/npm/test/tap/outdated-include-devdependencies/package.json new file mode 100644 index 0000000000..70998419bb --- /dev/null +++ b/deps/npm/test/tap/outdated-include-devdependencies/package.json @@ -0,0 +1,8 @@ +{ + "author": "Rocko Artischocko", + "name": "ignore-shrinkwrap", + "version": "0.0.0", + "devDependencies": { + "underscore": ">=1.3.1" + } +}
\ No newline at end of file diff --git a/deps/npm/test/tap/outdated-new-versions.js b/deps/npm/test/tap/outdated-new-versions.js new file mode 100644 index 0000000000..b3018230f5 --- /dev/null +++ b/deps/npm/test/tap/outdated-new-versions.js @@ -0,0 +1,38 @@ +var test = require("tap").test +var npm = require("../../") +var mkdirp = require("mkdirp") +var rimraf = require("rimraf") + + +var mr = require("npm-registry-mock") + +// config +var port = 1331 +var address = "http://localhost:" + port +var pkg = __dirname + "/outdated-new-versions" +mkdirp.sync(pkg + "/cache") + + +test("dicovers new versions in outdated", function (t) { + process.chdir(pkg) + t.plan(2) + mr(port, function (s) { + npm.load({cache: pkg + "/cache", registry: address}, function () { + npm.outdated(function (er, d) { + for (var i = 0; i < d.length; i++) { + if (d[i][1] === "underscore") + t.equal("1.5.1", d[i][4]) + if (d[i][1] === "request") + t.equal("2.27.0", d[i][4]) + } + s.close() + t.end() + }) + }) + }) +}) + +test("cleanup", function (t) { + rimraf.sync(pkg + "/cache") + t.end() +}) diff --git a/deps/npm/test/tap/outdated-new-versions/package.json b/deps/npm/test/tap/outdated-new-versions/package.json new file mode 100644 index 0000000000..2bfcdc5ab9 --- /dev/null +++ b/deps/npm/test/tap/outdated-new-versions/package.json @@ -0,0 +1,11 @@ +{ + "name": "new-versions-with-outdated", + "author": "Rockbert", + "version": "0.0.0", + "dependencies": { + "underscore": "~1.3.1" + }, + "devDependencies": { + "request": "~0.9.0" + } +} diff --git a/deps/npm/test/tap/prepublish.js b/deps/npm/test/tap/prepublish.js new file mode 100644 index 0000000000..56d7158b0f --- /dev/null +++ b/deps/npm/test/tap/prepublish.js @@ -0,0 +1,90 @@ +// verify that prepublish runs on pack and publish +var test = require('tap').test +var npm = require('../../') +var fs = require('fs') +var pkg = __dirname + '/prepublish_package' +var tmp = pkg + '/tmp' +var cache = pkg + '/cache' +var mkdirp = require('mkdirp') +var rimraf = require('rimraf') +var path = require('path') +var os = require('os') + +test('setup', function (t) { + var n = 0 + mkdirp(pkg, then()) + mkdirp(cache, then()) + mkdirp(tmp, then()) + function then (er) { + n ++ + return function (er) { + if (er) + throw er + if (--n === 0) + next() + } + } + + function next () { + fs.writeFile(pkg + '/package.json', JSON.stringify({ + name: 'npm-test-prepublish', + version: '1.2.5', + scripts: { prepublish: 'echo ok' } + }), 'ascii', function (er) { + if (er) + throw er + t.pass('setup done') + t.end() + }) + } +}) + +test('test', function (t) { + var spawn = require('child_process').spawn + var node = process.execPath + var npm = path.resolve(__dirname, '../../cli.js') + var env = { + npm_config_cache: cache, + npm_config_tmp: tmp, + npm_config_prefix: pkg, + npm_config_global: 'false' + } + for (var i in process.env) { + if (!/^npm_config_/.test(i)) + env[i] = process.env[i] + } + var child = spawn(node, [npm, 'pack'], { + cwd: pkg, + env: env + }) + child.stdout.setEncoding('utf8') + child.stderr.on('data', function(chunk) { + throw new Error('got stderr data: ' + JSON.stringify('' + chunk)) + }) + child.stdout.on('data', ondata) + child.on('close', onend) + var c = '' + function ondata (chunk) { + c += chunk + } + function onend () { + c = c.trim() + t.equal( c + , '> npm-test-prepublish@1.2.5 prepublish .' + os.EOL + + '> echo ok' + os.EOL + + os.EOL + + 'ok' + os.EOL + + 'npm-test-prepublish-1.2.5.tgz') + t.end() + } +}) + +test('cleanup', function (t) { + rimraf(pkg, function(er) { + if (er) + throw er + t.pass('cleaned up') + t.end() + }) +}) + diff --git a/deps/npm/test/tap/publish-config.js b/deps/npm/test/tap/publish-config.js index c9d52c8fcb..af55a286dd 100644 --- a/deps/npm/test/tap/publish-config.js +++ b/deps/npm/test/tap/publish-config.js @@ -1,5 +1,6 @@ var test = require('tap').test var fs = require('fs') +var osenv = require('osenv') var pkg = process.env.npm_config_tmp || '/tmp' pkg += '/npm-test-publish-config' @@ -41,7 +42,8 @@ test(function (t) { npm_config_cache_lock_wait: 1000, HOME: process.env.HOME, Path: process.env.PATH, - PATH: process.env.PATH + PATH: process.env.PATH, + USERPROFILE: osenv.home() } }) }) diff --git a/deps/npm/test/tap/uninstall-package.js b/deps/npm/test/tap/uninstall-package.js new file mode 100644 index 0000000000..d6bfa0d8fc --- /dev/null +++ b/deps/npm/test/tap/uninstall-package.js @@ -0,0 +1,24 @@ +var test = require("tap").test + , npm = require("../../") + +test("returns a list of removed items", function (t) { + t.plan(1) + + setup(function () { + npm.install(".", function (err) { + if (err) return t.fail(err) + npm.uninstall("once", "ini", "lala", function (err, d) { + if (err) return t.fail(err) + t.same(d.sort(), ["once", "ini"].sort()) + t.end() + }) + }) + }) +}) + +function setup (cb) { + process.chdir(__dirname + "/uninstall-package") + npm.load(function () { + cb() + }) +} diff --git a/deps/npm/test/tap/uninstall-package/package.json b/deps/npm/test/tap/uninstall-package/package.json new file mode 100644 index 0000000000..e445a1c6d4 --- /dev/null +++ b/deps/npm/test/tap/uninstall-package/package.json @@ -0,0 +1,9 @@ +{ + "name": "beep", + "version": "0.0.0", + "main": "index.js", + "dependencies": { + "once": "*", + "ini": "*" + } +} diff --git a/doc/api/addons.markdown b/doc/api/addons.markdown index b23b369f02..a7a393db35 100644 --- a/doc/api/addons.markdown +++ b/doc/api/addons.markdown @@ -326,12 +326,13 @@ Then in `myobject.h` make your wrapper inherit from `node::ObjectWrap`: static void Init(v8::Handle<v8::Object> exports); private: - MyObject(); + explicit MyObject(double value = 0); ~MyObject(); static v8::Handle<v8::Value> New(const v8::Arguments& args); static v8::Handle<v8::Value> PlusOne(const v8::Arguments& args); - double counter_; + static v8::Persistent<v8::Function> constructor; + double value_; }; #endif @@ -345,8 +346,13 @@ prototype: using namespace v8; - MyObject::MyObject() {}; - MyObject::~MyObject() {}; + Persistent<Function> MyObject::constructor; + + MyObject::MyObject(double value) : value_(value) { + } + + MyObject::~MyObject() { + } void MyObject::Init(Handle<Object> exports) { Isolate* isolate = Isolate::GetCurrent(); @@ -370,11 +376,18 @@ prototype: Isolate* isolate = Isolate::GetCurrent(); HandleScope scope(isolate); - MyObject* obj = new MyObject(); - obj->counter_ = args[0]->IsUndefined() ? 0 : args[0]->NumberValue(); - obj->Wrap(args.This()); - - return args.This(); + if (args.IsConstructCall()) { + // Invoked as constructor: `new MyObject(...)` + double value = args[0]->IsUndefined() ? 0 : args[0]->NumberValue(); + MyObject* obj = new MyObject(value); + obj->Wrap(args.This()); + return args.This(); + } else { + // Invoked as plain function `MyObject(...)`, turn into construct call. + const int argc = 1; + Local<Value> argv[argc] = { args[0] }; + return scope.Close(constructor->NewInstance(argc, argv)); + } } Handle<Value> MyObject::PlusOne(const Arguments& args) { @@ -382,9 +395,9 @@ prototype: HandleScope scope(isolate); MyObject* obj = ObjectWrap::Unwrap<MyObject>(args.This()); - obj->counter_ += 1; + obj->value_ += 1; - return scope.Close(Number::New(obj->counter_)); + return scope.Close(Number::New(obj->value_)); } Test it with: @@ -441,13 +454,13 @@ care of instantiating the object (i.e. it does the job of `new` in JavaScript): static v8::Handle<v8::Value> NewInstance(const v8::Arguments& args); private: - MyObject(); + explicit MyObject(double value = 0); ~MyObject(); - static v8::Persistent<v8::Function> constructor; static v8::Handle<v8::Value> New(const v8::Arguments& args); static v8::Handle<v8::Value> PlusOne(const v8::Arguments& args); - double counter_; + static v8::Persistent<v8::Function> constructor; + double value_; }; #endif @@ -459,11 +472,14 @@ The implementation is similar to the above in `myobject.cc`: using namespace v8; - MyObject::MyObject() {}; - MyObject::~MyObject() {}; - Persistent<Function> MyObject::constructor; + MyObject::MyObject(double value) : value_(value) { + } + + MyObject::~MyObject() { + } + void MyObject::Init() { Isolate* isolate = Isolate::GetCurrent(); // Prepare constructor template @@ -474,19 +490,30 @@ The implementation is similar to the above in `myobject.cc`: // Prototype tpl->PrototypeTemplate()->Set(String::NewSymbol("plusOne"), FunctionTemplate::New(PlusOne)->GetFunction()); +<<<<<<< HEAD constructor = Persistent<Function>::New(isolate, tpl->GetFunction()); +======= + constructor = Persistent<Function>::New(tpl->GetFunction()); +>>>>>>> upstream/v0.10 } Handle<Value> MyObject::New(const Arguments& args) { Isolate* isolate = Isolate::GetCurrent(); HandleScope scope(isolate); - MyObject* obj = new MyObject(); - obj->counter_ = args[0]->IsUndefined() ? 0 : args[0]->NumberValue(); - obj->Wrap(args.This()); - - return args.This(); + if (args.IsConstructCall()) { + // Invoked as constructor: `new MyObject(...)` + double value = args[0]->IsUndefined() ? 0 : args[0]->NumberValue(); + MyObject* obj = new MyObject(value); + obj->Wrap(args.This()); + return args.This(); + } else { + // Invoked as plain function `MyObject(...)`, turn into construct call. + const int argc = 1; + Local<Value> argv[argc] = { args[0] }; + return scope.Close(constructor->NewInstance(argc, argv)); + } } Handle<Value> MyObject::NewInstance(const Arguments& args) { @@ -505,9 +532,9 @@ The implementation is similar to the above in `myobject.cc`: HandleScope scope(isolate); MyObject* obj = ObjectWrap::Unwrap<MyObject>(args.This()); - obj->counter_ += 1; + obj->value_ += 1; - return scope.Close(Number::New(obj->counter_)); + return scope.Close(Number::New(obj->value_)); } Test it with: @@ -552,7 +579,7 @@ In the following `addon.cc` we introduce a function `add()` that can take on two MyObject* obj2 = node::ObjectWrap::Unwrap<MyObject>( args[1]->ToObject()); - double sum = obj1->Val() + obj2->Val(); + double sum = obj1->Value() + obj2->Value(); return scope.Close(Number::New(sum)); } @@ -580,15 +607,15 @@ can probe private values after unwrapping the object: public: static void Init(); static v8::Handle<v8::Value> NewInstance(const v8::Arguments& args); - double Val() const { return val_; } + double Value() const { return value_; } private: - MyObject(); + explicit MyObject(double value = 0); ~MyObject(); - static v8::Persistent<v8::Function> constructor; static v8::Handle<v8::Value> New(const v8::Arguments& args); - double val_; + static v8::Persistent<v8::Function> constructor; + double value_; }; #endif @@ -600,11 +627,14 @@ The implementation of `myobject.cc` is similar as before: using namespace v8; - MyObject::MyObject() {}; - MyObject::~MyObject() {}; - Persistent<Function> MyObject::constructor; + MyObject::MyObject(double value) : value_(value) { + } + + MyObject::~MyObject() { + } + void MyObject::Init() { Isolate* isolate = Isolate::GetCurrent(); @@ -612,19 +642,30 @@ The implementation of `myobject.cc` is similar as before: Local<FunctionTemplate> tpl = FunctionTemplate::New(New); tpl->SetClassName(String::NewSymbol("MyObject")); tpl->InstanceTemplate()->SetInternalFieldCount(1); +<<<<<<< HEAD constructor = Persistent<Function>::New(isolate, tpl->GetFunction()); +======= + constructor = Persistent<Function>::New(tpl->GetFunction()); +>>>>>>> upstream/v0.10 } Handle<Value> MyObject::New(const Arguments& args) { Isolate* isolate = Isolate::GetCurrent(); HandleScope scope(isolate); - MyObject* obj = new MyObject(); - obj->val_ = args[0]->IsUndefined() ? 0 : args[0]->NumberValue(); - obj->Wrap(args.This()); - - return args.This(); + if (args.IsConstructCall()) { + // Invoked as constructor: `new MyObject(...)` + double value = args[0]->IsUndefined() ? 0 : args[0]->NumberValue(); + MyObject* obj = new MyObject(value); + obj->Wrap(args.This()); + return args.This(); + } else { + // Invoked as plain function `MyObject(...)`, turn into construct call. + const int argc = 1; + Local<Value> argv[argc] = { args[0] }; + return scope.Close(constructor->NewInstance(argc, argv)); + } } Handle<Value> MyObject::NewInstance(const Arguments& args) { diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown index 4aef436371..c9113f4b92 100644 --- a/doc/api/child_process.markdown +++ b/doc/api/child_process.markdown @@ -52,6 +52,9 @@ of the signal, otherwise `null`. Note that the child process stdio streams might still be open. +Also, note that node establishes signal handlers for `'SIGINT'` and `'SIGTERM`', +so it will not terminate due to receipt of those signals, it will exit. + See `waitpid(2)`. ### Event: 'close' @@ -66,10 +69,9 @@ might share the same stdio streams. ### Event: 'disconnect' -This event is emitted after using the `.disconnect()` method in the parent or -in the child. After disconnecting it is no longer possible to send messages. -An alternative way to check if you can send messages is to see if the -`child.connected` property is `true`. +This event is emitted after calling the `.disconnect()` method in the parent +or in the child. After disconnecting it is no longer possible to send messages, +and the `.connected` property is false. ### Event: 'message' @@ -121,6 +123,12 @@ Example: console.log('Spawned child pid: ' + grep.pid); grep.stdin.end(); +### child.connected + +* {Boolean} Set to false after `.disconnect' is called + +If `.connected` is false, it is no longer possible to send messages. + ### child.kill([signal]) * `signal` {String} @@ -265,12 +273,15 @@ It is also recommended not to use `.maxConnections` in this condition. ### child.disconnect() -To close the IPC connection between parent and child use the -`child.disconnect()` method. This allows the child to exit gracefully since -there is no IPC channel keeping it alive. When calling this method the -`disconnect` event will be emitted in both parent and child, and the -`connected` flag will be set to `false`. Please note that you can also call -`process.disconnect()` in the child process. +Close the IPC channel between parent and child, allowing the child to exit +gracefully once there are no other connections keeping it alive. After calling +this method the `.connected` flag will be set to `false` in both the parent and +child, and it is no longer possible to send messages. + +The 'disconnect' event will be emitted when there are no messages in the process +of being received, most likely immediately. + +Note that you can also call `process.disconnect()` in the child process. ## child_process.spawn(command, [args], [options]) @@ -469,7 +480,7 @@ See also: `child_process.exec()` and `child_process.fork()` understand the `-c` switch on UNIX or `/s /c` on Windows. On Windows, command line parsing should be compatible with `cmd.exe`.) * `timeout` {Number} (Default: 0) - * `maxBuffer` {Number} (Default: 200*1024) + * `maxBuffer` {Number} (Default: `200*1024`) * `killSignal` {String} (Default: 'SIGTERM') * `callback` {Function} called with the output when process terminates * `error` {Error} @@ -535,7 +546,7 @@ subshell but rather the specified file directly. This makes it slightly leaner than `child_process.exec`. It has the same options. -## child\_process.fork(modulePath, [args], [options]) +## child_process.fork(modulePath, [args], [options]) * `modulePath` {String} The module to run in the child * `args` {Array} List of string arguments @@ -544,6 +555,8 @@ leaner than `child_process.exec`. It has the same options. * `env` {Object} Environment key-value pairs * `encoding` {String} (Default: 'utf8') * `execPath` {String} Executable used to create the child process + * `silent` {Boolean} If true, prevent stdout and stderr in the spawned node + process from being associated with the parent's (default is false) * Return: ChildProcess object This is a special case of the `spawn()` functionality for spawning Node @@ -551,13 +564,6 @@ processes. In addition to having all the methods in a normal ChildProcess instance, the returned object has a communication channel built-in. See `child.send(message, [sendHandle])` for details. -By default the spawned Node process will have the stdout, stderr associated -with the parent's. To change this behavior set the `silent` property in the -`options` object to `true`. - -The child process does not automatically exit once it's done, you need to call -`process.exit()` explicitly. This limitation may be lifted in the future. - These child Nodes are still whole new instances of V8. Assume at least 30ms startup and 10mb memory for each new Node. That is, you cannot create many thousands of them. diff --git a/doc/api/cluster.markdown b/doc/api/cluster.markdown index c8bccec217..414a00cef0 100644 --- a/doc/api/cluster.markdown +++ b/doc/api/cluster.markdown @@ -6,7 +6,7 @@ A single instance of Node runs in a single thread. To take advantage of multi-core systems the user will sometimes want to launch a cluster of Node processes to handle the load. -The cluster module allows you to easily create a network of processes that +The cluster module allows you to easily create child processes that all share server ports. var cluster = require('cluster'); @@ -121,13 +121,18 @@ values are `"rr"` and `"none"`. ## cluster.settings * {Object} - * `exec` {String} file path to worker file. (Default=`__filename`) + * `exec` {String} file path to worker file. (Default=`process.argv[1]`) * `args` {Array} string arguments passed to worker. (Default=`process.argv.slice(2)`) * `silent` {Boolean} whether or not to send output to parent's stdio. (Default=`false`) -All settings set by the `.setupMaster` is stored in this settings object. +After calling `.setupMaster()` (or `.fork()`) this settings object will contain +the settings, including the default values. + +It is effectively frozen after being set, because `.setupMaster()` can +only be called once. + This object is not supposed to be changed or set manually, by you. ## cluster.isMaster @@ -142,9 +147,7 @@ undefined, then `isMaster` is `true`. * {Boolean} -This boolean flag is true if the process is a worker forked from a master. -If the `process.env.NODE_UNIQUE_ID` is set to a value, then -`isWorker` is `true`. +True if the process is not a master (it is the negation of `cluster.isMaster`). ## Event: 'fork' @@ -173,11 +176,10 @@ This can be used to log worker activity, and create you own timeout. * `worker` {Worker object} -After forking a new worker, the worker should respond with a online message. -When the master receives a online message it will emit such event. +After forking a new worker, the worker should respond with an online message. +When the master receives an online message it will emit this event. The difference between 'fork' and 'online' is that fork is emitted when the -master tries to fork a worker, and 'online' is emitted when the worker is -being executed. +master forks a worker, and 'online' is emitted when the worker is running. cluster.on('online', function(worker) { console.log("Yay, the worker responded after it was forked"); @@ -188,9 +190,8 @@ being executed. * `worker` {Worker object} * `address` {Object} -When calling `listen()` from a worker, a 'listening' event is automatically assigned -to the server instance. When the server is listening a message is send to the master -where the 'listening' event is emitted. +After calling `listen()` from a worker, when the 'listening' event is emitted on +the server, a listening event will also be emitted on `cluster` in the master. The event handler is executed with two arguments, the `worker` contains the worker object and the `address` object contains the following connection properties: @@ -201,18 +202,24 @@ on more than one address. console.log("A worker is now connected to " + address.address + ":" + address.port); }); +The `addressType` is one of: + +* `4' (TCPv4) +* `6` (TCPv6) +* `-1` (unix domain socket) +* `"udp4"` or `"udp6"` (UDP v4 or v6) + ## Event: 'disconnect' * `worker` {Worker object} -When a workers IPC channel has disconnected this event is emitted. -This will happen when the worker dies, usually after calling -`.kill()`. +Emitted after the worker IPC channel has disconnected. This can occur when a +worker exits gracefully, is killed, or is disconnected manually (such as with +worker.disconnect()). -When calling `.disconnect()`, there may be a delay between the -`disconnect` and `exit` events. This event can be used to detect if -the process is stuck in a cleanup or if there are long-living -connections. +There may be a delay between the `disconnect` and `exit` events. These events +can be used to detect if the process is stuck in a cleanup or if there are +long-living connections. cluster.on('disconnect', function(worker) { console.log('The worker #' + worker.id + ' has disconnected'); @@ -226,33 +233,42 @@ connections. the process to be killed. When any of the workers die the cluster module will emit the 'exit' event. -This can be used to restart the worker by calling `fork()` again. + +This can be used to restart the worker by calling `.fork()` again. cluster.on('exit', function(worker, code, signal) { - var exitCode = worker.process.exitCode; - console.log('worker ' + worker.process.pid + ' died ('+exitCode+'). restarting...'); + console.log('worker %d died (%s). restarting...', + worker.process.pid, signal || code); cluster.fork(); }); -## Event: 'setup' +See [child_process event: 'exit'](child_process.html#child_process_event_exit). -* `worker` {Worker object} +## Event: 'setup' -When the `.setupMaster()` function has been executed this event emits. -If `.setupMaster()` was not executed before `fork()` this function will -call `.setupMaster()` with no arguments. +Emitted the first time that `.setupMaster()` is called. ## cluster.setupMaster([settings]) * `settings` {Object} - * `exec` {String} file path to worker file. (Default=`__filename`) + * `exec` {String} file path to worker file. (Default=`process.argv[1]`) * `args` {Array} string arguments passed to worker. (Default=`process.argv.slice(2)`) * `silent` {Boolean} whether or not to send output to parent's stdio. (Default=`false`) -`setupMaster` is used to change the default 'fork' behavior. The new settings -are effective immediately and permanently, they cannot be changed later on. +`setupMaster` is used to change the default 'fork' behavior. Once called, +the settings will be present in `cluster.settings`. + +Note that: + +* Only the first call to `.setupMaster()` has any effect, subsequent calls are + ignored +* That because of the above, the *only* attribute of a worker that may be + customized per-worker is the `env` passed to `.fork()` +* `.fork()` calls `.setupMaster()` internally to establish the defaults, so to + have any effect, `.setupMaster()` must be called *before* any calls to + `.fork()` Example: @@ -264,23 +280,31 @@ Example: }); cluster.fork(); +This can only be called from the master process. + ## cluster.fork([env]) -* `env` {Object} Key/value pairs to add to child process environment. +* `env` {Object} Key/value pairs to add to worker process environment. * return {Worker object} -Spawn a new worker process. This can only be called from the master process. +Spawn a new worker process. + +This can only be called from the master process. ## cluster.disconnect([callback]) -* `callback` {Function} called when all workers are disconnected and handlers are closed +* `callback` {Function} called when all workers are disconnected and handles are + closed -When calling this method, all workers will commit a graceful suicide. When they are -disconnected all internal handlers will be closed, allowing the master process to -die graceful if no other event is waiting. +Calls `.disconnect()` on each worker in `cluster.workers`. + +When they are disconnected all internal handles will be closed, allowing the +master process to die gracefully if no other event is waiting. The method takes an optional callback argument which will be called when finished. +This can only be called from the master process. + ## cluster.worker * {Object} @@ -305,6 +329,9 @@ A hash that stores the active worker objects, keyed by `id` field. Makes it easy to loop through all the workers. It is only available in the master process. +A worker is removed from cluster.workers just before the `'disconnect'` or +`'exit'` event is emitted. + // Go through all workers function eachWorker(callback) { for (var id in cluster.workers) { @@ -343,17 +370,33 @@ cluster.workers * {ChildProcess object} All workers are created using `child_process.fork()`, the returned object -from this function is stored in process. +from this function is stored as `.process`. In a worker, the global `process` +is stored. -See: [Child Process module](child_process.html) +See: [Child Process module]( +child_process.html#child_process_child_process_fork_modulepath_args_options) + +Note that workers will call `process.exit(0)` if the `'disconnect'` event occurs +on `process` and `.suicide` is not `true`. This protects against accidental +disconnection. ### worker.suicide * {Boolean} -This property is a boolean. It is set when a worker dies after calling -`.kill()` or immediately after calling the `.disconnect()` method. -Until then it is `undefined`. +Set by calling `.kill()` or `.disconnect()`, until then it is `undefined`. + +The boolean `worker.suicide` lets you distinguish between voluntary and accidental +exit, the master may choose not to respawn a worker based on this value. + + cluster.on('exit', function(worker, code, signal) { + if (worker.suicide === true) { + console.log('Oh, it was just suicide\' – no need to worry'). + } + }); + + // kill worker + worker.kill(); ### worker.send(message, [sendHandle]) @@ -362,8 +405,9 @@ Until then it is `undefined`. This function is equal to the send methods provided by `child_process.fork()`. In the master you should use this function to -send a message to a specific worker. However in a worker you can also use -`process.send(message)`, since this is the same function. +send a message to a specific worker. + +In a worker you can also use `process.send(message)`, it is the same function. This example will echo back all messages from the master: @@ -382,44 +426,54 @@ This example will echo back all messages from the master: * `signal` {String} Name of the kill signal to send to the worker process. -This function will kill the worker, and inform the master to not spawn a -new worker. The boolean `suicide` lets you distinguish between voluntary -and accidental exit. +This function will kill the worker. In the master, it does this by disconnecting +the `worker.process`, and once disconnected, killing with `signal`. In the +worker, it does it by disconnecting the channel, and then exiting with code `0`. - cluster.on('exit', function(worker, code, signal) { - if (worker.suicide === true) { - console.log('Oh, it was just suicide\' – no need to worry'). - } - }); +Causes `.suicide` to be set. - // kill worker - worker.kill(); +This method is aliased as `worker.destroy()` for backwards compatibility. -This method is aliased as `worker.destroy()` for backwards -compatibility. +Note that in a worker, `process.kill()` exists, but it is not this function, +it is [kill](process.html#process_process_kill_pid_signal). ### worker.disconnect() -When calling this function the worker will no longer accept new connections, but -they will be handled by any other listening worker. Existing connection will be -allowed to exit as usual. When no more connections exist, the IPC channel to the worker -will close allowing it to die graceful. When the IPC channel is closed the `disconnect` -event will emit, this is then followed by the `exit` event, there is emitted when -the worker finally die. +In a worker, this function will close all servers, wait for the 'close' event on +those servers, and then disconnect the IPC channel. + +In the master, an internal message is sent to the worker causing it to call +`.disconnect()` on itself. + +Causes `.suicide` to be set. -Because there might be long living connections, it is useful to implement a timeout. -This example ask the worker to disconnect and after 2 seconds it will destroy the -server. An alternative would be to execute `worker.kill()` after 2 seconds, but -that would normally not allow the worker to do any cleanup if needed. +Note that after a server is closed, it will no longer accept new connections, +but connections may be accepted by any other listening worker. Existing +connections will be allowed to close as usual. When no more connections exist, +see [server.close()](net.html#net_event_close), the IPC channel to the worker +will close allowing it to die gracefully. + +The above applies *only* to server connections, client connections are not +automatically closed by workers, and disconnect does not wait for them to close +before exiting. + +Note that in a worker, `process.disconnect` exists, but it is not this function, +it is [disconnect](child_process.html#child_process_child_disconnect). + +Because long living server connections may block workers from disconnecting, it +may be useful to send a message, so application specific actions may be taken to +close them. It also may be useful to implement a timeout, killing a worker if +the `disconnect` event has not been emitted after some time. if (cluster.isMaster) { var worker = cluster.fork(); var timeout; worker.on('listening', function(address) { + worker.send('shutdown'); worker.disconnect(); timeout = setTimeout(function() { - worker.send('force kill'); + worker.kill(); }, 2000); }); @@ -430,18 +484,14 @@ that would normally not allow the worker to do any cleanup if needed. } else if (cluster.isWorker) { var net = require('net'); var server = net.createServer(function(socket) { - // connection never end + // connections never end }); server.listen(8000); - server.on('close', function() { - // cleanup - }); - process.on('message', function(msg) { - if (msg === 'force kill') { - server.close(); + if(msg === 'shutdown') { + // initiate graceful close of any connections to server } }); } @@ -451,8 +501,8 @@ that would normally not allow the worker to do any cleanup if needed. * `message` {Object} This event is the same as the one provided by `child_process.fork()`. -In the master you should use this event, however in a worker you can also use -`process.on('message')` + +In a worker you can also use `process.on('message')`. As an example, here is a cluster that keeps count of the number of requests in the master process using the message system: @@ -499,28 +549,29 @@ in the master process using the message system: ### Event: 'online' -Same as the `cluster.on('online')` event, but emits only when the state change -on the specified worker. +Similar to the `cluster.on('online')` event, but specific to this worker. cluster.fork().on('online', function() { // Worker is online }); +It is not emitted in the worker. + ### Event: 'listening' * `address` {Object} -Same as the `cluster.on('listening')` event, but emits only when the state change -on the specified worker. +Similar to the `cluster.on('listening')` event, but specific to this worker. cluster.fork().on('listening', function(address) { // Worker is listening }); +It is not emitted in the worker. + ### Event: 'disconnect' -Same as the `cluster.on('disconnect')` event, but emits only when the state change -on the specified worker. +Similar to the `cluster.on('disconnect')` event, but specfic to this worker. cluster.fork().on('disconnect', function() { // Worker has disconnected @@ -532,8 +583,7 @@ on the specified worker. * `signal` {String} the name of the signal (eg. `'SIGHUP'`) that caused the process to be killed. -Emitted by the individual worker instance, when the underlying child process -is terminated. See [child_process event: 'exit'](child_process.html#child_process_event_exit). +Similar to the `cluster.on('exit')` event, but specific to this worker. var worker = cluster.fork(); worker.on('exit', function(code, signal) { @@ -545,3 +595,9 @@ is terminated. See [child_process event: 'exit'](child_process.html#child_proce console.log("worker success!"); } }); + +### Event: 'error' + +This event is the same as the one provided by `child_process.fork()`. + +In a worker you can also use `process.on('error')`. diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown index daf5f0b360..bb640b965c 100644 --- a/doc/api/fs.markdown +++ b/doc/api/fs.markdown @@ -639,6 +639,13 @@ Then call the `callback` argument with either true or false. Example: util.debug(exists ? "it's there" : "no passwd!"); }); +`fs.exists()` is an anachronism and exists only for historical reasons. +There should almost never be a reason to use it in your own code. + +In particular, checking if a file exists before opening it is an anti-pattern +that leaves you vulnerable to race conditions: another process may remove the +file between the calls to `fs.exists()` and `fs.open()`. Just open the file +and handle the error when it's not there. ## fs.existsSync(path) diff --git a/doc/api/http.markdown b/doc/api/http.markdown index 7088ee3ddd..ed390d3aa5 100644 --- a/doc/api/http.markdown +++ b/doc/api/http.markdown @@ -74,8 +74,8 @@ This is an [EventEmitter][] with the following events: Emitted each time there is a request. Note that there may be multiple requests per connection (in the case of keep-alive connections). -`request` is an instance of `http.IncomingMessage` and `response` is -an instance of `http.ServerResponse` + `request` is an instance of [http.IncomingMessage][] and `response` is +an instance of [http.ServerResponse][]. ### Event: 'connection' @@ -101,7 +101,7 @@ Emitted each time a request with an http Expect: 100-continue is received. If this event isn't listened for, the server will automatically respond with a 100 Continue as appropriate. -Handling this event involves calling `response.writeContinue` if the client +Handling this event involves calling [response.writeContinue()][] if the client should continue to send the request body, or generating an appropriate HTTP response (e.g., 400 Bad Request) if the client should not continue to send the request body. @@ -251,7 +251,7 @@ The response implements the [Writable Stream][] interface. This is an `function () { }` Indicates that the underlying connection was terminated before -`response.end()` was called or able to flush. +[response.end()][] was called or able to flush. ### response.writeContinue() @@ -273,9 +273,9 @@ Example: 'Content-Type': 'text/plain' }); This method must only be called once on a message and it must -be called before `response.end()` is called. +be called before [response.end()][] is called. -If you call `response.write()` or `response.end()` before calling this, the +If you call [response.write()][] or [response.end()][] before calling this, the implicit/mutable headers will be calculated and call this function for you. Note: that Content-Length is given in bytes not characters. The above example @@ -302,9 +302,9 @@ sockets. ### response.statusCode -When using implicit headers (not calling `response.writeHead()` explicitly), this property -controls the status code that will be sent to the client when the headers get -flushed. +When using implicit headers (not calling [response.writeHead()][] explicitly), +this property controls the status code that will be sent to the client when +the headers get flushed. Example: @@ -374,8 +374,8 @@ Example: ### response.write(chunk, [encoding]) -If this method is called and `response.writeHead()` has not been called, it will -switch to implicit header mode and flush the implicit headers. +If this method is called and [response.writeHead()][] has not been called, +it will switch to implicit header mode and flush the implicit headers. This sends a chunk of the response body. This method may be called multiple times to provide successive parts of the body. @@ -463,7 +463,7 @@ Options: send TCP KeepAlive packets over sockets being kept alive. Default = `1000`. Only relevant if `keepAlive` is set to `true`. -`http.request()` returns an instance of the `http.ClientRequest` +`http.request()` returns an instance of the [http.ClientRequest][] class. The `ClientRequest` instance is a writable stream. If one needs to upload a file with a POST request, then write to the `ClientRequest` object. @@ -664,7 +664,7 @@ data chunk or when closing the connection. To get the response, add a listener for `'response'` to the request object. `'response'` will be emitted from the request object when the response headers have been received. The `'response'` event is executed with one -argument which is an instance of `http.IncomingMessage`. +argument which is an instance of [http.IncomingMessage][]. During the `'response'` event, one can add listeners to the response object; particularly to listen for the `'data'` event. @@ -689,7 +689,7 @@ The request implements the [Writable Stream][] interface. This is an `function (response) { }` Emitted when a response is received to this request. This event is emitted only -once. The `response` argument will be an instance of `http.IncomingMessage`. +once. The `response` argument will be an instance of [http.IncomingMessage][]. Options: @@ -868,9 +868,10 @@ Once a socket is assigned to this request and is connected ## http.IncomingMessage -An `IncomingMessage` object is created by `http.Server` or `http.ClientRequest` -and passed as the first argument to the `'request'` and `'response'` event -respectively. It may be used to access response status, headers and data. +An `IncomingMessage` object is created by [http.Server][] or +[http.ClientRequest][] and passed as the first argument to the `'request'` +and `'response'` event respectively. It may be used to access response status, +headers and data. It implements the [Readable Stream][] interface, as well as the following additional events, methods, and properties. @@ -879,11 +880,8 @@ following additional events, methods, and properties. `function () { }` -Indicates that the underlaying connection was terminated before -`response.end()` was called or able to flush. - -Just like `'end'`, this event occurs only once per response. See -[http.ServerResponse][]'s `'close'` event for more information. +Indicates that the underlaying connection was closed. +Just like `'end'`, this event occurs only once per response. ### message.httpVersion @@ -948,14 +946,14 @@ Calls `message.connection.setTimeout(msecs, callback)`. ### message.method -**Only valid for request obtained from `http.Server`.** +**Only valid for request obtained from [http.Server][].** The request method as a string. Read only. Example: `'GET'`, `'DELETE'`. ### message.url -**Only valid for request obtained from `http.Server`.** +**Only valid for request obtained from [http.Server][].** Request URL string. This contains only the URL that is present in the actual HTTP request. If the request is: @@ -1002,21 +1000,29 @@ request.connection.getPeerCertificate() to obtain the client's authentication details. -[Agent]: #http_class_http_agent ['checkContinue']: #http_event_checkcontinue +['listening']: net.html#net_event_listening +[Agent]: #http_class_http_agent [Buffer]: buffer.html#buffer_buffer [EventEmitter]: events.html#events_class_events_eventemitter +[Readable Stream]: stream.html#stream_readable_stream +[Writable Stream]: stream.html#stream_writable_stream [global Agent]: #http_http_globalagent +[http.ClientRequest]: #http_class_http_clientrequest +[http.IncomingMessage]: #http_http_incomingmessage +[http.ServerResponse]: #http_class_http_serverresponse +[http.Server]: #http_class_http_server +[http.request()]: #http_http_request_options_callback [http.request()]: #http_http_request_options_callback -[http.IncomingMessage]: #http_class_http_incomingmessage -['listening']: net.html#net_event_listening [net.Server.close()]: net.html#net_server_close_callback [net.Server.listen(path)]: net.html#net_server_listen_path_callback [net.Server.listen(port)]: net.html#net_server_listen_port_host_backlog_callback -[Readable Stream]: stream.html#stream_readable_stream +[response.end()]: #http_response_end_data_encoding +[response.write()]: #http_response_write_chunk_encoding +[response.writeContinue()]: #http_response_writecontinue +[response.writeHead()]: #http_response_writehead_statuscode_reasonphrase_headers [socket.setKeepAlive()]: net.html#net_socket_setkeepalive_enable_initialdelay [socket.setNoDelay()]: net.html#net_socket_setnodelay_nodelay [socket.setTimeout()]: net.html#net_socket_settimeout_timeout_callback [stream.setEncoding()]: stream.html#stream_stream_setencoding_encoding [url.parse()]: url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost -[Writable Stream]: stream.html#stream_writable_stream diff --git a/doc/api/net.markdown b/doc/api/net.markdown index 1d7b6d2dda..c44b06d8d3 100644 --- a/doc/api/net.markdown +++ b/doc/api/net.markdown @@ -118,7 +118,6 @@ The `connectListener` parameter will be added as an listener for the ## Class: net.Server This class is used to create a TCP or UNIX server. -A server is a `net.Socket` that can listen for new incoming connections. ### server.listen(port, [host], [backlog], [callback]) diff --git a/doc/api/os.markdown b/doc/api/os.markdown index 928a79e881..58a80d074d 100644 --- a/doc/api/os.markdown +++ b/doc/api/os.markdown @@ -43,6 +43,14 @@ Returns the system uptime in seconds. Returns an array containing the 1, 5, and 15 minute load averages. +The load average is a measure of system activity, calculated by the operating +system and expressed as a fractional number. As a rule of thumb, the load +average should ideally be less than the number of logical CPUs in the system. + +The load average is a very UNIX-y concept; there is no real equivalent on +Windows platforms. That is why this function always returns `[0, 0, 0]` on +Windows. + ## os.totalmem() Returns the total amount of system memory in bytes. diff --git a/doc/api/stream.markdown b/doc/api/stream.markdown index 29f6785b29..1c4adf92ed 100644 --- a/doc/api/stream.markdown +++ b/doc/api/stream.markdown @@ -881,7 +881,7 @@ SimpleProtocol.prototype._read = function(n) { strings using the specified encoding. Default=null * `objectMode` {Boolean} Whether this stream should behave as a stream of objects. Meaning that stream.read(n) returns - a single value instead of a Buffer of size n + a single value instead of a Buffer of size n. Default=false In classes that extend the Readable class, make sure to call the Readable constructor so that the buffering settings can be properly diff --git a/doc/blog/release/v0.10.20.md b/doc/blog/release/v0.10.20.md new file mode 100644 index 0000000000..70db1fe92c --- /dev/null +++ b/doc/blog/release/v0.10.20.md @@ -0,0 +1,59 @@ +date: Mon Sep 30 15:05:41 PDT 2013 +version: 0.10.20 +category: release +title: Node v0.10.20 (Stable) +slug: node-v0-10-20-stable + +2013.09.30, Version 0.10.20 (Stable) + +* tls: fix sporadic hang and partial reads (Fedor Indutny) + - fixes "npm ERR! cb() never called!" + + +Source Code: http://nodejs.org/dist/v0.10.20/node-v0.10.20.tar.gz + +Macintosh Installer (Universal): http://nodejs.org/dist/v0.10.20/node-v0.10.20.pkg + +Windows Installer: http://nodejs.org/dist/v0.10.20/node-v0.10.20-x86.msi + +Windows x64 Installer: http://nodejs.org/dist/v0.10.20/x64/node-v0.10.20-x64.msi + +Windows x64 Files: http://nodejs.org/dist/v0.10.20/x64/ + +Linux 32-bit Binary: http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x86.tar.gz + +Linux 64-bit Binary: http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz + +Solaris 32-bit Binary: http://nodejs.org/dist/v0.10.20/node-v0.10.20-sunos-x86.tar.gz + +Solaris 64-bit Binary: http://nodejs.org/dist/v0.10.20/node-v0.10.20-sunos-x64.tar.gz + +Other release files: http://nodejs.org/dist/v0.10.20/ + +Website: http://nodejs.org/docs/v0.10.20/ + +Documentation: http://nodejs.org/docs/v0.10.20/api/ + +Shasums: +``` +6f827b5bb1184160a58e0aac711791b610c30afd node-v0.10.20-darwin-x64.tar.gz +89869942f09351a5256f9ff68c3e1c363f108e7a node-v0.10.20-darwin-x86.tar.gz +b7c0a79acddfaeda8af221acdd18640ef5c62e8a node-v0.10.20-linux-x64.tar.gz +709cd1a646447036abe3f57ea6e33bb1d411c229 node-v0.10.20-linux-x86.tar.gz +dbe318556bc7a4d7ea47947600edcdb375a92d8e node-v0.10.20-sunos-x64.tar.gz +b003527f645bfc8c65d890854e20c92edc1feb86 node-v0.10.20-sunos-x86.tar.gz +34015dac5e517492fec6584cacd2d9864056107e node-v0.10.20-x86.msi +a0408be15afd0b5d34b8762edab6420339a8c4ff node-v0.10.20.pkg +d8777ac318627c1413f01358ea5c455f0f86e4b5 node-v0.10.20.tar.gz +5f61f783345dc3663b03322d6387800d96560cd5 node.exe +bb81cb60eae4c6be9238aa05b5245f29609b6f96 node.exp +e06eab29b27de1908aa2cf624d438e15ee126640 node.lib +2495f7a88f0085df5206c0d0cb44131cf9715156 node.pdb +6036d6b1f2cf34a5055ed59b6519cb09cc6f86ff pkgsrc/nodejs-ia32-0.10.20.tgz +9b743d9a5d80758e8cd9d436e165c9569fa9d0fd pkgsrc/nodejs-x64-0.10.20.tgz +1b574ef4fe2ad61ce398415599f8f376b576e65d x64/node-v0.10.20-x64.msi +7137043329a25c36ad24d11d8e4ce6e5ff8a72b2 x64/node.exe +624c5bdb06ddd726457fa7b04197069ba021016b x64/node.exp +f61da5166124895495bd72520d6b6f730acc1cbc x64/node.lib +efa36de57eda469254fab252f24ef67c17f96f00 x64/node.pdb +``` diff --git a/doc/blog/release/v0.10.21.md b/doc/blog/release/v0.10.21.md new file mode 100644 index 0000000000..36bc2945bc --- /dev/null +++ b/doc/blog/release/v0.10.21.md @@ -0,0 +1,71 @@ +date: Fri Oct 18 15:39:23 PDT 2013 +version: 0.10.21 +category: release +title: Node v0.10.21 (Stable) +slug: node-v0-10-21-stable + +This release contains a security fix for the http server implementation, please +upgrade as soon as possible. Details will be released soon. + +2013.10.18, Version 0.10.21 (Stable) + +* uv: Upgrade to v0.10.18 + +* crypto: clear errors from verify failure (Timothy J Fontaine) + +* dtrace: interpret two byte strings (Dave Pacheco) + +* fs: fix fs.truncate() file content zeroing bug (Ben Noordhuis) + +* http: provide backpressure for pipeline flood (isaacs) + +* tls: fix premature connection termination (Ben Noordhuis) + + +Source Code: http://nodejs.org/dist/v0.10.21/node-v0.10.21.tar.gz + +Macintosh Installer (Universal): http://nodejs.org/dist/v0.10.21/node-v0.10.21.pkg + +Windows Installer: http://nodejs.org/dist/v0.10.21/node-v0.10.21-x86.msi + +Windows x64 Installer: http://nodejs.org/dist/v0.10.21/x64/node-v0.10.21-x64.msi + +Windows x64 Files: http://nodejs.org/dist/v0.10.21/x64/ + +Linux 32-bit Binary: http://nodejs.org/dist/v0.10.21/node-v0.10.21-linux-x86.tar.gz + +Linux 64-bit Binary: http://nodejs.org/dist/v0.10.21/node-v0.10.21-linux-x64.tar.gz + +Solaris 32-bit Binary: http://nodejs.org/dist/v0.10.21/node-v0.10.21-sunos-x86.tar.gz + +Solaris 64-bit Binary: http://nodejs.org/dist/v0.10.21/node-v0.10.21-sunos-x64.tar.gz + +Other release files: http://nodejs.org/dist/v0.10.21/ + +Website: http://nodejs.org/docs/v0.10.21/ + +Documentation: http://nodejs.org/docs/v0.10.21/api/ + +Shasums: +``` +fb1318fb7721aa292310599e7c6696edebcfd70d node-v0.10.21-darwin-x64.tar.gz +486235cc54d269d1961dfb150b1479ec14e83541 node-v0.10.21-darwin-x86.tar.gz +7528d2fa240a5dd88d37e4847cebec50ef40c8eb node-v0.10.21-linux-x64.tar.gz +b372abf9d9c53bfe675e2c3f71dcfdece44edddd node-v0.10.21-linux-x86.tar.gz +cb873cdff3f30aa198b52c8be3588745d2ee3933 node-v0.10.21-sunos-x64.tar.gz +020d202d7066b68f160d0ceebe8cc8306de25956 node-v0.10.21-sunos-x86.tar.gz +037ea0e3be3512da2bc94aa765fa89d61da3e275 node-v0.10.21-x86.msi +de2bd0e858f99098ef24f99f972b8088c1f0405c node-v0.10.21.pkg +b7fd2a3660635af40e3719ca0db49280d10359b2 node-v0.10.21.tar.gz +a0e3988170beee1273a2fb6d650bf17db8495c67 node.exe +99332a03aeba8a22254d671665b9b2161a64bd84 node.exp +263dafeec907bd1f28ceb8272b9caaadceacb4d6 node.lib +76d578bf352772dc4db9ebb95fb61cf18e34c80d node.pdb +b6d11b67ce7aaff5c7a456a4c85c80849a3d576e pkgsrc/nodejs-ia32-0.10.21.tgz +b116825d1d2cbcfd567f730b1c2452424508b062 pkgsrc/nodejs-x64-0.10.21.tgz +29632c5a21a4ebf89703e417852306a676f6ede8 x64/node-v0.10.21-x64.msi +033b0a2b57e031a9e47f0b28eb4dc50a5389b592 x64/node.exe +f62b53229d77eaddf1f3a7909ef6533eea0e2295 x64/node.exp +8d5cfe83c3bc78ddcf79de9d065d1b4f2af9347e x64/node.lib +6844e78e9ba80bfa48f6c150544e3e73d83dd316 x64/node.pdb +``` diff --git a/doc/blog/release/v0.8.26.md b/doc/blog/release/v0.8.26.md new file mode 100644 index 0000000000..45e227a9b9 --- /dev/null +++ b/doc/blog/release/v0.8.26.md @@ -0,0 +1,71 @@ +date: Fri Oct 18 14:52:30 PDT 2013 +version: 0.8.26 +category: release +title: Node v0.8.26 (Maintenance) +slug: node-v0-8-26-maintenance + +This release contains a security fix for the http server implementation, please +upgrade as soon as possible. Details will be released soon. + +2013.10.13, Version 0.8.26 (maintenance) + +* v8: Upgrade to 3.11.10.26 + +* crypto: clear openssl error stack when handled (Ben Noordhuis) + +* crypto: clear errors from verify failure (Timothy J Fontaine) + +* crypto: fix memory leak in LoadPKCS12 (Fedor Indutny) + +* http: provide backpressure for pipeline flood (isaacs) + +* http_parser: expose pause/resume method for parser (Timothy J Fontaine) + +* readline: pause stdin before turning off terminal raw mode (Daniel Chatfield) + + +Source Code: http://nodejs.org/dist/v0.8.26/node-v0.8.26.tar.gz + +Macintosh Installer (Universal): http://nodejs.org/dist/v0.8.26/node-v0.8.26.pkg + +Windows Installer: http://nodejs.org/dist/v0.8.26/node-v0.8.26-x86.msi + +Windows x64 Installer: http://nodejs.org/dist/v0.8.26/x64/node-v0.8.26-x64.msi + +Windows x64 Files: http://nodejs.org/dist/v0.8.26/x64/ + +Linux 32-bit Binary: http://nodejs.org/dist/v0.8.26/node-v0.8.26-linux-x86.tar.gz + +Linux 64-bit Binary: http://nodejs.org/dist/v0.8.26/node-v0.8.26-linux-x64.tar.gz + +Solaris 32-bit Binary: http://nodejs.org/dist/v0.8.26/node-v0.8.26-sunos-x86.tar.gz + +Solaris 64-bit Binary: http://nodejs.org/dist/v0.8.26/node-v0.8.26-sunos-x64.tar.gz + +Other release files: http://nodejs.org/dist/v0.8.26/ + +Website: http://nodejs.org/docs/v0.8.26/ + +Documentation: http://nodejs.org/docs/v0.8.26/api/ + +Shasums: +``` +b9fa5fca6282a01d491ab585b6a6a64f23ea4da2 node-v0.8.26-darwin-x64.tar.gz +ba760b282f38f62ad333c2ecc69d3b296f87cf4a node-v0.8.26-darwin-x86.tar.gz +c96470908234656c6060cbe0dab4502f90ca7cd1 node-v0.8.26-linux-x64.tar.gz +3b5c776ae8632df2a4c67b89bdd37d843135be90 node-v0.8.26-linux-x86.tar.gz +6b9b6bb2676b37ff63f240931f68aa22e9187e99 node-v0.8.26-sunos-x64.tar.gz +cb3f975293f9561fdda0b46571aee570576e0406 node-v0.8.26-sunos-x86.tar.gz +668bbc8240497675bb4ed3b61c6f7fb79772b264 node-v0.8.26-x86.msi +e51a33c28e2c75b0e40826100e5f6b84d5cf8d98 node-v0.8.26.pkg +2ec960bcc8cd38da271f83c1b2007c12da5153b3 node-v0.8.26.tar.gz +860ec0bcb6e89fcee3e45e56e469dd28cfcf400c node.exe +ad0e366a82e8570768f5c92d97eebd8fd4a54f8f node.exp +559a7b4e3c49b1071d1cd1374cf4bc4bae2aa558 node.lib +687eeb71782ac36f26aaba60e07bd92f47bfcf36 node.pdb +b10e28a100ab40169759bd431ccc855de1763fa8 x64/node-v0.8.26-x64.msi +19b5210e212b3b5473c251786c3d22b8cb919f5f x64/node.exe +6129121aad9d48ffa19a712f59e6acb9bff14eb1 x64/node.exp +4eb1822b10ec3b7a17deff1126725c30c5ef65b1 x64/node.lib +7f39e38b62ad44c774ae381a661726494b2f066e x64/node.pdb +``` diff --git a/doc/blog/vulnerability/http-server-pipeline-flood-dos.md b/doc/blog/vulnerability/http-server-pipeline-flood-dos.md new file mode 100644 index 0000000000..e4a607d7a9 --- /dev/null +++ b/doc/blog/vulnerability/http-server-pipeline-flood-dos.md @@ -0,0 +1,37 @@ +title: DoS Vulnerability (fixed in Node v0.8.26 and v0.10.21) +date: Tue Oct 22 10:42:10 PDT 2013 +slug: cve-2013-4450-http-server-pipeline-flood-dos +category: vulnerability + +Node.js is vulnerable to a denial of service attack when a client +sends many pipelined HTTP requests on a single connection, and the +client does not read the responses from the connection. + +We recommend that anyone using Node.js v0.8 or v0.10 to run HTTP +servers in production please update as soon as possible. + +* v0.10.21 <http://blog.nodejs.org/2013/10/18/node-v0-10-21-stable/> +* v0.8.26 <http://blog.nodejs.org/2013/10/18/node-v0-8-26-maintenance/> + +This is fixed in Node.js by pausing both the socket and the HTTP +parser whenever the downstream writable side of the socket is awaiting +a drain event. In the attack scenario, the socket will eventually +time out, and be destroyed by the server. If the "attacker" is not +malicious, but merely sends a lot of requests and reacts to them +slowly, then the throughput on that connection will be reduced to what +the client can handle. + +There is no change to program semantics, and except in the +pathological cases described, no changes to behavior. + +If upgrading is not possible, then putting an HTTP proxy in front of +the Node.js server can mitigate the vulnerability, but only if the +proxy parses HTTP and is not itself vulnerable to a pipeline flood +DoS. + +For example, nginx will prevent the attack (since it closes +connections after 100 pipelined requests by default), but HAProxy in +raw TCP mode will not (since it proxies the TCP connection without +regard for HTTP semantics). + +This addresses CVE-2013-4450. diff --git a/doc/community/index.html b/doc/community/index.html index 823b77fa33..ee059ccbc6 100644 --- a/doc/community/index.html +++ b/doc/community/index.html @@ -186,6 +186,8 @@ Node.js blog & developers listing<br> <a href="http://nodejs.geek.nz/">nodejs.geek.nz</a> Node.js site for Kiwis<br> + <a href="http://nodejs.rs/">nodejs.rs</a> + Serbian Node.js community website </p> </div> </div> diff --git a/lib/_debugger.js b/lib/_debugger.js index 2613d8bbbe..4dd9f53633 100644 --- a/lib/_debugger.js +++ b/lib/_debugger.js @@ -1367,7 +1367,9 @@ Interface.prototype.setBreakpoint = function(script, line, if (script != +script && !this.client.scripts[script]) { var scripts = this.client.scripts; Object.keys(scripts).forEach(function(id) { - if (scripts[id] && scripts[id].name.indexOf(script) !== -1) { + if (scripts[id] && + scripts[id].name && + scripts[id].name.indexOf(script) !== -1) { if (scriptId) { ambiguous = true; } diff --git a/lib/_tls_legacy.js b/lib/_tls_legacy.js index 9792b8927a..a42a3802dc 100644 --- a/lib/_tls_legacy.js +++ b/lib/_tls_legacy.js @@ -275,10 +275,9 @@ CryptoStream.prototype._read = function read(size) { var bytesRead = 0, start = this._buffer.offset; do { - var read = this._buffer.use(this.pair.ssl, out, size); + var read = this._buffer.use(this.pair.ssl, out, size - bytesRead); if (read > 0) { bytesRead += read; - size -= read; } // Handle and report errors @@ -831,7 +830,7 @@ exports.pipe = function pipe(pair, socket) { // Encrypted should be unpiped from socket to prevent possible // write after destroy. pair.encrypted.unpipe(socket); - socket.destroy(); + socket.destroySoon(); }); }); @@ -543,7 +543,7 @@ fs.truncate = function(path, len, callback) { len = 0; } callback = maybeCallback(callback); - fs.open(path, 'w', function(er, fd) { + fs.open(path, 'r+', function(er, fd) { if (er) return callback(er); binding.ftruncate(fd, len, function(er) { fs.close(fd, function(er2) { @@ -562,7 +562,7 @@ fs.truncateSync = function(path, len) { len = 0; } // allow error to be thrown, but still close fd. - var fd = fs.openSync(path, 'w'); + var fd = fs.openSync(path, 'r+'); try { var ret = fs.ftruncateSync(fd, len); } finally { diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 17c693bc9f..de9b80328c 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -2791,6 +2791,9 @@ bool Verify::VerifyFinal(const char* key_pem, return false; } + ClearErrorOnReturn clear_error_on_return; + (void) &clear_error_on_return; // Silence compiler warning. + EVP_PKEY* pkey = NULL; BIO* bp = NULL; X509* x509 = NULL; diff --git a/src/node_file.cc b/src/node_file.cc index 3bf29c8109..cb37124c1a 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -98,7 +98,7 @@ class FSReqWrap: public ReqWrap<uv_fs_t> { #define GET_OFFSET(a) ((a)->IsNumber() ? (a)->IntegerValue() : -1) #define GET_TRUNCATE_LENGTH(a) ((a)->IntegerValue()) -static inline int IsInt64(double x) { +static inline bool IsInt64(double x) { return x == static_cast<double>(static_cast<int64_t>(x)); } diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc index 805e69b668..b0bd28dd82 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -280,7 +280,10 @@ void PipeWrap::Open(const FunctionCallbackInfo<Value>& args) { int fd = args[0]->Int32Value(); - uv_pipe_open(&wrap->handle_, fd); + int err = uv_pipe_open(&wrap->handle_, fd); + + if (err != 0) + ThrowException(UVException(err, "uv_pipe_open")); } diff --git a/test/pummel/test-postmortem-findjsobjects.js b/test/pummel/test-postmortem-findjsobjects.js index 568e2ff059..292b060933 100644 --- a/test/pummel/test-postmortem-findjsobjects.js +++ b/test/pummel/test-postmortem-findjsobjects.js @@ -67,7 +67,7 @@ gcore.on('exit', function (code) { } var lines = output.split('\n'); - var found = 0, i, expected = 'OBEY: ' + obj.OBEY, nexpected = 2; + var found = 0, i, expected = 'OBEY: "' + obj.OBEY + '"', nexpected = 2; for (var i = 0; i < lines.length; i++) { if (lines[i].indexOf(expected) != -1) diff --git a/test/simple/test-crypto-verify-failure.js b/test/simple/test-crypto-verify-failure.js new file mode 100644 index 0000000000..09c43ddc05 --- /dev/null +++ b/test/simple/test-crypto-verify-failure.js @@ -0,0 +1,83 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// 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. + + + + +var common = require('../common'); +var assert = require('assert'); + +try { + var crypto = require('crypto'); + var tls = require('tls'); +} catch (e) { + console.log('Not compiled with OPENSSL support.'); + process.exit(); +} + +crypto.DEFAULT_ENCODING = 'buffer'; + +var fs = require('fs'); + +var certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii'); + +var options = { + key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'), + cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem') +}; + +var canSend = true; + +var server = tls.Server(options, function(socket) { + setImmediate(function() { + console.log('sending'); + verify(); + setImmediate(function() { + socket.destroy(); + }); + }); +}); + +var client; + +function verify() { + console.log('verify'); + var verified = crypto.createVerify('RSA-SHA1') + .update('Test') + .verify(certPem, 'asdfasdfas', 'base64'); +} + +server.listen(common.PORT, function() { + client = tls.connect({ + port: common.PORT, + rejectUnauthorized: false + }, function() { + verify(); + }).on('data', function(data) { + console.log(data); + }).on('error', function(err) { + throw err; + }).on('close', function() { + server.close(); + }).resume(); +}); + +server.unref(); diff --git a/test/simple/test-fs-truncate-GH-6233.js b/test/simple/test-fs-truncate-GH-6233.js new file mode 100644 index 0000000000..472afdcab9 --- /dev/null +++ b/test/simple/test-fs-truncate-GH-6233.js @@ -0,0 +1,44 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// 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. + +var common = require('../common'); +var assert = require('assert'); +var fs = require('fs'); + +var filename = common.tmpDir + '/truncate-file.txt'; + +// Synchronous test. +(function() { + fs.writeFileSync(filename, '0123456789'); + assert.equal(fs.readFileSync(filename).toString(), '0123456789'); + fs.truncateSync(filename, 5); + assert.equal(fs.readFileSync(filename).toString(), '01234'); +})(); + +// Asynchronous test. +(function() { + fs.writeFileSync(filename, '0123456789'); + assert.equal(fs.readFileSync(filename).toString(), '0123456789'); + fs.truncate(filename, 5, common.mustCall(function(err) { + if (err) throw err; + assert.equal(fs.readFileSync(filename).toString(), '01234'); + })); +})(); diff --git a/tools/blog/wp-to-markdown.js b/tools/blog/wp-to-markdown.js deleted file mode 100644 index 65ec2d5b72..0000000000 --- a/tools/blog/wp-to-markdown.js +++ /dev/null @@ -1,189 +0,0 @@ -var sax = require('sax'); -var fs = require('fs'); -var parser = sax.parser(false, { lowercase: true }); -var assert = require('assert'); -var mkdirp = require('mkdirp'); -var url = require('url'); - -var input = fs.createReadStream(process.argv[2]); -input.on('data', function(c) { - parser.write(c.toString()); -}); -input.on('end', parser.end.bind(parser)); - -var post = null; -var author = null; -var authors = {}; -mkdirp.sync('out'); - -parser.onopentag = function (tag) { - switch (tag.name) { - case 'wp:author': - assert(author === null); - author = {}; - author.text = ''; - return; - - case 'wp:author_login': - assert(author); - author.field = 'login'; - author.text = ''; - return; - - case 'wp:author_display_name': - assert(author); - author.field = 'name'; - author.text = ''; - return - - case 'wp:author_first_name': - assert(author); - author.field = 'first_name'; - author.text = ''; - return; - - case 'wp:author_last_name': - assert(author); - author.field = 'last_name'; - author.text = ''; - return; - - case 'item': - assert(post === null); - post = {}; - post.text = ''; - return; - - case 'title': - if (post === null) return; - post.field = 'title'; - return - - case 'pubDate': - case 'wp:post_date': - post.field = 'date'; - return; - - case 'dc:creator': - post.field = 'author'; - return; - - case 'wp:status': - post.field = 'status'; - return; - - case 'category': - post.field = 'category'; - return; - - case 'content:encoded': - post.field = 'body'; - return; - - case 'link': - if (post) post.field = 'link'; - return; - - default: - if (post) post.field = null; - if (author) author.field = null; - return; - } -}; - -parser.onclosetag = function (tagName, tag) { - switch (tagName) { - case 'wp:author': - assert(author); - finishAuthor(); - return; - case 'item': - assert(post); - finishPost(); - return; - default: - if (post && post.field || author && author.field) finishField(); - return; - } -}; - -parser.ontext = parser.oncdata = function (text) { - if (author) { - if (author.field) author.text += text; - else author.text = ''; - } else if (post) { - if (post.field) post.text += text; - else post.field = ''; - } -}; - -function finishField() { - if (post && post.field) { - post[post.field] = post.text; - post.field = null; - post.text = ''; - } else if (author && author.field) { - author[author.field] = author.text; - author.field = null; - author.text = ''; - } -} - -function finishPost() { - // don't port drafts. - if (post.status === 'draft') { - return post = null; - } - post.date = new Date(post.date); - - if (post.link) { - post.slug = - url.parse(post.link) - .pathname - .replace(/\/+$/, '') - .split('/') - .pop(); - } - if (!post.slug) { - post.slug = - (post.title + '-' + post.date.toISOString()) - .replace(/[^a-z0-9]+/gi, '-') - .replace(/^-|-$/g, '') - .toLowerCase(); - } - post.slug = post.slug || '-'; - - delete post.text - delete post.link - delete post.field - post.author = authors[post.author] || post.author; - - post.body = post.body || ''; - - // actually write it! - var output = []; - Object.keys(post) - .filter(function (f) { return f !== 'body' }).forEach(function (k) { - output.push(k + ': ' + post[k]); - }) - output = output.join('\n') + '\n\n' + post.body.trim() + '\n'; - - var f = 'out/' + post.category + '/' + post.slug + '.md'; - console.log(f, post.title); - mkdirp.sync('out/' + post.category) - fs.writeFileSync(f, output, 'utf8'); - - post = null; -} - -function finishAuthor () { - author.name = author.name || - (author.first_name + ' ' + author.last_name) || - author.login; - delete author.first_name - delete author.last_name - delete author.text - delete author.field - authors[author.login] = author.name - author = null; -} |
