Abstract out graceful-fs

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "node_modules/minimatch"]
 	path = node_modules/minimatch
 	url = git://github.com/isaacs/minimatch.git
+[submodule "node_modules/graceful-fs"]
+	path = node_modules/graceful-fs
+	url = git://github.com/isaacs/node-graceful-fs.git

bin/npm.js

@@ -4,7 +4,7 @@ var log = require("../lib/utils/log")
 log.waitForConfig()
 log.info("ok", "it worked if it ends with")
 
-var fs = require("../lib/utils/graceful-fs")
+var fs = require("graceful-fs")
   , path = require("path")
   , sys = require("../lib/utils/sys")
   , npm = require("../npm")

lib/build.js

@@ -11,7 +11,7 @@
 var npm = require("../npm")
   , log = require("./utils/log")
   , chain = require("./utils/chain")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , path = require("path")
   , lifecycle = require("./utils/lifecycle")
   , readJson = require("./utils/read-json")

lib/cache.js

@@ -35,7 +35,7 @@ var mkdir = require("./utils/mkdir-p")
   , exec = require("./utils/exec")
   , fetch = require("./utils/fetch")
   , npm = require("../npm")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , rm = require("./utils/rm-rf")
   , readJson = require("./utils/read-json")
   , registry = require("./utils/npm-registry-client")

lib/completion.js

@@ -139,7 +139,7 @@ function completion (args, cb) {
 }
 
 function dumpScript (cb) {
-  var fs = require("./utils/graceful-fs")
+  var fs = require("graceful-fs")
     , path = require("path")
     , p = path.resolve(__dirname, "utils/completion.sh")
 

lib/config.js

@@ -11,7 +11,7 @@ var ini = require("./utils/ini")
   , log = require("./utils/log")
   , npm = require("../npm")
   , exec = require("./utils/exec")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , dc
   , output = require("./utils/output")
   , types = require("./utils/config-defs").types

lib/edit.js

@@ -9,7 +9,7 @@ edit.completion = require("./utils/completion/installed-shallow")
 var npm = require("../npm")
   , exec = require("./utils/exec")
   , path = require("path")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , log = require("./utils/log")
 
 function edit (args, cb) {

lib/explore.js

@@ -8,7 +8,7 @@ explore.completion = require("./utils/completion/installed-shallow")
 var npm = require("../npm")
   , exec = require("./utils/exec")
   , path = require("path")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
 
 function explore (args, cb) {
   if (args.length < 1 || !args[0]) return cb(explore.usage)

lib/help-search.js

@@ -1,7 +1,7 @@
 
 module.exports = helpSearch
 
-var fs = require("./utils/graceful-fs")
+var fs = require("graceful-fs")
   , output = require("./utils/output")
   , path = require("path")
   , asyncMap = require("./utils/async-map")

lib/help.js

@@ -6,7 +6,7 @@ help.completion = function (opts, cb) {
   getSections(cb)
 }
 
-var fs = require("./utils/graceful-fs")
+var fs = require("graceful-fs")
   , path = require("path")
   , exec = require("./utils/exec")
   , npm = require("../npm")

lib/init.js

@@ -6,7 +6,7 @@ module.exports = init
 var prompt = require("./utils/prompt")
   , path = require("path")
   , readJson = require("./utils/read-json")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , promiseChain = require("./utils/promise-chain")
   , exec = require("./utils/exec")
   , semver = require("semver")

lib/install.js

@@ -136,7 +136,7 @@ var npm = require("../npm")
   , readJson = require("./utils/read-json")
   , log = require("./utils/log")
   , path = require("path")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , cache = require("./cache")
   , asyncMap = require("./utils/async-map")
   , chain = require("./utils/chain")

lib/link.js

@@ -4,7 +4,7 @@
 
 var npm = require("../npm")
   , symlink = require("./utils/link")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , log = require("./utils/log")
   , asyncMap = require("./utils/async-map")
   , chain = require("./utils/chain")

lib/outdated.js

@@ -19,7 +19,7 @@ outdated.completion = require("./utils/completion/installed-deep")
 
 
 var path = require("path")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , readJson = require("./utils/read-json")
   , cache = require("./cache")
   , asyncMap = require("./utils/async-map")

lib/pack.js

@@ -8,7 +8,7 @@ var npm = require("../npm")
   , install = require("./install")
   , cache = require("./cache")
   , output = require("./utils/output")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , chain = require("./utils/chain")
   , path = require("path")
   , relativize = require("./utils/relativize")

lib/run-script.js

@@ -7,7 +7,7 @@ var lifecycle = require("./utils/lifecycle")
   , readJson = require("./utils/read-json")
   , log = require("./utils/log")
   , chain = require("./utils/chain")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , asyncMap = require("./utils/async-map")
 
 runScript.usage = "npm run-script [<pkg>] <command>"

lib/unbuild.js

@@ -5,7 +5,7 @@ var readJson = require("./utils/read-json")
   , rm = require("./utils/rm-rf")
   , npm = require("../npm")
   , path = require("path")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , lifecycle = require("./utils/lifecycle")
   , asyncMap = require("./utils/async-map")
   , chain = require("./utils/chain")

lib/uninstall.js

@@ -11,7 +11,7 @@ uninstall.usage = "npm uninstall <name>[@<version> [<name>[@<version>] ...]"
 uninstall.completion = require("./utils/completion/installed-shallow")
 
 var rm = require("./utils/rm-rf")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , log = require("./utils/log")
   , readJson = require("./utils/read-json")
   , path = require("path")

lib/utils/completion/installed-shallow.js

@@ -2,7 +2,7 @@
 module.exports = installedShallow
 
 var npm = require("../../../npm")
-  , fs = require("../graceful-fs")
+  , fs = require("graceful-fs")
   , path = require("path")
   , readJson = require("../read-json")
   , asyncMap = require("../async-map")

lib/utils/error-handler.js

@@ -176,7 +176,7 @@ function exit (code) {
 }
 
 function writeLogFile (cb) {
-  var fs = require("./graceful-fs")
+  var fs = require("graceful-fs")
     , fstr = fs.createWriteStream("npm-debug.log")
     , sys = require("util")
 

lib/utils/excludes.js

@@ -24,7 +24,7 @@ exports.test = test
 exports.filter = filter
 
 var path = require("path")
-  , fs = require("./graceful-fs")
+  , fs = require("graceful-fs")
   , minimatch = require("minimatch")
   , relativize = require("./relativize")
   , log = require("./log")

lib/utils/fetch.js

@@ -6,7 +6,7 @@ var http
   , https
   , url = require("url")
   , sys = require("./sys")
-  , fs = require("./graceful-fs")
+  , fs = require("graceful-fs")
   , get = require("./get")
   , set = require("./set")
   , log = require("./log")

lib/utils/find-prefix.js

@@ -2,7 +2,7 @@
 
 module.exports = findPrefix
 
-var fs = require("./graceful-fs")
+var fs = require("graceful-fs")
   , path = require("path")
   , npm = require("../../npm")
 

lib/utils/find.js

@@ -4,7 +4,7 @@
 // provided.
 
 module.exports = find
-var fs = require("./graceful-fs")
+var fs = require("graceful-fs")
   , asyncMap = require("./async-map")
   , path = require("path")
 

lib/utils/ini.js

@@ -28,7 +28,7 @@ exports.defaultConfig = null
 Object.defineProperty(exports, "keys",
   { get : function () { return configList.keys }})
 
-var fs = require("./graceful-fs")
+var fs = require("graceful-fs")
   , path = require("path")
   , sys = require("./sys")
 

lib/utils/lifecycle.js

@@ -7,7 +7,7 @@ var log = require("./log")
   , npm = require("../../npm")
   , path = require("path")
   , readJson = require("./read-json")
-  , fs = require("./graceful-fs")
+  , fs = require("graceful-fs")
   , chain = require("./chain")
   , asyncMap = require("./async-map")
   , constants = require("constants")

lib/utils/link.js

@@ -2,7 +2,7 @@
 module.exports = link
 link.ifExists = linkIfExists
 
-var fs = require("./graceful-fs")
+var fs = require("graceful-fs")
   , chain = require("./chain")
   , mkdir = require("./mkdir-p")
   , rm = require("./rm-rf")

lib/utils/load-package-defaults.js

@@ -6,7 +6,7 @@ var path = require("path")
   , find = require("./find")
   , asyncMap = require("./async-map")
   , npm = require("../../npm")
-  , fs = require("./graceful-fs")
+  , fs = require("graceful-fs")
 
 function loadPackageDefaults (pkg, pkgDir, cb) {
   if (!pkg) return cb(new Error("no package to load defaults from!"))

lib/utils/mkdir-p.js

@@ -1,6 +1,6 @@
 
 var log = require("./log")
-  , fs = require("./graceful-fs")
+  , fs = require("graceful-fs")
   , path = require("path")
   , npm = require("../../npm")
   , exec = require("./exec")

lib/utils/npm-registry-client/get.js

@@ -2,7 +2,7 @@
 module.exports = get
 
 var GET = require("./request").GET
-  , fs = require("../graceful-fs")
+  , fs = require("graceful-fs")
   , npm = require("../../../npm")
   , path = require("path")
   , log = require("../log")

lib/utils/npm-registry-client/request.js

@@ -11,7 +11,7 @@ var npm = require("../../../npm")
   , url = require("url")
   , log = require("../log")
   , ini = require("../ini")
-  , fs = require("../graceful-fs")
+  , fs = require("graceful-fs")
   , rm = require("../rm-rf")
   , asyncMap = require("../async-map")
   , proxyify = require("../proxyify")

lib/utils/read-installed.js

@@ -88,7 +88,7 @@ as far as the left-most node_modules folder.
 
 
 var npm = require("../../npm")
-  , fs = require("./graceful-fs")
+  , fs = require("graceful-fs")
   , path = require("path")
   , asyncMap = require("./async-map")
   , semver = require("semver")

lib/utils/read-json.js

@@ -4,7 +4,7 @@ readJson.processJson = processJson
 readJson.unParsePeople = unParsePeople
 readJson.parsePeople = parsePeople
 
-var fs = require("./graceful-fs")
+var fs = require("graceful-fs")
   , semver = require("semver")
   , path = require("path")
   , log = require("./log")

lib/utils/rm-rf.js

@@ -3,7 +3,7 @@
 
 module.exports = rm
 
-var fs = require("./graceful-fs")
+var fs = require("graceful-fs")
   , path = require("path")
   , failedToRemove = []
   , log = require("./log")

lib/utils/sha.js

@@ -1,5 +1,5 @@
 
-var fs = require("./graceful-fs")
+var fs = require("graceful-fs")
   , crypto = require("crypto")
   , log = require("./log")
   , binding

lib/utils/tar.js

@@ -4,7 +4,7 @@
 var FMODE = exports.FMODE = 0644
   , DMODE = exports.DMODE = 0755
   , npm = require("../../npm")
-  , fs = require("./graceful-fs")
+  , fs = require("graceful-fs")
   , exec = require("./exec")
   , spawn = exec.spawn
   , pipe = exec.pipe

lib/utils/which.js

@@ -2,7 +2,7 @@ module.exports = which
 which.sync = whichSync
 
 var path = require("path")
-  , fs = require("./graceful-fs")
+  , fs = require("graceful-fs")
 
 // console.log(process.execPath)
 // console.log(process.argv)

lib/version.js

@@ -6,7 +6,7 @@ var exec = require("./utils/exec")
   , readJson = require("./utils/read-json")
   , semver = require("semver")
   , path = require("path")
-  , fs = require("./utils/graceful-fs")
+  , fs = require("graceful-fs")
   , chain = require("./utils/chain")
   , log = require("./utils/log")
   , npm = require("../npm")

npm.js

@@ -16,7 +16,7 @@ var EventEmitter = require("events").EventEmitter
   , get = require("./lib/utils/get")
   , ini = require("./lib/utils/ini")
   , log = require("./lib/utils/log")
-  , fs = require("./lib/utils/graceful-fs")
+  , fs = require("graceful-fs")
   , path = require("path")
   , abbrev = require("abbrev")
   , which = require("./lib/utils/which")

package.json

@@ -26,11 +26,12 @@
 , "dependencies" :
   { "semver" : "1"
   , "abbrev" : "1"
+  , "graceful-fs" : "1"
   , "minimatch" : "0"
   , "nopt" : "1"
   , "node-uuid" : "1.2" }
 , "bundleDependencies" :
-  [ "semver", "abbrev", "minimatch", "nopt", "node-uuid" ]
+  [ "semver", "abbrev", "graceful-fs", "minimatch", "nopt", "node-uuid" ]
 , "devDependencies" : { "ronn" : "" }
 , "engines" : { "node" : "0.4 || 0.5", "npm" : "1" }
 , "scripts" : { "test" : "./test/run.sh"