npm: upgrade to v2.1.18

PR-URL: https://github.com/iojs/io.js/pull/266
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

1 files changed, 13 insertions, 14 deletions

diff --git a/deps/npm/lib/docs.js b/deps/npm/lib/docs.js
index dead3f7551..9abe740a3c 100644
--- a/deps/npm/lib/docs.js
+++ b/deps/npm/lib/docs.js
@@ -4,23 +4,22 @@ docs.usage  = "npm docs <pkgname>"
 docs.usage += "\n"
 docs.usage += "npm docs ."
 
+var npm = require("./npm.js")
+  , opener = require("opener")
+  , path = require("path")
+  , log = require("npmlog")
+  , mapToRegistry = require("./utils/map-to-registry.js")
+
 docs.completion = function (opts, cb) {
-  mapToRegistry("/-/short", npm.config, function (er, uri) {
+  mapToRegistry("/-/short", npm.config, function (er, uri, auth) {
     if (er) return cb(er)
 
-    registry.get(uri, { timeout : 60000 }, function (er, list) {
+    npm.registry.get(uri, { timeout : 60000, auth : auth }, function (er, list) {
       return cb(null, list || [])
     })
   })
 }
 
-var npm = require("./npm.js")
-  , registry = npm.registry
-  , opener = require("opener")
-  , path = require("path")
-  , log = require("npmlog")
-  , mapToRegistry = require("./utils/map-to-registry.js")
-
 function url (json) {
   return json.homepage ? json.homepage : "https://npmjs.org/package/" + json.name
 }
@@ -28,7 +27,7 @@ function url (json) {
 function docs (args, cb) {
   args = args || []
   var pending = args.length
-  if (!pending) return getDoc('.', cb)
+  if (!pending) return getDoc(".", cb)
   args.forEach(function(proj) {
     getDoc(proj, function(err) {
       if (err) {
@@ -40,10 +39,10 @@ function docs (args, cb) {
 }
 
 function getDoc (project, cb) {
-  project = project || '.'
+  project = project || "."
   var package = path.resolve(npm.localPrefix, "package.json")
 
-  if (project === '.' || project === './') {
+  if (project === "." || project === "./") {
     var json
     try {
       json = require(package)
@@ -57,10 +56,10 @@ function getDoc (project, cb) {
     return opener(url(json), { command: npm.config.get("browser") }, cb)
   }
 
-  mapToRegistry(project, npm.config, function (er, uri) {
+  mapToRegistry(project, npm.config, function (er, uri, auth) {
     if (er) return cb(er)
 
-    registry.get(uri + "/latest", { timeout : 3600 }, next)
+    npm.registry.get(uri + "/latest", { timeout : 3600, auth : auth }, next)
   })
 
   function next (er, json) {