Merge remote branch 'origin/v0.6'

Conflicts: wscript
nodejs · Dec 16, 2011 · 1865b11 · 1865b11
2 parents 67e12a0 + a599aeb
commit 1865b11
Show file tree

Hide file tree

Showing 229 changed files with 3,346 additions and 1,303 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
-
+core
+vgcore.*
 .waf*
 tags
 .lock-wscript

diff --git a/AUTHORS b/AUTHORS
@@ -235,3 +235,12 @@ Jacob H.C. Kragh <jhckragh@gmail.com>
 Benjamin Pasero <benjamin.pasero@gmail.com>
 Scott Anderson <sanderson7@gmail.com>
 Yoji SHIDARA <dara@shidara.net>
+Mathias Bynens <mathias@qiwi.be>
+Łukasz Walukiewicz <lukasz@walukiewicz.eu>
+Artur Adib <arturadib@gmail.com>
+E. Azer Koçulu <azer@kodfabrik.com>
+Roman Shtylman <shtylman@gmail.com>
+Kyle Robinson Young <kyle@dontkry.com>
+Tim Oxley <secoif@gmail.com>
+Ingmar Runge <ingmar@irsoft.de>
+Russ Bradberry <rbradberry@gmail.com>
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,27 @@
-2011.12.04, Version 0.6.5 (stable)
+2011.12.14, Version 0.6.6 (stable)
+
+* npm update to 1.1.0-beta-4 (Isaac Z. Schlueter)
+
+* cli: fix output of --help (Ben Noordhuis)
+
+* new website
+
+* pause/resume semantics for stdin (Isaac Z. Schlueter)
+
+* Travis CI integration (Maciej Małecki)
+
+* child_process: Fix bug regarding closed stdin (Ben Noordhuis)
+
+* Enable upgrades in MSI. (Igor Zinkovsky)
+
+* net: Fixes memory leak (Ben Noordhuis)
+
+* fs: handle fractional or NaN ReadStream buffer size (Ben Noordhuis)
+
+* crypto: fix memory leaks in PBKDF2 error path (Ben Noordhuis)
+
+
+2011.12.04, Version 0.6.5 (stable), 6cc94db653a2739ab28e33b2d6a63c51bd986a9f
 
 * npm workaround Windows antivirus software (isaacs)
 

diff --git a/Makefile b/Makefile
@@ -62,7 +62,7 @@ test-internet: all
 apidoc_sources = $(wildcard doc/api/*.markdown)
 apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html))
 
-apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets
+apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/logos
 
 apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*)))
 
@@ -75,8 +75,22 @@ website_files = \
 	out/doc/sh_vim-dark.css \
 	out/doc/logo.png      \
 	out/doc/sponsored.png \
-  out/doc/favicon.ico   \
-	out/doc/pipe.css
+	out/doc/favicon.ico   \
+	out/doc/pipe.css \
+	out/doc/about/index.html \
+	out/doc/close-downloads.png \
+	out/doc/community/index.html \
+	out/doc/community/not-invented-here.png \
+	out/doc/download-logo.png \
+	out/doc/ebay-logo.png \
+	out/doc/footer-logo.png \
+	out/doc/icons.png \
+	out/doc/linkedin-logo.png \
+	out/doc/logos/index.html \
+	out/doc/microsoft-logo.png \
+	out/doc/platform-icons.png \
+	out/doc/ryan-speaker.jpg \
+	out/doc/yahoo-logo.png
 
 doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
 
@@ -95,7 +109,7 @@ out/doc/api/%.html: doc/api/%.markdown out/Release/node $(apidoc_dirs) $(apiasse
 out/doc/%:
 
 website-upload: doc
-	scp -r out/doc/* $(web_root)
+	rsync -r out/doc/ node@nodejs.org:~/web/nodejs.org/
 
 docopen: out/doc/api/all.html
 	-google-chrome out/doc/api/all.html

diff --git a/deps/npm/.gitmodules b/deps/npm/.gitmodules
@@ -36,19 +36,25 @@
 	url = https://github.com/mikeal/request.git
 [submodule "node_modules/tar"]
 	path = node_modules/tar
-	url = git://github.com/isaacs/node-tar.git
+	url = https://github.com/isaacs/node-tar.git
 [submodule "node_modules/fstream"]
 	path = node_modules/fstream
-	url = git://github.com/isaacs/fstream.git
+	url = https://github.com/isaacs/fstream.git
 [submodule "node_modules/inherits"]
 	path = node_modules/inherits
-	url = git://github.com/isaacs/inherits.git
+	url = https://github.com/isaacs/inherits.git
 [submodule "node_modules/block-stream"]
 	path = node_modules/block-stream
-	url = git://github.com/isaacs/block-stream.git
+	url = https://github.com/isaacs/block-stream.git
 [submodule "node_modules/mkdirp"]
 	path = node_modules/mkdirp
-	url = git://github.com/isaacs/node-mkdirp.git
+	url = https://github.com/isaacs/node-mkdirp.git
 [submodule "node_modules/fast-list"]
 	path = node_modules/fast-list
-	url = git://github.com/isaacs/fast-list.git
+	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/.travis.yml b/deps/npm/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+before_install: "make &>out || cat out; rm out"
+node_js:
+  - 0.6
diff --git a/deps/npm/Makefile b/deps/npm/Makefile
@@ -110,7 +110,7 @@ version: link
 
 publish: link
 	git tag -s -m v$(shell npm -v) v$(shell npm -v) &&\
-	git push origin master --tags &&\
+	git push origin --tags &&\
 	npm publish &&\
 	make doc-publish
 

diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js
@@ -12,6 +12,9 @@ if (typeof WScript !== "undefined") {
   return
 }
 
+
+process.title = "npm"
+
 var log = require("../lib/utils/log.js")
 log.waitForConfig()
 log.info("ok", "it worked if it ends with")

diff --git a/deps/npm/doc/cli/config.md b/deps/npm/doc/cli/config.md
@@ -225,6 +225,14 @@ The location of npm's cache directory.  See `npm-cache(1)`
 If false, never shows colors.  If `"always"` then always shows colors.
 If true, then only prints color codes for tty file descriptors.
 
+### coverage
+
+* Default: false
+* Type: Boolean
+
+A flag to tell test-harness to run with their coverage options enabled,
+if they respond to the `npm_config_coverage` environment variable.
+
 ### depth
 
 * Default: Infinity
@@ -379,13 +387,16 @@ The location to write log output.
 
 ### loglevel
 
-* Default: "warn"
+* Default: "http"
 * Type: String
-* Values: "silent", "win", "error", "warn", "info", "verbose", "silly"
+* Values: "silent", "win", "error", "warn", "http", "info", "verbose", "silly"
 
 What level of logs to report.  On failure, *all* logs are written to
 `npm-debug.log` in the current working directory.
 
+Any logs of a higher level than the setting are shown.
+The default is "http", which shows http, warn, and error output.
+
 ### logprefix
 
 * Default: true on Posix, false on Windows
@@ -537,6 +548,16 @@ Space-separated options that are always passed to search.
 
 Space-separated options that limit the results from search.
 
+### searchsort
+
+* Default: "name"
+* Type: String
+* Values: "name", "-name", "date", "-date", "description",
+  "-description", "keywords", "-keywords"
+
+Indication of which field to sort search results by.  Prefix with a `-`
+character to indicate reverse sort.
+
 ### shell
 
 * Default: SHELL environment variable, or "bash" on Posix, or "cmd" on

diff --git a/deps/npm/doc/cli/developers.md b/deps/npm/doc/cli/developers.md
@@ -150,8 +150,8 @@ You can give publish a url to a tarball, or a filename of a tarball,
 or a path to a folder.
 
 Note that pretty much **everything in that folder will be exposed**
-by default.  So, if you have secret stuff in there, use a `.npminclude`
-or `.npmignore` file to list out the globs to include/ignore, or publish
+by default.  So, if you have secret stuff in there, use a
+`.npmignore` file to list out the globs to ignore, or publish
 from a fresh checkout.
 
 ## Brag about it

diff --git a/deps/npm/doc/cli/search.md b/deps/npm/doc/cli/search.md
@@ -9,28 +9,9 @@ npm-search(1) -- Search for packages
 
 Search the registry for packages matching the search terms.
 
-## CONFIGURATION
-
-### description
-
-* Default: true
-* Type: Boolean
-
-Show the description in `npm search`
-
-### searchopts
-
-* Default: ""
-* Type: String
-
-Space-separated options that are always passed to search.
-
-### searchexclude
-
-* Default: ""
-* Type: String
-
-Space-separated options that limit the results from search.
+If a term starts with `/`, then it's interpreted as a regular expression.
+A trailing `/` will be ignored in this case.  (Note that many regular
+expression characters must be escaped or quoted in most shells.)
 
 ## SEE ALSO
 

diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This function should not be used programmatically.  Instead, just refer
 to the <code>npm.bin</code> member.</p>
 </div>
-<p id="footer">bin &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">bin &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/bugs.html b/deps/npm/html/api/bugs.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This command will launch a browser, so this command may not be the most
 friendly for programmatic use.</p>
 </div>
-<p id="footer">bugs &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">bugs &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/commands.html b/deps/npm/html/api/commands.html
@@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../doc/index.html">index(1)</a></li></ul>
 </div>
-<p id="footer">commands &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">commands &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/config.html b/deps/npm/html/api/config.html
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/npm.html">npm(3)</a></li></ul>
 </div>
-<p id="footer">config &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">config &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/deprecate.html b/deps/npm/html/api/deprecate.html
@@ -30,7 +30,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../api/unpublish.html">unpublish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
 </div>
-<p id="footer">deprecate &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">deprecate &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/docs.html b/deps/npm/html/api/docs.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This command will launch a browser, so this command may not be the most
 friendly for programmatic use.</p>
 </div>
-<p id="footer">docs &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">docs &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/edit.html b/deps/npm/html/api/edit.html
@@ -30,7 +30,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>Since this command opens an editor in a new process, be careful about where
 and how this is used.</p>
 </div>
-<p id="footer">edit &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">edit &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/explore.html b/deps/npm/html/api/explore.html
@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>The first element in the 'args' parameter must be a package name.  After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p>
 </div>
-<p id="footer">explore &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">explore &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/help-search.html b/deps/npm/html/api/help-search.html
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>The silent parameter is not neccessary not used, but it may in the future.</p>
 </div>
-<p id="footer">help-search &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">help-search &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/init.html b/deps/npm/html/api/init.html
@@ -35,7 +35,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <p><a href="../doc/json.html">json(1)</a></p>
 </div>
-<p id="footer">init &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">init &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/install.html b/deps/npm/html/api/install.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>Finally, 'callback' is a function that will be called when all packages have been
 installed or when an error has been encountered.</p>
 </div>
-<p id="footer">install &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">install &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/link.html b/deps/npm/html/api/link.html
@@ -39,7 +39,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>Now, any changes to the redis package will be reflected in
 the package in the current working directory</p>
 </div>
-<p id="footer">link &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">link &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/load.html b/deps/npm/html/api/load.html
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>For a list of all the available command-line configs, see <code>npm help config</code></p>
 </div>
-<p id="footer">load &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">load &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/ls.html b/deps/npm/html/api/ls.html
@@ -53,7 +53,7 @@ <h3 id="global">global</h3>
 This means that if a submodule a same dependency as a parent module, then the
 dependency will only be output once.</p>
 </div>
-<p id="footer">ls &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">ls &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/npm.html b/deps/npm/html/api/npm.html
@@ -24,7 +24,7 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
 <h2 id="VERSION">VERSION</h2>
 
-<p>1.1.0-alpha-6</p>
+<p>1.1.0-beta-4</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
@@ -91,7 +91,7 @@ <h2 id="ABBREVS">ABBREVS</h2>
 
 <pre><code>var cmd = npm.deref("unp") // cmd === "unpublish"</code></pre>
 </div>
-<p id="footer">npm &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">npm &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/outdated.html b/deps/npm/html/api/outdated.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>If the 'packages' parameter is left out, npm will check all packages.</p>
 </div>
-<p id="footer">outdated &mdash; npm@1.1.0-alpha-6</p>
+<p id="footer">outdated &mdash; npm@1.1.0-beta-4</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")