rimraf@2.4.0

2 files changed, 17 insertions, 12 deletions

diff --git a/node_modules/rimraf/package.json b/node_modules/rimraf/package.json
index aabb562a7..b0ec171e0 100644
--- a/node_modules/rimraf/package.json
+++ b/node_modules/rimraf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rimraf",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "main": "rimraf.js",
   "description": "A deep deletion module for node (like `rm -rf`)",
   "author": {
@@ -14,7 +14,7 @@
     "url": "git://github.com/isaacs/rimraf.git"
   },
   "scripts": {
-    "test": "cd test && bash run.sh"
+    "test": "tap test/*.js"
   },
   "bin": {
     "rimraf": "./bin.js"
@@ -28,23 +28,27 @@
     "LICENSE",
     "README.md"
   ],
-  "gitHead": "2a6cc45bbbdd8da5fd703d8af62843565f7dea57",
+  "devDependencies": {
+    "mkdirp": "^0.5.1",
+    "tap": "^1.2.0"
+  },
+  "gitHead": "2128f0b9ade05a81394dd21a383fa309dd9eca94",
   "bugs": {
     "url": "https://github.com/isaacs/rimraf/issues"
   },
   "homepage": "https://github.com/isaacs/rimraf#readme",
-  "_id": "rimraf@2.3.4",
-  "_shasum": "82d9bc1b2fcf31e205ac7b28138a025d08e9159a",
-  "_from": "rimraf@>=2.3.4 <2.4.0",
-  "_npmVersion": "2.10.0",
+  "_id": "rimraf@2.4.0",
+  "_shasum": "40ba0416037d8511ecb50f6b07cf8d18e658a864",
+  "_from": "rimraf@latest",
+  "_npmVersion": "2.10.1",
   "_nodeVersion": "2.0.1",
   "_npmUser": {
     "name": "isaacs",
     "email": "isaacs@npmjs.com"
   },
   "dist": {
-    "shasum": "82d9bc1b2fcf31e205ac7b28138a025d08e9159a",
-    "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz"
+    "shasum": "40ba0416037d8511ecb50f6b07cf8d18e658a864",
+    "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.4.0.tgz"
   },
   "maintainers": [
     {
@@ -53,6 +57,6 @@
     }
   ],
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
+  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.0.tgz",
   "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/rimraf/rimraf.js b/node_modules/rimraf/rimraf.js
index 7f684e4b5..447705ac9 100644
--- a/node_modules/rimraf/rimraf.js
+++ b/node_modules/rimraf/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) {
@@ -262,7 +263,7 @@ function rimrafSync (p, options) {
 
   var results
 
-  if (!glob.hasMagic(p)) {
+  if (options.disableGlob || !glob.hasMagic(p)) {
     results = [p]
   } else {
     try {