deps: upgrade npm to 3.3.6

PR-URL: https://github.com/nodejs/node/pull/3310
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

1 files changed, 99 insertions, 95 deletions

diff --git a/deps/npm/lib/view.js b/deps/npm/lib/view.js
index 9199d352ae..9ca18d3540 100644
--- a/deps/npm/lib/view.js
+++ b/deps/npm/lib/view.js
@@ -1,16 +1,17 @@
 // npm view [pkg [pkg ...]]
 
 module.exports = view
-view.usage = "npm view pkg[@version] [<field>[.subfield]...]"
-
-var npm = require("./npm.js")
-  , readJson = require("read-package-json")
-  , log = require("npmlog")
-  , util = require("util")
-  , semver = require("semver")
-  , mapToRegistry = require("./utils/map-to-registry.js")
-  , npa = require("npm-package-arg")
-  , path = require("path")
+view.usage = 'npm view [<@scope>/]<pkg>[@<version>] [<field>[.subfield]...]' +
+             '\n\naliases: info, show, v'
+
+var npm = require('./npm.js')
+var readJson = require('read-package-json')
+var log = require('npmlog')
+var util = require('util')
+var semver = require('semver')
+var mapToRegistry = require('./utils/map-to-registry.js')
+var npa = require('npm-package-arg')
+var path = require('path')
 
 view.completion = function (opts, cb) {
   if (opts.conf.argv.remain.length <= 2) {
@@ -19,14 +20,14 @@ view.completion = function (opts, cb) {
     return cb()
   }
   // have the package, get the fields.
-  var tag = npm.config.get("tag")
+  var tag = npm.config.get('tag')
   mapToRegistry(opts.conf.argv.remain[2], npm.config, function (er, uri, auth) {
     if (er) return cb(er)
 
-    npm.registry.get(uri, { auth : auth }, function (er, d) {
+    npm.registry.get(uri, { auth: auth }, function (er, d) {
       if (er) return cb(er)
-      var dv = d.versions[d["dist-tags"][tag]]
-        , fields = []
+      var dv = d.versions[d['dist-tags'][tag]]
+      var fields = []
       d.versions = Object.keys(d.versions).sort(semver.compareLoose)
       fields = getFields(d).concat(getFields(dv))
       cb(null, fields)
@@ -38,48 +39,51 @@ view.completion = function (opts, cb) {
     if (!d) return f
     pref = pref || []
     Object.keys(d).forEach(function (k) {
-      if (k.charAt(0) === "_" || k.indexOf(".") !== -1) return
-      var p = pref.concat(k).join(".")
+      if (k.charAt(0) === '_' || k.indexOf('.') !== -1) return
+      var p = pref.concat(k).join('.')
       f.push(p)
       if (Array.isArray(d[k])) {
         d[k].forEach(function (val, i) {
-          var pi = p + "[" + i + "]"
-          if (val && typeof val === "object") getFields(val, f, [p])
+          var pi = p + '[' + i + ']'
+          if (val && typeof val === 'object') getFields(val, f, [p])
           else f.push(pi)
         })
         return
       }
-      if (typeof d[k] === "object") getFields(d[k], f, [p])
+      if (typeof d[k] === 'object') getFields(d[k], f, [p])
     })
     return f
   }
 }
 
 function view (args, silent, cb) {
-  if (typeof cb !== "function") cb = silent, silent = false
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
 
-  if (!args.length) args = ["."]
+  if (!args.length) args = ['.']
 
   var pkg = args.shift()
-    , nv = npa(pkg)
-    , name = nv.name
-    , local = (name === "." || !name)
+  var nv = npa(pkg)
+  var name = nv.name
+  var local = (name === '.' || !name)
 
-  if (npm.config.get("global") && local) {
-    return cb(new Error("Cannot use view command in global mode."))
+  if (npm.config.get('global') && local) {
+    return cb(new Error('Cannot use view command in global mode.'))
   }
 
   if (local) {
     var dir = npm.prefix
-    readJson(path.resolve(dir, "package.json"), function (er, d) {
+    readJson(path.resolve(dir, 'package.json'), function (er, d) {
       d = d || {}
-      if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-      if (!d.name) return cb(new Error("Invalid package.json"))
+      if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
+      if (!d.name) return cb(new Error('Invalid package.json'))
 
       var p = d.name
       nv = npa(p)
-      if (pkg && ~pkg.indexOf("@")) {
-        nv.rawSpec = pkg.split("@")[pkg.indexOf("@")]
+      if (pkg && ~pkg.indexOf('@')) {
+        nv.rawSpec = pkg.split('@')[pkg.indexOf('@')]
       }
 
       fetchAndRead(nv, args, silent, cb)
@@ -92,53 +96,54 @@ function view (args, silent, cb) {
 function fetchAndRead (nv, args, silent, cb) {
   // get the data about this package
   var name = nv.name
-    , version = nv.rawSpec || npm.config.get("tag")
+  var version = nv.rawSpec || npm.config.get('tag')
 
   mapToRegistry(name, npm.config, function (er, uri, auth) {
     if (er) return cb(er)
 
-    npm.registry.get(uri, { auth : auth }, function (er, data) {
+    npm.registry.get(uri, { auth: auth }, function (er, data) {
       if (er) return cb(er)
-      if (data["dist-tags"] && data["dist-tags"].hasOwnProperty(version)) {
-        version = data["dist-tags"][version]
+      if (data['dist-tags'] && data['dist-tags'].hasOwnProperty(version)) {
+        version = data['dist-tags'][version]
       }
 
       if (data.time && data.time.unpublished) {
         var u = data.time.unpublished
-        er = new Error("Unpublished by " + u.name + " on " + u.time)
+        er = new Error('Unpublished by ' + u.name + ' on ' + u.time)
         er.statusCode = 404
-        er.code = "E404"
+        er.code = 'E404'
         er.pkgid = data._id
         return cb(er, data)
       }
 
-
       var results = []
-        , error = null
-        , versions = data.versions || {}
+      var error = null
+      var versions = data.versions || {}
       data.versions = Object.keys(versions).sort(semver.compareLoose)
-      if (!args.length) args = [""]
+      if (!args.length) args = ['']
 
       // remove readme unless we asked for it
-      if (-1 === args.indexOf("readme")) {
+      if (args.indexOf('readme') === -1) {
         delete data.readme
       }
 
       Object.keys(versions).forEach(function (v) {
-        if (semver.satisfies(v, version, true)) args.forEach(function (args) {
-          // remove readme unless we asked for it
-          if (-1 === args.indexOf("readme")) {
-            delete versions[v].readme
-          }
-          results.push(showFields(data, versions[v], args))
-        })
+        if (semver.satisfies(v, version, true)) {
+          args.forEach(function (args) {
+            // remove readme unless we asked for it
+            if (args.indexOf('readme') !== -1) {
+              delete versions[v].readme
+            }
+            results.push(showFields(data, versions[v], args))
+          })
+        }
       })
       results = results.reduce(reducer, {})
       var retval = results
 
-      if (args.length === 1 && args[0] === "") {
+      if (args.length === 1 && args[0] === '') {
         retval = cleanBlanks(retval)
-        log.silly("cleanup", retval)
+        log.silly('cleanup', retval)
       }
 
       if (error || silent) cb(error, retval)
@@ -150,18 +155,21 @@ function fetchAndRead (nv, args, silent, cb) {
 function cleanBlanks (obj) {
   var clean = {}
   Object.keys(obj).forEach(function (version) {
-    clean[version] = obj[version][""]
+    clean[version] = obj[version]['']
   })
   return clean
 }
 
 function reducer (l, r) {
-  if (r) Object.keys(r).forEach(function (v) {
-    l[v] = l[v] || {}
-    Object.keys(r[v]).forEach(function (t) {
-      l[v][t] = r[v][t]
+  if (r) {
+    Object.keys(r).forEach(function (v) {
+      l[v] = l[v] || {}
+      Object.keys(r[v]).forEach(function (t) {
+        l[v][t] = r[v][t]
+      })
     })
-  })
+  }
+
   return l
 }
 
@@ -173,12 +181,12 @@ function showFields (data, version, fields) {
       o[k] = s[k]
     })
   })
-  return search(o, fields.split("."), version.version, fields)
+  return search(o, fields.split('.'), version.version, fields)
 }
 
 function search (data, fields, version, title) {
   var field
-    , tail = fields
+  var tail = fields
   while (!field && fields.length) field = tail.shift()
   fields = [field].concat(tail)
   var o
@@ -195,7 +203,7 @@ function search (data, fields, version, title) {
     if (data.field && data.field.hasOwnProperty(index)) {
       return search(data[field][index], tail, version, title)
     } else {
-      field = field + "[" + index + "]"
+      field = field + '[' + index + ']'
     }
   }
   if (Array.isArray(data)) {
@@ -205,8 +213,8 @@ function search (data, fields, version, title) {
     var results = []
     data.forEach(function (data, i) {
       var tl = title.length
-        , newt = title.substr(0, tl-(fields.join(".").length) - 1)
-               + "["+i+"]" + [""].concat(fields).join(".")
+      var newt = title.substr(0, tl - fields.join('.').length - 1) +
+                 '[' + i + ']' + [''].concat(fields).join('.')
       results.push(search(data, fields.slice(), version, newt))
     })
     results = results.reduce(reducer, {})
@@ -215,11 +223,11 @@ function search (data, fields, version, title) {
   if (!data.hasOwnProperty(field)) return undefined
   data = data[field]
   if (tail.length) {
-    if (typeof data === "object") {
+    if (typeof data === 'object') {
       // there are more fields to deal with.
       return search(data, tail, version, title)
     } else {
-      return new Error("Not an object: "+data)
+      return new Error('Not an object: ' + data)
     }
   }
   o = {}
@@ -230,33 +238,33 @@ function search (data, fields, version, title) {
 
 function printData (data, name, cb) {
   var versions = Object.keys(data)
-    , msg = ""
-    , includeVersions = versions.length > 1
-    , includeFields
+  var msg = ''
+  var includeVersions = versions.length > 1
+  var includeFields
 
   versions.forEach(function (v) {
     var fields = Object.keys(data[v])
     includeFields = includeFields || (fields.length > 1)
     fields.forEach(function (f) {
       var d = cleanup(data[v][f])
-      if (includeVersions || includeFields || typeof d !== "string") {
+      if (includeVersions || includeFields || typeof d !== 'string') {
         d = cleanup(data[v][f])
-        d = npm.config.get("json")
+        d = npm.config.get('json')
           ? JSON.stringify(d, null, 2)
           : util.inspect(d, false, 5, npm.color)
-      } else if (typeof d === "string" && npm.config.get("json")) {
+      } else if (typeof d === 'string' && npm.config.get('json')) {
         d = JSON.stringify(d)
       }
-      if (f && includeFields) f += " = "
-      if (d.indexOf("\n") !== -1) d = " \n" + d
-      msg += (includeVersions ? name + "@" + v + " " : "")
-           + (includeFields ? f : "") + d + "\n"
+      if (f && includeFields) f += ' = '
+      if (d.indexOf('\n') !== -1) d = ' \n' + d
+      msg += (includeVersions ? name + '@' + v + ' ' : '') +
+             (includeFields ? f : '') + d + '\n'
     })
   })
 
   // preserve output symmetry by adding a whitespace-only line at the end if
   // there's one at the beginning
-  if (/^\s*\n/.test(msg)) msg += "\n"
+  if (/^\s*\n/.test(msg)) msg += '\n'
 
   // print directly to stdout to not unnecessarily add blank lines
   process.stdout.write(msg)
@@ -265,38 +273,34 @@ function printData (data, name, cb) {
 }
 function cleanup (data) {
   if (Array.isArray(data)) {
-    if (data.length === 1) {
-      data = data[0]
-    } else {
-      return data.map(cleanup)
-    }
+    return data.map(cleanup)
   }
-  if (!data || typeof data !== "object") return data
+  if (!data || typeof data !== 'object') return data
 
-  if (typeof data.versions === "object"
-      && data.versions
-      && !Array.isArray(data.versions)) {
+  if (typeof data.versions === 'object' &&
+      data.versions &&
+      !Array.isArray(data.versions)) {
     data.versions = Object.keys(data.versions || {})
   }
 
   var keys = Object.keys(data)
   keys.forEach(function (d) {
-    if (d.charAt(0) === "_") delete data[d]
-    else if (typeof data[d] === "object") data[d] = cleanup(data[d])
+    if (d.charAt(0) === '_') delete data[d]
+    else if (typeof data[d] === 'object') data[d] = cleanup(data[d])
   })
   keys = Object.keys(data)
-  if (keys.length <= 3
-      && data.name
-      && (keys.length === 1
-          || keys.length === 3 && data.email && data.url
-          || keys.length === 2 && (data.email || data.url))) {
+  if (keys.length <= 3 &&
+      data.name &&
+      (keys.length === 1 ||
+       keys.length === 3 && data.email && data.url ||
+       keys.length === 2 && (data.email || data.url))) {
     data = unparsePerson(data)
   }
   return data
 }
 function unparsePerson (d) {
-  if (typeof d === "string") return d
-  return d.name
-       + (d.email ? " <"+d.email+">" : "")
-       + (d.url ? " ("+d.url+")" : "")
+  if (typeof d === 'string') return d
+  return d.name +
+    (d.email ? ' <' + d.email + '>' : '') +
+    (d.url ? ' (' + d.url + ')' : '')
 }