diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md index 1e2c6fbae9..a6576de6fd 100644 --- a/deps/npm/CHANGELOG.md +++ b/deps/npm/CHANGELOG.md @@ -1,3 +1,34 @@ +### v2.2.0 (2015-01-08): + +* [`88c531d`](https://github.com/npm/npm/commit/88c531d1c0b3aced8f2a09632db01b5635e7226a) + [#7056](https://github.com/npm/npm/issues/7056) version doesn't need a + package.json. ([@othiym23](https://github.com/othiym23)) +* [`2656c19`](https://github.com/npm/npm/commit/2656c19f6b915c3173acc3b6f184cc321563da5f) + [#7095](https://github.com/npm/npm/issues/7095) Link to npm website instead + of registry. ([@konklone](https://github.com/konklone)) +* [`c76b801`](https://github.com/npm/npm/commit/c76b8013bf1758587565822626171b76cb465c9e) + [#7067](https://github.com/npm/npm/issues/7067) Obfuscate secrets, including + nerfed URLs. ([@smikes](https://github.com/smikes)) +* [`17f66ce`](https://github.com/npm/npm/commit/17f66ceb1bd421084e4ae82a6b66634a6e272929) + [#6849](https://github.com/npm/npm/issues/6849) Explain the tag workflow more + clearly. ([@smikes](https://github.com/smikes)) +* [`e309df6`](https://github.com/npm/npm/commit/e309df642de33d10d6dffadaa8a5d214a924d0dc) + [#7096](https://github.com/npm/npm/issues/7096) Really, `npm update -g` is + almost always a terrible idea. ([@smikes](https://github.com/smikes)) +* [`acf287d`](https://github.com/npm/npm/commit/acf287d2547c8a0a8871652c164019261b666d55) + [#6999](https://github.com/npm/npm/issues/6999) `npm run-script env`: add a + new default script that will print out environment values. + ([@gcb](https://github.com/gcb)) +* [`560c009`](https://github.com/npm/npm/commit/560c00945d4dec926cd29193e336f137c7f3f951) + [#6745](https://github.com/npm/npm/issues/6745) Document `npm update --dev`. + ([@smikes](https://github.com/smikes)) +* [`226a677`](https://github.com/npm/npm/commit/226a6776a1a9e28570485623b8adc2ec4b041335) + [#7046](https://github.com/npm/npm/issues/7046) We have never been the Node + package manager. ([@linclark](https://github.com/linclark)) +* [`38eef22`](https://github.com/npm/npm/commit/38eef2248f03bb8ab04cae1833e2a228fb887f3c) + `npm-install-checks@1.0.5`: Compatibility with npmlog@^1. + ([@iarna](https://github.com/iarna)) + ### v2.1.18 (2015-01-01): * [`bf8640b`](https://github.com/npm/npm/commit/bf8640b0395b5dff71260a0cede7efc699a7bcf5) diff --git a/deps/npm/doc/api/npm-tag.md b/deps/npm/doc/api/npm-tag.md index b5a3d7faa6..9cda0c407d 100644 --- a/deps/npm/doc/api/npm-tag.md +++ b/deps/npm/doc/api/npm-tag.md @@ -18,6 +18,6 @@ is the package name and version is the version number (much like installing a specific version). The second element is the name of the tag to tag this version with. If this -parameter is missing or falsey (empty), the default froom the config will be +parameter is missing or falsey (empty), the default from the config will be used. For more information about how to set this config, check `man 3 npm-config` for programmatic usage or `man npm-config` for cli usage. diff --git a/deps/npm/doc/api/npm.md b/deps/npm/doc/api/npm.md index 4b4dfcaddd..611292ec94 100644 --- a/deps/npm/doc/api/npm.md +++ b/deps/npm/doc/api/npm.md @@ -1,5 +1,5 @@ -npm(3) -- node package manager -============================== +npm(3) -- javascript package manager +==================================== ## SYNOPSIS diff --git a/deps/npm/doc/cli/npm-run-script.md b/deps/npm/doc/cli/npm-run-script.md index 74f416e0be..c218c845f5 100644 --- a/deps/npm/doc/cli/npm-run-script.md +++ b/deps/npm/doc/cli/npm-run-script.md @@ -11,10 +11,13 @@ npm-run-script(1) -- Run arbitrary package scripts This runs an arbitrary command from a package's `"scripts"` object. If no package name is provided, it will search for a `package.json` in the current folder and use its `"scripts"` object. If no `"command"` -is provided, it will list the available top level scripts. +is provided, it will list the available top level scripts. The `env` command +can be used to list environment variables that will be available to the script +at runtime. If an "env" command is defined in your package it will have +precedence instead. -It is used by the test, start, restart, and stop commands, but can be -called directly, as well. +`run[-script]` is used by the test, start, restart, and stop commands, but can +be called directly, as well. As of [`npm@2.0.0`](http://blog.npmjs.org/post/98131109725/npm-2-0-0), you can use custom arguments when executing scripts. The special option `--` is used by diff --git a/deps/npm/doc/cli/npm-tag.md b/deps/npm/doc/cli/npm-tag.md index 3e1d1051bd..28a1c9334f 100644 --- a/deps/npm/doc/cli/npm-tag.md +++ b/deps/npm/doc/cli/npm-tag.md @@ -23,6 +23,29 @@ This also applies to `npm dedupe`. Publishing a package always sets the "latest" tag to the published version. +## PURPOSE + +Tags can be used to provide an alias instead of version numbers. For +example, `npm` currently uses the tag "next" to identify the upcoming +version, and the tag "latest" to identify the current version. + +A project might choose to have multiple streams of development, e.g., +"stable", "canary". + +## CAVEATS + +Tags must share a namespace with version numbers, because they are +specified in the same slot: `npm install @` vs `npm +install @`. + +Tags that can be interpreted as valid semver ranges will be +rejected. For example, `v1.4` cannot be used as a tag, because it is +interpreted by semver as `>=1.4.0 <1.5.0`. See +. + +The simplest way to avoid semver problems with tags is to use tags +that do not begin with a number or the letter `v`. + ## SEE ALSO * npm-publish(1) @@ -31,4 +54,5 @@ Publishing a package always sets the "latest" tag to the published version. * npm-registry(7) * npm-config(1) * npm-config(7) +* npm-tag(3) * npmrc(5) diff --git a/deps/npm/doc/cli/npm-update.md b/deps/npm/doc/cli/npm-update.md index a53d294592..2aa0f366bc 100644 --- a/deps/npm/doc/cli/npm-update.md +++ b/deps/npm/doc/cli/npm-update.md @@ -10,7 +10,9 @@ npm-update(1) -- Update a package This command will update all the packages listed to the latest version (specified by the `tag` config). -It will also install missing packages. +It will also install missing packages. As with all commands that install +packages, the `--dev` flag will cause `devDependencies` to be processed +as well. If the `-g` flag is specified, this command will update globally installed packages. diff --git a/deps/npm/doc/cli/npm.md b/deps/npm/doc/cli/npm.md index ad16d419e8..331a03577b 100644 --- a/deps/npm/doc/cli/npm.md +++ b/deps/npm/doc/cli/npm.md @@ -1,5 +1,5 @@ -npm(1) -- node package manager -============================== +npm(1) -- javascript package manager +==================================== ## SYNOPSIS diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md index e23f7affc7..00939cbf49 100644 --- a/deps/npm/doc/files/package.json.md +++ b/deps/npm/doc/files/package.json.md @@ -28,7 +28,7 @@ The name is what your thing is called. Some tips: * The name will probably be passed as an argument to require(), so it should be something short, but also reasonably descriptive. * You may want to check the npm registry to see if there's something by that name - already, before you get too attached to it. http://registry.npmjs.org/ + already, before you get too attached to it. A name can be optionally prefixed by a scope, e.g. `@myorg/mypackage`. See `npm-scope(7)` for more detail. diff --git a/deps/npm/doc/misc/npm-index.md b/deps/npm/doc/misc/npm-index.md index a68ac30c97..96c62cced6 100644 --- a/deps/npm/doc/misc/npm-index.md +++ b/deps/npm/doc/misc/npm-index.md @@ -11,7 +11,7 @@ Using npm on the command line ### npm(1) -node package manager +javascript package manager ### npm-adduser(1) @@ -199,7 +199,7 @@ Using npm in your Node programs ### npm(3) -node package manager +javascript package manager ### npm-bin(3) diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index cbd05d3b75..2738adcd74 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -126,7 +126,7 @@ specific purpose, or lack of malice in any given npm package.

If you have a complaint about a package in the public npm registry, and cannot resolve it with the package owner, please email -support@npmjs.com and explain the situation.

+support@npmjs.com and explain the situation.

Any data published to The npm Registry (including user account information) may be removed or modified at the sole discretion of the npm server administrators.

@@ -169,5 +169,5 @@ will no doubt tell you to put the output in a gist or email.

       - + diff --git a/deps/npm/html/doc/api/npm-bin.html b/deps/npm/html/doc/api/npm-bin.html index 6ca184d672..971bb13611 100644 --- a/deps/npm/html/doc/api/npm-bin.html +++ b/deps/npm/html/doc/api/npm-bin.html @@ -28,5 +28,5 @@ to the npm.bin property.

       - + diff --git a/deps/npm/html/doc/api/npm-bugs.html b/deps/npm/html/doc/api/npm-bugs.html index 07aafe2c72..e34204f8a6 100644 --- a/deps/npm/html/doc/api/npm-bugs.html +++ b/deps/npm/html/doc/api/npm-bugs.html @@ -33,5 +33,5 @@ friendly for programmatic use.

       - + diff --git a/deps/npm/html/doc/api/npm-cache.html b/deps/npm/html/doc/api/npm-cache.html index 77fb38f396..65e5d0d399 100644 --- a/deps/npm/html/doc/api/npm-cache.html +++ b/deps/npm/html/doc/api/npm-cache.html @@ -42,5 +42,5 @@ incrementation.

       - + diff --git a/deps/npm/html/doc/api/npm-commands.html b/deps/npm/html/doc/api/npm-commands.html index 98071c601a..36e2ab9a03 100644 --- a/deps/npm/html/doc/api/npm-commands.html +++ b/deps/npm/html/doc/api/npm-commands.html @@ -36,5 +36,5 @@ usage, or man 3 npm-<command> for programmatic usage.

       - + diff --git a/deps/npm/html/doc/api/npm-config.html b/deps/npm/html/doc/api/npm-config.html index f72789eef1..7ee80e63e3 100644 --- a/deps/npm/html/doc/api/npm-config.html +++ b/deps/npm/html/doc/api/npm-config.html @@ -57,5 +57,5 @@ functions instead.

       - + diff --git a/deps/npm/html/doc/api/npm-deprecate.html b/deps/npm/html/doc/api/npm-deprecate.html index 76381b99ee..8799f10ffd 100644 --- a/deps/npm/html/doc/api/npm-deprecate.html +++ b/deps/npm/html/doc/api/npm-deprecate.html @@ -47,5 +47,5 @@ a deprecation warning to all who attempt to install it.

       - + diff --git a/deps/npm/html/doc/api/npm-docs.html b/deps/npm/html/doc/api/npm-docs.html index 08a9a712a3..e13998e46f 100644 --- a/deps/npm/html/doc/api/npm-docs.html +++ b/deps/npm/html/doc/api/npm-docs.html @@ -33,5 +33,5 @@ friendly for programmatic use.

       - + diff --git a/deps/npm/html/doc/api/npm-edit.html b/deps/npm/html/doc/api/npm-edit.html index ab9a7ede33..9779d1743d 100644 --- a/deps/npm/html/doc/api/npm-edit.html +++ b/deps/npm/html/doc/api/npm-edit.html @@ -36,5 +36,5 @@ and how this is used.

       - + diff --git a/deps/npm/html/doc/api/npm-explore.html b/deps/npm/html/doc/api/npm-explore.html index 0c76406555..4b7d88cc94 100644 --- a/deps/npm/html/doc/api/npm-explore.html +++ b/deps/npm/html/doc/api/npm-explore.html @@ -31,5 +31,5 @@ sure to use npm rebuild <pkg> if you make any changes.

       - + diff --git a/deps/npm/html/doc/api/npm-help-search.html b/deps/npm/html/doc/api/npm-help-search.html index c1c4bb1b3a..7311b1d5d5 100644 --- a/deps/npm/html/doc/api/npm-help-search.html +++ b/deps/npm/html/doc/api/npm-help-search.html @@ -44,5 +44,5 @@ Name of the file that matched        - + diff --git a/deps/npm/html/doc/api/npm-init.html b/deps/npm/html/doc/api/npm-init.html index 52fe45e073..8ae0adaebb 100644 --- a/deps/npm/html/doc/api/npm-init.html +++ b/deps/npm/html/doc/api/npm-init.html @@ -39,5 +39,5 @@ then go ahead and use this programmatically.

       - + diff --git a/deps/npm/html/doc/api/npm-install.html b/deps/npm/html/doc/api/npm-install.html index f001913097..dc3cb69c74 100644 --- a/deps/npm/html/doc/api/npm-install.html +++ b/deps/npm/html/doc/api/npm-install.html @@ -32,5 +32,5 @@ installed or when an error has been encountered.

       - + diff --git a/deps/npm/html/doc/api/npm-link.html b/deps/npm/html/doc/api/npm-link.html index ffc909cbb2..81831911df 100644 --- a/deps/npm/html/doc/api/npm-link.html +++ b/deps/npm/html/doc/api/npm-link.html @@ -42,5 +42,5 @@ the package in the current working directory

       - + diff --git a/deps/npm/html/doc/api/npm-load.html b/deps/npm/html/doc/api/npm-load.html index 8a442887bb..3dd0d472df 100644 --- a/deps/npm/html/doc/api/npm-load.html +++ b/deps/npm/html/doc/api/npm-load.html @@ -37,5 +37,5 @@ config object.

       - + diff --git a/deps/npm/html/doc/api/npm-ls.html b/deps/npm/html/doc/api/npm-ls.html index c74f8d5a63..7c533218f6 100644 --- a/deps/npm/html/doc/api/npm-ls.html +++ b/deps/npm/html/doc/api/npm-ls.html @@ -63,5 +63,5 @@ dependency will only be output once.

       - + diff --git a/deps/npm/html/doc/api/npm-outdated.html b/deps/npm/html/doc/api/npm-outdated.html index 896bb24199..2511656267 100644 --- a/deps/npm/html/doc/api/npm-outdated.html +++ b/deps/npm/html/doc/api/npm-outdated.html @@ -28,5 +28,5 @@ currently outdated.

       - + diff --git a/deps/npm/html/doc/api/npm-owner.html b/deps/npm/html/doc/api/npm-owner.html index 02d19f331d..35070f867e 100644 --- a/deps/npm/html/doc/api/npm-owner.html +++ b/deps/npm/html/doc/api/npm-owner.html @@ -47,5 +47,5 @@ that is not implemented at this time.

       - + diff --git a/deps/npm/html/doc/api/npm-pack.html b/deps/npm/html/doc/api/npm-pack.html index f1e21945d5..c506967a88 100644 --- a/deps/npm/html/doc/api/npm-pack.html +++ b/deps/npm/html/doc/api/npm-pack.html @@ -33,5 +33,5 @@ overwritten the second time.

       - + diff --git a/deps/npm/html/doc/api/npm-prefix.html b/deps/npm/html/doc/api/npm-prefix.html index afe49dc115..19d5abc291 100644 --- a/deps/npm/html/doc/api/npm-prefix.html +++ b/deps/npm/html/doc/api/npm-prefix.html @@ -29,5 +29,5 @@        - + diff --git a/deps/npm/html/doc/api/npm-prune.html b/deps/npm/html/doc/api/npm-prune.html index dd783500dc..c528d1f1b7 100644 --- a/deps/npm/html/doc/api/npm-prune.html +++ b/deps/npm/html/doc/api/npm-prune.html @@ -30,5 +30,5 @@ package's dependencies list.

       - + diff --git a/deps/npm/html/doc/api/npm-publish.html b/deps/npm/html/doc/api/npm-publish.html index 1259ce0f75..96338745ca 100644 --- a/deps/npm/html/doc/api/npm-publish.html +++ b/deps/npm/html/doc/api/npm-publish.html @@ -46,5 +46,5 @@ the registry. Overwrites when the "force" environment variable is set        - + diff --git a/deps/npm/html/doc/api/npm-rebuild.html b/deps/npm/html/doc/api/npm-rebuild.html index 2461cd361f..9ff291a324 100644 --- a/deps/npm/html/doc/api/npm-rebuild.html +++ b/deps/npm/html/doc/api/npm-rebuild.html @@ -30,5 +30,5 @@ the new binary. If no 'packages' parameter is specify, every package wil        - + diff --git a/deps/npm/html/doc/api/npm-repo.html b/deps/npm/html/doc/api/npm-repo.html index 2364fb5b45..0f4436b8c3 100644 --- a/deps/npm/html/doc/api/npm-repo.html +++ b/deps/npm/html/doc/api/npm-repo.html @@ -33,5 +33,5 @@ friendly for programmatic use.

       - + diff --git a/deps/npm/html/doc/api/npm-restart.html b/deps/npm/html/doc/api/npm-restart.html index 3c43780c97..aade48106a 100644 --- a/deps/npm/html/doc/api/npm-restart.html +++ b/deps/npm/html/doc/api/npm-restart.html @@ -52,5 +52,5 @@ behavior will be accompanied by an increase in major version number

       - + diff --git a/deps/npm/html/doc/api/npm-root.html b/deps/npm/html/doc/api/npm-root.html index 071743e152..ebdede871e 100644 --- a/deps/npm/html/doc/api/npm-root.html +++ b/deps/npm/html/doc/api/npm-root.html @@ -29,5 +29,5 @@        - + diff --git a/deps/npm/html/doc/api/npm-run-script.html b/deps/npm/html/doc/api/npm-run-script.html index bc70d936d0..aed1a1f9d1 100644 --- a/deps/npm/html/doc/api/npm-run-script.html +++ b/deps/npm/html/doc/api/npm-run-script.html @@ -41,5 +41,5 @@ assumed to be the command to run. All other elements are ignored.

       - + diff --git a/deps/npm/html/doc/api/npm-search.html b/deps/npm/html/doc/api/npm-search.html index 075e49c52d..7faf23b649 100644 --- a/deps/npm/html/doc/api/npm-search.html +++ b/deps/npm/html/doc/api/npm-search.html @@ -53,5 +53,5 @@ like).

       - + diff --git a/deps/npm/html/doc/api/npm-shrinkwrap.html b/deps/npm/html/doc/api/npm-shrinkwrap.html index cabe6195ee..5da80e161c 100644 --- a/deps/npm/html/doc/api/npm-shrinkwrap.html +++ b/deps/npm/html/doc/api/npm-shrinkwrap.html @@ -33,5 +33,5 @@ been saved.

       - + diff --git a/deps/npm/html/doc/api/npm-start.html b/deps/npm/html/doc/api/npm-start.html index 7c7586cce1..5af05b1f1e 100644 --- a/deps/npm/html/doc/api/npm-start.html +++ b/deps/npm/html/doc/api/npm-start.html @@ -28,5 +28,5 @@        - + diff --git a/deps/npm/html/doc/api/npm-stop.html b/deps/npm/html/doc/api/npm-stop.html index 143a2f3eb1..fe29ac2a50 100644 --- a/deps/npm/html/doc/api/npm-stop.html +++ b/deps/npm/html/doc/api/npm-stop.html @@ -28,5 +28,5 @@ in the packages parameter.

       - + diff --git a/deps/npm/html/doc/api/npm-tag.html b/deps/npm/html/doc/api/npm-tag.html index d7c188dbcd..454329e630 100644 --- a/deps/npm/html/doc/api/npm-tag.html +++ b/deps/npm/html/doc/api/npm-tag.html @@ -21,7 +21,7 @@ currently used.

is the package name and version is the version number (much like installing a specific version).

The second element is the name of the tag to tag this version with. If this -parameter is missing or falsey (empty), the default froom the config will be +parameter is missing or falsey (empty), the default from the config will be used. For more information about how to set this config, check man 3 npm-config for programmatic usage or man npm-config for cli usage.

@@ -36,5 +36,5 @@ used. For more information about how to set this config, check        - + diff --git a/deps/npm/html/doc/api/npm-test.html b/deps/npm/html/doc/api/npm-test.html index fdda16c0ac..ecb1f949b2 100644 --- a/deps/npm/html/doc/api/npm-test.html +++ b/deps/npm/html/doc/api/npm-test.html @@ -30,5 +30,5 @@ in the packages parameter.

       - + diff --git a/deps/npm/html/doc/api/npm-uninstall.html b/deps/npm/html/doc/api/npm-uninstall.html index 690a1503ce..97baf3e8e9 100644 --- a/deps/npm/html/doc/api/npm-uninstall.html +++ b/deps/npm/html/doc/api/npm-uninstall.html @@ -30,5 +30,5 @@ uninstalled or when an error has been encountered.

       - + diff --git a/deps/npm/html/doc/api/npm-unpublish.html b/deps/npm/html/doc/api/npm-unpublish.html index ae2459a2d8..8e8d3e4186 100644 --- a/deps/npm/html/doc/api/npm-unpublish.html +++ b/deps/npm/html/doc/api/npm-unpublish.html @@ -33,5 +33,5 @@ the root package entry is removed from the registry entirely.

       - + diff --git a/deps/npm/html/doc/api/npm-update.html b/deps/npm/html/doc/api/npm-update.html index b9d4c410de..60a56e336c 100644 --- a/deps/npm/html/doc/api/npm-update.html +++ b/deps/npm/html/doc/api/npm-update.html @@ -27,5 +27,5 @@        - + diff --git a/deps/npm/html/doc/api/npm-version.html b/deps/npm/html/doc/api/npm-version.html index 72e63f308e..07f17f8491 100644 --- a/deps/npm/html/doc/api/npm-version.html +++ b/deps/npm/html/doc/api/npm-version.html @@ -32,5 +32,5 @@ not have exactly one element. The only element should be a version number.

       - + diff --git a/deps/npm/html/doc/api/npm-view.html b/deps/npm/html/doc/api/npm-view.html index 3297e83bcb..13b73d5463 100644 --- a/deps/npm/html/doc/api/npm-view.html +++ b/deps/npm/html/doc/api/npm-view.html @@ -81,5 +81,5 @@ the field name.

       - + diff --git a/deps/npm/html/doc/api/npm-whoami.html b/deps/npm/html/doc/api/npm-whoami.html index e5a317bbb1..f15772c49b 100644 --- a/deps/npm/html/doc/api/npm-whoami.html +++ b/deps/npm/html/doc/api/npm-whoami.html @@ -29,5 +29,5 @@        - + diff --git a/deps/npm/html/doc/api/npm.html b/deps/npm/html/doc/api/npm.html index 3d9912a930..3e9e8cd7aa 100644 --- a/deps/npm/html/doc/api/npm.html +++ b/deps/npm/html/doc/api/npm.html @@ -9,7 +9,7 @@
-

npm

node package manager

+

npm

javascript package manager

SYNOPSIS

var npm = require("npm")
 npm.load([configObject, ]function (er, npm) {
@@ -23,7 +23,7 @@ npm.load([configObject, ]function (er, npm) {
   npm.commands.install(["package"], cb)
 })
 

VERSION

-

2.1.18

+

2.2.0

DESCRIPTION

This is the API documentation for npm. To find documentation of the command line @@ -109,5 +109,5 @@ method names. Use the npm.deref method to find the real name.

       - + diff --git a/deps/npm/html/doc/cli/npm-adduser.html b/deps/npm/html/doc/cli/npm-adduser.html index 5a575a6762..73c55a20f5 100644 --- a/deps/npm/html/doc/cli/npm-adduser.html +++ b/deps/npm/html/doc/cli/npm-adduser.html @@ -68,5 +68,5 @@ precedence over any global configuration.

       - + diff --git a/deps/npm/html/doc/cli/npm-bin.html b/deps/npm/html/doc/cli/npm-bin.html index e47afcd0c2..9fb28248be 100644 --- a/deps/npm/html/doc/cli/npm-bin.html +++ b/deps/npm/html/doc/cli/npm-bin.html @@ -35,5 +35,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm-bugs.html b/deps/npm/html/doc/cli/npm-bugs.html index e32ec4a77b..46e1bb7142 100644 --- a/deps/npm/html/doc/cli/npm-bugs.html +++ b/deps/npm/html/doc/cli/npm-bugs.html @@ -54,5 +54,5 @@ a package.json in the current folder and use the name        - + diff --git a/deps/npm/html/doc/cli/npm-build.html b/deps/npm/html/doc/cli/npm-build.html index c1ae15ec43..321af44288 100644 --- a/deps/npm/html/doc/cli/npm-build.html +++ b/deps/npm/html/doc/cli/npm-build.html @@ -38,5 +38,5 @@ A folder containing a package.json file in its root.        - + diff --git a/deps/npm/html/doc/cli/npm-bundle.html b/deps/npm/html/doc/cli/npm-bundle.html index ea7506aa4d..49c06b8927 100644 --- a/deps/npm/html/doc/cli/npm-bundle.html +++ b/deps/npm/html/doc/cli/npm-bundle.html @@ -31,5 +31,5 @@ install packages into the local space.

       - + diff --git a/deps/npm/html/doc/cli/npm-cache.html b/deps/npm/html/doc/cli/npm-cache.html index 226cbf3555..e08fdc1570 100644 --- a/deps/npm/html/doc/cli/npm-cache.html +++ b/deps/npm/html/doc/cli/npm-cache.html @@ -81,5 +81,5 @@ they do not make an HTTP request to the registry.

       - + diff --git a/deps/npm/html/doc/cli/npm-completion.html b/deps/npm/html/doc/cli/npm-completion.html index fb5adbe0d9..49e16489c6 100644 --- a/deps/npm/html/doc/cli/npm-completion.html +++ b/deps/npm/html/doc/cli/npm-completion.html @@ -42,5 +42,5 @@ completions based on the arguments.

       - + diff --git a/deps/npm/html/doc/cli/npm-config.html b/deps/npm/html/doc/cli/npm-config.html index de2252bd69..a35e60beef 100644 --- a/deps/npm/html/doc/cli/npm-config.html +++ b/deps/npm/html/doc/cli/npm-config.html @@ -66,5 +66,5 @@ global config.

       - + diff --git a/deps/npm/html/doc/cli/npm-dedupe.html b/deps/npm/html/doc/cli/npm-dedupe.html index 01284bc664..85b74cb783 100644 --- a/deps/npm/html/doc/cli/npm-dedupe.html +++ b/deps/npm/html/doc/cli/npm-dedupe.html @@ -63,5 +63,5 @@ versions.

       - + diff --git a/deps/npm/html/doc/cli/npm-deprecate.html b/deps/npm/html/doc/cli/npm-deprecate.html index 8f0b86a171..ccbd233052 100644 --- a/deps/npm/html/doc/cli/npm-deprecate.html +++ b/deps/npm/html/doc/cli/npm-deprecate.html @@ -38,5 +38,5 @@ something like this:

       - + diff --git a/deps/npm/html/doc/cli/npm-docs.html b/deps/npm/html/doc/cli/npm-docs.html index ed0a3002fe..53e8f77c8c 100644 --- a/deps/npm/html/doc/cli/npm-docs.html +++ b/deps/npm/html/doc/cli/npm-docs.html @@ -56,5 +56,5 @@ the current folder and use the name property.

       - + diff --git a/deps/npm/html/doc/cli/npm-edit.html b/deps/npm/html/doc/cli/npm-edit.html index 1b15510be8..6fc2b6cb99 100644 --- a/deps/npm/html/doc/cli/npm-edit.html +++ b/deps/npm/html/doc/cli/npm-edit.html @@ -49,5 +49,5 @@ or "notepad" on Windows.        - + diff --git a/deps/npm/html/doc/cli/npm-explore.html b/deps/npm/html/doc/cli/npm-explore.html index edbe173994..d8b1c3345f 100644 --- a/deps/npm/html/doc/cli/npm-explore.html +++ b/deps/npm/html/doc/cli/npm-explore.html @@ -49,5 +49,5 @@ Windows        - + diff --git a/deps/npm/html/doc/cli/npm-help-search.html b/deps/npm/html/doc/cli/npm-help-search.html index 34e4061bed..47ae3dd884 100644 --- a/deps/npm/html/doc/cli/npm-help-search.html +++ b/deps/npm/html/doc/cli/npm-help-search.html @@ -46,5 +46,5 @@ where the terms were found in the documentation.

       - + diff --git a/deps/npm/html/doc/cli/npm-help.html b/deps/npm/html/doc/cli/npm-help.html index 9f4f3bba5a..ad398fd1cb 100644 --- a/deps/npm/html/doc/cli/npm-help.html +++ b/deps/npm/html/doc/cli/npm-help.html @@ -52,5 +52,5 @@ matches are equivalent to specifying a topic name.

       - + diff --git a/deps/npm/html/doc/cli/npm-init.html b/deps/npm/html/doc/cli/npm-init.html index acdd967d58..8d1573a907 100644 --- a/deps/npm/html/doc/cli/npm-init.html +++ b/deps/npm/html/doc/cli/npm-init.html @@ -40,5 +40,5 @@ defaults and not prompt you for any options.

       - + diff --git a/deps/npm/html/doc/cli/npm-install.html b/deps/npm/html/doc/cli/npm-install.html index 33897998b5..4ecf983b60 100644 --- a/deps/npm/html/doc/cli/npm-install.html +++ b/deps/npm/html/doc/cli/npm-install.html @@ -239,5 +239,5 @@ affects a real use-case, it will be investigated.

       - + diff --git a/deps/npm/html/doc/cli/npm-link.html b/deps/npm/html/doc/cli/npm-link.html index 72be63d7f3..605250dff9 100644 --- a/deps/npm/html/doc/cli/npm-link.html +++ b/deps/npm/html/doc/cli/npm-link.html @@ -71,5 +71,5 @@ include that scope, e.g.

       - + diff --git a/deps/npm/html/doc/cli/npm-ls.html b/deps/npm/html/doc/cli/npm-ls.html index ae44c1314c..9e339765c7 100644 --- a/deps/npm/html/doc/cli/npm-ls.html +++ b/deps/npm/html/doc/cli/npm-ls.html @@ -22,7 +22,7 @@ installed, as well as their dependencies, in a tree-structure.

limit the results to only the paths to the packages named. Note that nested packages will also show the paths to the specified packages. For example, running npm ls promzard in npm's source tree will show:

-
npm@2.1.18 /path/to/npm
+
npm@2.2.0 /path/to/npm
 └─┬ init-package-json@0.0.4
   └── promzard@0.1.5
 

It will print out extraneous, missing, and invalid packages.

@@ -85,5 +85,5 @@ project.

       - + diff --git a/deps/npm/html/doc/cli/npm-outdated.html b/deps/npm/html/doc/cli/npm-outdated.html index f62276ed84..097040ae33 100644 --- a/deps/npm/html/doc/cli/npm-outdated.html +++ b/deps/npm/html/doc/cli/npm-outdated.html @@ -67,5 +67,5 @@ project.

       - + diff --git a/deps/npm/html/doc/cli/npm-owner.html b/deps/npm/html/doc/cli/npm-owner.html index adc0af02bd..8f525c08e5 100644 --- a/deps/npm/html/doc/cli/npm-owner.html +++ b/deps/npm/html/doc/cli/npm-owner.html @@ -49,5 +49,5 @@ that is not implemented at this time.

       - + diff --git a/deps/npm/html/doc/cli/npm-pack.html b/deps/npm/html/doc/cli/npm-pack.html index af2fe5c85d..dc24a7fb4d 100644 --- a/deps/npm/html/doc/cli/npm-pack.html +++ b/deps/npm/html/doc/cli/npm-pack.html @@ -41,5 +41,5 @@ overwritten the second time.

       - + diff --git a/deps/npm/html/doc/cli/npm-prefix.html b/deps/npm/html/doc/cli/npm-prefix.html index b6a8783fd9..03b2137713 100644 --- a/deps/npm/html/doc/cli/npm-prefix.html +++ b/deps/npm/html/doc/cli/npm-prefix.html @@ -38,5 +38,5 @@ to contain a package.json file unless -g is also specified.

       - + diff --git a/deps/npm/html/doc/cli/npm-prune.html b/deps/npm/html/doc/cli/npm-prune.html index 6610508e17..98c757a453 100644 --- a/deps/npm/html/doc/cli/npm-prune.html +++ b/deps/npm/html/doc/cli/npm-prune.html @@ -39,5 +39,5 @@ packages specified in your devDependencies.

       - + diff --git a/deps/npm/html/doc/cli/npm-publish.html b/deps/npm/html/doc/cli/npm-publish.html index 9044ed38f0..f5d7adfaa4 100644 --- a/deps/npm/html/doc/cli/npm-publish.html +++ b/deps/npm/html/doc/cli/npm-publish.html @@ -59,5 +59,5 @@ it is removed with        - + diff --git a/deps/npm/html/doc/cli/npm-rebuild.html b/deps/npm/html/doc/cli/npm-rebuild.html index 2b3d758619..e1a3ca6e98 100644 --- a/deps/npm/html/doc/cli/npm-rebuild.html +++ b/deps/npm/html/doc/cli/npm-rebuild.html @@ -38,5 +38,5 @@ the new binary.

       - + diff --git a/deps/npm/html/doc/cli/npm-repo.html b/deps/npm/html/doc/cli/npm-repo.html index 631781c47b..050c1f624d 100644 --- a/deps/npm/html/doc/cli/npm-repo.html +++ b/deps/npm/html/doc/cli/npm-repo.html @@ -42,5 +42,5 @@ a package.json in the current folder and use the name        - + diff --git a/deps/npm/html/doc/cli/npm-restart.html b/deps/npm/html/doc/cli/npm-restart.html index ea0b1bd5db..37deabf887 100644 --- a/deps/npm/html/doc/cli/npm-restart.html +++ b/deps/npm/html/doc/cli/npm-restart.html @@ -53,5 +53,5 @@ behavior will be accompanied by an increase in major version number

       - + diff --git a/deps/npm/html/doc/cli/npm-rm.html b/deps/npm/html/doc/cli/npm-rm.html index 772a3dc8c7..845da11c61 100644 --- a/deps/npm/html/doc/cli/npm-rm.html +++ b/deps/npm/html/doc/cli/npm-rm.html @@ -39,5 +39,5 @@ on its behalf.

       - + diff --git a/deps/npm/html/doc/cli/npm-root.html b/deps/npm/html/doc/cli/npm-root.html index 37b6291585..044a914531 100644 --- a/deps/npm/html/doc/cli/npm-root.html +++ b/deps/npm/html/doc/cli/npm-root.html @@ -35,5 +35,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm-run-script.html b/deps/npm/html/doc/cli/npm-run-script.html index ec7df7489d..69f93318c4 100644 --- a/deps/npm/html/doc/cli/npm-run-script.html +++ b/deps/npm/html/doc/cli/npm-run-script.html @@ -17,9 +17,12 @@ npm run [command] [-- <args>]

This runs an arbitrary command from a package's "scripts" object. If no package name is provided, it will search for a package.json in the current folder and use its "scripts" object. If no "command" -is provided, it will list the available top level scripts.

-

It is used by the test, start, restart, and stop commands, but can be -called directly, as well.

+is provided, it will list the available top level scripts. The env command +can be used to list environment variables that will be available to the script +at runtime. If an "env" command is defined in your package it will have +precedence instead.

+

run[-script] is used by the test, start, restart, and stop commands, but can +be called directly, as well.

As of npm@2.0.0, you can use custom arguments when executing scripts. The special option -- is used by getopt to delimit the end of the options. npm will pass @@ -47,5 +50,5 @@ and not to any pre or post script.

       - + diff --git a/deps/npm/html/doc/cli/npm-search.html b/deps/npm/html/doc/cli/npm-search.html index ff015526e6..f2943cca9f 100644 --- a/deps/npm/html/doc/cli/npm-search.html +++ b/deps/npm/html/doc/cli/npm-search.html @@ -49,5 +49,5 @@ fall on multiple lines.

       - + diff --git a/deps/npm/html/doc/cli/npm-shrinkwrap.html b/deps/npm/html/doc/cli/npm-shrinkwrap.html index 67dcc29387..3d6fb470b3 100644 --- a/deps/npm/html/doc/cli/npm-shrinkwrap.html +++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html @@ -164,5 +164,5 @@ contents rather than versions.

       - + diff --git a/deps/npm/html/doc/cli/npm-star.html b/deps/npm/html/doc/cli/npm-star.html index 4608b23de5..ceb9bcf0b5 100644 --- a/deps/npm/html/doc/cli/npm-star.html +++ b/deps/npm/html/doc/cli/npm-star.html @@ -36,5 +36,5 @@ a vaguely positive way to show that you care.

       - + diff --git a/deps/npm/html/doc/cli/npm-stars.html b/deps/npm/html/doc/cli/npm-stars.html index dcc8478a7d..ee5cf6ed57 100644 --- a/deps/npm/html/doc/cli/npm-stars.html +++ b/deps/npm/html/doc/cli/npm-stars.html @@ -37,5 +37,5 @@ you will most certainly enjoy this command.

       - + diff --git a/deps/npm/html/doc/cli/npm-start.html b/deps/npm/html/doc/cli/npm-start.html index 627463ba45..c9ed7fc39e 100644 --- a/deps/npm/html/doc/cli/npm-start.html +++ b/deps/npm/html/doc/cli/npm-start.html @@ -34,5 +34,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm-stop.html b/deps/npm/html/doc/cli/npm-stop.html index 527581be74..c1f54ba8f7 100644 --- a/deps/npm/html/doc/cli/npm-stop.html +++ b/deps/npm/html/doc/cli/npm-stop.html @@ -34,5 +34,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm-tag.html b/deps/npm/html/doc/cli/npm-tag.html index 836fb63532..d3540dae31 100644 --- a/deps/npm/html/doc/cli/npm-tag.html +++ b/deps/npm/html/doc/cli/npm-tag.html @@ -22,6 +22,22 @@ of using a specific version number:

npm install --tag <tag>
 

This also applies to npm dedupe.

Publishing a package always sets the "latest" tag to the published version.

+

PURPOSE

+

Tags can be used to provide an alias instead of version numbers. For +example, npm currently uses the tag "next" to identify the upcoming +version, and the tag "latest" to identify the current version.

+

A project might choose to have multiple streams of development, e.g., +"stable", "canary".

+

CAVEATS

+

Tags must share a namespace with version numbers, because they are +specified in the same slot: npm install <pkg>@<version> vs npm +install <pkg>@<tag>.

+

Tags that can be interpreted as valid semver ranges will be +rejected. For example, v1.4 cannot be used as a tag, because it is +interpreted by semver as >=1.4.0 <1.5.0. See +https://github.com/npm/npm/issues/6082.

+

The simplest way to avoid semver problems with tags is to use tags +that do not begin with a number or the letter v.

SEE ALSO

@@ -44,5 +61,5 @@ of using a specific version number:

       - + diff --git a/deps/npm/html/doc/cli/npm-test.html b/deps/npm/html/doc/cli/npm-test.html index 48e7ae8d6d..754e7a91a1 100644 --- a/deps/npm/html/doc/cli/npm-test.html +++ b/deps/npm/html/doc/cli/npm-test.html @@ -37,5 +37,5 @@ true.

       - + diff --git a/deps/npm/html/doc/cli/npm-uninstall.html b/deps/npm/html/doc/cli/npm-uninstall.html index 9771b9c505..b7a7426ea8 100644 --- a/deps/npm/html/doc/cli/npm-uninstall.html +++ b/deps/npm/html/doc/cli/npm-uninstall.html @@ -57,5 +57,5 @@ npm uninstall dtrace-provider --save-optional        - + diff --git a/deps/npm/html/doc/cli/npm-unpublish.html b/deps/npm/html/doc/cli/npm-unpublish.html index 293e2057a8..3c4df5efe3 100644 --- a/deps/npm/html/doc/cli/npm-unpublish.html +++ b/deps/npm/html/doc/cli/npm-unpublish.html @@ -47,5 +47,5 @@ package again, a new version number must be used.

       - + diff --git a/deps/npm/html/doc/cli/npm-update.html b/deps/npm/html/doc/cli/npm-update.html index 9846147355..72f508aab3 100644 --- a/deps/npm/html/doc/cli/npm-update.html +++ b/deps/npm/html/doc/cli/npm-update.html @@ -15,7 +15,9 @@

DESCRIPTION

This command will update all the packages listed to the latest version (specified by the tag config).

-

It will also install missing packages.

+

It will also install missing packages. As with all commands that install +packages, the --dev flag will cause devDependencies to be processed +as well.

If the -g flag is specified, this command will update globally installed packages.

If no package name is specified, all packages in the specified location (global @@ -40,5 +42,5 @@ or local) will be updated.

       - + diff --git a/deps/npm/html/doc/cli/npm-version.html b/deps/npm/html/doc/cli/npm-version.html index 825baab43c..a9a40f7366 100644 --- a/deps/npm/html/doc/cli/npm-version.html +++ b/deps/npm/html/doc/cli/npm-version.html @@ -55,5 +55,5 @@ Enter passphrase:        - + diff --git a/deps/npm/html/doc/cli/npm-view.html b/deps/npm/html/doc/cli/npm-view.html index 69c1d06b9c..aee2ff19a6 100644 --- a/deps/npm/html/doc/cli/npm-view.html +++ b/deps/npm/html/doc/cli/npm-view.html @@ -82,5 +82,5 @@ the field name.

       - + diff --git a/deps/npm/html/doc/cli/npm-whoami.html b/deps/npm/html/doc/cli/npm-whoami.html index 9d71b8e0f1..d6b6425c0a 100644 --- a/deps/npm/html/doc/cli/npm-whoami.html +++ b/deps/npm/html/doc/cli/npm-whoami.html @@ -33,5 +33,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm.html b/deps/npm/html/doc/cli/npm.html index e3077b3fe8..64f8d3f554 100644 --- a/deps/npm/html/doc/cli/npm.html +++ b/deps/npm/html/doc/cli/npm.html @@ -9,11 +9,11 @@
-

npm

node package manager

+

npm

javascript package manager

SYNOPSIS

npm <command> [args]
 

VERSION

-

2.1.18

+

2.2.0

DESCRIPTION

npm is the package manager for the Node JavaScript platform. It puts modules in place so that node can find them, and manages dependency @@ -110,7 +110,7 @@ easily by doing npm view npm contributors.

the issues list or ask on the mailing list.

BUGS

When you find issues, please report them:

@@ -118,7 +118,7 @@ the issues list or ask on the mailing list.

  • web: http://github.com/npm/npm/issues
  • email: -npm-@googlegroups.com
  • +npm-@googlegroups.com

    Be sure to include all of the output from the npm command that didn't work as expected. The npm-debug.log file is also helpful to provide.

    @@ -128,7 +128,7 @@ will no doubt tell you to put the output in a gist or email.

    Isaac Z. Schlueter :: isaacs :: @izs :: -i@izs.me

    +i@izs.me

    SEE ALSO

    A name can be optionally prefixed by a scope, e.g. @myorg/mypackage. See npm-scope(7) for more detail.

    @@ -488,5 +488,5 @@ ignored.

           - + diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html index 5600e24380..4ee352e536 100644 --- a/deps/npm/html/doc/files/npmrc.html +++ b/deps/npm/html/doc/files/npmrc.html @@ -77,5 +77,5 @@ manner.

           - + diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html index 4360a1488b..ff1f7cff21 100644 --- a/deps/npm/html/doc/files/package.json.html +++ b/deps/npm/html/doc/files/package.json.html @@ -32,7 +32,7 @@ Also, it can't start with a dot or an underscore.
  • The name will probably be passed as an argument to require(), so it should be something short, but also reasonably descriptive.
  • You may want to check the npm registry to see if there's something by that name -already, before you get too attached to it. http://registry.npmjs.org/
  • +already, before you get too attached to it. https://www.npmjs.com/

    A name can be optionally prefixed by a scope, e.g. @myorg/mypackage. See npm-scope(7) for more detail.

    @@ -488,5 +488,5 @@ ignored.

           - + diff --git a/deps/npm/html/doc/index.html b/deps/npm/html/doc/index.html index 88e64e9079..97d5862263 100644 --- a/deps/npm/html/doc/index.html +++ b/deps/npm/html/doc/index.html @@ -15,7 +15,7 @@

    Command Line Documentation

    Using npm on the command line

    npm(1)

    -

    node package manager

    +

    javascript package manager

    npm-adduser(1)

    Add a registry user account

    npm-bin(1)

    @@ -109,7 +109,7 @@

    API Documentation

    Using npm in your Node programs

    npm(3)

    -

    node package manager

    +

    javascript package manager

    npm-bin(3)

    Display npm bin folder

    npm-bugs(3)

    @@ -230,5 +230,5 @@        - + diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html index a5f04aff72..04925d5e2d 100644 --- a/deps/npm/html/doc/misc/npm-coding-style.html +++ b/deps/npm/html/doc/misc/npm-coding-style.html @@ -147,5 +147,5 @@ set to anything."

           - + diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html index 5f68b86786..f3e89cf43f 100644 --- a/deps/npm/html/doc/misc/npm-config.html +++ b/deps/npm/html/doc/misc/npm-config.html @@ -767,5 +767,5 @@ exit successfully.

           - + diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html index 18d1020e15..42f1006373 100644 --- a/deps/npm/html/doc/misc/npm-developers.html +++ b/deps/npm/html/doc/misc/npm-developers.html @@ -189,5 +189,5 @@ from a fresh checkout.

           - + diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html index 00a0e2a650..68f9271ca7 100644 --- a/deps/npm/html/doc/misc/npm-disputes.html +++ b/deps/npm/html/doc/misc/npm-disputes.html @@ -13,7 +13,7 @@

    SYNOPSIS

    1. Get the author email with npm owner ls <pkgname>
    2. -
    3. Email the author, CC support@npmjs.com
    4. +
    5. Email the author, CC support@npmjs.com
    6. After a few weeks, if there's no resolution, we'll sort it out.

    Don't squat on package names. Publish code or move out of the way.

    @@ -51,12 +51,12 @@ Joe's appropriate course of action in each case is the same.

    owner (Bob).
  • Joe emails Bob, explaining the situation as respectfully as possible, and what he would like to do with the module name. He -adds the npm support staff support@npmjs.com to the CC list of +adds the npm support staff support@npmjs.com to the CC list of the email. Mention in the email that Bob can run npm owner add joe foo to add Joe as an owner of the foo package.
  • After a reasonable amount of time, if Bob has not responded, or if Bob and Joe can't come to any sort of resolution, email support -support@npmjs.com and we'll sort it out. ("Reasonable" is +support@npmjs.com and we'll sort it out. ("Reasonable" is usually at least 4 weeks, but extra time is allowed around common holidays.)
  • @@ -112,5 +112,5 @@ things into it.        - + diff --git a/deps/npm/html/doc/misc/npm-faq.html b/deps/npm/html/doc/misc/npm-faq.html index 6caf41929f..01caec95a6 100644 --- a/deps/npm/html/doc/misc/npm-faq.html +++ b/deps/npm/html/doc/misc/npm-faq.html @@ -236,7 +236,7 @@ that has a package.json in its root, or a git url.

    To check if the registry is down, open up https://registry.npmjs.org/ in a web browser. This will also tell you if you are just unable to access the internet for some reason.

    -

    If the registry IS down, let us know by emailing support@npmjs.com +

    If the registry IS down, let us know by emailing support@npmjs.com or posting an issue at https://github.com/npm/npm/issues. If it's down for the world (and not just on your local network) then we're probably already being pinged about it.

    @@ -307,5 +307,5 @@ good folks at npm, Inc.

           - + diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html index 60a8845a77..4f6fd59228 100644 --- a/deps/npm/html/doc/misc/npm-index.html +++ b/deps/npm/html/doc/misc/npm-index.html @@ -15,7 +15,7 @@

    Command Line Documentation

    Using npm on the command line

    npm(1)

    -

    node package manager

    +

    javascript package manager

    npm-adduser(1)

    Add a registry user account

    npm-bin(1)

    @@ -109,7 +109,7 @@

    API Documentation

    Using npm in your Node programs

    npm(3)

    -

    node package manager

    +

    javascript package manager

    npm-bin(3)

    Display npm bin folder

    npm-bugs(3)

    @@ -230,5 +230,5 @@        - + diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html index 9c82de7168..4730dff297 100644 --- a/deps/npm/html/doc/misc/npm-registry.html +++ b/deps/npm/html/doc/misc/npm-registry.html @@ -70,5 +70,5 @@ effectively implement the entire CouchDB API anyway.

           - + diff --git a/deps/npm/html/doc/misc/npm-scope.html b/deps/npm/html/doc/misc/npm-scope.html index 3b81cf00ce..ffb364a06a 100644 --- a/deps/npm/html/doc/misc/npm-scope.html +++ b/deps/npm/html/doc/misc/npm-scope.html @@ -78,5 +78,5 @@ that registry instead.

           - + diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html index 4f0d466efd..3210818e40 100644 --- a/deps/npm/html/doc/misc/npm-scripts.html +++ b/deps/npm/html/doc/misc/npm-scripts.html @@ -216,5 +216,5 @@ the user will sudo the npm command in question.        - + diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html index e8f05b097f..aad4b522d4 100644 --- a/deps/npm/html/doc/misc/removing-npm.html +++ b/deps/npm/html/doc/misc/removing-npm.html @@ -57,5 +57,5 @@ modules. To track those down, you can do the following:

           - + diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html index 3b1556041e..98de492fd7 100644 --- a/deps/npm/html/doc/misc/semver.html +++ b/deps/npm/html/doc/misc/semver.html @@ -279,5 +279,5 @@ range, use the satisfies(version, range) function.

           - + diff --git a/deps/npm/html/index.html b/deps/npm/html/index.html index bf0a3f0b62..06ca14ba4a 100644 --- a/deps/npm/html/index.html +++ b/deps/npm/html/index.html @@ -52,7 +52,7 @@ code { background:#fff ; outline: 1px solid #ccc; padding:0 2px; } } - npm - Node Package Manager + npm - JavaScript Package Manager

    npm

    diff --git a/deps/npm/html/partial/doc/README.html b/deps/npm/html/partial/doc/README.html index 823c8a0b5e..182dbb18bd 100644 --- a/deps/npm/html/partial/doc/README.html +++ b/deps/npm/html/partial/doc/README.html @@ -115,7 +115,7 @@ specific purpose, or lack of malice in any given npm package.

    If you have a complaint about a package in the public npm registry, and cannot resolve it with the package owner, please email -support@npmjs.com and explain the situation.

    +support@npmjs.com and explain the situation.

    Any data published to The npm Registry (including user account information) may be removed or modified at the sole discretion of the npm server administrators.

    diff --git a/deps/npm/html/partial/doc/api/npm-tag.html b/deps/npm/html/partial/doc/api/npm-tag.html index f288fc15cf..227c91b46c 100644 --- a/deps/npm/html/partial/doc/api/npm-tag.html +++ b/deps/npm/html/partial/doc/api/npm-tag.html @@ -10,7 +10,7 @@ currently used.

    is the package name and version is the version number (much like installing a specific version).

    The second element is the name of the tag to tag this version with. If this -parameter is missing or falsey (empty), the default froom the config will be +parameter is missing or falsey (empty), the default from the config will be used. For more information about how to set this config, check man 3 npm-config for programmatic usage or man npm-config for cli usage.

    diff --git a/deps/npm/html/partial/doc/api/npm.html b/deps/npm/html/partial/doc/api/npm.html index dd5276a751..52e80b12ba 100644 --- a/deps/npm/html/partial/doc/api/npm.html +++ b/deps/npm/html/partial/doc/api/npm.html @@ -1,4 +1,4 @@ -

    npm

    node package manager

    +

    npm

    javascript package manager

    SYNOPSIS

    var npm = require("npm")
     npm.load([configObject, ]function (er, npm) {
    @@ -12,7 +12,7 @@ npm.load([configObject, ]function (er, npm) {
       npm.commands.install(["package"], cb)
     })
     

    VERSION

    -

    2.1.18

    +

    2.2.0

    DESCRIPTION

    This is the API documentation for npm. To find documentation of the command line diff --git a/deps/npm/html/partial/doc/cli/npm-ls.html b/deps/npm/html/partial/doc/cli/npm-ls.html index 3a5cae1b49..bfbb8f8c50 100644 --- a/deps/npm/html/partial/doc/cli/npm-ls.html +++ b/deps/npm/html/partial/doc/cli/npm-ls.html @@ -11,7 +11,7 @@ installed, as well as their dependencies, in a tree-structure.

    limit the results to only the paths to the packages named. Note that nested packages will also show the paths to the specified packages. For example, running npm ls promzard in npm's source tree will show:

    -
    npm@2.1.18 /path/to/npm
    +
    npm@2.2.0 /path/to/npm
     └─┬ init-package-json@0.0.4
       └── promzard@0.1.5
     

    It will print out extraneous, missing, and invalid packages.

    diff --git a/deps/npm/html/partial/doc/cli/npm-run-script.html b/deps/npm/html/partial/doc/cli/npm-run-script.html index b9a7cefce9..13ff259638 100644 --- a/deps/npm/html/partial/doc/cli/npm-run-script.html +++ b/deps/npm/html/partial/doc/cli/npm-run-script.html @@ -6,9 +6,12 @@ npm run [command] [-- <args>]

    This runs an arbitrary command from a package's "scripts" object. If no package name is provided, it will search for a package.json in the current folder and use its "scripts" object. If no "command" -is provided, it will list the available top level scripts.

    -

    It is used by the test, start, restart, and stop commands, but can be -called directly, as well.

    +is provided, it will list the available top level scripts. The env command +can be used to list environment variables that will be available to the script +at runtime. If an "env" command is defined in your package it will have +precedence instead.

    +

    run[-script] is used by the test, start, restart, and stop commands, but can +be called directly, as well.

    As of npm@2.0.0, you can use custom arguments when executing scripts. The special option -- is used by getopt to delimit the end of the options. npm will pass diff --git a/deps/npm/html/partial/doc/cli/npm-tag.html b/deps/npm/html/partial/doc/cli/npm-tag.html index 61b1c76e65..3d0ff71861 100644 --- a/deps/npm/html/partial/doc/cli/npm-tag.html +++ b/deps/npm/html/partial/doc/cli/npm-tag.html @@ -11,6 +11,22 @@ of using a specific version number:

    npm install --tag <tag>
     

    This also applies to npm dedupe.

    Publishing a package always sets the "latest" tag to the published version.

    +

    PURPOSE

    +

    Tags can be used to provide an alias instead of version numbers. For +example, npm currently uses the tag "next" to identify the upcoming +version, and the tag "latest" to identify the current version.

    +

    A project might choose to have multiple streams of development, e.g., +"stable", "canary".

    +

    CAVEATS

    +

    Tags must share a namespace with version numbers, because they are +specified in the same slot: npm install <pkg>@<version> vs npm +install <pkg>@<tag>.

    +

    Tags that can be interpreted as valid semver ranges will be +rejected. For example, v1.4 cannot be used as a tag, because it is +interpreted by semver as >=1.4.0 <1.5.0. See +https://github.com/npm/npm/issues/6082.

    +

    The simplest way to avoid semver problems with tags is to use tags +that do not begin with a number or the letter v.

    SEE ALSO

    diff --git a/deps/npm/html/partial/doc/cli/npm-update.html b/deps/npm/html/partial/doc/cli/npm-update.html index 3923be7faf..6e35abd451 100644 --- a/deps/npm/html/partial/doc/cli/npm-update.html +++ b/deps/npm/html/partial/doc/cli/npm-update.html @@ -4,7 +4,9 @@

    DESCRIPTION

    This command will update all the packages listed to the latest version (specified by the tag config).

    -

    It will also install missing packages.

    +

    It will also install missing packages. As with all commands that install +packages, the --dev flag will cause devDependencies to be processed +as well.

    If the -g flag is specified, this command will update globally installed packages.

    If no package name is specified, all packages in the specified location (global diff --git a/deps/npm/html/partial/doc/cli/npm.html b/deps/npm/html/partial/doc/cli/npm.html index 94ab5a6451..7f7892ec62 100644 --- a/deps/npm/html/partial/doc/cli/npm.html +++ b/deps/npm/html/partial/doc/cli/npm.html @@ -1,8 +1,8 @@ -

    npm

    node package manager

    +

    npm

    javascript package manager

    SYNOPSIS

    npm <command> [args]
     

    VERSION

    -

    2.1.18

    +

    2.2.0

    DESCRIPTION

    npm is the package manager for the Node JavaScript platform. It puts modules in place so that node can find them, and manages dependency @@ -99,7 +99,7 @@ easily by doing npm view npm contributors.

    the issues list or ask on the mailing list.

    BUGS

    When you find issues, please report them:

    @@ -107,7 +107,7 @@ the issues list or ask on the mailing list.

  • web: http://github.com/npm/npm/issues
  • email: -npm-@googlegroups.com
  • +npm-@googlegroups.com

    Be sure to include all of the output from the npm command that didn't work as expected. The npm-debug.log file is also helpful to provide.

    @@ -117,7 +117,7 @@ will no doubt tell you to put the output in a gist or email.

    Isaac Z. Schlueter :: isaacs :: @izs :: -i@izs.me

    +i@izs.me

    SEE ALSO

    • npm-help(1)
    • diff --git a/deps/npm/html/partial/doc/files/npm-json.html b/deps/npm/html/partial/doc/files/npm-json.html index 1e297ad77a..31e4979b87 100644 --- a/deps/npm/html/partial/doc/files/npm-json.html +++ b/deps/npm/html/partial/doc/files/npm-json.html @@ -21,7 +21,7 @@ Also, it can't start with a dot or an underscore.
    • The name will probably be passed as an argument to require(), so it should be something short, but also reasonably descriptive.
    • You may want to check the npm registry to see if there's something by that name -already, before you get too attached to it. http://registry.npmjs.org/
    • +already, before you get too attached to it. https://www.npmjs.com/

    A name can be optionally prefixed by a scope, e.g. @myorg/mypackage. See npm-scope(7) for more detail.

    diff --git a/deps/npm/html/partial/doc/files/package.json.html b/deps/npm/html/partial/doc/files/package.json.html index 1e297ad77a..31e4979b87 100644 --- a/deps/npm/html/partial/doc/files/package.json.html +++ b/deps/npm/html/partial/doc/files/package.json.html @@ -21,7 +21,7 @@ Also, it can't start with a dot or an underscore.
  • The name will probably be passed as an argument to require(), so it should be something short, but also reasonably descriptive.
  • You may want to check the npm registry to see if there's something by that name -already, before you get too attached to it. http://registry.npmjs.org/
  • +already, before you get too attached to it. https://www.npmjs.com/

    A name can be optionally prefixed by a scope, e.g. @myorg/mypackage. See npm-scope(7) for more detail.

    diff --git a/deps/npm/html/partial/doc/index.html b/deps/npm/html/partial/doc/index.html index 6af3f79bd9..4fb98e1bd6 100644 --- a/deps/npm/html/partial/doc/index.html +++ b/deps/npm/html/partial/doc/index.html @@ -4,7 +4,7 @@

    Command Line Documentation

    Using npm on the command line

    npm(1)

    -

    node package manager

    +

    javascript package manager

    npm-adduser(1)

    Add a registry user account

    npm-bin(1)

    @@ -98,7 +98,7 @@

    API Documentation

    Using npm in your Node programs

    npm(3)

    -

    node package manager

    +

    javascript package manager

    npm-bin(3)

    Display npm bin folder

    npm-bugs(3)

    diff --git a/deps/npm/html/partial/doc/misc/npm-disputes.html b/deps/npm/html/partial/doc/misc/npm-disputes.html index 7e6983ceb2..1cc7ca38ae 100644 --- a/deps/npm/html/partial/doc/misc/npm-disputes.html +++ b/deps/npm/html/partial/doc/misc/npm-disputes.html @@ -2,7 +2,7 @@

    SYNOPSIS

    1. Get the author email with npm owner ls <pkgname>
    2. -
    3. Email the author, CC support@npmjs.com
    4. +
    5. Email the author, CC support@npmjs.com
    6. After a few weeks, if there's no resolution, we'll sort it out.

    Don't squat on package names. Publish code or move out of the way.

    @@ -40,12 +40,12 @@ Joe's appropriate course of action in each case is the same.

    owner (Bob).
  • Joe emails Bob, explaining the situation as respectfully as possible, and what he would like to do with the module name. He -adds the npm support staff support@npmjs.com to the CC list of +adds the npm support staff support@npmjs.com to the CC list of the email. Mention in the email that Bob can run npm owner add joe foo to add Joe as an owner of the foo package.
  • After a reasonable amount of time, if Bob has not responded, or if Bob and Joe can't come to any sort of resolution, email support -support@npmjs.com and we'll sort it out. ("Reasonable" is +support@npmjs.com and we'll sort it out. ("Reasonable" is usually at least 4 weeks, but extra time is allowed around common holidays.)
  • diff --git a/deps/npm/html/partial/doc/misc/npm-faq.html b/deps/npm/html/partial/doc/misc/npm-faq.html index f42abe7159..5b935102cd 100644 --- a/deps/npm/html/partial/doc/misc/npm-faq.html +++ b/deps/npm/html/partial/doc/misc/npm-faq.html @@ -225,7 +225,7 @@ that has a package.json in its root, or a git url.

    To check if the registry is down, open up https://registry.npmjs.org/ in a web browser. This will also tell you if you are just unable to access the internet for some reason.

    -

    If the registry IS down, let us know by emailing support@npmjs.com +

    If the registry IS down, let us know by emailing support@npmjs.com or posting an issue at https://github.com/npm/npm/issues. If it's down for the world (and not just on your local network) then we're probably already being pinged about it.

    diff --git a/deps/npm/html/partial/doc/misc/npm-index.html b/deps/npm/html/partial/doc/misc/npm-index.html index 3800cea938..eab0753c9e 100644 --- a/deps/npm/html/partial/doc/misc/npm-index.html +++ b/deps/npm/html/partial/doc/misc/npm-index.html @@ -4,7 +4,7 @@

    Command Line Documentation

    Using npm on the command line

    npm(1)

    -

    node package manager

    +

    javascript package manager

    npm-adduser(1)

    Add a registry user account

    npm-bin(1)

    @@ -98,7 +98,7 @@

    API Documentation

    Using npm in your Node programs

    npm(3)

    -

    node package manager

    +

    javascript package manager

    npm-bin(3)

    Display npm bin folder

    npm-bugs(3)

    diff --git a/deps/npm/lib/config.js b/deps/npm/lib/config.js index f51156aad4..d2a6a89f69 100644 --- a/deps/npm/lib/config.js +++ b/deps/npm/lib/config.js @@ -84,7 +84,7 @@ function edit (cb) { ] ) .concat(Object.keys(npmconf.defaults).reduce(function (arr, key) { - var obj = {}; + var obj = {} obj[key] = npmconf.defaults[key] if (key === "logstream") return arr return arr.concat( @@ -138,7 +138,7 @@ function set (key, val, cb) { function get (key, cb) { if (!key) return list(cb) - if (key.charAt(0) === "_") { + if (!public(key)) { return cb(new Error("---sekretz---")) } console.log(npm.config.get(key)) @@ -150,7 +150,9 @@ function sort (a, b) { } function public (k) { - return !(k.charAt(0) === "_" || types[k] !== types[k]) + return !(k.charAt(0) === "_" || + k.indexOf(":_") !== -1 || + types[k] !== types[k]) } function getKeys (data) { diff --git a/deps/npm/lib/run-script.js b/deps/npm/lib/run-script.js index fd26a0c43b..ce8ea0f13a 100644 --- a/deps/npm/lib/run-script.js +++ b/deps/npm/lib/run-script.js @@ -125,9 +125,17 @@ function run (pkg, wd, cmd, args, cb) { } else { if (!pkg.scripts[cmd]) { if (cmd === "test") { - pkg.scripts.test = "echo \"Error: no test specified\""; + pkg.scripts.test = "echo \"Error: no test specified\"" + } else if (cmd === "env") { + if (process.platform === "win32") { + log.verbose("run-script using default platform env: SET (Windows)") + pkg.scripts[cmd] = "SET" + } else { + log.verbose("run-script using default platform env: env (Unix)") + pkg.scripts[cmd] = "env" + } } else { - return cb(new Error("missing script: " + cmd)); + return cb(new Error("missing script: " + cmd)) } } cmds = [cmd] @@ -140,7 +148,9 @@ function run (pkg, wd, cmd, args, cb) { log.verbose("run-script", cmds) chain(cmds.map(function (c) { // pass cli arguments after -- to script. - if (pkg.scripts[c] && c === cmd) pkg.scripts[c] = pkg.scripts[c] + joinArgs(args) + if (pkg.scripts[c] && c === cmd) { + pkg.scripts[c] = pkg.scripts[c] + joinArgs(args) + } // when running scripts explicitly, assume that they're trusted. return [lifecycle, pkg, c, wd, true] diff --git a/deps/npm/lib/version.js b/deps/npm/lib/version.js index 930708676e..d4af41be57 100644 --- a/deps/npm/lib/version.js +++ b/deps/npm/lib/version.js @@ -36,11 +36,10 @@ function version (args, silent, cb_) { data = JSON.parse(data) } catch (er) { - log.error("version", "Bad package.json data", data) - return cb_(er) + data = null } - if (!args.length && data) return dump(data.name, data.version, cb_) + if (!args.length) return dump(data, cb_) if (er) { log.error("version", "No package.json found") @@ -93,15 +92,12 @@ function updateShrinkwrap (newVersion, cb) { }) } -function dump (name, version, cb) { - assert(typeof name === "string", "package name must be passed to version dump") - assert(typeof version === "string", "package version must be passed to version dump") - +function dump (data, cb) { var v = {} - if (name) v[name] = version + if (data && data.name && data.version) v[data.name] = data.version v.npm = npm.version - Object.keys(process.versions).forEach(function (k) { + Object.keys(process.versions).sort().forEach(function (k) { v[k] = process.versions[k] }) diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1 index bcf9a52d15..569a2adc22 100644 --- a/deps/npm/man/man1/npm-ls.1 +++ b/deps/npm/man/man1/npm-ls.1 @@ -23,7 +23,7 @@ For example, running \fBnpm ls promzard\fR in npm's source tree will show: .P .RS 2 .nf -npm@2.1.18 /path/to/npm +npm@2.2.0 /path/to/npm └─┬ init\-package\-json@0\.0\.4 └── promzard@0\.1\.5 .fi diff --git a/deps/npm/man/man1/npm-run-script.1 b/deps/npm/man/man1/npm-run-script.1 index 65ea4ea94e..24ff5d9583 100644 --- a/deps/npm/man/man1/npm-run-script.1 +++ b/deps/npm/man/man1/npm-run-script.1 @@ -14,10 +14,13 @@ npm run [command] [\-\- ] This runs an arbitrary command from a package's \fB"scripts"\fR object\. If no package name is provided, it will search for a \fBpackage\.json\fR in the current folder and use its \fB"scripts"\fR object\. If no \fB"command"\fR -is provided, it will list the available top level scripts\. +is provided, it will list the available top level scripts\. The \fBenv\fR command +can be used to list environment variables that will be available to the script +at runtime\. If an "env" command is defined in your package it will have +precedence instead\. .P -It is used by the test, start, restart, and stop commands, but can be -called directly, as well\. +\fBrun[\-script]\fR is used by the test, start, restart, and stop commands, but can +be called directly, as well\. .P As of \fBnpm@2\.0\.0\fR \fIhttp://blog\.npmjs\.org/post/98131109725/npm\-2\-0\-0\fR, you can use custom arguments when executing scripts\. The special option \fB\-\-\fR is used by diff --git a/deps/npm/man/man1/npm-tag.1 b/deps/npm/man/man1/npm-tag.1 index 70eb323463..995ad39907 100644 --- a/deps/npm/man/man1/npm-tag.1 +++ b/deps/npm/man/man1/npm-tag.1 @@ -33,6 +33,27 @@ npm install \-\-tag This also applies to \fBnpm dedupe\fR\|\. .P Publishing a package always sets the "latest" tag to the published version\. +.SH PURPOSE +.P +Tags can be used to provide an alias instead of version numbers\. For +example, \fBnpm\fR currently uses the tag "next" to identify the upcoming +version, and the tag "latest" to identify the current version\. +.P +A project might choose to have multiple streams of development, e\.g\., +"stable", "canary"\. +.SH CAVEATS +.P +Tags must share a namespace with version numbers, because they are +specified in the same slot: \fBnpm install @\fR vs \fBnpm +install @\fR\|\. +.P +Tags that can be interpreted as valid semver ranges will be +rejected\. For example, \fBv1\.4\fR cannot be used as a tag, because it is +interpreted by semver as \fB>=1\.4\.0 <1\.5\.0\fR\|\. See +https://github\.com/npm/npm/issues/6082\|\. +.P +The simplest way to avoid semver problems with tags is to use tags +that do not begin with a number or the letter \fBv\fR\|\. .SH SEE ALSO .RS 0 .IP \(bu 2 @@ -48,6 +69,8 @@ npm help config .IP \(bu 2 npm help 7 config .IP \(bu 2 +npm apihelp tag +.IP \(bu 2 npm help 5 npmrc .RE diff --git a/deps/npm/man/man1/npm-update.1 b/deps/npm/man/man1/npm-update.1 index 61e1ccebac..969909482c 100644 --- a/deps/npm/man/man1/npm-update.1 +++ b/deps/npm/man/man1/npm-update.1 @@ -13,7 +13,9 @@ npm update [\-g] [ [ \.\.\.]] This command will update all the packages listed to the latest version (specified by the \fBtag\fR config)\. .P -It will also install missing packages\. +It will also install missing packages\. As with all commands that install +packages, the \fB\-\-dev\fR flag will cause \fBdevDependencies\fR to be processed +as well\. .P If the \fB\-g\fR flag is specified, this command will update globally installed packages\. diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1 index aed41f88fe..6f6b18416e 100644 --- a/deps/npm/man/man1/npm.1 +++ b/deps/npm/man/man1/npm.1 @@ -1,6 +1,6 @@ .TH "NPM" "1" "January 2015" "" "" .SH "NAME" -\fBnpm\fR \- node package manager +\fBnpm\fR \- javascript package manager .SH SYNOPSIS .P .RS 2 @@ -10,7 +10,7 @@ npm [args] .RE .SH VERSION .P -2.1.18 +2.2.0 .SH DESCRIPTION .P npm is the package manager for the Node JavaScript platform\. It puts diff --git a/deps/npm/man/man3/npm-tag.3 b/deps/npm/man/man3/npm-tag.3 index a2daa3134f..c0092c274f 100644 --- a/deps/npm/man/man3/npm-tag.3 +++ b/deps/npm/man/man3/npm-tag.3 @@ -21,7 +21,7 @@ is the package name and version is the version number (much like installing a specific version)\. .P The second element is the name of the tag to tag this version with\. If this -parameter is missing or falsey (empty), the default froom the config will be +parameter is missing or falsey (empty), the default from the config will be used\. For more information about how to set this config, check \fBman 3 npm\-config\fR for programmatic usage or \fBman npm\-config\fR for cli usage\. diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3 index 6298c8d5e6..5f89ff7a36 100644 --- a/deps/npm/man/man3/npm.3 +++ b/deps/npm/man/man3/npm.3 @@ -1,6 +1,6 @@ .TH "NPM" "3" "January 2015" "" "" .SH "NAME" -\fBnpm\fR \- node package manager +\fBnpm\fR \- javascript package manager .SH SYNOPSIS .P .RS 2 @@ -20,7 +20,7 @@ npm\.load([configObject, ]function (er, npm) { .RE .SH VERSION .P -2.1.18 +2.2.0 .SH DESCRIPTION .P This is the API documentation for npm\. diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5 index cf306294e9..113153f082 100644 --- a/deps/npm/man/man5/npm-json.5 +++ b/deps/npm/man/man5/npm-json.5 @@ -31,7 +31,7 @@ The name will probably be passed as an argument to require(), so it should be something short, but also reasonably descriptive\. .IP \(bu 2 You may want to check the npm registry to see if there's something by that name -already, before you get too attached to it\. http://registry\.npmjs\.org/ +already, before you get too attached to it\. https://www\.npmjs\.com/ .RE .P diff --git a/deps/npm/man/man5/package.json.5 b/deps/npm/man/man5/package.json.5 index cf306294e9..113153f082 100644 --- a/deps/npm/man/man5/package.json.5 +++ b/deps/npm/man/man5/package.json.5 @@ -31,7 +31,7 @@ The name will probably be passed as an argument to require(), so it should be something short, but also reasonably descriptive\. .IP \(bu 2 You may want to check the npm registry to see if there's something by that name -already, before you get too attached to it\. http://registry\.npmjs\.org/ +already, before you get too attached to it\. https://www\.npmjs\.com/ .RE .P diff --git a/deps/npm/man/man7/npm-index.7 b/deps/npm/man/man7/npm-index.7 index 056c96bc63..b3608b5777 100644 --- a/deps/npm/man/man7/npm-index.7 +++ b/deps/npm/man/man7/npm-index.7 @@ -9,7 +9,7 @@ a JavaScript package manager Using npm on the command line .SS npm help npm .P -node package manager +javascript package manager .SS npm help adduser .P Add a registry user account @@ -150,7 +150,7 @@ Display npm username Using npm in your Node programs .SS npm apihelp npm .P -node package manager +javascript package manager .SS npm apihelp bin .P Display npm bin folder diff --git a/deps/npm/node_modules/.bin/mkdirp b/deps/npm/node_modules/.bin/mkdirp deleted file mode 100644 index ec035f397c..0000000000 --- a/deps/npm/node_modules/.bin/mkdirp +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -basedir=`dirname "$0"` - -case `uname` in - *CYGWIN*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - "$basedir/node" "$basedir/../mkdirp/bin/cmd.js" "$@" - ret=$? -else - node "$basedir/../mkdirp/bin/cmd.js" "$@" - ret=$? -fi -exit $ret diff --git a/deps/npm/node_modules/.bin/mkdirp.cmd b/deps/npm/node_modules/.bin/mkdirp.cmd deleted file mode 100644 index 0d2cdd7c48..0000000000 --- a/deps/npm/node_modules/.bin/mkdirp.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@IF EXIST "%~dp0\node.exe" ( - "%~dp0\node.exe" "%~dp0\..\mkdirp\bin\cmd.js" %* -) ELSE ( - @SETLOCAL - @SET PATHEXT=%PATHEXT:;.JS;=;% - node "%~dp0\..\mkdirp\bin\cmd.js" %* -) \ No newline at end of file diff --git a/deps/npm/node_modules/.bin/node-gyp b/deps/npm/node_modules/.bin/node-gyp deleted file mode 100644 index 8e8f30796b..0000000000 --- a/deps/npm/node_modules/.bin/node-gyp +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -basedir=`dirname "$0"` - -case `uname` in - *CYGWIN*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - "$basedir/node" "$basedir/../node-gyp/bin/node-gyp.js" "$@" - ret=$? -else - node "$basedir/../node-gyp/bin/node-gyp.js" "$@" - ret=$? -fi -exit $ret diff --git a/deps/npm/node_modules/.bin/node-gyp.cmd b/deps/npm/node_modules/.bin/node-gyp.cmd deleted file mode 100644 index d97b8bfa33..0000000000 --- a/deps/npm/node_modules/.bin/node-gyp.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@IF EXIST "%~dp0\node.exe" ( - "%~dp0\node.exe" "%~dp0\..\node-gyp\bin\node-gyp.js" %* -) ELSE ( - @SETLOCAL - @SET PATHEXT=%PATHEXT:;.JS;=;% - node "%~dp0\..\node-gyp\bin\node-gyp.js" %* -) \ No newline at end of file diff --git a/deps/npm/node_modules/.bin/nopt b/deps/npm/node_modules/.bin/nopt deleted file mode 100644 index 6a48073874..0000000000 --- a/deps/npm/node_modules/.bin/nopt +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -basedir=`dirname "$0"` - -case `uname` in - *CYGWIN*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - "$basedir/node" "$basedir/../nopt/bin/nopt.js" "$@" - ret=$? -else - node "$basedir/../nopt/bin/nopt.js" "$@" - ret=$? -fi -exit $ret diff --git a/deps/npm/node_modules/.bin/nopt.cmd b/deps/npm/node_modules/.bin/nopt.cmd deleted file mode 100644 index 1626454b23..0000000000 --- a/deps/npm/node_modules/.bin/nopt.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@IF EXIST "%~dp0\node.exe" ( - "%~dp0\node.exe" "%~dp0\..\nopt\bin\nopt.js" %* -) ELSE ( - @SETLOCAL - @SET PATHEXT=%PATHEXT:;.JS;=;% - node "%~dp0\..\nopt\bin\nopt.js" %* -) \ No newline at end of file diff --git a/deps/npm/node_modules/.bin/opener b/deps/npm/node_modules/.bin/opener deleted file mode 100644 index d03c07868e..0000000000 --- a/deps/npm/node_modules/.bin/opener +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -basedir=`dirname "$0"` - -case `uname` in - *CYGWIN*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - "$basedir/node" "$basedir/../opener/opener.js" "$@" - ret=$? -else - node "$basedir/../opener/opener.js" "$@" - ret=$? -fi -exit $ret diff --git a/deps/npm/node_modules/.bin/opener.cmd b/deps/npm/node_modules/.bin/opener.cmd deleted file mode 100644 index d3cc65c641..0000000000 --- a/deps/npm/node_modules/.bin/opener.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@IF EXIST "%~dp0\node.exe" ( - "%~dp0\node.exe" "%~dp0\..\opener\opener.js" %* -) ELSE ( - @SETLOCAL - @SET PATHEXT=%PATHEXT:;.JS;=;% - node "%~dp0\..\opener\opener.js" %* -) \ No newline at end of file diff --git a/deps/npm/node_modules/.bin/rimraf b/deps/npm/node_modules/.bin/rimraf deleted file mode 100644 index a0e698f00f..0000000000 --- a/deps/npm/node_modules/.bin/rimraf +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -basedir=`dirname "$0"` - -case `uname` in - *CYGWIN*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - "$basedir/node" "$basedir/../rimraf/bin.js" "$@" - ret=$? -else - node "$basedir/../rimraf/bin.js" "$@" - ret=$? -fi -exit $ret diff --git a/deps/npm/node_modules/.bin/rimraf.cmd b/deps/npm/node_modules/.bin/rimraf.cmd deleted file mode 100644 index 9333ec64e1..0000000000 --- a/deps/npm/node_modules/.bin/rimraf.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@IF EXIST "%~dp0\node.exe" ( - "%~dp0\node.exe" "%~dp0\..\rimraf\bin.js" %* -) ELSE ( - @SETLOCAL - @SET PATHEXT=%PATHEXT:;.JS;=;% - node "%~dp0\..\rimraf\bin.js" %* -) \ No newline at end of file diff --git a/deps/npm/node_modules/.bin/semver b/deps/npm/node_modules/.bin/semver deleted file mode 100644 index 59ddf6f280..0000000000 --- a/deps/npm/node_modules/.bin/semver +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -basedir=`dirname "$0"` - -case `uname` in - *CYGWIN*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - "$basedir/node" "$basedir/../semver/bin/semver" "$@" - ret=$? -else - node "$basedir/../semver/bin/semver" "$@" - ret=$? -fi -exit $ret diff --git a/deps/npm/node_modules/.bin/semver.cmd b/deps/npm/node_modules/.bin/semver.cmd deleted file mode 100644 index 37c00a46d9..0000000000 --- a/deps/npm/node_modules/.bin/semver.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@IF EXIST "%~dp0\node.exe" ( - "%~dp0\node.exe" "%~dp0\..\semver\bin\semver" %* -) ELSE ( - @SETLOCAL - @SET PATHEXT=%PATHEXT:;.JS;=;% - node "%~dp0\..\semver\bin\semver" %* -) \ No newline at end of file diff --git a/deps/npm/node_modules/.bin/which b/deps/npm/node_modules/.bin/which deleted file mode 100644 index 6877bde02c..0000000000 --- a/deps/npm/node_modules/.bin/which +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -basedir=`dirname "$0"` - -case `uname` in - *CYGWIN*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - "$basedir/node" "$basedir/../which/bin/which" "$@" - ret=$? -else - node "$basedir/../which/bin/which" "$@" - ret=$? -fi -exit $ret diff --git a/deps/npm/node_modules/.bin/which.cmd b/deps/npm/node_modules/.bin/which.cmd deleted file mode 100644 index 588f44d682..0000000000 --- a/deps/npm/node_modules/.bin/which.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@IF EXIST "%~dp0\node.exe" ( - "%~dp0\node.exe" "%~dp0\..\which\bin\which" %* -) ELSE ( - @SETLOCAL - @SET PATHEXT=%PATHEXT:;.JS;=;% - node "%~dp0\..\which\bin\which" %* -) \ No newline at end of file diff --git a/deps/npm/node_modules/node-gyp/addon.gypi b/deps/npm/node_modules/node-gyp/addon.gypi index 63fefe3d16..0b81fab202 100644 --- a/deps/npm/node_modules/node-gyp/addon.gypi +++ b/deps/npm/node_modules/node-gyp/addon.gypi @@ -42,7 +42,7 @@ '-luuid.lib', '-lodbc32.lib', '-lDelayImp.lib', - '-l"<(node_root_dir)/$(ConfigurationName)/iojs.lib"' + '-l"<(node_root_dir)/$(ConfigurationName)/node.lib"' ], # warning C4251: 'node::ObjectWrap::handle_' : class 'v8::Persistent' # needs to have dll-interface to be used by clients of class 'node::ObjectWrap' diff --git a/deps/npm/node_modules/node-gyp/lib/build.js b/deps/npm/node_modules/node-gyp/lib/build.js index 3d3c58785f..f3605902e9 100644 --- a/deps/npm/node_modules/node-gyp/lib/build.js +++ b/deps/npm/node_modules/node-gyp/lib/build.js @@ -173,7 +173,7 @@ function build (gyp, argv, callback) { } /** - * Copies the iojs.lib file for the current target architecture into the + * Copies the node.lib file for the current target architecture into the * current proper dev dir location. */ @@ -181,15 +181,15 @@ function build (gyp, argv, callback) { if (!win || !copyDevLib) return doBuild() var buildDir = path.resolve(nodeDir, buildType) - , archNodeLibPath = path.resolve(nodeDir, arch, 'iojs.lib') - , buildNodeLibPath = path.resolve(buildDir, 'iojs.lib') + , archNodeLibPath = path.resolve(nodeDir, arch, 'node.lib') + , buildNodeLibPath = path.resolve(buildDir, 'node.lib') mkdirp(buildDir, function (err, isNew) { if (err) return callback(err) log.verbose('"' + buildType + '" dir needed to be created?', isNew) var rs = fs.createReadStream(archNodeLibPath) , ws = fs.createWriteStream(buildNodeLibPath) - log.verbose('copying "iojs.lib" for ' + arch, buildNodeLibPath) + log.verbose('copying "node.lib" for ' + arch, buildNodeLibPath) rs.pipe(ws) rs.on('error', callback) ws.on('error', callback) diff --git a/deps/npm/node_modules/node-gyp/lib/install.js b/deps/npm/node_modules/node-gyp/lib/install.js index 378fbfae47..6f72e6a93d 100644 --- a/deps/npm/node_modules/node-gyp/lib/install.js +++ b/deps/npm/node_modules/node-gyp/lib/install.js @@ -39,7 +39,7 @@ function install (gyp, argv, callback) { } } - var distUrl = gyp.opts['dist-url'] || gyp.opts.disturl || 'https://iojs.org/dist' + var distUrl = gyp.opts['dist-url'] || gyp.opts.disturl || 'http://nodejs.org/dist' // Determine which node dev files version we are installing @@ -185,7 +185,7 @@ function install (gyp, argv, callback) { // now download the node tarball var tarPath = gyp.opts['tarball'] - var tarballUrl = tarPath ? tarPath : distUrl + '/v' + version + '/iojs-v' + version + '.tar.gz' + var tarballUrl = tarPath ? tarPath : distUrl + '/v' + version + '/node-v' + version + '.tar.gz' , badDownload = false , extractCount = 0 , gunzip = zlib.createGunzip() @@ -267,7 +267,7 @@ function install (gyp, argv, callback) { var async = 0 if (win) { - // need to download iojs.lib + // need to download node.lib async++ downloadNodeLib(deref) } @@ -295,8 +295,7 @@ function install (gyp, argv, callback) { // check content shasums for (var k in contentShasums) { log.verbose('validating download checksum for ' + k, '(%s == %s)', contentShasums[k], expectShasums[k]) - // TODO(piscisaureus) re-enable checksum verification when the correct files are in place. - if (false || contentShasums[k] !== expectShasums[k]) { + if (contentShasums[k] !== expectShasums[k]) { cb(new Error(k + ' local checksum ' + contentShasums[k] + ' not match remote ' + expectShasums[k])) return } @@ -344,36 +343,36 @@ function install (gyp, argv, callback) { } function downloadNodeLib (done) { - log.verbose('on Windows; need to download `iojs.lib`...') + log.verbose('on Windows; need to download `node.lib`...') var dir32 = path.resolve(devDir, 'ia32') , dir64 = path.resolve(devDir, 'x64') - , nodeLibPath32 = path.resolve(dir32, 'iojs.lib') - , nodeLibPath64 = path.resolve(dir64, 'iojs.lib') - , nodeLibUrl32 = distUrl + '/v' + version + '/win-x86/iojs.lib' - , nodeLibUrl64 = distUrl + '/v' + version + '/win-x64/iojs.lib' + , nodeLibPath32 = path.resolve(dir32, 'node.lib') + , nodeLibPath64 = path.resolve(dir64, 'node.lib') + , nodeLibUrl32 = distUrl + '/v' + version + '/node.lib' + , nodeLibUrl64 = distUrl + '/v' + version + '/x64/node.lib' - log.verbose('32-bit iojs.lib dir', dir32) - log.verbose('64-bit iojs.lib dir', dir64) - log.verbose('`iojs.lib` 32-bit url', nodeLibUrl32) - log.verbose('`iojs.lib` 64-bit url', nodeLibUrl64) + log.verbose('32-bit node.lib dir', dir32) + log.verbose('64-bit node.lib dir', dir64) + log.verbose('`node.lib` 32-bit url', nodeLibUrl32) + log.verbose('`node.lib` 64-bit url', nodeLibUrl64) var async = 2 mkdir(dir32, function (err) { if (err) return done(err) - log.verbose('streaming 32-bit iojs.lib to:', nodeLibPath32) + log.verbose('streaming 32-bit node.lib to:', nodeLibPath32) var req = download(nodeLibUrl32) if (!req) return req.on('error', done) req.on('response', function (res) { if (res.statusCode !== 200) { - done(new Error(res.statusCode + ' status code downloading 32-bit iojs.lib')) + done(new Error(res.statusCode + ' status code downloading 32-bit node.lib')) return } getContentSha(res, function (_, checksum) { - contentShasums['win-x86/iojs.lib'] = checksum - log.verbose('content checksum', 'win-x86/iojs.lib', checksum) + contentShasums['node.lib'] = checksum + log.verbose('content checksum', 'node.lib', checksum) }) var ws = fs.createWriteStream(nodeLibPath32) @@ -386,20 +385,20 @@ function install (gyp, argv, callback) { }) mkdir(dir64, function (err) { if (err) return done(err) - log.verbose('streaming 64-bit iojs.lib to:', nodeLibPath64) + log.verbose('streaming 64-bit node.lib to:', nodeLibPath64) var req = download(nodeLibUrl64) if (!req) return req.on('error', done) req.on('response', function (res) { if (res.statusCode !== 200) { - done(new Error(res.statusCode + ' status code downloading 64-bit iojs.lib')) + done(new Error(res.statusCode + ' status code downloading 64-bit node.lib')) return } getContentSha(res, function (_, checksum) { - contentShasums['win-x64/iojs.lib'] = checksum - log.verbose('content checksum', 'win-x64/iojs.lib', checksum) + contentShasums['x64/node.lib'] = checksum + log.verbose('content checksum', 'x64/node.lib', checksum) }) var ws = fs.createWriteStream(nodeLibPath64) diff --git a/deps/npm/node_modules/npm-install-checks/package.json b/deps/npm/node_modules/npm-install-checks/package.json index 06ca052e41..cc9f206d14 100644 --- a/deps/npm/node_modules/npm-install-checks/package.json +++ b/deps/npm/node_modules/npm-install-checks/package.json @@ -1,10 +1,10 @@ { "name": "npm-install-checks", - "version": "1.0.4", + "version": "1.0.5", "description": "checks that npm runs during the installation of a module", "main": "index.js", "dependencies": { - "npmlog": "0.1", + "npmlog": "0.1 || 1", "semver": "^2.3.0 || 3.x || 4" }, "devDependencies": { @@ -32,14 +32,15 @@ "bugs": { "url": "https://github.com/npm/npm-install-checks/issues" }, - "gitHead": "05944f95860b0ac3769667551c4b7aa3d3fcdc32", - "_id": "npm-install-checks@1.0.4", - "_shasum": "9757c6f9d4d493c2489465da6d07a8ed416d44c8", - "_from": "npm-install-checks@>=1.0.2-0 <1.1.0-0", - "_npmVersion": "2.0.0-beta.3", + "gitHead": "c36e052a0a54ad82932689fa86fd59197277f80d", + "_id": "npm-install-checks@1.0.5", + "_shasum": "a1b5beabfd60e0535b14f763157c410cb6bdae56", + "_from": "npm-install-checks@>=1.0.5 <1.1.0", + "_npmVersion": "2.1.11", + "_nodeVersion": "0.10.33", "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" + "name": "iarna", + "email": "me@re-becca.org" }, "maintainers": [ { @@ -49,12 +50,16 @@ { "name": "isaacs", "email": "i@izs.me" + }, + { + "name": "iarna", + "email": "me@re-becca.org" } ], "dist": { - "shasum": "9757c6f9d4d493c2489465da6d07a8ed416d44c8", - "tarball": "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.4.tgz" + "shasum": "a1b5beabfd60e0535b14f763157c410cb6bdae56", + "tarball": "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.5.tgz" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.4.tgz" + "_resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.5.tgz" } diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/float.patch b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/float.patch index 41c0a5bddb..7abb6dc30b 100644 --- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/float.patch +++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/float.patch @@ -1,3 +1,24 @@ +diff --git a/lib/_stream_duplex.js b/lib/_stream_duplex.js +index c5a741c..a2e0d8e 100644 +--- a/lib/_stream_duplex.js ++++ b/lib/_stream_duplex.js +@@ -26,8 +26,8 @@ + + module.exports = Duplex; + var util = require('util'); +-var Readable = require('_stream_readable'); +-var Writable = require('_stream_writable'); ++var Readable = require('./_stream_readable'); ++var Writable = require('./_stream_writable'); + + util.inherits(Duplex, Readable); + +diff --git a/lib/_stream_passthrough.js b/lib/_stream_passthrough.js +index a5e9864..330c247 100644 +--- a/lib/_stream_passthrough.js ++++ b/lib/_stream_passthrough.js +@@ -25,7 +25,7 @@ + module.exports = PassThrough; -var Transform = require('_stream_transform'); diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js index 77d09b3136..b513d61a96 100644 --- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js +++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js @@ -1,3 +1,24 @@ +// 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. + // a duplex stream is just a stream that is both readable and writable. // Since JS doesn't have multiple prototypal inheritance, this class // prototypally inherits from Readable, and then parasitically from diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js index 5f46351067..895ca50a1d 100644 --- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js +++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js @@ -1,3 +1,24 @@ +// 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. + // a passthrough stream. // basically just the most minimal sort of Transform stream. // Every written chunk gets output as-is. diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js index e16637e739..19ab358898 100644 --- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js +++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js @@ -1,3 +1,24 @@ +// 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. + module.exports = Readable; /**/ diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js index c351d824e4..905c5e4507 100644 --- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js +++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js @@ -1,3 +1,25 @@ +// 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. + + // a transform stream is a readable/writable stream where you do // something with the data. Sometimes it's called a "filter", // but that's not a great name for it, since that implies a thing where diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js index 2dfffe71b4..db8539cd5b 100644 --- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js +++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js @@ -1,3 +1,24 @@ +// 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. + // A bit simpler than readable streams. // Implement an async ._write(chunk, cb), and it'll handle all // the drain event emission and buffering. diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/lib/util.js index 4d78234545..9074e8ebcb 100644 --- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/lib/util.js +++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/lib/util.js @@ -1,3 +1,24 @@ +// 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. + // NOTE: These type checking functions intentionally don't use `instanceof` // because it is fragile and can be easily faked with `Object.create()`. function isArray(ar) { diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/util.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/util.js index cab925a2e3..007fa10575 100644 --- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/util.js +++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/util.js @@ -1,3 +1,24 @@ +// 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. + // NOTE: These type checking functions intentionally don't use `instanceof` // because it is fragile and can be easily faked with `Object.create()`. function isArray(ar) { diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/index.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/index.js index 53145c2fa7..b00e54fb79 100644 --- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/index.js +++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/index.js @@ -1,3 +1,24 @@ +// 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 Buffer = require('buffer').Buffer; var isBufferEncoding = Buffer.isEncoding diff --git a/deps/npm/node_modules/read-installed/node_modules/util-extend/extend.js b/deps/npm/node_modules/read-installed/node_modules/util-extend/extend.js index 3ee4aac24b..de9fcf471a 100644 --- a/deps/npm/node_modules/read-installed/node_modules/util-extend/extend.js +++ b/deps/npm/node_modules/read-installed/node_modules/util-extend/extend.js @@ -1,3 +1,24 @@ +// 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. + module.exports = extend; function extend(origin, add) { // Don't do anything if add isn't an object diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_duplex.js b/deps/npm/node_modules/readable-stream/lib/_stream_duplex.js index 77d09b3136..b513d61a96 100644 --- a/deps/npm/node_modules/readable-stream/lib/_stream_duplex.js +++ b/deps/npm/node_modules/readable-stream/lib/_stream_duplex.js @@ -1,3 +1,24 @@ +// 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. + // a duplex stream is just a stream that is both readable and writable. // Since JS doesn't have multiple prototypal inheritance, this class // prototypally inherits from Readable, and then parasitically from diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_passthrough.js b/deps/npm/node_modules/readable-stream/lib/_stream_passthrough.js index 5f46351067..895ca50a1d 100644 --- a/deps/npm/node_modules/readable-stream/lib/_stream_passthrough.js +++ b/deps/npm/node_modules/readable-stream/lib/_stream_passthrough.js @@ -1,3 +1,24 @@ +// 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. + // a passthrough stream. // basically just the most minimal sort of Transform stream. // Every written chunk gets output as-is. diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_readable.js b/deps/npm/node_modules/readable-stream/lib/_stream_readable.js index b45da91493..630722099e 100644 --- a/deps/npm/node_modules/readable-stream/lib/_stream_readable.js +++ b/deps/npm/node_modules/readable-stream/lib/_stream_readable.js @@ -1,3 +1,24 @@ +// 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. + module.exports = Readable; /**/ diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_transform.js b/deps/npm/node_modules/readable-stream/lib/_stream_transform.js index a831cd243b..eb188df3e8 100644 --- a/deps/npm/node_modules/readable-stream/lib/_stream_transform.js +++ b/deps/npm/node_modules/readable-stream/lib/_stream_transform.js @@ -1,3 +1,25 @@ +// 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. + + // a transform stream is a readable/writable stream where you do // something with the data. Sometimes it's called a "filter", // but that's not a great name for it, since that implies a thing where diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_writable.js b/deps/npm/node_modules/readable-stream/lib/_stream_writable.js index 23946be737..4bdaa4fa49 100644 --- a/deps/npm/node_modules/readable-stream/lib/_stream_writable.js +++ b/deps/npm/node_modules/readable-stream/lib/_stream_writable.js @@ -1,3 +1,24 @@ +// 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. + // A bit simpler than readable streams. // Implement an async ._write(chunk, cb), and it'll handle all // the drain event emission and buffering. diff --git a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/readable-stream/node_modules/core-util-is/lib/util.js index 4d78234545..9074e8ebcb 100644 --- a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/lib/util.js +++ b/deps/npm/node_modules/readable-stream/node_modules/core-util-is/lib/util.js @@ -1,3 +1,24 @@ +// 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. + // NOTE: These type checking functions intentionally don't use `instanceof` // because it is fragile and can be easily faked with `Object.create()`. function isArray(ar) { diff --git a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/util.js b/deps/npm/node_modules/readable-stream/node_modules/core-util-is/util.js index cab925a2e3..007fa10575 100644 --- a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/util.js +++ b/deps/npm/node_modules/readable-stream/node_modules/core-util-is/util.js @@ -1,3 +1,24 @@ +// 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. + // NOTE: These type checking functions intentionally don't use `instanceof` // because it is fragile and can be easily faked with `Object.create()`. function isArray(ar) { diff --git a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/index.js b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/index.js index 53145c2fa7..b00e54fb79 100644 --- a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/index.js +++ b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/index.js @@ -1,3 +1,24 @@ +// 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 Buffer = require('buffer').Buffer; var isBufferEncoding = Buffer.isEncoding diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/test/run.js b/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/test/run.js old mode 100644 new mode 100755 diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/bin/uuid b/deps/npm/node_modules/request/node_modules/node-uuid/bin/uuid old mode 100644 new mode 100755 diff --git a/deps/npm/node_modules/request/node_modules/qs/package.json b/deps/npm/node_modules/request/node_modules/qs/package.json old mode 100755 new mode 100644 diff --git a/deps/npm/node_modules/request/package.json b/deps/npm/node_modules/request/package.json old mode 100755 new mode 100644 diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/float.patch b/deps/npm/node_modules/sha/node_modules/readable-stream/float.patch index b10546898e..c5d8242da5 100644 --- a/deps/npm/node_modules/sha/node_modules/readable-stream/float.patch +++ b/deps/npm/node_modules/sha/node_modules/readable-stream/float.patch @@ -1,3 +1,23 @@ +diff --git a/lib/_stream_duplex.js b/lib/_stream_duplex.js +index c5a741c..a2e0d8e 100644 +--- a/lib/_stream_duplex.js ++++ b/lib/_stream_duplex.js +@@ -26,8 +26,8 @@ + + module.exports = Duplex; + var util = require('util'); +-var Readable = require('_stream_readable'); +-var Writable = require('_stream_writable'); ++var Readable = require('./_stream_readable'); ++var Writable = require('./_stream_writable'); + + util.inherits(Duplex, Readable); + +diff --git a/lib/_stream_passthrough.js b/lib/_stream_passthrough.js +index a5e9864..330c247 100644 +--- a/lib/_stream_passthrough.js ++++ b/lib/_stream_passthrough.js +@@ -25,7 +25,7 @@ module.exports = PassThrough; diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_duplex.js b/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_duplex.js index 77d09b3136..b513d61a96 100644 --- a/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_duplex.js +++ b/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_duplex.js @@ -1,3 +1,24 @@ +// 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. + // a duplex stream is just a stream that is both readable and writable. // Since JS doesn't have multiple prototypal inheritance, this class // prototypally inherits from Readable, and then parasitically from diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_passthrough.js b/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_passthrough.js index 5f46351067..895ca50a1d 100644 --- a/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_passthrough.js +++ b/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_passthrough.js @@ -1,3 +1,24 @@ +// 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. + // a passthrough stream. // basically just the most minimal sort of Transform stream. // Every written chunk gets output as-is. diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_readable.js b/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_readable.js index e16637e739..19ab358898 100644 --- a/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_readable.js +++ b/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_readable.js @@ -1,3 +1,24 @@ +// 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. + module.exports = Readable; /**/ diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_transform.js b/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_transform.js index c351d824e4..905c5e4507 100644 --- a/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_transform.js +++ b/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_transform.js @@ -1,3 +1,25 @@ +// 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. + + // a transform stream is a readable/writable stream where you do // something with the data. Sometimes it's called a "filter", // but that's not a great name for it, since that implies a thing where diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_writable.js b/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_writable.js index 2dfffe71b4..db8539cd5b 100644 --- a/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_writable.js +++ b/deps/npm/node_modules/sha/node_modules/readable-stream/lib/_stream_writable.js @@ -1,3 +1,24 @@ +// 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. + // A bit simpler than readable streams. // Implement an async ._write(chunk, cb), and it'll handle all // the drain event emission and buffering. diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js index 4d78234545..9074e8ebcb 100644 --- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js +++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js @@ -1,3 +1,24 @@ +// 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. + // NOTE: These type checking functions intentionally don't use `instanceof` // because it is fragile and can be easily faked with `Object.create()`. function isArray(ar) { diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js index cab925a2e3..007fa10575 100644 --- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js +++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js @@ -1,3 +1,24 @@ +// 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. + // NOTE: These type checking functions intentionally don't use `instanceof` // because it is fragile and can be easily faked with `Object.create()`. function isArray(ar) { diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js index 53145c2fa7..b00e54fb79 100644 --- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js +++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js @@ -1,3 +1,24 @@ +// 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 Buffer = require('buffer').Buffer; var isBufferEncoding = Buffer.isEncoding diff --git a/deps/npm/package.json b/deps/npm/package.json index 7fa65f7d86..191268f7e9 100644 --- a/deps/npm/package.json +++ b/deps/npm/package.json @@ -1,5 +1,5 @@ { - "version": "2.1.18", + "version": "2.2.0", "name": "npm", "description": "A package manager for node", "keywords": [ @@ -13,18 +13,14 @@ "publishtest": false }, "homepage": "https://docs.npmjs.com/", - "author": { - "name": "Isaac Z. Schlueter", - "email": "i@izs.me", - "url": "http://blog.izs.me" - }, + "author": "Isaac Z. Schlueter (http://blog.izs.me)", "repository": { "type": "git", "url": "https://github.com/npm/npm" }, "bugs": { - "url": "http://github.com/npm/npm/issues", - "email": "npm-@googlegroups.com" + "email": "npm-@googlegroups.com", + "url": "http://github.com/npm/npm/issues" }, "directories": { "doc": "./doc", @@ -33,9 +29,7 @@ "bin": "./bin" }, "main": "./lib/npm.js", - "bin": { - "npm": "./bin/npm-cli.js" - }, + "bin": "./bin/npm-cli.js", "dependencies": { "abbrev": "~1.0.5", "ansi": "~0.3.0", @@ -74,7 +68,7 @@ "normalize-git-url": "~1.0.0", "normalize-package-data": "~1.0.3", "npm-cache-filename": "~1.0.1", - "npm-install-checks": "~1.0.2", + "npm-install-checks": "~1.0.5", "npm-package-arg": "~2.1.3", "npm-registry-client": "~4.0.5", "npm-user-validate": "~0.1.1", @@ -185,769 +179,5 @@ "prepublish": "node bin/npm-cli.js prune --prefix=. --no-global && rm -rf test/*/*/node_modules && make -j8 doc", "dumpconf": "env | grep npm | sort | uniq" }, - "license": "Artistic-2.0", - "contributors": [ - { - "name": "Isaac Z. Schlueter", - "email": "i@izs.me" - }, - { - "name": "Steve Steiner", - "email": "ssteinerX@gmail.com" - }, - { - "name": "Mikeal Rogers", - "email": "mikeal.rogers@gmail.com" - }, - { - "name": "Aaron Blohowiak", - "email": "aaron.blohowiak@gmail.com" - }, - { - "name": "Martyn Smith", - "email": "martyn@dollyfish.net.nz" - }, - { - "name": "Mathias Pettersson", - "email": "mape@mape.me" - }, - { - "name": "Brian Hammond", - "email": "brian@fictorial.com" - }, - { - "name": "Charlie Robbins", - "email": "charlie.robbins@gmail.com" - }, - { - "name": "Francisco Treacy", - "email": "francisco.treacy@gmail.com" - }, - { - "name": "Cliffano Subagio", - "email": "cliffano@gmail.com" - }, - { - "name": "Christian Eager", - "email": "christian.eager@nokia.com" - }, - { - "name": "Dav Glass", - "email": "davglass@gmail.com" - }, - { - "name": "Alex K. Wolfe", - "email": "alexkwolfe@gmail.com" - }, - { - "name": "James Sanders", - "email": "jimmyjazz14@gmail.com" - }, - { - "name": "Reid Burke", - "email": "me@reidburke.com" - }, - { - "name": "Arlo Breault", - "email": "arlolra@gmail.com" - }, - { - "name": "Timo Derstappen", - "email": "teemow@gmail.com" - }, - { - "name": "Bradley Meck", - "email": "bradley.meck@gmail.com" - }, - { - "name": "Bart Teeuwisse", - "email": "bart.teeuwisse@thecodemill.biz" - }, - { - "name": "Ben Noordhuis", - "email": "info@bnoordhuis.nl" - }, - { - "name": "Tor Valamo", - "email": "tor.valamo@gmail.com" - }, - { - "name": "Whyme.Lyu", - "email": "5longluna@gmail.com" - }, - { - "name": "Olivier Melcher", - "email": "olivier.melcher@gmail.com" - }, - { - "name": "Tomaž Muraus", - "email": "kami@k5-storitve.net" - }, - { - "name": "Evan Meagher", - "email": "evan.meagher@gmail.com" - }, - { - "name": "Orlando Vazquez", - "email": "ovazquez@gmail.com" - }, - { - "name": "George Miroshnykov", - "email": "gmiroshnykov@lohika.com" - }, - { - "name": "Geoff Flarity", - "email": "geoff.flarity@gmail.com" - }, - { - "name": "Pete Kruckenberg", - "email": "pete@kruckenberg.com" - }, - { - "name": "Laurie Harper", - "email": "laurie@holoweb.net" - }, - { - "name": "Chris Wong", - "email": "chris@chriswongstudio.com" - }, - { - "name": "Max Goodman", - "email": "c@chromacode.com" - }, - { - "name": "Scott Bronson", - "email": "brons_github@rinspin.com" - }, - { - "name": "Federico Romero", - "email": "federomero@gmail.com" - }, - { - "name": "Visnu Pitiyanuvath", - "email": "visnupx@gmail.com" - }, - { - "name": "Irakli Gozalishvili", - "email": "rfobic@gmail.com" - }, - { - "name": "Mark Cahill", - "email": "mark@tiemonster.info" - }, - { - "name": "Zearin", - "email": "zearin@gonk.net" - }, - { - "name": "Iain Sproat", - "email": "iainsproat@gmail.com" - }, - { - "name": "Trent Mick", - "email": "trentm@gmail.com" - }, - { - "name": "Felix Geisendörfer", - "email": "felix@debuggable.com" - }, - { - "name": "Conny Brunnkvist", - "email": "cbrunnkvist@gmail.com" - }, - { - "name": "Will Elwood", - "email": "w.elwood08@gmail.com" - }, - { - "name": "Oleg Efimov", - "email": "efimovov@gmail.com" - }, - { - "name": "Martin Cooper", - "email": "mfncooper@gmail.com" - }, - { - "name": "Jameson Little", - "email": "t.jameson.little@gmail.com" - }, - { - "name": "cspotcode", - "email": "cspotcode@gmail.com" - }, - { - "name": "Maciej Małecki", - "email": "maciej.malecki@notimplemented.org" - }, - { - "name": "Stephen Sugden", - "email": "glurgle@gmail.com" - }, - { - "name": "Gautham Pai", - "email": "buzypi@gmail.com" - }, - { - "name": "David Trejo", - "email": "david.daniel.trejo@gmail.com" - }, - { - "name": "Paul Vorbach", - "email": "paul@vorb.de" - }, - { - "name": "George Ornbo", - "email": "george@shapeshed.com" - }, - { - "name": "Tim Oxley", - "email": "secoif@gmail.com" - }, - { - "name": "Tyler Green", - "email": "tyler.green2@gmail.com" - }, - { - "name": "atomizer", - "email": "danila.gerasimov@gmail.com" - }, - { - "name": "Rod Vagg", - "email": "rod@vagg.org" - }, - { - "name": "Christian Howe", - "email": "coderarity@gmail.com" - }, - { - "name": "Andrew Lunny", - "email": "alunny@gmail.com" - }, - { - "name": "Henrik Hodne", - "email": "dvyjones@binaryhex.com" - }, - { - "name": "Adam Blackburn", - "email": "regality@gmail.com" - }, - { - "name": "Kris Windham", - "email": "kriswindham@gmail.com" - }, - { - "name": "Jens Grunert", - "email": "jens.grunert@gmail.com" - }, - { - "name": "Joost-Wim Boekesteijn", - "email": "joost-wim@boekesteijn.nl" - }, - { - "name": "Dalmais Maxence", - "email": "github@maxired.fr" - }, - { - "name": "Marcus Ekwall", - "email": "marcus.ekwall@gmail.com" - }, - { - "name": "Aaron Stacy", - "email": "aaron.r.stacy@gmail.com" - }, - { - "name": "Phillip Howell", - "email": "phowell@cothm.org" - }, - { - "name": "Domenic Denicola", - "email": "domenic@domenicdenicola.com" - }, - { - "name": "James Halliday", - "email": "mail@substack.net" - }, - { - "name": "Jeremy Cantrell", - "email": "jmcantrell@gmail.com" - }, - { - "name": "Ribettes", - "email": "patlogan29@gmail.com" - }, - { - "name": "Einar Otto Stangvik", - "email": "einaros@gmail.com" - }, - { - "name": "Don Park", - "email": "donpark@docuverse.com" - }, - { - "name": "Kei Son", - "email": "heyacct@gmail.com" - }, - { - "name": "Nicolas Morel", - "email": "marsup@gmail.com" - }, - { - "name": "Mark Dube", - "email": "markisdee@gmail.com" - }, - { - "name": "Nathan Rajlich", - "email": "nathan@tootallnate.net" - }, - { - "name": "Maxim Bogushevich", - "email": "boga1@mail.ru" - }, - { - "name": "Justin Beckwith", - "email": "justbe@microsoft.com" - }, - { - "name": "Meaglin", - "email": "Meaglin.wasabi@gmail.com" - }, - { - "name": "Ben Evans", - "email": "ben@bensbit.co.uk" - }, - { - "name": "Nathan Zadoks", - "email": "nathan@nathan7.eu" - }, - { - "name": "Brian White", - "email": "mscdex@gmail.com" - }, - { - "name": "Jed Schmidt", - "email": "tr@nslator.jp" - }, - { - "name": "Ian Livingstone", - "email": "ianl@cs.dal.ca" - }, - { - "name": "Patrick Pfeiffer", - "email": "patrick@buzzle.at" - }, - { - "name": "Paul Miller", - "email": "paul@paulmillr.com" - }, - { - "name": "seebees", - "email": "seebees@gmail.com" - }, - { - "name": "Carl Lange", - "email": "carl@flax.ie" - }, - { - "name": "Jan Lehnardt", - "email": "jan@apache.org" - }, - { - "name": "Alexey Kreschuk", - "email": "akrsch@gmail.com" - }, - { - "name": "Di Wu", - "email": "dwu@palantir.com" - }, - { - "name": "Florian Margaine", - "email": "florian@margaine.com" - }, - { - "name": "Forbes Lindesay", - "email": "forbes@lindesay.co.uk" - }, - { - "name": "Ian Babrou", - "email": "ibobrik@gmail.com" - }, - { - "name": "Jaakko Manninen", - "email": "jaakko@rocketpack.fi" - }, - { - "name": "Johan Nordberg", - "email": "its@johan-nordberg.com" - }, - { - "name": "Johan Sköld", - "email": "johan@skold.cc" - }, - { - "name": "Larz Conwell", - "email": "larz@larz-laptop.(none)", - "url": "none" - }, - { - "name": "Luke Arduini", - "email": "luke.arduini@gmail.com" - }, - { - "name": "Marcel Klehr", - "email": "mklehr@gmx.net" - }, - { - "name": "Mathias Bynens", - "email": "mathias@qiwi.be" - }, - { - "name": "Matt Lunn", - "email": "matt@mattlunn.me.uk" - }, - { - "name": "Matt McClure", - "email": "matt.mcclure@mapmyfitness.com" - }, - { - "name": "Nirk Niggler", - "email": "nirk.niggler@gmail.com" - }, - { - "name": "Paolo Fragomeni", - "email": "paolo@async.ly" - }, - { - "name": "Jake Verbaten", - "email": "raynos2@gmail.com", - "url": "Raynos" - }, - { - "name": "Robert Kowalski", - "email": "rok@kowalski.gd" - }, - { - "name": "Schabse Laks", - "email": "Dev@SLaks.net" - }, - { - "name": "Stuart Knightley", - "email": "stuart@stuartk.com" - }, - { - "name": "Stuart P. Bentley", - "email": "stuart@testtrack4.com" - }, - { - "name": "Vaz Allen", - "email": "vaz@tryptid.com" - }, - { - "name": "elisee", - "email": "elisee@sparklin.org" - }, - { - "name": "Evan You", - "email": "yyx990803@gmail.com" - }, - { - "name": "Wil Moore III", - "email": "wil.moore@wilmoore.com" - }, - { - "name": "Dylan Greene", - "email": "dylang@gmail.com" - }, - { - "name": "zeke", - "email": "zeke@sikelianos.com" - }, - { - "name": "Andrew Horton", - "email": "andrew.j.horton@gmail.com" - }, - { - "name": "Denis Gladkikh", - "email": "outcoldman@gmail.com" - }, - { - "name": "Daniel Santiago", - "email": "daniel.santiago@highlevelwebs.com" - }, - { - "name": "Alex Kocharin", - "email": "alex@kocharin.ru" - }, - { - "name": "Evan Lucas", - "email": "evanlucas@me.com" - }, - { - "name": "Steve Mason", - "email": "stevem@brandwatch.com" - }, - { - "name": "Quinn Slack", - "email": "qslack@qslack.com" - }, - { - "name": "Sébastien Santoro", - "email": "dereckson@espace-win.org" - }, - { - "name": "CamilleM", - "email": "camille.moulin@alterway.fr" - }, - { - "name": "Tom Huang", - "email": "hzlhu.dargon@gmail.com" - }, - { - "name": "Sergey Belov", - "email": "peimei@ya.ru" - }, - { - "name": "Younghoon Park", - "email": "sola92@gmail.com" - }, - { - "name": "Yazhong Liu", - "email": "yorkiefixer@gmail.com" - }, - { - "name": "Mikola Lysenko", - "email": "mikolalysenko@gmail.com" - }, - { - "name": "Rafael de Oleza", - "email": "rafa@spotify.com" - }, - { - "name": "Yeonghoon Park", - "email": "sola92@gmail.com" - }, - { - "name": "Franck Cuny", - "email": "franck.cuny@gmail.com" - }, - { - "name": "Alan Shaw", - "email": "alan@freestyle-developments.co.uk" - }, - { - "name": "Alex Rodionov", - "email": "p0deje@gmail.com" - }, - { - "name": "Alexej Yaroshevich", - "email": "alex@qfox.ru" - }, - { - "name": "Elan Shanker", - "email": "elan.shanker@gmail.com" - }, - { - "name": "François Frisch", - "email": "francoisfrisch@gmail.com" - }, - { - "name": "Gabriel Falkenberg", - "email": "gabriel.falkenberg@gmail.com" - }, - { - "name": "Jason Diamond", - "email": "jason@diamond.name" - }, - { - "name": "Jess Martin", - "email": "jessmartin@gmail.com" - }, - { - "name": "Jon Spencer", - "email": "jon@jonspencer.ca" - }, - { - "name": "Matt Colyer", - "email": "matt@colyer.name" - }, - { - "name": "Matt McClure", - "email": "matt.mcclure@mapmyfitness.com" - }, - { - "name": "Maximilian Antoni", - "email": "maximilian.antoni@juliusbaer.com" - }, - { - "name": "Nicholas Kinsey", - "email": "pyro@feisty.io" - }, - { - "name": "Paulo Cesar", - "email": "pauloc062@gmail.com" - }, - { - "name": "Quim Calpe", - "email": "quim@kalpe.com" - }, - { - "name": "Robert Gieseke", - "email": "robert.gieseke@gmail.com" - }, - { - "name": "Spain Train", - "email": "michael.spainhower@opower.com" - }, - { - "name": "TJ Holowaychuk", - "email": "tj@vision-media.ca" - }, - { - "name": "Thom Blake", - "email": "tblake@brightroll.com" - }, - { - "name": "Trevor Burnham", - "email": "tburnham@hubspot.com" - }, - { - "name": "bitspill", - "email": "bitspill+github@bitspill.net" - }, - { - "name": "Neil Gentleman", - "email": "ngentleman@gmail.com" - } - ], - "man": [ - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-README.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-adduser.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-bin.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-bugs.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-build.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-bundle.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-cache.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-completion.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-config.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-dedupe.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-deprecate.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-docs.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-edit.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-explore.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-help-search.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-help.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-init.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-install.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-link.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-ls.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-outdated.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-owner.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-pack.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-prefix.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-prune.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-publish.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-rebuild.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-repo.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-restart.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-rm.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-root.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-run-script.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-search.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-shrinkwrap.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-star.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-stars.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-start.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-stop.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-submodule.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-tag.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-test.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-uninstall.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-unpublish.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-update.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-version.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-view.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm-whoami.1", - "/Users/ogd/Documents/projects/npm/npm/man/man1/npm.1", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-bin.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-bugs.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-cache.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-commands.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-config.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-deprecate.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-docs.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-edit.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-explore.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-help-search.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-init.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-install.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-link.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-load.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-ls.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-outdated.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-owner.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-pack.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-prefix.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-prune.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-publish.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-rebuild.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-repo.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-restart.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-root.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-run-script.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-search.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-shrinkwrap.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-start.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-stop.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-submodule.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-tag.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-test.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-uninstall.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-unpublish.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-update.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-version.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-view.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm-whoami.3", - "/Users/ogd/Documents/projects/npm/npm/man/man3/npm.3", - "/Users/ogd/Documents/projects/npm/npm/man/man5/npm-folders.5", - "/Users/ogd/Documents/projects/npm/npm/man/man5/npm-global.5", - "/Users/ogd/Documents/projects/npm/npm/man/man5/npm-json.5", - "/Users/ogd/Documents/projects/npm/npm/man/man5/npmrc.5", - "/Users/ogd/Documents/projects/npm/npm/man/man5/package.json.5", - "/Users/ogd/Documents/projects/npm/npm/man/man7/npm-coding-style.7", - "/Users/ogd/Documents/projects/npm/npm/man/man7/npm-config.7", - "/Users/ogd/Documents/projects/npm/npm/man/man7/npm-developers.7", - "/Users/ogd/Documents/projects/npm/npm/man/man7/npm-disputes.7", - "/Users/ogd/Documents/projects/npm/npm/man/man7/npm-faq.7", - "/Users/ogd/Documents/projects/npm/npm/man/man7/npm-index.7", - "/Users/ogd/Documents/projects/npm/npm/man/man7/npm-registry.7", - "/Users/ogd/Documents/projects/npm/npm/man/man7/npm-scope.7", - "/Users/ogd/Documents/projects/npm/npm/man/man7/npm-scripts.7", - "/Users/ogd/Documents/projects/npm/npm/man/man7/removing-npm.7", - "/Users/ogd/Documents/projects/npm/npm/man/man7/semver.7" - ], - "gitHead": "cad3d1ed571981b13c8165ba4516b836bf79293c", - "_id": "npm@2.1.18", - "_shasum": "e2af4c5f848fb023851cd2ec129005d33090bd57", - "_from": "npm@2.1.18", - "_npmVersion": "2.1.18", - "_nodeVersion": "0.10.35", - "_npmUser": { - "name": "othiym23", - "email": "ogd@aoaioxxysz.net" - }, - "maintainers": [ - { - "name": "isaacs", - "email": "i@izs.me" - }, - { - "name": "othiym23", - "email": "ogd@aoaioxxysz.net" - } - ], - "dist": { - "shasum": "e2af4c5f848fb023851cd2ec129005d33090bd57", - "tarball": "http://registry.npmjs.org/npm/-/npm-2.1.18.tgz" - }, - "_resolved": "https://registry.npmjs.org/npm/-/npm-2.1.18.tgz", - "readme": "ERROR: No README data found!" + "license": "Artistic-2.0" } diff --git a/deps/npm/test/tap/config-private.js b/deps/npm/test/tap/config-private.js new file mode 100644 index 0000000000..37e283eec3 --- /dev/null +++ b/deps/npm/test/tap/config-private.js @@ -0,0 +1,81 @@ +var fs = require("fs") +var path = require("path") +var test = require("tap").test +var rimraf = require("rimraf") +var mkdirp = require("mkdirp") +var common = require("../common-tap.js") + +var pkg = path.resolve(__dirname, "config-private") +var opts = { cwd: pkg } + +test("setup", function (t) { + rimraf.sync(pkg) + mkdirp.sync(pkg) + t.end() +}) + +test("config get private var (old auth)", function (t) { + common.npm([ + "config", + "get", + "_auth" + ], + opts, + function (err, code, stdout, stderr) { + t.ifError(err) + + t.similar(stderr, /sekretz/, "password blocked on stderr") + t.equal(stdout, "", "no output") + t.end() + } + ) +}) + +test("config get private var (new auth)", function (t) { + common.npm([ + "config", + "get", + "//registry.npmjs.org/:_password" + ], + opts, + function (err, code, stdout, stderr) { + t.ifError(err) + + t.similar(stderr, /sekretz/, "password blocked on stderr") + t.equal(stdout, "", "no output") + t.end() + } + ) +}) + +test("config get public var (new username)", function (t) { + var FIXTURE_PATH = path.resolve(pkg, "fixture_npmrc") + var s = "//registry.lvh.me/:username = wombat\n" + + "//registry.lvh.me/:_password = YmFkIHBhc3N3b3Jk\n" + + "//registry.lvh.me/:email = lindsay@wdu.org.au\n" + fs.writeFileSync(FIXTURE_PATH, s, "ascii") + fs.chmodSync(FIXTURE_PATH, "0444") + + common.npm( + [ + "config", + "get", + "//registry.lvh.me/:username", + "--userconfig=" + FIXTURE_PATH, + "--registry=http://registry.lvh.me/" + ], + opts, + function (err, code, stdout, stderr) { + t.ifError(err) + + t.equal(stderr, "", "stderr is empty") + t.equal(stdout, "wombat\n", "got usename is output") + t.end() + } + ) +}) + +test("clean", function (t) { + rimraf.sync(pkg) + t.end() +}) diff --git a/deps/npm/test/tap/run-script.js b/deps/npm/test/tap/run-script.js index 0b12237fa6..6b5ce26aa4 100644 --- a/deps/npm/test/tap/run-script.js +++ b/deps/npm/test/tap/run-script.js @@ -19,8 +19,8 @@ function testOutput (t, command, er, code, stdout, stderr) { lines = stdout.trim().split("\n") stdout = lines.filter(function(line) { - return line.trim() !== "" && line[0] !== '>' - }).join(';') + return line.trim() !== "" && line[0] !== ">" + }).join(";") t.equal(stdout, command) t.end() @@ -78,25 +78,32 @@ test("npm run-script explicitly call pre script with arg", function (t) { common.npm(["run-script", "prewith-pre", "--", "an arg"], opts, testOutput.bind(null, t, "an arg")) }) -test('npm run-script test', function (t) { - common.npm(['run-script', 'test'], opts, function (er, code, stdout, stderr) { - if (er) - throw er - t.notOk(stderr, 'should not generate errors') +test("npm run-script test", function (t) { + common.npm(["run-script", "test"], opts, function (er, code, stdout, stderr) { + t.ifError(er, "npm run-script test ran without issue") + t.notOk(stderr, "should not generate errors") t.end() }) }) -test('npm run-script nonexistent-script', function (t) { - common.npm(['run-script', 'nonexistent-script'], opts, function (er, code, stdout, stderr) { - if (er) - throw er - t.ok(stderr, 'should generate errors') +test("npm run-script env", function (t) { + common.npm(["run-script", "env"], opts, function (er, code, stdout, stderr) { + t.ifError(er, "using default env script") + t.notOk(stderr, "should not generate errors") + t.ok( stdout.indexOf("npm_config_init_version") > 0, "expected values in var list" ) t.end() }) }) -test('cleanup', function (t) { +test("npm run-script nonexistent-script", function (t) { + common.npm(["run-script", "nonexistent-script"], opts, function (er, code, stdout, stderr) { + t.ifError(er, "npm run-script nonexistent-script did not cause npm to explode") + t.ok(stderr, "should generate errors") + t.end() + }) +}) + +test("cleanup", function (t) { cleanup() t.end() }) diff --git a/deps/npm/test/tap/run-script/package.json b/deps/npm/test/tap/run-script/package.json index afa0e3f0c8..ebaffefe02 100644 --- a/deps/npm/test/tap/run-script/package.json +++ b/deps/npm/test/tap/run-script/package.json @@ -1,13 +1,13 @@ {"name":"runscript" ,"version":"1.2.3" ,"scripts":{ - "start":"node -e 'console.log(process.argv[1] || \"start\")'", - "prewith-pre":"node -e 'console.log(process.argv[1] || \"pre\")'", - "with-pre":"node -e 'console.log(process.argv[1] || \"main\")'", - "with-post":"node -e 'console.log(process.argv[1] || \"main\")'", - "postwith-post":"node -e 'console.log(process.argv[1] || \"post\")'", - "prewith-both":"node -e 'console.log(process.argv[1] || \"pre\")'", - "with-both":"node -e 'console.log(process.argv[1] || \"main\")'", - "postwith-both":"node -e 'console.log(process.argv[1] || \"post\")'" + "start":"node -e \"console.log(process.argv[1] || 'start')\"", + "prewith-pre":"node -e \"console.log(process.argv[1] || 'pre')\"", + "with-pre":"node -e \"console.log(process.argv[1] || 'main')\"", + "with-post":"node -e \"console.log(process.argv[1] || 'main')\"", + "postwith-post":"node -e \"console.log(process.argv[1] || 'post')\"", + "prewith-both":"node -e \"console.log(process.argv[1] || 'pre')\"", + "with-both":"node -e \"console.log(process.argv[1] || 'main')\"", + "postwith-both":"node -e \"console.log(process.argv[1] || 'post')\"" } } diff --git a/deps/npm/test/tap/version-no-package.js b/deps/npm/test/tap/version-no-package.js new file mode 100644 index 0000000000..539f53feb7 --- /dev/null +++ b/deps/npm/test/tap/version-no-package.js @@ -0,0 +1,45 @@ +var common = require("../common-tap.js") +var test = require("tap").test +var osenv = require("osenv") +var path = require("path") +var mkdirp = require("mkdirp") +var rimraf = require("rimraf") + +var pkg = path.resolve(__dirname, "version-no-package") + +test("setup", function (t) { + setup() + t.end() +}) + +test("npm version in a prefix with no package.json", function(t) { + setup() + common.npm( + ["version", "--json", "--prefix", pkg], + { cwd : pkg }, + function (er, code, stdout, stderr) { + t.ifError(er, "npm version doesn't care that there's no package.json") + t.notOk(code, "npm version ran without barfing") + t.ok(stdout, "got version output") + t.notOk(stderr, "no error output") + t.doesNotThrow(function () { + var metadata = JSON.parse(stdout) + t.equal(metadata.node, process.versions.node, "node versions match") + + t.end() + }, "able to reconstitute version object from stdout") + } + ) +}) + +test("cleanup", function(t) { + process.chdir(osenv.tmpdir()) + + rimraf.sync(pkg) + t.end() +}) + +function setup() { + mkdirp.sync(pkg) + process.chdir(pkg) +}