.github/issue_template.md

@@ -1,4 +1,5 @@
-<!-- Please fill out the following information if it applies to your issue: -->
+<!-- First ensure you installed the latest version of fs-extra -->
+<!-- If your bug still exists please fill out the following information if it applies to your issue: -->
 - **Operating System:**
 - **Node.js version:**
 - **`fs-extra` version:**

.npmignore

@@ -7,3 +7,5 @@ lib/**/__tests__/
 test/readme.md
 test.js
 .github/
+docs/
+CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,10 @@
+7.0.1 / 2018-11-07
+------------------
+
+- Fix `removeSync()` on Windows, in some cases, it would error out with `ENOTEMPTY` ([#646](https://github.com/jprichardson/node-fs-extra/pull/646))
+- Document `mode` option for `ensureDir*()` ([#587](https://github.com/jprichardson/node-fs-extra/pull/587))
+- Don't include documentation files in npm package tarball ([#642](https://github.com/jprichardson/node-fs-extra/issues/642), [#643](https://github.com/jprichardson/node-fs-extra/pull/643))
+
 7.0.0 / 2018-07-16
 ------------------
 

docs/ensureDir-sync.md

@@ -1,17 +1,29 @@
-# ensureDirSync(dir)
+# ensureDirSync(dir[,options])
 
-Ensures that the directory exists. If the directory structure does not exist, it is created. Like `mkdir -p`.
+Ensures that the directory exists. If the directory structure does not exist, it is created. Like `mkdir -p`. If provided, options may specify the desired mode for the directory. 
 
 **Aliases:** `mkdirsSync()`, `mkdirpSync()`
 
 - `dir` `<String>`
-
+- `options` `<Integer>|<Object>`
 ## Example:
 
 ```js
 const fs = require('fs-extra')
 
 const dir = '/tmp/this/path/does/not/exist'
+
+const desiredMode = 0o2775
+const options = {
+  mode: 0o2775
+}
+
 fs.ensureDirSync(dir)
 // dir has now been created, including the directory it is to be placed in
+
+fs.ensureDirSync(dir, desiredMode)
+// dir has now been created, including the directory it is to be placed in with permission 0o2775
+
+fs.ensureDirSync(dir, options)
+// dir has now been created, including the directory it is to be placed in with permission 0o2775
 ```

docs/ensureDir.md

@@ -1,10 +1,11 @@
-# ensureDir(dir, [callback])
+# ensureDir(dir[,options][,callback])
 
 Ensures that the directory exists. If the directory structure does not exist, it is created. Like `mkdir -p`.
 
 **Aliases:** `mkdirs()`, `mkdirp()`
 
 - `dir` `<String>`
+- `options` `<Integer>|<Object>`
 - `callback` `<Function>`
 
 ## Example:
@@ -13,13 +14,23 @@ Ensures that the directory exists. If the directory structure does not exist, it
 const fs = require('fs-extra')
 
 const dir = '/tmp/this/path/does/not/exist'
+const desiredMode = 0o2775
+const options = {
+  mode: 0o2775
+}
 
 // With a callback:
 fs.ensureDir(dir, err => {
   console.log(err) // => null
   // dir has now been created, including the directory it is to be placed in
 })
 
+// With a callback and a mode integer
+fs.ensureDir(dir, desiredMode, err => {
+  console.log(err) // => null
+  // dir has now been created with mode 0o2775, including the directory it is to be placed in
+})
+
 // With Promises:
 fs.ensureDir(dir)
 .then(() => {
@@ -29,6 +40,15 @@ fs.ensureDir(dir)
   console.error(err)
 })
 
+// With Promises and a mode integer:
+fs.ensureDir(dir, desiredMode)
+.then(() => {
+  console.log('success!')
+})
+.catch(err => {
+  console.error(err)
+})
+
 // With async/await:
 async function example (directory) {
   try {
@@ -38,6 +58,16 @@ async function example (directory) {
     console.error(err)
   }
 }
-
 example(dir)
+
+// With async/await and an options object, containing mode:
+async function exampleMode (directory) {
+  try {
+    await fs.ensureDir(directory, options)
+    console.log('success!')
+  } catch (err) {
+    console.error(err)
+  }
+}
+exampleMode(dir)
 ```

lib/remove/rimraf.js

@@ -290,24 +290,24 @@ function rmkidsSync (p, options) {
   assert(options)
   options.readdirSync(p).forEach(f => rimrafSync(path.join(p, f), options))
 
-  // We only end up here once we got ENOTEMPTY at least once, and
-  // at this point, we are guaranteed to have removed all the kids.
-  // So, we know that it won't be ENOENT or ENOTDIR or anything else.
-  // try really hard to delete stuff on windows, because it has a
-  // PROFOUNDLY annoying habit of not closing handles promptly when
-  // files are deleted, resulting in spurious ENOTEMPTY errors.
-  const retries = isWindows ? 100 : 1
-  let i = 0
-  do {
-    let threw = true
-    try {
-      const ret = options.rmdirSync(p, options)
-      threw = false
-      return ret
-    } finally {
-      if (++i < retries && threw) continue // eslint-disable-line
-    }
-  } while (true)
+  if (isWindows) {
+    // We only end up here once we got ENOTEMPTY at least once, and
+    // at this point, we are guaranteed to have removed all the kids.
+    // So, we know that it won't be ENOENT or ENOTDIR or anything else.
+    // try really hard to delete stuff on windows, because it has a
+    // PROFOUNDLY annoying habit of not closing handles promptly when
+    // files are deleted, resulting in spurious ENOTEMPTY errors.
+    const startTime = Date.now()
+    do {
+      try {
+        const ret = options.rmdirSync(p, options)
+        return ret
+      } catch (er) { }
+    } while (Date.now() - startTime < 500) // give up after 500ms
+  } else {
+    const ret = options.rmdirSync(p, options)
+    return ret
+  }
 }
 
 module.exports = rimraf

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fs-extra",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "fs-extra contains methods that aren't included in the vanilla Node.js fs package. Such as mkdir -p, cp -r, and rm -rf.",
   "engines": {
     "node": ">=6 <7 || >=8"
@@ -60,7 +60,7 @@
     "full-ci": "npm run lint && npm run coverage",
     "coverage": "istanbul cover -i 'lib/**' -x '**/__tests__/**' test.js",
     "coveralls": "coveralls < coverage/lcov.info",
-    "lint": "standard && standard-markdown",
+    "lint": "standard",
     "test-find": "find ./lib/**/__tests__ -name *.test.js | xargs mocha",
     "test": "npm run lint && npm run unit",
     "unit": "node test.js"