From 3dd7938c03389371ce1d142a8558a98b450ca2ee Mon Sep 17 00:00:00 2001 From: isaacs Date: Wed, 20 Mar 2013 17:49:57 -0700 Subject: [PATCH] npm: upgrade to 1.2.15 --- deps/npm/.npmignore | 3 + deps/npm/doc/cli/faq.md | 2 +- deps/npm/doc/cli/json.md | 27 +++++++- deps/npm/html/api/bin.html | 2 +- deps/npm/html/api/bugs.html | 2 +- deps/npm/html/api/commands.html | 2 +- deps/npm/html/api/config.html | 2 +- deps/npm/html/api/deprecate.html | 2 +- deps/npm/html/api/docs.html | 2 +- deps/npm/html/api/edit.html | 2 +- deps/npm/html/api/explore.html | 2 +- deps/npm/html/api/help-search.html | 2 +- deps/npm/html/api/init.html | 2 +- deps/npm/html/api/install.html | 2 +- deps/npm/html/api/link.html | 2 +- deps/npm/html/api/load.html | 2 +- deps/npm/html/api/ls.html | 2 +- deps/npm/html/api/npm.html | 4 +- deps/npm/html/api/outdated.html | 2 +- deps/npm/html/api/owner.html | 2 +- deps/npm/html/api/pack.html | 2 +- deps/npm/html/api/prefix.html | 2 +- deps/npm/html/api/prune.html | 2 +- deps/npm/html/api/publish.html | 2 +- deps/npm/html/api/rebuild.html | 2 +- deps/npm/html/api/restart.html | 2 +- deps/npm/html/api/root.html | 2 +- deps/npm/html/api/run-script.html | 2 +- deps/npm/html/api/search.html | 2 +- deps/npm/html/api/shrinkwrap.html | 2 +- deps/npm/html/api/start.html | 2 +- deps/npm/html/api/stop.html | 2 +- deps/npm/html/api/submodule.html | 2 +- deps/npm/html/api/tag.html | 2 +- deps/npm/html/api/test.html | 2 +- deps/npm/html/api/uninstall.html | 2 +- deps/npm/html/api/unpublish.html | 2 +- deps/npm/html/api/update.html | 2 +- deps/npm/html/api/version.html | 2 +- deps/npm/html/api/view.html | 2 +- deps/npm/html/api/whoami.html | 2 +- deps/npm/html/doc/README.html | 2 +- deps/npm/html/doc/adduser.html | 2 +- deps/npm/html/doc/bin.html | 2 +- deps/npm/html/doc/bugs.html | 2 +- deps/npm/html/doc/build.html | 2 +- deps/npm/html/doc/bundle.html | 2 +- deps/npm/html/doc/cache.html | 2 +- deps/npm/html/doc/changelog.html | 2 +- deps/npm/html/doc/coding-style.html | 2 +- deps/npm/html/doc/completion.html | 2 +- deps/npm/html/doc/config.html | 2 +- deps/npm/html/doc/dedupe.html | 2 +- deps/npm/html/doc/deprecate.html | 2 +- deps/npm/html/doc/developers.html | 2 +- deps/npm/html/doc/disputes.html | 2 +- deps/npm/html/doc/docs.html | 2 +- deps/npm/html/doc/edit.html | 2 +- deps/npm/html/doc/explore.html | 2 +- deps/npm/html/doc/faq.html | 4 +- deps/npm/html/doc/folders.html | 2 +- deps/npm/html/doc/global.html | 2 +- deps/npm/html/doc/help-search.html | 2 +- deps/npm/html/doc/help.html | 2 +- deps/npm/html/doc/index.html | 2 +- deps/npm/html/doc/init.html | 2 +- deps/npm/html/doc/install.html | 2 +- deps/npm/html/doc/json.html | 29 ++++++-- deps/npm/html/doc/link.html | 2 +- deps/npm/html/doc/ls.html | 4 +- deps/npm/html/doc/npm.html | 4 +- deps/npm/html/doc/outdated.html | 2 +- deps/npm/html/doc/owner.html | 2 +- deps/npm/html/doc/pack.html | 2 +- deps/npm/html/doc/prefix.html | 2 +- deps/npm/html/doc/prune.html | 2 +- deps/npm/html/doc/publish.html | 2 +- deps/npm/html/doc/rebuild.html | 2 +- deps/npm/html/doc/registry.html | 2 +- deps/npm/html/doc/removing-npm.html | 2 +- deps/npm/html/doc/restart.html | 2 +- deps/npm/html/doc/rm.html | 2 +- deps/npm/html/doc/root.html | 2 +- deps/npm/html/doc/run-script.html | 2 +- deps/npm/html/doc/scripts.html | 2 +- deps/npm/html/doc/search.html | 2 +- deps/npm/html/doc/semver.html | 2 +- deps/npm/html/doc/shrinkwrap.html | 2 +- deps/npm/html/doc/star.html | 2 +- deps/npm/html/doc/stars.html | 2 +- deps/npm/html/doc/start.html | 2 +- deps/npm/html/doc/stop.html | 2 +- deps/npm/html/doc/submodule.html | 2 +- deps/npm/html/doc/tag.html | 2 +- deps/npm/html/doc/test.html | 2 +- deps/npm/html/doc/uninstall.html | 2 +- deps/npm/html/doc/unpublish.html | 2 +- deps/npm/html/doc/update.html | 2 +- deps/npm/html/doc/version.html | 2 +- deps/npm/html/doc/view.html | 2 +- deps/npm/html/doc/whoami.html | 2 +- deps/npm/lib/cache.js | 20 +++--- deps/npm/lib/install.js | 2 +- deps/npm/lib/rebuild.js | 30 ++------- deps/npm/lib/utils/exec.js | 3 + deps/npm/lib/utils/fetch.js | 47 +++++++------ deps/npm/man/man1/faq.1 | 2 +- deps/npm/man/man1/json.1 | 42 +++++++++++- deps/npm/man/man1/ls.1 | 2 +- deps/npm/man/man1/npm.1 | 2 +- deps/npm/man/man3/npm.3 | 2 +- .../node_modules/fstream-npm/fstream-npm.js | 5 +- .../npm/node_modules/fstream-npm/package.json | 6 +- .../read-package-json/package.json | 4 +- .../read-package-json/read-json.js | 25 +------ deps/npm/node_modules/request/main.js | 3 +- deps/npm/package.json | 4 +- deps/npm/test/tap/peer-deps-invalid.js | 66 +++++++++++++++++-- .../test/tap/peer-deps-invalid/package.json | 4 +- .../tap/peer-deps-without-package-json.js | 47 ++++++++++--- 120 files changed, 358 insertions(+), 221 deletions(-) diff --git a/deps/npm/.npmignore b/deps/npm/.npmignore index bd0982f2e2..6c258eaa0b 100644 --- a/deps/npm/.npmignore +++ b/deps/npm/.npmignore @@ -1,4 +1,5 @@ *.swp +.*.swp npm-debug.log /test/bin /test/output.log @@ -20,3 +21,5 @@ html/*.png !.npmignore /npm-*.tgz + +*.pyc diff --git a/deps/npm/doc/cli/faq.md b/deps/npm/doc/cli/faq.md index d6cc041e4c..518fbef120 100644 --- a/deps/npm/doc/cli/faq.md +++ b/deps/npm/doc/cli/faq.md @@ -77,7 +77,7 @@ npm will not help you do something that is known to be a bad idea. No. This will never happen. This question comes up sometimes, because it seems silly from the outside that npm couldn't just be configured to put stuff somewhere else, and then npm could load them -from there. It's an arbitrary spelling choice, right? What's the bg +from there. It's an arbitrary spelling choice, right? What's the big deal? At the time of this writing, the string `'node_modules'` appears 151 diff --git a/deps/npm/doc/cli/json.md b/deps/npm/doc/cli/json.md index c6cedaaaf3..403f7f856a 100644 --- a/deps/npm/doc/cli/json.md +++ b/deps/npm/doc/cli/json.md @@ -118,6 +118,27 @@ you can specify the value for "bugs" as a simple string instead of an object. If a url is provided, it will be used by the `npm bugs` command. +## license + +You should specify a license for your package so that people know how they are +permitted to use it, and any restrictions you're placing on it. + +The simplest way, assuming you're using a common license such as BSD or MIT, is +to just specify the name of the license you're using, like this: + + { "license" : "BSD" } + +If you have more complex licensing terms, or you want to provide more detail +in your package.json file, you can use the more verbose plural form, like this: + + "licenses" : [ + { "type" : "MyLicense" + , "url" : "http://github.com/owner/project/path/to/license" + } + ] + +It's also a good idea to include a license file at the top level in your package. + ## people fields: author, contributors The "author" is one person. "contributors" is an array of people. A "person" @@ -416,9 +437,9 @@ In this case, it's best to list these additional items in a `devDependencies` hash. These things will be installed whenever the `--dev` configuration flag -is set. This flag is set automatically when doing `npm link`, and can -be managed like any other npm configuration param. See `npm-config(1)` -for more on the topic. +is set. This flag is set automatically when doing `npm link` or when doing +`npm install` from the root of a package, and can be managed like any other npm +configuration param. See `npm-config(1)` for more on the topic. ## bundledDependencies diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html index 7aa186c24f..7408820b37 100644 --- a/deps/npm/html/api/bin.html +++ b/deps/npm/html/api/bin.html @@ -19,7 +19,7 @@

This function should not be used programmatically. Instead, just refer to the npm.bin member.

- +