src: Make fs-write-stream-atomic consistently referred to as writeStreamAtomic

iarna · zkat · commit 654169070080 · 2016-01-19T16:37:53.000-05:00
PR-URL: #10903 Credit: @iarna
diff --git a/lib/cache/add-local-tarball.js b/lib/cache/add-local-tarball.js
@@ -13,7 +13,7 @@ var mkdir = require("mkdirp")
   , chownr = require("chownr")
   , inflight = require("inflight")
   , once = require("once")
-  , writeStream = require("fs-write-stream-atomic")
+  , writeStreamAtomic = require("fs-write-stream-atomic")
   , randomBytes = require("crypto").pseudoRandomBytes // only need uniqueness
 
 module.exports = addLocalTarball
@@ -166,7 +166,7 @@ function addTmpTarball_ (tgz, data, shasum, cb) {
 
       if (er) return cb(er)
       var read = fs.createReadStream(tgz)
-      var write = writeStream(target, { mode: npm.modes.file })
+      var write = writeStreamAtomic(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)
     })
diff --git a/lib/cache/add-remote-tarball.js b/lib/cache/add-remote-tarball.js
@@ -4,7 +4,7 @@ var mkdir = require("mkdirp")
   , path = require("path")
   , sha = require("sha")
   , retry = require("retry")
-  , createWriteStream = require("fs-write-stream-atomic")
+  , writeStreamAtomic = require("fs-write-stream-atomic")
   , npm = require("../npm.js")
   , inflight = require("inflight")
   , addLocalTarball = require("./add-local-tarball.js")
@@ -78,8 +78,8 @@ function fetchAndShaCheck (u, tmp, shasum, auth, cb) {
       return cb(er, response)
     }
 
-    var tarball = createWriteStream(tmp, { mode : npm.modes.file })
-    tarball.on("error", function (er) {
+    var tarball = writeStreamAtomic(tmp, { mode: npm.modes.file })
+    tarball.on('error', function (er) {
       cb(er)
       tarball.destroy()
     })
diff --git a/lib/pack.js b/lib/pack.js
@@ -11,7 +11,7 @@ var npm = require("./npm.js")
   , chain = require("slide").chain
   , path = require("path")
   , cwd = process.cwd()
-  , writeStream = require('fs-write-stream-atomic')
+  , writeStreamAtomic = require('fs-write-stream-atomic')
   , cachedPackageRoot = require("./cache/cached-package-root.js")
 
 pack.usage = "npm pack <pkg>"
@@ -52,7 +52,7 @@ function pack_ (pkg, cb) {
 
     var cached = path.join(cachedPackageRoot(data), "package.tgz")
       , from = fs.createReadStream(cached)
-      , to = writeStream(fname)
+      , to = writeStreamAtomic(fname)
       , errState = null
 
     from.on("error", cb_)
diff --git a/lib/utils/error-handler.js b/lib/utils/error-handler.js
@@ -11,7 +11,7 @@ var cbCalled = false
   , exitCode = 0
   , rollbacks = npm.rollbacks
   , chain = require("slide").chain
-  , writeStream = require("fs-write-stream-atomic")
+  , writeStreamAtomic = require("fs-write-stream-atomic")
   , nameValidator = require("validate-npm-package-name")
 
 
@@ -393,7 +393,7 @@ function writeLogFile (cb) {
   writingLogFile = true
   wroteLogFile = true
 
-  var fstr = writeStream("npm-debug.log")
+  var fstr = writeStreamAtomic("npm-debug.log")
     , os = require("os")
     , out = ""
 
