From 25410096b4c38eb9b17501ea06349872ab33e1ea Mon Sep 17 00:00:00 2001 From: isaacs Date: Mon, 16 Jan 2012 15:06:16 -0800 Subject: [PATCH] Update npm to 1.1.0-2 --- deps/npm/.gitmodules | 60 -- deps/npm/.npmignore | 1 + deps/npm/AUTHORS | 3 + deps/npm/Makefile | 20 +- deps/npm/bin/npm | 6 + deps/npm/bin/npm-g.cmd | 6 - deps/npm/bin/npm_g.cmd | 6 - deps/npm/doc/cli/config.md | 10 + 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/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 | 12 +- 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 | 2 +- deps/npm/html/doc/folders.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 | 2 +- deps/npm/html/doc/link.html | 2 +- deps/npm/html/doc/list.html | 2 +- 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/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/star.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 | 4 +- deps/npm/lib/init.js | 4 +- deps/npm/lib/install.js | 57 +- deps/npm/lib/submodule.js | 6 +- deps/npm/lib/utils/cmd-shim.js | 46 +- deps/npm/lib/utils/config-defs.js | 6 + deps/npm/lib/utils/error-handler.js | 31 +- deps/npm/lib/utils/ini.js | 2 +- deps/npm/lib/utils/lifecycle.js | 2 +- deps/npm/lib/utils/read-installed.js | 11 + deps/npm/lib/utils/read-json.js | 18 +- deps/npm/lib/version.js | 12 +- deps/npm/man/man1/config.1 | 18 + deps/npm/man/man1/npm.1 | 2 +- deps/npm/man/man3/npm.3 | 2 +- deps/npm/node_modules/fast-list/README.md | 5 + deps/npm/node_modules/fast-list/fast-list.js | 58 +- deps/npm/node_modules/fast-list/package.json | 4 +- deps/npm/node_modules/ini/README.md | 2 +- deps/npm/node_modules/ini/ini.js | 7 +- deps/npm/node_modules/ini/package.json | 2 +- deps/npm/node_modules/minimatch/README.md | 158 ++- deps/npm/node_modules/minimatch/minimatch.js | 1115 ++++++++++++++++---- deps/npm/node_modules/minimatch/package.json | 6 +- deps/npm/node_modules/node-uuid/README.md | 30 +- deps/npm/node_modules/node-uuid/package.json | 4 +- deps/npm/node_modules/node-uuid/uuid.js | 218 ++-- deps/npm/node_modules/request/README.md | 5 +- deps/npm/node_modules/request/forever.js | 84 ++ deps/npm/node_modules/request/main.js | 126 ++- deps/npm/node_modules/request/oauth.js | 15 +- deps/npm/node_modules/request/package.json | 2 +- .../node_modules/request/vendor/cookie/index.js | 15 +- deps/npm/node_modules/rimraf/package.json | 2 +- deps/npm/node_modules/rimraf/rimraf.js | 15 +- deps/npm/node_modules/semver/package.json | 2 +- deps/npm/node_modules/semver/semver.js | 4 +- deps/npm/node_modules/tar/lib/parse.js | 11 + deps/npm/node_modules/tar/package.json | 4 +- deps/npm/package.json | 179 ++-- deps/npm/scripts/doc-build.sh | 8 +- .../packages/npm-test-optional-deps/package.json | 10 + 142 files changed, 1824 insertions(+), 798 deletions(-) delete mode 100644 deps/npm/.gitmodules create mode 100755 deps/npm/bin/npm delete mode 100644 deps/npm/bin/npm-g.cmd delete mode 100644 deps/npm/bin/npm_g.cmd create mode 100644 deps/npm/node_modules/request/forever.js create mode 100644 deps/npm/test/packages/npm-test-optional-deps/package.json diff --git a/deps/npm/.gitmodules b/deps/npm/.gitmodules deleted file mode 100644 index 169c875..0000000 --- a/deps/npm/.gitmodules +++ /dev/null @@ -1,60 +0,0 @@ -[submodule "node_modules/semver"] - path = node_modules/semver - url = https://github.com/isaacs/node-semver.git -[submodule "node_modules/abbrev"] - path = node_modules/abbrev - url = https://github.com/isaacs/abbrev-js.git -[submodule "node_modules/nopt"] - path = node_modules/nopt - url = https://github.com/isaacs/nopt.git -[submodule "node_modules/node-uuid"] - path = node_modules/node-uuid - url = https://github.com/broofa/node-uuid -[submodule "node_modules/minimatch"] - path = node_modules/minimatch - url = https://github.com/isaacs/minimatch.git -[submodule "node_modules/graceful-fs"] - path = node_modules/graceful-fs - url = https://github.com/isaacs/node-graceful-fs.git -[submodule "node_modules/slide"] - path = node_modules/slide - url = https://github.com/isaacs/slide-flow-control.git -[submodule "node_modules/rimraf"] - path = node_modules/rimraf - url = https://github.com/isaacs/rimraf.git -[submodule "node_modules/proto-list"] - path = node_modules/proto-list - url = https://github.com/isaacs/proto-list.git -[submodule "node_modules/ini"] - path = node_modules/ini - url = https://github.com/isaacs/ini.git -[submodule "node_modules/which"] - path = node_modules/which - url = https://github.com/isaacs/node-which.git -[submodule "node_modules/request"] - path = node_modules/request - url = https://github.com/mikeal/request.git -[submodule "node_modules/tar"] - path = node_modules/tar - url = https://github.com/isaacs/node-tar.git -[submodule "node_modules/fstream"] - path = node_modules/fstream - url = https://github.com/isaacs/fstream.git -[submodule "node_modules/inherits"] - path = node_modules/inherits - url = https://github.com/isaacs/inherits.git -[submodule "node_modules/block-stream"] - path = node_modules/block-stream - url = https://github.com/isaacs/block-stream.git -[submodule "node_modules/mkdirp"] - path = node_modules/mkdirp - url = https://github.com/isaacs/node-mkdirp.git -[submodule "node_modules/fast-list"] - path = node_modules/fast-list - url = https://github.com/isaacs/fast-list.git -[submodule "node_modules/read"] - path = node_modules/read - url = https://github.com/isaacs/read.git -[submodule "node_modules/lru-cache"] - path = node_modules/lru-cache - url = https://github.com/isaacs/node-lru-cache.git diff --git a/deps/npm/.npmignore b/deps/npm/.npmignore index 7ba078e..6ab1868 100644 --- a/deps/npm/.npmignore +++ b/deps/npm/.npmignore @@ -10,3 +10,4 @@ node_modules/.bin npm-debug.log ./npmrc .gitignore +release/ diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS index 59d7257..c977af8 100644 --- a/deps/npm/AUTHORS +++ b/deps/npm/AUTHORS @@ -48,3 +48,6 @@ Jameson Little cspotcode Maciej Małecki Stephen Sugden +Gautham Pai +David Trejo +Paul Vorbach diff --git a/deps/npm/Makefile b/deps/npm/Makefile index 7d3e106..415a1b3 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -27,12 +27,9 @@ mandocs = $(api_mandocs) $(cli_mandocs) htmldocs = $(api_htmldocs) $(cli_htmldocs) -all: submodules doc +all: doc -submodules: - ! [ -d .git ] || git submodule update --init --recursive - -latest: submodules +latest: @echo "Installing latest published npm" @echo "Use 'make install' or 'make link' to install the code" @echo "in this folder that you're looking at right now." @@ -51,7 +48,7 @@ clean: doc-clean uninstall rm npmrc node cli.js cache clean -uninstall: submodules +uninstall: node cli.js rm npm -g -f doc: $(mandocs) $(htmldocs) @@ -94,14 +91,14 @@ html/api/%.html: doc/api/%.md html/dochead.html html/docfoot.html scripts/doc-bu doc/cli/index.md: $(markdowns) scripts/index-build.js scripts/doc-build.sh package.json node scripts/index-build.js > $@ -node_modules/ronn: +node_modules/.bin/ronn: node cli.js install https://github.com/isaacs/ronnjs/tarball/master doc: man man: $(cli_docs) $(api_docs) -test: submodules +test: node cli.js test version: link @@ -109,9 +106,10 @@ version: link git ci -m v$(shell npm -v) publish: link doc - git tag -d v$(shell npm -v) || true - git push origin :v$(shell npm -v) || true - npm unpublish npm@$(shell npm -v) || true + @git tag -d v$(shell npm -v) || true + @git push origin :v$(shell npm -v) || true + @npm unpublish npm@$(shell npm -v) || true + git clean -fd git tag -s -m v$(shell npm -v) v$(shell npm -v) &&\ git push origin --tags &&\ npm publish &&\ diff --git a/deps/npm/bin/npm b/deps/npm/bin/npm new file mode 100755 index 0000000..5fbcd3b --- /dev/null +++ b/deps/npm/bin/npm @@ -0,0 +1,6 @@ +#!/bin/sh +if [ -x "`dirname "$0"`/node.exe" ]; then + "`dirname "$0"`/node.exe" "`dirname "$0"`/node_modules/npm/bin/npm-cli.js" "$@" +else + node "`dirname "$0"`/node_modules/npm/bin/npm-cli.js" "$@" +fi diff --git a/deps/npm/bin/npm-g.cmd b/deps/npm/bin/npm-g.cmd deleted file mode 100644 index bac9e5f..0000000 --- a/deps/npm/bin/npm-g.cmd +++ /dev/null @@ -1,6 +0,0 @@ -:: Created by npm, please don't edit manually. -@IF EXIST "%~dp0"\"node.exe" ( - "%~dp0"\"node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* -) ELSE ( - node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* -) \ No newline at end of file diff --git a/deps/npm/bin/npm_g.cmd b/deps/npm/bin/npm_g.cmd deleted file mode 100644 index bac9e5f..0000000 --- a/deps/npm/bin/npm_g.cmd +++ /dev/null @@ -1,6 +0,0 @@ -:: Created by npm, please don't edit manually. -@IF EXIST "%~dp0"\"node.exe" ( - "%~dp0"\"node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* -) ELSE ( - node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* -) \ No newline at end of file diff --git a/deps/npm/doc/cli/config.md b/deps/npm/doc/cli/config.md index e70acc2..2c6ca26 100644 --- a/deps/npm/doc/cli/config.md +++ b/deps/npm/doc/cli/config.md @@ -101,6 +101,7 @@ The following shorthands are parsed on the command-line: * `-v`: `--version` * `-h`, `-?`, `--help`, `-H`: `--usage` * `-s`, `--silent`: `--loglevel silent` +* `-q`, `--quiet`: `--loglevel warn` * `-d`: `--loglevel info` * `-dd`, `--verbose`: `--loglevel verbose` * `-ddd`: `--loglevel silly` @@ -278,6 +279,15 @@ Makes various commands more forceful. * skips cache when requesting from the registry. * prevents checks against clobbering non-npm files. +### git + +* Default: `"git"` +* Type: String + +The command to use for git commands. If git is installed on the +computer, but is not in the `PATH`, then set this to the full path to +the git binary. + ### global * Default: false diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html index a5bd332..c439267 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.

- +