Replace wrench with fs-extra

jsdoc · Mar 31, 2016 · 5ca4590 · 5ca4590
1 parent b7c89c9
commit 5ca4590
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 27 deletions.
diff --git a/lib/jsdoc/fs.js b/lib/jsdoc/fs.js
@@ -7,7 +7,7 @@
 var fs = require('fs');
 var path = require('path');
 var stream = require('stream');
-var wrench = require('wrench');
+var fse = require('fs-extra');
 
 var ls = exports.ls = function(dir, recurse, _allFiles, _path) {
     var file;
@@ -91,7 +91,7 @@ exports.mkPath = function(_path) {
         _path = _path.join('');
     }
 
-    wrench.mkdirSyncRecursive(_path);
+    fse.mkdirsSync(_path);
 };
 
 // adapted from http://procbits.com/2011/11/15/synchronous-file-copy-in-node-js
@@ -106,7 +106,7 @@ exports.copyFileSync = function(inFile, outDir, fileName) {
     var outFile = path.join( outDir, fileName || path.basename(inFile) );
     var pos = 0;
 
-    wrench.mkdirSyncRecursive(outDir);
+    fse.mkdirsSync(outDir);
     read = fs.openSync(inFile, 'r');
     write = fs.openSync(outFile, 'w');
 

diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "strip-json-comments": "~2.0.1",
     "taffydb": "https://github.com/hegemonic/taffydb/tarball/7d100bcee0e997ee4977e273cdce60bd8933050e",
     "underscore": "~1.8.3",
-    "wrench": "~1.5.9"
+    "fs-extra": "~0.26.7"
   },
   "devDependencies": {
     "gulp": "~3.9.1",

diff --git a/test/jasmine-jsdoc.js b/test/jasmine-jsdoc.js
@@ -100,21 +100,21 @@ jasmine.executeSpecsInFolder = function(folder, done, opts) {
     var jasmineEnv = jasmine.initialize(done, opts.verbose);
 
     // Load the specs
-    specs.load(folder, fileMatcher, true);
-
-    var specsList = specs.getSpecs();
-    var filename;
-
-    // Add the specs to the context
-    for (var i = 0, len = specsList.length; i < len; ++i) {
-        filename = specsList[i];
-        require(filename.path().replace(/\\/g, '/')
-            .replace(new RegExp('^' + jsdoc.env.dirname + '/test'), './')
-            .replace(/\.\w+$/, ''));
-    }
+    specs.load(folder, fileMatcher, true, function() {
+        var specsList = specs.getSpecs();
+        var filename;
+
+        // Add the specs to the context
+        for (var i = 0, len = specsList.length; i < len; ++i) {
+            filename = specsList[i];
+            require(filename.path().replace(/\\/g, '/')
+                .replace(new RegExp('^' + jsdoc.env.dirname + '/test'), './')
+                .replace(/\.\w+$/, ''));
+        }
 
-    // Run Jasmine
-    jasmineEnv.execute();
+        // Run Jasmine
+        jasmineEnv.execute();
+    });
 };
 
 function now() {

diff --git a/test/spec-collection.js b/test/spec-collection.js
@@ -3,7 +3,7 @@
 var fs = require('jsdoc/fs');
 var path = require('jsdoc/path');
 var runtime = require('jsdoc/util/runtime');
-var wrench = require('wrench');
+var fse = require('fs-extra');
 
 var specs = [];
 var finalSpecs = [];
@@ -75,18 +75,25 @@ function shouldLoad(file, matcher) {
     return result;
 }
 
-exports.load = function(loadpath, matcher, clear) {
+exports.load = function(loadpath, matcher, clear, callback) {
     if (clear === true) {
         clearSpecs();
     }
 
-    var wannaBeSpecs = wrench.readdirSyncRecursive(loadpath);
-    for (var i = 0; i < wannaBeSpecs.length; i++) {
-        var file = path.join(loadpath, wannaBeSpecs[i]);
-        if ( shouldLoad(file, matcher) ) {
-            addSpec(file);
-        }
-    }
+    var wannaBeSpecs = [];
+    fse.walk(loadpath)
+      .on('data', function(spec) {
+        wannaBeSpecs.push(spec.path);
+      })
+      .on('end', function() {
+          for (var i = 0; i < wannaBeSpecs.length; i++) {
+              var file = wannaBeSpecs[i];
+              if ( shouldLoad(file, matcher) ) {
+                  addSpec(file);
+              }
+          }
+          callback();
+      });
 };
 
 exports.getSpecs = function() {