reorganize for readability

2 files changed, 45 insertions, 45 deletions

diff --git a/lib/cache.js b/lib/cache.js
index 108ffe4c7..1ff8718ba 100644
--- a/lib/cache.js
+++ b/lib/cache.js
@@ -262,6 +262,48 @@ function add (args, cb) {
   add_(name, spec, p, cb)
 }
 
+function unpack (pkg, ver, unpackTarget, dMode, fMode, uid, gid, cb) {
+  if (typeof cb !== "function") cb = gid, gid = null
+  if (typeof cb !== "function") cb = uid, uid = null
+  if (typeof cb !== "function") cb = fMode, fMode = null
+  if (typeof cb !== "function") cb = dMode, dMode = null
+
+  read(pkg, ver, false, function (er) {
+    if (er) {
+      log.error("unpack", "Could not read data for %s", pkg + "@" + ver)
+      return cb(er)
+    }
+    npm.commands.unbuild([unpackTarget], true, function (er) {
+      if (er) return cb(er)
+      tar.unpack( path.join(npm.cache, pkg, ver, "package.tgz")
+                , unpackTarget
+                , dMode, fMode
+                , uid, gid
+                , cb )
+    })
+  })
+}
+
+function add_ (name, spec, p, cb) {
+  switch (p.protocol) {
+    case "http:":
+    case "https:":
+      return addRemoteTarball(spec, null, name, "", cb)
+
+    default:
+      if (isGitUrl(p))
+        return addRemoteGit(spec, p, false, cb)
+
+      // if we have a name and a spec, then try name@spec
+      // if not, then try just spec (which may try name@"" if not found)
+      if (name) {
+        addNamed(name, spec, null, cb)
+      } else {
+        addLocal(spec, "", cb)
+      }
+  }
+}
+
 function afterAdd (arg, cb) { return function (er, data) {
   if (er || !data || !data.name || !data.version) {
     return cb(er, data)
@@ -277,8 +319,6 @@ function afterAdd (arg, cb) { return function (er, data) {
   })
 }}
 
-
-
 function maybeFile (spec, p, cb) {
   fs.stat(spec, function (er) {
     if (!er) {
@@ -304,48 +344,6 @@ function maybeAt (spec, cb) {
   return add([name, spec], cb)
 }
 
-function add_ (name, spec, p, cb) {
-  switch (p.protocol) {
-    case "http:":
-    case "https:":
-      return addRemoteTarball(spec, null, name, "", cb)
-
-    default:
-      if (isGitUrl(p))
-        return addRemoteGit(spec, p, false, cb)
-
-      // if we have a name and a spec, then try name@spec
-      // if not, then try just spec (which may try name@"" if not found)
-      if (name) {
-        addNamed(name, spec, null, cb)
-      } else {
-        addLocal(spec, "", cb)
-      }
-  }
-}
-
-function unpack (pkg, ver, unpackTarget, dMode, fMode, uid, gid, cb) {
-  if (typeof cb !== "function") cb = gid, gid = null
-  if (typeof cb !== "function") cb = uid, uid = null
-  if (typeof cb !== "function") cb = fMode, fMode = null
-  if (typeof cb !== "function") cb = dMode, dMode = null
-
-  read(pkg, ver, false, function (er) {
-    if (er) {
-      log.error("unpack", "Could not read data for %s", pkg + "@" + ver)
-      return cb(er)
-    }
-    npm.commands.unbuild([unpackTarget], true, function (er) {
-      if (er) return cb(er)
-      tar.unpack( path.join(npm.cache, pkg, ver, "package.tgz")
-                , unpackTarget
-                , dMode, fMode
-                , uid, gid
-                , cb )
-    })
-  })
-}
-
 function needName(er, data) {
   return er ? er
        : (data && !data.name) ? new Error("No name provided")
diff --git a/lib/cache/add-remote-tarball.js b/lib/cache/add-remote-tarball.js
index e5c344ef4..7d5a9ae6f 100644
--- a/lib/cache/add-remote-tarball.js
+++ b/lib/cache/add-remote-tarball.js
@@ -14,7 +14,9 @@ var mkdir = require("mkdirp")
   , unlock = locker.unlock
   , addLocalTarball = require("./add-local-tarball.js")
 
-module.exports = function addRemoteTarball (u, shasum, name, version, cb_) {
+module.exports = addRemoteTarball
+
+function addRemoteTarball (u, shasum, name, version, cb_) {
   assert(typeof u === "string", "must have module URL")
   assert(typeof cb_ === "function", "must have callback")