deps: upgrade npm to 2.15.11

Refs: nodejs/Release#143
PR-URL: #9619
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>

deps/npm/.npmignore

@@ -28,3 +28,5 @@ html/*.png
 *.pyc
 
 /test/tap/builtin-config
+
+.nyc_output

deps/npm/.travis.yml

@@ -1,18 +1,33 @@
-language: node_js
 sudo: false
-node_js:
-  - "5"
-  - "4"
-  - iojs
-  - "0.12"
-  - "0.10"
-  - "0.8"
-env:
-  - DEPLOY_VERSION=testing
+# need to declare the language as well as the matrix below
+language: node_js
+# having top-level `env:` adds a phantom build
+# https://github.com/travis-ci/travis-ci/issues/4681
+#env: DEPLOY_VERSION=testing
+matrix:
+  include:
+    # LTS is our most important target
+    - node_js: "4"
+      # DEPLOY_VERSION is used to set the couchapp setup mode for test/tap/registry.js
+      # only gather coverage info for LTS
+      env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
+    # next LTS and master is next most important
+    - node_js: "6"
+      env: DEPLOY_VERSION=testing
+    # still in LTS maintenance until fall 2016 (also still in wide use)
+    - node_js: "0.10"
+      env: DEPLOY_VERSION=testing
+    # will be unsupported as soon as 6 becomes LTS and 7 released
+    - node_js: "5"
+      env: DEPLOY_VERSION=testing
+    # technically in LTS / distros, unbeloved
+    - node_js: "0.12"
+      env: DEPLOY_VERSION=testing
 before_install:
-  - "npm config set spin false"
-  - "npm install -g npm/npm#2.x"
+  # explicitly install rimraf for LTS self-install
+  - "npm install -g rimraf"
+  - "node . install -g ."
+  # required by test/tap/registry.js
   - "mkdir -p /var/run/couchdb"
-script: "npm test"
 notifications:
     slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8

deps/npm/AUTHORS

@@ -355,3 +355,26 @@ Adam Byrne <misterbyrne@gmail.com>
 GriffinSchneider <griffinschneider@gmail.com>
 doug.wade <doug.wade@redfin.com>
 rhgb <kaiserdaemon@gmail.com>
+Yael <yaelz@users.noreply.github.com>
+Yann Odeyer <yann@odeyer.com>
+James Monger <jameskmonger@hotmail.co.uk>
+Paul Irish <paul.irish@gmail.com>
+Paul O'Leary McCann <polm@dampfkraft.com>
+Francis Gulotta <wizard@roborooter.com>
+Rachel Evans <git@rve.org.uk>
+Michael Jackson <majgis@gmail.com>
+Myles Borins <mborins@us.ibm.com>
+André Herculano <andresilveirah@gmail.com>
+Wyatt Preul <wpreul@gmail.com>
+Gianluca Casati <fibo@users.noreply.github.com>
+Tapani Moilanen <moilanen.tapani@gmail.com>
+Simon MacDonald <simon.macdonald@gmail.com>
+Adam Stankiewicz <sheerun@sher.pl>
+Julian Duque <julianduquej@gmail.com>
+Michael Hart <michael.hart.au@gmail.com>
+Daniel Paz-Soldan <daniel.pazsoldan@gmail.com>
+legodude17 <legodudejb@gmail.com>
+Andrew Meyer <andrewm.bpi@gmail.com>
+Michael Jasper <mdjasper@gmail.com>
+Max <contact@mstoiber.com>
+Jason Karns <jason.karns@gmail.com>

deps/npm/LICENSE

@@ -233,49 +233,3 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 --------
-
-
-The following additional terms shall apply to use of the npm software, the npm
-website, the npm repository and any other services or products offered by npm,
-Inc.:
-
-"Node.js" trademark Joyent, Inc.  npm is not officially part of the Node.js
-project, and is neither owned by nor affiliated with Joyent, Inc.
-
-"npm" and "The npm Registry" are owned by npm, Inc. All rights reserved.
-
-Modules published on the npm registry are not officially endorsed by npm, Inc.
-or the Node.js project.
-
-Data published to the npm registry is not part of npm itself, and is the sole
-property of the publisher. While every effort is made to ensure accountability,
-there is absolutely no guarantee, warrantee, or assertion expressed or implied
-as to the quality, fitness for a specific purpose, or lack of malice in any
-given npm package.  Packages downloaded through the npm registry are
-independently licensed and are not covered by this license.
-
-Additional policies relating to, and restrictions on use of, npm products and
-services are available on the npm website.  All such policies and restrictions,
-as updated from time to time, are hereby incorporated into this license
-agreement.  By using npm, you acknowledge your agreement to all such policies
-and restrictions.
-
-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.  See the [npm Dispute Resolution
-policy](https://github.com/npm/policies/blob/master/disputes.md) for more
-details.
-
-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.
-
-"npm Logo" contributed by Mathias Pettersson and Brian Hammond,
-use is subject to https://www.npmjs.com/policies/trademark
-
-"Gubblebum Blocky" font
-Copyright (c) by Tjarda Koster, https://jelloween.deviantart.com
-included for use in the npm website and documentation,
-used with permission.
-
-This program uses several Node modules contained in the node_modules/
-subdirectory, according to the terms of their respective licenses.

deps/npm/Makefile

@@ -176,7 +176,7 @@ test: doc
 tag:
 	npm tag npm@$(PUBLISHTAG) latest
 
-publish: link doc
+publish: link doc-clean doc
 	@git push origin :v$(shell npm -v) 2>&1 || true
 	git clean -fd &&\
 	git push origin $(BRANCH) &&\

deps/npm/README.md

@@ -9,7 +9,7 @@ Much more info available via `npm help` once it's installed.
 
 ## IMPORTANT
 
-**You need node v0.8 or higher to run this program.**
+**You need node v0.10 or higher to run this program.**
 
 To install an old **and unsupported** version of npm that works on node 0.3
 and prior, clone the git repo and dig through the old tags and branches.

deps/npm/appveyor.yml

@@ -0,0 +1,38 @@
+environment:
+  matrix:
+    # LTS is our most important target
+    - nodejs_version: "4"
+    # next LTS and master is next most important
+    - nodejs_version: "6"
+    # still in LTS maintenance until fall 2016
+    # (also still in wide use)
+    - nodejs_version: "0.10"
+    # will be unsupported as soon as 6 becomes LTS and 7 released
+    - nodejs_version: "5"
+    # technically in LTS / distros, unbeloved
+    - nodejs_version: "0.12"
+  COVERALLS_REPO_TOKEN:
+    secure: XdC0aySefK0HLh1GNk6aKrzZPbCfPQLyA4mYtFGEp4DrTuZA/iuCUS0LDqFYO8JQ
+platform:
+  - x86
+  - x64
+install:
+  - ps: Install-Product node $env:nodejs_version $env:platform
+  - npm config set spin false
+  - npm rebuild
+  - node . install -g .
+  - set "PATH=%APPDATA%\npm;C:\Program Files\Git\mingw64\libexec;%PATH%"
+  - npm install --loglevel=http
+test_script:
+  - node --version
+  - npm --version
+  - npm test
+notifications:
+- provider: Slack
+  incoming_webhook:
+    secure: vXiG5AgpqxJsXZ0N0CTYDuVrX6RMjBybZKtOx6IbRxCyjgd+DAx6Z9/0XgYQjuof7QFJY3M/U6HxaREQVYbNVHA+C5N5dNALRbKzAC8QNbA=
+# GO_FAST
+matrix:
+  fast_finish: true
+# we don't need the builds, we just need tests
+build: off

deps/npm/doc/cli/npm-install.md

@@ -171,6 +171,7 @@ after packing it up into a tarball (b).
     to the environment when running git:
 
     * `GIT_ASKPASS`
+    * `GIT_EXEC_PATH`
     * `GIT_PROXY_COMMAND`
     * `GIT_SSH`
     * `GIT_SSH_COMMAND`
@@ -250,6 +251,9 @@ local copy exists on disk.
 The `--global` argument will cause npm to install the package globally
 rather than locally.  See `npm-folders(5)`.
 
+The `--ignore-scripts` argument will cause npm to not execute any
+scripts defined in the package.json. See `npm-scripts(7)`.
+
 The `--link` argument will cause npm to link global installs into the
 local space in some cases.
 

deps/npm/doc/cli/npm-link.md

@@ -13,7 +13,8 @@ Package linking is a two-step process.
 
 First, `npm link` in a package folder will create a symlink in the global folder
 `{prefix}/lib/node_modules/<package>` that links to the package where the `npm
-link` command was executed. (see `npm-config(7)` for the value of `prefix`).
+link` command was executed. (see `npm-config(7)` for the value of `prefix`). It
+will also link any bins in the package to `{prefix}/bin/{name}`.
 
 Next, in some other location, `npm link package-name` will create a
 symbolic link from globally-installed `package-name` to `node_modules/`

deps/npm/doc/cli/npm-tag.md

@@ -56,5 +56,5 @@ that do not begin with a number or the letter `v`.
 * npm-registry(7)
 * npm-config(1)
 * npm-config(7)
-* npm-tag(3)
+* npm-dist-tag(1)
 * npmrc(5)

deps/npm/doc/cli/npm.md

@@ -41,7 +41,7 @@ requires compiling of C++ Code, npm will use
 [node-gyp](https://github.com/TooTallNate/node-gyp) for that task.
 For a Unix system, [node-gyp](https://github.com/TooTallNate/node-gyp)
 needs Python, make and a buildchain like GCC. On Windows,
-Python and Microsoft Visual Studio C++ is needed. Python 3 is
+Python and Microsoft Visual Studio C++ are needed. Python 3 is
 not supported by [node-gyp](https://github.com/TooTallNate/node-gyp).
 For more information visit
 [the node-gyp repository](https://github.com/TooTallNate/node-gyp) and

deps/npm/doc/files/npmrc.md

@@ -41,6 +41,16 @@ sensitive credentials, they must be readable and writable _only_ by your user
 account (i.e. must have a mode of `0600`), otherwise they _will be ignored by
 npm!_
 
+#### Comments
+
+Lines in `.npmrc` files are interpreted as comments when they begin with a `;` or `#` character. `.npmrc` files are parsed by [npm/ini](https://github.com/npm/ini), which specifies this comment syntax.
+
+For example:
+
+    # last modified: 01 Jan 2016
+    ; Set a new registry for a scoped package
+    @myscope:registry=https://mycustomregistry.example.org
+
 ### Per-project config file
 
 When working locally in a project, a `.npmrc` file in the root of the

deps/npm/doc/files/package.json.md

@@ -204,6 +204,7 @@ Conversely, some files are always ignored:
 * `._*`
 * `npm-debug.log`
 * `.npmrc`
+* `node_modules`
 
 ## main
 
@@ -248,6 +249,10 @@ would be the same as this:
     , "version": "1.2.5"
     , "bin" : { "my-program" : "./path/to/program" } }
 
+Please make sure that your file(s) referenced in `bin` starts with
+`#!/usr/bin/env node`, otherwise the scripts are started without the node
+executable!
+
 ## man
 
 Specify either a single file or an array of filenames to put in place for the
@@ -644,8 +649,8 @@ are capable of properly installing your program.  For example:
 
     { "engines" : { "npm" : "~1.0.20" } }
 
-Note that, unless the user has set the `engine-strict` config flag, this
-field is advisory only.
+Unless the user has set the `engine-strict` config flag, this
+field is advisory only will produce warnings when your package is installed as a dependency.
 
 ## engineStrict
 
@@ -733,10 +738,10 @@ npm will default some values based on package contents.
   If there is a `server.js` file in the root of your package, then npm
   will default the `start` command to `node server.js`.
 
-* `"scripts":{"preinstall": "node-gyp rebuild"}`
+* `"scripts":{"install": "node-gyp rebuild"}`
 
-  If there is a `binding.gyp` file in the root of your package, npm will
-  default the `preinstall` command to compile using node-gyp.
+  If there is a `binding.gyp` file in the root of your package and you have not defined an `install` or `preinstall` script, npm will
+  default the `install` command to compile using node-gyp.
 
 * `"contributors": [...]`
 

deps/npm/doc/misc/npm-config.md

@@ -26,10 +26,12 @@ same.
 
 The four relevant files are:
 
-* per-project config file (/path/to/my/project/.npmrc)
-* per-user config file (~/.npmrc)
-* global config file ($PREFIX/npmrc)
-* npm builtin config file (/path/to/npm/npmrc)
+* per-project configuration file (`/path/to/my/project/.npmrc`)
+* per-user configuration file (defaults to `$HOME/.npmrc`; configurable via CLI
+  option `--userconfig` or environment variable `$NPM_CONF_USERCONFIG`)
+* global configuration file (defaults to `$PREFIX/etc/npmrc`; configurable via
+  CLI option `--globalconfig` or environment variable `$NPM_CONF_GLOBALCONFIG`)
+* npm's built-in configuration file (`/path/to/npm/npmrc`)
 
 See npmrc(5) for more details.
 
@@ -228,7 +230,12 @@ explicitly used, and that only GET requests use the cache.
 * Default: `null`
 * Type: String
 
-A client certificate to pass when accessing the registry.
+A client certificate to pass when accessing the registry.  Values should be in
+PEM format with newlines replaced by the string "\n". For example:
+
+    cert="-----BEGIN CERTIFICATE-----\nXXXX\nXXXX\n-----END CERTIFICATE-----"
+
+It is _not_ the path to a certificate file (and there is no "certfile" option).
 
 ### color
 
@@ -470,7 +477,12 @@ change.  Only the output from `npm ls --json` is currently valid.
 * Default: `null`
 * Type: String
 
-A client key to pass when accessing the registry.
+A client key to pass when accessing the registry.  Values should be in PEM
+format with newlines replaced by the string "\n". For example:
+
+    key="-----BEGIN PRIVATE KEY-----\nXXXX\nXXXX\n-----END PRIVATE KEY-----"
+
+It is _not_ the path to a key file (and there is no "keyfile" option).
 
 ### link
 

deps/npm/doc/misc/npm-orgs.md

@@ -17,8 +17,8 @@ The developer will be able to access packages based on the teams they are on. Ac
 
 There are two main commands:
 
-1. `npm team` see npm-access(1) for more details
-2. `npm access` see npm-team(1) for more details
+1. `npm team` see npm-team(1) for more details
+2. `npm access` see npm-access(1) for more details
 
 ## Team Admins create teams
 

deps/npm/doc/misc/npm-scope.md

@@ -13,9 +13,10 @@ followed by a slash, e.g.
 Scopes are a way of grouping related packages together, and also affect a few
 things about the way npm treats the package.
 
-Scoped packages are supported by the public npm registry.  The npm
-client is backwards-compatible with un-scoped registries, so it can be
-used to work with scoped and un-scoped registries at the same time.
+Scoped packages can be published and installed as of `npm@2` and are supported
+by the primary npm registry. The npm client is backwards-compatible with
+un-scoped registries, so it can be used to work with scoped and un-scoped
+registries at the same time.
 
 ## Installing scoped packages
 
@@ -51,15 +52,16 @@ just specifying to require the module `mypackage` in the folder called `@myorg`.
 
 ## Publishing scoped packages
 
-Scoped packages can be published to any registry that supports them, including
-the public npm registry.
+Scoped packages can be published from the CLI as of `npm@2` and can be
+published to any registry that supports them, including the primary npm
+registry.
 
-(As of 2015-04-19, and with npm 2.0 or newer, the public npm registry **does**
+(As of 2015-04-19, and with npm 2.0 or newer, the primary npm registry **does**
 support scoped packages)
 
 If you wish, you may associate a scope with a registry; see below.
 
-### Publishing public scoped packages to the public npm registry
+### Publishing public scoped packages to the primary npm registry
 
 To publish a public scoped package, you must specify `--access public` with
 the initial publication.  This will publish the package and set access
@@ -79,7 +81,7 @@ desired, with `npm access` or on the npmjs.com website.
 ## Associating a scope with a registry
 
 Scopes can be associated with a separate registry. This allows you to
-seamlessly use a mix of packages from the public npm registry and one or more
+seamlessly use a mix of packages from the primary npm registry and one or more
 private registries, such as npm Enterprise.
 
 You can associate a scope with a registry at login, e.g.