From: isaacs Date: Fri, 13 Jul 2012 18:40:38 +0000 (-0700) Subject: npm: upgrade to 1.1.41 X-Git-Tag: v0.8.3~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d4362403c10dd28b5644b947945f853cd354f28;p=platform%2Fupstream%2Fnodejs.git npm: upgrade to 1.1.41 --- diff --git a/deps/npm/.gitignore b/deps/npm/.gitignore new file mode 100644 index 0000000..842fca9 --- /dev/null +++ b/deps/npm/.gitignore @@ -0,0 +1,17 @@ +*.swp +npm-debug.log +/test/bin +/test/output.log +/test/*/*/node_modules +/test/packages/npm-test-depends-on-spark/which-spark.log +/test/packages/test-package/random-data.txt +/test/root +/node_modules/ronn +/node_modules/tap +/node_modules/.bin +/html/api/ +/html/doc/ +/man/ +/doc/*/index.md +/npmrc +/release/ diff --git a/deps/npm/Makefile b/deps/npm/Makefile index 2663075..96e3f37 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -101,16 +101,10 @@ man: $(cli_docs) $(api_docs) test: node cli.js test -version: link - git add package.json &&\ - 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 clean -fd - git tag -s -m v$(shell npm -v) v$(shell npm -v) &&\ git push origin --tags &&\ npm publish &&\ npm tag npm@$(shell npm -v) $(shell npm -v | awk -F. '{print $$1 "." $$2}') &&\ @@ -131,6 +125,6 @@ release: @bash scripts/release.sh sandwich: - @[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || echo "make it yourself" + @[ $$(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/config.md b/deps/npm/doc/cli/config.md index 537af5c..7bd46cd 100644 --- a/deps/npm/doc/cli/config.md +++ b/deps/npm/doc/cli/config.md @@ -694,6 +694,17 @@ character to indicate reverse sort. The shell to run for the `npm explore` command. +### sign-git-tag + +* Default: false +* Type: Boolean + +If set to true, then the `npm version` command will tag the version +using `-s` to add a signature. + +Note that git requires you to have set up GPG keys in your git configs +for this to work properly. + ### strict-ssl * Default: true diff --git a/deps/npm/doc/cli/list.md b/deps/npm/doc/cli/list.md index 93d86cd..3dd709b 100644 --- a/deps/npm/doc/cli/list.md +++ b/deps/npm/doc/cli/list.md @@ -3,20 +3,26 @@ npm-ls(1) -- List installed packages ## SYNOPSIS - npm list - npm ls - npm la - npm ll + npm list [ ...] + npm ls [ ...] + npm la [ ...] + npm ll [ ...] ## DESCRIPTION This command will print to stdout all the versions of packages that are installed, as well as their dependencies, in a tree-structure. -It does not take positional arguments, though you may set config flags -like with any other command, such as `-g` to list global packages. +Positional arguments are `name@version-range` identifiers, which will +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: -It will print out extraneous, missing, and invalid packages. + npm@@VERSION@ /path/to/npm + âââ¬ init-package-json@0.0.4 + âââ promzard@0.1.5 + +It will show print out extraneous, missing, and invalid packages. When run as `ll` or `la`, it shows extended information by default. diff --git a/deps/npm/doc/cli/version.md b/deps/npm/doc/cli/version.md index 480c90d..ca9b5fb 100644 --- a/deps/npm/doc/cli/version.md +++ b/deps/npm/doc/cli/version.md @@ -3,7 +3,7 @@ npm-version(1) -- Bump a package version ## SYNOPSIS - npm version [--message commit-message] + npm version [ | major | minor | patch | build] ## DESCRIPTION @@ -11,14 +11,23 @@ Run this in a package directory to bump the version and write the new data back to the package.json file. The `newversion` argument should be a valid semver string, *or* a valid -second argument to semver.inc (one of "patch", "minor", or "major"). In -the second case, the existing version will be incremented by that amount. +second argument to semver.inc (one of "build", "patch", "minor", or +"major"). In the second case, the existing version will be incremented +by 1 in the specified field. If run in a git repo, it will also create a version commit and tag, and fail if the repo is not clean. -If supplied with `--message` (shorthand: `-m`) command line option, npm -will use it as a commit message when creating a version commit. +If supplied with `--message` (shorthand: `-m`) config option, npm will +use it as a commit message when creating a version commit. If the +`message` config contains `%s` then that will be replaced with the +resulting version number. For example: + + npm version patch -m "Upgrade to %s for reasons" + +If the `sign-git-tag` config is set, then the tag will be signed using +the `-s` flag to git. Note that you must have a default GPG key set up +in your git config for this to work properly. ## SEE ALSO diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html index 9071e79..1053a36 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.

- +