1 files changed, 54 insertions, 56 deletions

diff --git a/lib/cache/add-local-tarball.js b/lib/cache/add-local-tarball.js
index 7628c1102..9f252b8ca 100644
--- a/lib/cache/add-local-tarball.js
+++ b/lib/cache/add-local-tarball.js
@@ -1,27 +1,27 @@
-var mkdir = require("mkdirp")
-  , assert = require("assert")
-  , fs = require("graceful-fs")
-  , writeFileAtomic = require("write-file-atomic")
-  , path = require("path")
-  , sha = require("sha")
-  , npm = require("../npm.js")
-  , log = require("npmlog")
-  , tar = require("../utils/tar.js")
-  , pathIsInside = require("path-is-inside")
-  , getCacheStat = require("./get-stat.js")
-  , cachedPackageRoot = require("./cached-package-root.js")
-  , chownr = require("chownr")
-  , inflight = require("inflight")
-  , once = require("once")
-  , writeStream = require("fs-write-stream-atomic")
-  , tempFilename = require("../utils/temp-filename.js")
-  , rimraf = require("rimraf")
+var mkdir = require('mkdirp')
+var assert = require('assert')
+var fs = require('graceful-fs')
+var writeFileAtomic = require('write-file-atomic')
+var path = require('path')
+var sha = require('sha')
+var npm = require('../npm.js')
+var log = require('npmlog')
+var tar = require('../utils/tar.js')
+var pathIsInside = require('path-is-inside')
+var getCacheStat = require('./get-stat.js')
+var cachedPackageRoot = require('./cached-package-root.js')
+var chownr = require('chownr')
+var inflight = require('inflight')
+var once = require('once')
+var writeStream = require('fs-write-stream-atomic')
+var tempFilename = require('../utils/temp-filename.js')
+var rimraf = require('rimraf')
 
 module.exports = addLocalTarball
 
 function addLocalTarball (p, pkgData, shasum, cb) {
-  assert(typeof p === "string", "must have path")
-  assert(typeof cb === "function", "must have callback")
+  assert(typeof p === 'string', 'must have path')
+  assert(typeof cb === 'function', 'must have callback')
 
   if (!pkgData) pkgData = {}
 
@@ -29,16 +29,16 @@ function addLocalTarball (p, pkgData, shasum, cb) {
   if (!shasum) {
     return sha.get(p, function (er, shasum) {
       if (er) return cb(er)
-      log.silly("addLocalTarball", "shasum (computed)", shasum)
+      log.silly('addLocalTarball', 'shasum (computed)', shasum)
       addLocalTarball(p, pkgData, shasum, cb)
     })
   }
 
   if (pathIsInside(p, npm.cache)) {
-    if (path.basename(p) !== "package.tgz") {
-      return cb(new Error("Not a valid cache tarball name: "+p))
+    if (path.basename(p) !== 'package.tgz') {
+      return cb(new Error('Not a valid cache tarball name: ' + p))
     }
-    log.verbose("addLocalTarball", "adding from inside cache", p)
+    log.verbose('addLocalTarball', 'adding from inside cache', p)
     return addPlacedTarball(p, pkgData, shasum, cb)
   }
 
@@ -52,8 +52,8 @@ function addLocalTarball (p, pkgData, shasum, cb) {
 }
 
 function addPlacedTarball (p, pkgData, shasum, cb) {
-  assert(pkgData, "should have package data by now")
-  assert(typeof cb === "function", "cb function required")
+  assert(pkgData, 'should have package data by now')
+  assert(typeof cb === 'function', 'cb function required')
 
   getCacheStat(function (er, cs) {
     if (er) return cb(er)
@@ -62,7 +62,7 @@ function addPlacedTarball (p, pkgData, shasum, cb) {
 }
 
 function addPlacedTarball_ (p, pkgData, uid, gid, resolvedSum, cb) {
-  var folder = path.join(cachedPackageRoot(pkgData), "package")
+  var folder = path.join(cachedPackageRoot(pkgData), 'package')
 
   // First, make sure we have the shasum, if we don't already.
   if (!resolvedSum) {
@@ -75,7 +75,7 @@ function addPlacedTarball_ (p, pkgData, uid, gid, resolvedSum, cb) {
 
   mkdir(folder, function (er) {
     if (er) return cb(er)
-    var pj = path.join(folder, "package.json")
+    var pj = path.join(folder, 'package.json')
     var json = JSON.stringify(pkgData, null, 2)
     writeFileAtomic(pj, json, function (er) {
       cb(er, pkgData)
@@ -84,19 +84,19 @@ function addPlacedTarball_ (p, pkgData, uid, gid, resolvedSum, cb) {
 }
 
 function addTmpTarball (tgz, pkgData, shasum, cb) {
-  assert(typeof cb === "function", "must have callback function")
-  assert(shasum, "must have shasum by now")
+  assert(typeof cb === 'function', 'must have callback function')
+  assert(shasum, 'must have shasum by now')
 
-  cb = inflight("addTmpTarball:" + tgz, cb)
-  if (!cb) return log.verbose("addTmpTarball", tgz, "already in flight; not adding")
-  log.verbose("addTmpTarball", tgz, "not in flight; adding")
+  cb = inflight('addTmpTarball:' + tgz, cb)
+  if (!cb) return log.verbose('addTmpTarball', tgz, 'already in flight; not adding')
+  log.verbose('addTmpTarball', tgz, 'not in flight; adding')
 
   // we already have the package info, so just move into place
   if (pkgData && pkgData.name && pkgData.version) {
     log.verbose(
-      "addTmpTarball",
-      "already have metadata; skipping unpack for",
-      pkgData.name + "@" + pkgData.version
+      'addTmpTarball',
+      'already have metadata; skipping unpack for',
+      pkgData.name + '@' + pkgData.version
     )
     return addTmpTarball_(tgz, pkgData, shasum, cb)
   }
@@ -108,31 +108,29 @@ function addTmpTarball (tgz, pkgData, shasum, cb) {
   // NOTE: we might not have any clue what we think it is, for example if the
   // user just did `npm install ./foo.tgz`
 
-  var target = tempFilename("unpack")
+  var target = tempFilename('unpack')
   getCacheStat(function (er, cs) {
     if (er) return cb(er)
 
-    log.verbose("addTmpTarball", "validating metadata from", tgz)
+    log.verbose('addTmpTarball', 'validating metadata from', tgz)
     tar.unpack(tgz, target, null, null, cs.uid, cs.gid, function (unpackEr, data) {
       // cleanup the extracted package and move on with the metadata
       rimraf(target, function () {
         if (unpackEr) return cb(unpackEr)
         // check that this is what we expected.
         if (!data.name) {
-          return cb(new Error("No name provided"))
-        }
-        else if (pkgData.name && data.name !== pkgData.name) {
-          return cb(new Error("Invalid Package: expected " + pkgData.name +
-                              " but found " + data.name))
+          return cb(new Error('No name provided'))
+        } else if (pkgData.name && data.name !== pkgData.name) {
+          return cb(new Error('Invalid Package: expected ' + pkgData.name +
+                              ' but found ' + data.name))
         }
 
         if (!data.version) {
-          return cb(new Error("No version provided"))
-        }
-        else if (pkgData.version && data.version !== pkgData.version) {
-          return cb(new Error("Invalid Package: expected " +
-                              pkgData.name + "@" + pkgData.version +
-                              " but found " + data.name + "@" + data.version))
+          return cb(new Error('No version provided'))
+        } else if (pkgData.version && data.version !== pkgData.version) {
+          return cb(new Error('Invalid Package: expected ' +
+                              pkgData.name + '@' + pkgData.version +
+                              ' but found ' + data.name + '@' + data.version))
         }
 
         addTmpTarball_(tgz, data, shasum, cb)
@@ -142,15 +140,15 @@ function addTmpTarball (tgz, pkgData, shasum, cb) {
 }
 
 function addTmpTarball_ (tgz, data, shasum, cb) {
-  assert(typeof cb === "function", "must have callback function")
+  assert(typeof cb === 'function', 'must have callback function')
   cb = once(cb)
 
-  assert(data.name, "should have package name by now")
-  assert(data.version, "should have package version by now")
+  assert(data.name, 'should have package name by now')
+  assert(data.version, 'should have package version by now')
 
   var root = cachedPackageRoot(data)
-  var pkg = path.resolve(root, "package")
-  var target = path.resolve(root, "package.tgz")
+  var pkg = path.resolve(root, 'package')
+  var target = path.resolve(root, 'package.tgz')
   getCacheStat(function (er, cs) {
     if (er) return cb(er)
     mkdir(pkg, function (er, created) {
@@ -166,12 +164,12 @@ function addTmpTarball_ (tgz, data, shasum, cb) {
       var read = fs.createReadStream(tgz)
       var write = writeStream(target, { mode: npm.modes.file })
       var fin = cs.uid && cs.gid ? chown : done
-      read.on("error", cb).pipe(write).on("error", cb).on("close", fin)
+      read.on('error', cb).pipe(write).on('error', cb).on('close', fin)
     })
 
   })
 
-  function done() {
+  function done () {
     data._shasum = data._shasum || shasum
     cb(null, data)
   }