rimraf 2.3.4 → 2.4.3

package/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/isaacs/rimraf.svg?branch=master)](https://travis-ci.org/isaacs/rimraf) [![Dependency Status](https://david-dm.org/isaacs/rimraf.svg)](https://david-dm.org/isaacs/rimraf) [![devDependency Status](https://david-dm.org/isaacs/rimraf/dev-status.svg)](https://david-dm.org/isaacs/rimraf#info=devDependencies)
+
 The [UNIX command](http://en.wikipedia.org/wiki/Rm_(Unix)) `rm -rf` for node.  
 
 Install with `npm install rimraf`, or just drop rimraf.js somewhere.
@@ -28,7 +30,7 @@ the async API.  It's better.
 ## CLI
 
 If installed with `npm install rimraf -g` it can be used as a global
-command `rimraf <path>` which is useful for cross platform support.
+command `rimraf <path> [<path> ...]` which is useful for cross platform support.
 
 ## mkdirp
 

package/bin.js

@@ -18,7 +18,7 @@ var args = process.argv.slice(2).filter(function(arg) {
 if (help || args.length === 0) {
   // If they didn't ask for help, then this is not a "success"
   var log = help ? console.log : console.error
-  log('Usage: rimraf <path>')
+  log('Usage: rimraf <path> [<path> ...]')
   log('')
   log('  Deletes all files and folders at "path" recursively.')
   log('')
@@ -26,8 +26,15 @@ if (help || args.length === 0) {
   log('')
   log('  -h, --help    Display this usage info')
   process.exit(help ? 0 : 1)
-} else {
-  args.forEach(function(arg) {
-    rimraf.sync(arg)
+} else
+  go(0)
+
+function go (n) {
+  if (n >= args.length)
+    return
+  rimraf(args[n], function (er) {
+    if (er)
+      throw er
+    go(n+1)
   })
 }

package/package.json

@@ -1,22 +1,26 @@
 {
   "name": "rimraf",
-  "version": "2.3.4",
+  "version": "2.4.3",
   "main": "rimraf.js",
   "description": "A deep deletion module for node (like `rm -rf`)",
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
   "license": "ISC",
   "repository": "git://github.com/isaacs/rimraf.git",
   "scripts": {
-    "test": "cd test && bash run.sh"
+    "test": "tap test/*.js"
   },
   "bin": "./bin.js",
   "dependencies": {
-    "glob": "^4.4.2"
+    "glob": "^5.0.14"
   },
   "files": [
-    "bin.js",
-    "rimraf.js",
     "LICENSE",
-    "README.md"
-  ]
+    "README.md",
+    "bin.js",
+    "rimraf.js"
+  ],
+  "devDependencies": {
+    "mkdirp": "^0.5.1",
+    "tap": "^1.3.1"
+  }
 }

package/rimraf.js

@@ -35,6 +35,7 @@ function defaults (options) {
 
   options.maxBusyTries = options.maxBusyTries || 3
   options.emfileWait = options.emfileWait || 1000
+  options.disableGlob = options.disableGlob || false
 }
 
 function rimraf (p, options, cb) {
@@ -55,7 +56,7 @@ function rimraf (p, options, cb) {
   var errState = null
   var n = 0
 
-  if (!glob.hasMagic(p))
+  if (options.disableGlob || !glob.hasMagic(p))
     return afterGlob(null, [p])
 
   fs.lstat(p, function (er, stat) {
@@ -82,7 +83,7 @@ function rimraf (p, options, cb) {
     results.forEach(function (p) {
       rimraf_(p, options, function CB (er) {
         if (er) {
-          if (isWindows && (er.code === "EBUSY" || er.code === "ENOTEMPTY") &&
+          if (isWindows && (er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") &&
               busyTries < options.maxBusyTries) {
             busyTries ++
             var time = busyTries * 100
@@ -262,7 +263,7 @@ function rimrafSync (p, options) {
 
   var results
 
-  if (!glob.hasMagic(p)) {
+  if (options.disableGlob || !glob.hasMagic(p)) {
     results = [p]
   } else {
     try {