Upgrade npm to 1.1.25

nodejs · Jun 11, 2012 · 7200bb8 · 7200bb8
1 parent 284816e
commit 7200bb8
Show file tree

Hide file tree

Showing 172 changed files with 871 additions and 1,906 deletions.
diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE
@@ -49,6 +49,11 @@ and are not covered by this license.
 "npm Logo" created by Mathias Pettersson and Brian Hammond,
 used with permission.
 
+"Gubblebum Blocky" font
+Copyright (c) 2007 by Tjarda Koster, http://jelloween.deviantart.com
+included for use in the npm website and documentation,
+used with permission.
+
 This program uses "node-uuid", Copyright (c) 2010 Robert Kieffer,
 according to the terms of the MIT license.
 

diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js
@@ -15,9 +15,9 @@ if (typeof WScript !== "undefined") {
 
 process.title = "npm"
 
-var log = require("../lib/utils/log.js")
-log.waitForConfig()
-log.info("ok", "it worked if it ends with")
+var log = require("npmlog")
+log.pause() // will be unpaused when config is loaded.
+log.info("it worked if it ends with", "ok")
 
 var fs = require("graceful-fs")
   , path = require("path")
@@ -36,7 +36,7 @@ if (path.basename(process.argv[1]).slice(-1)  === "g") {
   process.argv.splice(1, 1, "npm", "-g")
 }
 
-log.verbose(process.argv, "cli")
+log.verbose("cli", process.argv)
 
 var conf = nopt(types, shorthands)
 npm.argv = conf.argv.remain
@@ -56,8 +56,8 @@ if (conf.versions) {
   return
 }
 
-log.info("npm@"+npm.version, "using")
-log.info("node@"+process.version, "using")
+log.info("using", "npm@%s", npm.version)
+log.info("using", "node@%s", process.version)
 
 // make sure that this version of node works with this version of npm.
 var semver = require("semver")

diff --git a/deps/npm/doc/cli/coding-style.md b/deps/npm/doc/cli/coding-style.md
@@ -129,29 +129,18 @@ Just send the error message back as the first argument to the callback.
 Always create a new Error object with your message.  Don't just return a
 string message to the callback.  Stack traces are handy.
 
-Use the `require("./utils/log").er` function.  It takes a callback and an
-error message, and returns an object that will report the message in the
-event of a failure.  It's quite handy.
-
-    function myThing (args, cb) {
-      getData(args, function (er, data) {
-        if (er) return log.er(cb, "Couldn't get data")(er)
-        doSomethingElse(data, cb)
-      })
-    }
-    function justHasToWork (cb) {
-      doSomething(log.er(cb, "the doSomething failed."))
-    }
-
 ## Logging
 
+Logging is done using the [npmlog](https://github.com/isaacs/npmlog)
+utility.
+
 Please clean up logs when they are no longer helpful.  In particular,
 logging the same object over and over again is not helpful.  Logs should
 report what's happening so that it's easier to track down where a fault
 occurs.
 
-Use appropriate log levels.  The default log() function logs at the
-"info" level.  See `npm-config(1)` and search for "loglevel".
+Use appropriate log levels.  See `npm-config(1)` and search for
+"loglevel".
 
 ## Case, naming, etc.
 

diff --git a/deps/npm/doc/cli/config.md b/deps/npm/doc/cli/config.md
@@ -430,13 +430,6 @@ if one of the two conditions are met:
 * the globally installed version is identical to the version that is
   being installed locally.
 
-### logfd
-
-* Default: stderr file descriptor
-* Type: Number or Stream
-
-The location to write log output.
-
 ### loglevel
 
 * Default: "http"
@@ -449,14 +442,6 @@ What level of logs to report.  On failure, *all* logs are written to
 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
-* Type: Boolean
-
-Whether or not to prefix log messages with "npm" and the log level.  See
-also "color" and "loglevel".
-
 ### long
 
 * Default: false
@@ -503,13 +488,6 @@ The url to report npat test results.
 A node module to `require()` when npm loads.  Useful for programmatic
 usage.
 
-### outfd
-
-* Default: standard output file descriptor
-* Type: Number or Stream
-
-Where to write "normal" output.  This has no effect on log output.
-
 ### parseable
 
 * Default: false

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.24</p>
+<p id="footer">bin &mdash; npm@1.1.25</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.24</p>
+<p id="footer">bugs &mdash; npm@1.1.25</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.24</p>
+<p id="footer">commands &mdash; npm@1.1.25</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.24</p>
+<p id="footer">config &mdash; npm@1.1.25</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.24</p>
+<p id="footer">deprecate &mdash; npm@1.1.25</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.24</p>
+<p id="footer">docs &mdash; npm@1.1.25</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.24</p>
+<p id="footer">edit &mdash; npm@1.1.25</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.24</p>
+<p id="footer">explore &mdash; npm@1.1.25</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.24</p>
+<p id="footer">help-search &mdash; npm@1.1.25</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.24</p>
+<p id="footer">init &mdash; npm@1.1.25</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.24</p>
+<p id="footer">install &mdash; npm@1.1.25</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.24</p>
+<p id="footer">link &mdash; npm@1.1.25</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.24</p>
+<p id="footer">load &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/ls.html b/deps/npm/html/api/ls.html
@@ -59,7 +59,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.24</p>
+<p id="footer">ls &mdash; npm@1.1.25</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.24</p>
+<p>1.1.25</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.24</p>
+<p id="footer">npm &mdash; npm@1.1.25</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.24</p>
+<p id="footer">outdated &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/owner.html b/deps/npm/html/api/owner.html
@@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
 </div>
-<p id="footer">owner &mdash; npm@1.1.24</p>
+<p id="footer">owner &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/pack.html b/deps/npm/html/api/pack.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>If no arguments are supplied, then npm packs the current package folder.</p>
 </div>
-<p id="footer">pack &mdash; npm@1.1.24</p>
+<p id="footer">pack &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/prefix.html b/deps/npm/html/api/prefix.html
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>This function is not useful programmatically</p>
 </div>
-<p id="footer">prefix &mdash; npm@1.1.24</p>
+<p id="footer">prefix &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/prune.html b/deps/npm/html/api/prune.html
@@ -23,7 +23,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>Extraneous packages are packages that are not listed on the parent
 package's dependencies list.</p>
 </div>
-<p id="footer">prune &mdash; npm@1.1.24</p>
+<p id="footer">prune &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/publish.html b/deps/npm/html/api/publish.html
@@ -32,7 +32,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../api/owner.html">owner(3)</a></li></ul>
 </div>
-<p id="footer">publish &mdash; npm@1.1.24</p>
+<p id="footer">publish &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/rebuild.html b/deps/npm/html/api/rebuild.html
@@ -22,7 +22,7 @@ <h2 id="CONFIGURATION">CONFIGURATION</h2>
 
 <p>See <code>npm help build</code></p>
 </div>
-<p id="footer">rebuild &mdash; npm@1.1.24</p>
+<p id="footer">rebuild &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/restart.html b/deps/npm/html/api/restart.html
@@ -27,7 +27,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
 </div>
-<p id="footer">restart &mdash; npm@1.1.24</p>
+<p id="footer">restart &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/root.html b/deps/npm/html/api/root.html
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>This function is not useful programmatically.</p>
 </div>
-<p id="footer">root &mdash; npm@1.1.24</p>
+<p id="footer">root &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/run-script.html b/deps/npm/html/api/run-script.html
@@ -29,7 +29,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../api/test.html">test(3)</a></li><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/restart.html">restart(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
 </div>
-<p id="footer">run-script &mdash; npm@1.1.24</p>
+<p id="footer">run-script &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/search.html b/deps/npm/html/api/search.html
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 and doesn't try to read your mind (it doesn't do any verb tense matching or the
 like).</p>
 </div>
-<p id="footer">search &mdash; npm@1.1.24</p>
+<p id="footer">search &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/shrinkwrap.html b/deps/npm/html/api/shrinkwrap.html
@@ -26,7 +26,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>Finally, 'callback' is a function that will be called when the shrinkwrap has
 been saved.</p>
 </div>
-<p id="footer">shrinkwrap &mdash; npm@1.1.24</p>
+<p id="footer">shrinkwrap &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/start.html b/deps/npm/html/api/start.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>npm can run tests on multiple packages. Just specify multiple packages
 in the <code>packages</code> parameter.</p>
 </div>
-<p id="footer">start &mdash; npm@1.1.24</p>
+<p id="footer">start &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/stop.html b/deps/npm/html/api/stop.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>npm can run stop on multiple packages. Just specify multiple packages
 in the <code>packages</code> parameter.</p>
 </div>
-<p id="footer">stop &mdash; npm@1.1.24</p>
+<p id="footer">stop &mdash; npm@1.1.25</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")