rimraf 2.4.4 → 2.5.2

package/README.md

@@ -27,6 +27,64 @@ errors are handled for you:
   async case, rimraf will gradually back off with timeouts up to
   `opts.emfileWait` ms, which defaults to 1000.
 
+## options
+
+* unlink, chmod, stat, lstat, rmdir, readdir,
+  unlinkSync, chmodSync, statSync, lstatSync, rmdirSync, readdirSync
+
+    In order to use a custom file system library, you can override
+    specific fs functions on the options object.
+
+    If any of these functions are present on the options object, then
+    the supplied function will be used instead of the default fs
+    method.
+
+    Sync methods are only relevant for `rimraf.sync()`, of course.
+
+    For example:
+
+    ```javascript
+    var myCustomFS = require('some-custom-fs')
+
+    rimraf('some-thing', myCustomFS, callback)
+    ```
+
+* maxBusyTries
+
+    If an `EBUSY`, `ENOTEMPTY`, or `EPERM` error code is encountered
+    on Windows systems, then rimraf will retry with a linear backoff
+    wait of 100ms longer on each try.  The default maxBusyTries is 3.
+
+    Only relevant for async usage.
+
+* emfileWait
+
+    If an `EMFILE` error is encountered, then rimraf will retry
+    repeatedly with a linear backoff of 1ms longer on each try, until
+    the timeout counter hits this max.  The default limit is 1000.
+
+    If you repeatedly encounter `EMFILE` errors, then consider using
+    [graceful-fs](http://npm.im/graceful-fs) in your program.
+
+    Only relevant for async usage.
+
+* glob
+
+    Set to `false` to disable [glob](http://npm.im/glob) pattern
+    matching.
+
+    Set to an object to pass options to the glob module.  The default
+    glob options are `{ nosort: true, silent: true }`.
+
+    Glob version 6 is used in this module.
+
+    Relevant for both sync and async usage.
+
+* disableGlob
+
+    Set to any non-falsey value to disable globbing entirely.
+    (Equivalent to setting `glob: false`.)
+
 ## rimraf.sync
 
 It can remove stuff synchronously, too.  But that's not so good.  Use

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rimraf",
-  "version": "2.4.4",
+  "version": "2.5.2",
   "main": "rimraf.js",
   "description": "A deep deletion module for node (like `rm -rf`)",
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
@@ -11,7 +11,7 @@
   },
   "bin": "./bin.js",
   "dependencies": {
-    "glob": "^5.0.14"
+    "glob": "^7.0.0"
   },
   "files": [
     "LICENSE",
@@ -21,6 +21,6 @@
   ],
   "devDependencies": {
     "mkdirp": "^0.5.1",
-    "tap": "^1.3.1"
+    "tap": "^5.1.1"
   }
 }

package/rimraf.js

@@ -6,10 +6,8 @@ var path = require("path")
 var fs = require("fs")
 var glob = require("glob")
 
-var globOpts = {
+var defaultGlobOpts = {
   nosort: true,
-  nocomment: true,
-  nonegate: true,
   silent: true
 }
 
@@ -35,7 +33,11 @@ function defaults (options) {
 
   options.maxBusyTries = options.maxBusyTries || 3
   options.emfileWait = options.emfileWait || 1000
+  if (options.glob === false) {
+    options.disableGlob = true
+  }
   options.disableGlob = options.disableGlob || false
+  options.glob = options.glob || defaultGlobOpts
 }
 
 function rimraf (p, options, cb) {
@@ -63,7 +65,7 @@ function rimraf (p, options, cb) {
     if (!er)
       return afterGlob(null, [p])
 
-    glob(p, globOpts, afterGlob)
+    glob(p, options.glob, afterGlob)
   })
 
   function next (er) {
@@ -270,7 +272,7 @@ function rimrafSync (p, options) {
       fs.lstatSync(p)
       results = [p]
     } catch (er) {
-      results = glob.sync(p, globOpts)
+      results = glob.sync(p, options.glob)
     }
   }