From c1452f4c6fac17dd8ab974372daee05cd5cdbdec Mon Sep 17 00:00:00 2001 From: isaacs Date: Wed, 20 Nov 2013 11:08:52 -0800 Subject: [PATCH] npm: Upgrade to v1.3.15 --- deps/npm/Makefile | 2 +- deps/npm/doc/cli/npm.md | 4 - deps/npm/html/doc/README.html | 2 +- deps/npm/html/doc/api/npm-bin.html | 2 +- deps/npm/html/doc/api/npm-bugs.html | 2 +- deps/npm/html/doc/api/npm-commands.html | 2 +- deps/npm/html/doc/api/npm-config.html | 2 +- deps/npm/html/doc/api/npm-deprecate.html | 2 +- deps/npm/html/doc/api/npm-docs.html | 2 +- deps/npm/html/doc/api/npm-edit.html | 2 +- deps/npm/html/doc/api/npm-explore.html | 2 +- deps/npm/html/doc/api/npm-help-search.html | 2 +- deps/npm/html/doc/api/npm-init.html | 2 +- deps/npm/html/doc/api/npm-install.html | 2 +- deps/npm/html/doc/api/npm-link.html | 2 +- deps/npm/html/doc/api/npm-load.html | 2 +- deps/npm/html/doc/api/npm-ls.html | 2 +- deps/npm/html/doc/api/npm-outdated.html | 2 +- deps/npm/html/doc/api/npm-owner.html | 2 +- deps/npm/html/doc/api/npm-pack.html | 2 +- deps/npm/html/doc/api/npm-prefix.html | 2 +- deps/npm/html/doc/api/npm-prune.html | 2 +- deps/npm/html/doc/api/npm-publish.html | 2 +- deps/npm/html/doc/api/npm-rebuild.html | 2 +- deps/npm/html/doc/api/npm-restart.html | 2 +- deps/npm/html/doc/api/npm-root.html | 2 +- deps/npm/html/doc/api/npm-run-script.html | 2 +- deps/npm/html/doc/api/npm-search.html | 2 +- deps/npm/html/doc/api/npm-shrinkwrap.html | 2 +- deps/npm/html/doc/api/npm-start.html | 2 +- deps/npm/html/doc/api/npm-stop.html | 2 +- deps/npm/html/doc/api/npm-submodule.html | 2 +- deps/npm/html/doc/api/npm-tag.html | 2 +- deps/npm/html/doc/api/npm-test.html | 2 +- deps/npm/html/doc/api/npm-uninstall.html | 2 +- deps/npm/html/doc/api/npm-unpublish.html | 2 +- deps/npm/html/doc/api/npm-update.html | 2 +- deps/npm/html/doc/api/npm-version.html | 2 +- deps/npm/html/doc/api/npm-view.html | 2 +- deps/npm/html/doc/api/npm-whoami.html | 2 +- deps/npm/html/doc/api/npm.html | 4 +- deps/npm/html/doc/api/repo.html | 2 +- deps/npm/html/doc/cli/npm-adduser.html | 2 +- deps/npm/html/doc/cli/npm-bin.html | 2 +- deps/npm/html/doc/cli/npm-bugs.html | 2 +- deps/npm/html/doc/cli/npm-build.html | 2 +- deps/npm/html/doc/cli/npm-bundle.html | 2 +- deps/npm/html/doc/cli/npm-cache.html | 2 +- deps/npm/html/doc/cli/npm-completion.html | 2 +- deps/npm/html/doc/cli/npm-config.html | 2 +- deps/npm/html/doc/cli/npm-dedupe.html | 2 +- deps/npm/html/doc/cli/npm-deprecate.html | 2 +- deps/npm/html/doc/cli/npm-docs.html | 2 +- deps/npm/html/doc/cli/npm-edit.html | 2 +- deps/npm/html/doc/cli/npm-explore.html | 2 +- deps/npm/html/doc/cli/npm-help-search.html | 2 +- deps/npm/html/doc/cli/npm-help.html | 2 +- deps/npm/html/doc/cli/npm-init.html | 2 +- deps/npm/html/doc/cli/npm-install.html | 2 +- deps/npm/html/doc/cli/npm-link.html | 2 +- deps/npm/html/doc/cli/npm-ls.html | 4 +- deps/npm/html/doc/cli/npm-outdated.html | 2 +- deps/npm/html/doc/cli/npm-owner.html | 2 +- deps/npm/html/doc/cli/npm-pack.html | 2 +- deps/npm/html/doc/cli/npm-prefix.html | 2 +- deps/npm/html/doc/cli/npm-prune.html | 2 +- deps/npm/html/doc/cli/npm-publish.html | 2 +- deps/npm/html/doc/cli/npm-rebuild.html | 2 +- deps/npm/html/doc/cli/npm-restart.html | 2 +- deps/npm/html/doc/cli/npm-rm.html | 2 +- deps/npm/html/doc/cli/npm-root.html | 2 +- deps/npm/html/doc/cli/npm-run-script.html | 2 +- deps/npm/html/doc/cli/npm-search.html | 2 +- deps/npm/html/doc/cli/npm-shrinkwrap.html | 2 +- deps/npm/html/doc/cli/npm-star.html | 2 +- deps/npm/html/doc/cli/npm-stars.html | 2 +- deps/npm/html/doc/cli/npm-start.html | 2 +- deps/npm/html/doc/cli/npm-stop.html | 2 +- deps/npm/html/doc/cli/npm-submodule.html | 2 +- deps/npm/html/doc/cli/npm-tag.html | 2 +- deps/npm/html/doc/cli/npm-test.html | 2 +- deps/npm/html/doc/cli/npm-uninstall.html | 2 +- deps/npm/html/doc/cli/npm-unpublish.html | 2 +- deps/npm/html/doc/cli/npm-update.html | 2 +- deps/npm/html/doc/cli/npm-version.html | 2 +- deps/npm/html/doc/cli/npm-view.html | 2 +- deps/npm/html/doc/cli/npm-whoami.html | 2 +- deps/npm/html/doc/cli/npm.html | 8 +- deps/npm/html/doc/cli/repo.html | 2 +- deps/npm/html/doc/files/npm-folders.html | 2 +- deps/npm/html/doc/files/npm-global.html | 2 +- deps/npm/html/doc/files/npm-json.html | 2 +- deps/npm/html/doc/files/npmrc.html | 2 +- deps/npm/html/doc/files/package.json.html | 2 +- deps/npm/html/doc/index.html | 2 +- deps/npm/html/doc/misc/npm-coding-style.html | 2 +- deps/npm/html/doc/misc/npm-config.html | 2 +- deps/npm/html/doc/misc/npm-developers.html | 2 +- deps/npm/html/doc/misc/npm-disputes.html | 2 +- deps/npm/html/doc/misc/npm-faq.html | 2 +- deps/npm/html/doc/misc/npm-index.html | 2 +- deps/npm/html/doc/misc/npm-registry.html | 2 +- deps/npm/html/doc/misc/npm-scripts.html | 2 +- deps/npm/html/doc/misc/removing-npm.html | 2 +- deps/npm/html/doc/misc/semver.html | 2 +- deps/npm/lib/dedupe.js | 2 - deps/npm/lib/npm.js | 2 +- deps/npm/lib/utils/lifecycle.js | 6 +- deps/npm/man/man1/npm-ls.1 | 2 +- deps/npm/man/man1/npm.1 | 5 +- deps/npm/man/man3/npm.3 | 2 +- deps/npm/node_modules/glob/glob.js | 5 + deps/npm/node_modules/glob/package.json | 7 +- .../node_modules/glob/test/bash-results.json | 1 + .../glob/test/new-glob-optional-options.js | 10 + .../example/example-basic.js | 8 + .../example/example-default.js | 7 + .../{example.js => example/example-npm.js} | 7 +- .../example/init/basic-init.js | 1 + .../node_modules/promzard/package.json | 1 + .../init-package-json/package.json | 8 +- deps/npm/node_modules/node-gyp/gyp/AUTHORS | 2 + deps/npm/node_modules/node-gyp/gyp/DEPS | 2 - deps/npm/node_modules/node-gyp/gyp/MANIFEST | 21 - .../node_modules/node-gyp/gyp/PRESUBMIT.py | 1 - .../node-gyp/gyp/buildbot/buildbot_run.py | 148 +++ deps/npm/node_modules/node-gyp/gyp/gyp | 19 +- deps/npm/node_modules/node-gyp/gyp/gyp.bat | 2 +- .../npm/node_modules/node-gyp/gyp/gyp_main.py | 18 + deps/npm/node_modules/node-gyp/gyp/gyptest.py | 23 +- .../node-gyp/gyp/pylib/gyp/MSVSNew.py | 19 +- .../node-gyp/gyp/pylib/gyp/MSVSSettings.py | 7 +- .../node-gyp/gyp/pylib/gyp/MSVSUtil.py | 79 +- .../node-gyp/gyp/pylib/gyp/MSVSVersion.py | 48 +- .../node-gyp/gyp/pylib/gyp/SCons.py | 199 --- .../node-gyp/gyp/pylib/gyp/__init__.py | 129 +- .../node-gyp/gyp/pylib/gyp/common.py | 26 +- .../pylib/gyp/{sun_tool.py => flock_tool.py} | 12 +- .../gyp/pylib/gyp/generator/android.py | 120 +- .../gyp/generator/dump_dependency_json.py | 14 +- .../gyp/pylib/gyp/generator/eclipse.py | 63 +- .../node-gyp/gyp/pylib/gyp/generator/make.py | 79 +- .../node-gyp/gyp/pylib/gyp/generator/msvs.py | 205 +++- .../node-gyp/gyp/pylib/gyp/generator/ninja.py | 861 +++++++++---- .../gyp/pylib/gyp/generator/ninja_test.py | 48 +- .../node-gyp/gyp/pylib/gyp/generator/scons.py | 1072 ----------------- .../node-gyp/gyp/pylib/gyp/generator/xcode.py | 73 +- .../gyp/pylib/gyp/generator/xcode_test.py | 23 + .../node-gyp/gyp/pylib/gyp/input.py | 280 +++-- .../node-gyp/gyp/pylib/gyp/input_test.py | 90 ++ .../node-gyp/gyp/pylib/gyp/mac_tool.py | 73 +- .../node-gyp/gyp/pylib/gyp/msvs_emulation.py | 143 ++- .../node-gyp/gyp/pylib/gyp/ninja_syntax.py | 18 +- .../node-gyp/gyp/pylib/gyp/win_tool.py | 53 +- .../node-gyp/gyp/pylib/gyp/xcode_emulation.py | 313 ++++- .../node-gyp/gyp/pylib/gyp/xcodeproj_file.py | 56 +- deps/npm/node_modules/node-gyp/gyp/setup.py | 11 +- .../node-gyp/gyp/tools/emacs/gyp.el | 1 + .../node_modules/node-gyp/lib/configure.js | 134 +-- deps/npm/node_modules/node-gyp/package.json | 8 +- deps/npm/node_modules/npmconf/config-defs.js | 16 + .../node_modules/proto-list/package.json | 6 +- .../node_modules/config-chain/package.json | 6 +- deps/npm/node_modules/npmconf/package.json | 10 +- deps/npm/node_modules/npmconf/test/basic.js | 1 + deps/npm/node_modules/npmconf/test/builtin.js | 3 +- .../form-data/node_modules/async/package.json | 6 +- .../node_modules/delayed-stream/package.json | 6 +- .../node_modules/combined-stream/package.json | 6 +- .../hawk/node_modules/boom/package.json | 6 +- .../hawk/node_modules/cryptiles/package.json | 6 +- .../hawk/node_modules/hoek/package.json | 6 +- .../hawk/node_modules/sntp/package.json | 6 +- deps/npm/package.json | 8 +- deps/npm/scripts/install.sh | 6 +- deps/npm/test/common-tap.js | 2 + deps/npm/test/tap/ignore-shrinkwrap.js | 11 +- deps/npm/test/tap/lifecycle-signal.js | 17 + .../test/tap/lifecycle-signal/package.json | 3 + .../test/tap/noargs-install-config-save.js | 17 +- .../tap/outdated-include-devdependencies.js | 19 +- deps/npm/test/tap/outdated-new-versions.js | 10 +- deps/npm/test/tap/outdated.js | 22 +- deps/npm/test/tap/outdated/README.md | 1 + deps/npm/test/tap/outdated/package.json | 4 +- deps/npm/test/tap/peer-deps-invalid.js | 3 +- .../tap/peer-deps-without-package-json.js | 5 +- deps/npm/test/tap/publish-config.js | 5 +- deps/npm/test/tap/uninstall-package.js | 35 +- .../test/tap/uninstall-package/package.json | 6 +- 190 files changed, 2546 insertions(+), 2501 deletions(-) create mode 100644 deps/npm/node_modules/glob/test/new-glob-optional-options.js create mode 100644 deps/npm/node_modules/init-package-json/example/example-basic.js create mode 100644 deps/npm/node_modules/init-package-json/example/example-default.js rename deps/npm/node_modules/init-package-json/{example.js => example/example-npm.js} (54%) create mode 100644 deps/npm/node_modules/init-package-json/example/init/basic-init.js delete mode 100644 deps/npm/node_modules/node-gyp/gyp/MANIFEST create mode 100755 deps/npm/node_modules/node-gyp/gyp/buildbot/buildbot_run.py create mode 100755 deps/npm/node_modules/node-gyp/gyp/gyp_main.py delete mode 100644 deps/npm/node_modules/node-gyp/gyp/pylib/gyp/SCons.py rename deps/npm/node_modules/node-gyp/gyp/pylib/gyp/{sun_tool.py => flock_tool.py} (82%) delete mode 100644 deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/scons.py create mode 100644 deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.py create mode 100755 deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.py create mode 100644 deps/npm/test/common-tap.js create mode 100644 deps/npm/test/tap/lifecycle-signal.js create mode 100644 deps/npm/test/tap/lifecycle-signal/package.json create mode 100644 deps/npm/test/tap/outdated/README.md diff --git a/deps/npm/Makefile b/deps/npm/Makefile index 326d6f0d509..d2338baba6e 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -214,6 +214,6 @@ release: @bash scripts/release.sh sandwich: - @[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || echo "make it yourself" && exit 13 + @[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || (echo "make it yourself" && exit 13) .PHONY: all latest install dev link doc clean uninstall test man doc-publish doc-clean docclean docpublish release zip-publish diff --git a/deps/npm/doc/cli/npm.md b/deps/npm/doc/cli/npm.md index 91357e93007..0f9b30b226e 100644 --- a/deps/npm/doc/cli/npm.md +++ b/deps/npm/doc/cli/npm.md @@ -132,10 +132,6 @@ as expected. The `npm-debug.log` file is also helpful to provide. You can also look for isaacs in #node.js on irc://irc.freenode.net. He will no doubt tell you to put the output in a gist or email. -## HISTORY - -See npm-changelog(1) - ## AUTHOR [Isaac Z. Schlueter](http://blog.izs.me/) :: diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index 515f262dfb4..9a34b83adb2 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -239,7 +239,7 @@ will no doubt tell you to put the output in a gist or email.

- +