rimraf 2.2.2 → 2.2.6

package/README.md

@@ -1,4 +1,4 @@
-A `rm -rf` for node.
+`rm -rf` for node.
 
 Install with `npm install rimraf`, or just drop rimraf.js somewhere.
 
@@ -9,11 +9,10 @@ Install with `npm install rimraf`, or just drop rimraf.js somewhere.
 The callback will be called with an error if there is one.  Certain
 errors are handled for you:
 
-* `EBUSY` -  rimraf will back off a maximum of opts.maxBusyTries times
-  before giving up.
-* `EMFILE` - If too many file descriptors get opened, rimraf will
-  patiently wait until more become available.
-
+* Windows: `EBUSY` and `ENOTEMPTY` - rimraf will back off a maximum of
+  `opts.maxBusyTries` times before giving up.
+* `ENOENT` - If the file doesn't exist, rimraf will return
+  successfully, since your desired outcome is already the case.
 
 ## rimraf.sync
 
@@ -24,3 +23,8 @@ the async API.  It's better.
 
 If installed with `npm install rimraf -g` it can be used as a global
 command `rimraf <path>` which is useful for cross platform support.
+
+## mkdirp
+
+If you need to create a directory recursively, check out
+[mkdirp](https://github.com/substack/node-mkdirp).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rimraf",
-  "version": "2.2.2",
+  "version": "2.2.6",
   "main": "rimraf.js",
   "description": "A deep deletion module for node (like `rm -rf`)",
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
@@ -8,9 +8,6 @@
     "type": "MIT",
     "url": "https://github.com/isaacs/rimraf/raw/master/LICENSE"
   },
-  "optionalDependencies": {
-    "graceful-fs": "~2"
-  },
   "repository": "git://github.com/isaacs/rimraf.git",
   "scripts": {
     "test": "cd test && bash run.sh"

package/rimraf.js

@@ -2,14 +2,7 @@ module.exports = rimraf
 rimraf.sync = rimrafSync
 
 var path = require("path")
-  , fs
-
-try {
-  // optional dependency
-  fs = require("graceful-fs")
-} catch (er) {
-  fs = require("fs")
-}
+var fs = require("fs")
 
 // for EMFILE handling
 var timeout = 0
@@ -24,7 +17,8 @@ function rimraf (p, cb) {
   var busyTries = 0
   rimraf_(p, function CB (er) {
     if (er) {
-      if (er.code === "EBUSY" && busyTries < exports.BUSYTRIES_MAX) {
+      if (isWindows && (er.code === "EBUSY" || er.code === "ENOTEMPTY") &&
+          busyTries < exports.BUSYTRIES_MAX) {
         busyTries ++
         var time = busyTries * 100
         // try again, with the same exact callback as this one.
@@ -64,7 +58,7 @@ function rimraf_ (p, cb) {
   fs.unlink(p, function (er) {
     if (er) {
       if (er.code === "ENOENT")
-        return cb()
+        return cb(null)
       if (er.code === "EPERM")
         return (isWindows) ? fixWinEPERM(p, er, cb) : rmdir(p, er, cb)
       if (er.code === "EISDIR")
@@ -116,7 +110,7 @@ function rmdir (p, originalEr, cb) {
   // if we guessed wrong, and it's not a directory, then
   // raise the original error.
   fs.rmdir(p, function (er) {
-    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST"))
+    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
       rmkids(p, cb)
     else if (er && er.code === "ENOTDIR")
       cb(originalEr)
@@ -171,7 +165,7 @@ function rmdirSync (p, originalEr) {
       return
     if (er.code === "ENOTDIR")
       throw originalEr
-    if (er.code === "ENOTEMPTY" || er.code === "EEXIST")
+    if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")
       rmkidsSync(p)
   }
 }