From c4753a4e588b45390b75a15ef5522bb3465e51be Mon Sep 17 00:00:00 2001 From: tmont Date: Fri, 18 Jan 2013 11:20:41 -0800 Subject: [PATCH 1/3] ignore .idea directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 93f1361..05ade97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules npm-debug.log +.idea -- 2.39.5 From 9dbd7513acf01545f036d5f63ad1a3934246d4bf Mon Sep 17 00:00:00 2001 From: tmont Date: Fri, 18 Jan 2013 11:21:08 -0800 Subject: [PATCH 2/3] handle errors to fs.readdir() --- lib/wrench.js | 4 ++++ tests/readdir.js | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/lib/wrench.js b/lib/wrench.js index cc5c18b..98b94be 100644 --- a/lib/wrench.js +++ b/lib/wrench.js @@ -80,6 +80,10 @@ exports.readdirRecursive = function(baseDir, fn) { waitCount++; fs.readdir(curDir, function(e, curFiles) { + if (e) { + fn(e); + return; + } waitCount--; curFiles = curFiles.map(prependcurDir); diff --git a/tests/readdir.js b/tests/readdir.js index 2460203..5e8abf0 100644 --- a/tests/readdir.js +++ b/tests/readdir.js @@ -46,6 +46,15 @@ module.exports = testCase({ checkResult(test, allFiles); } }); + }, + + test_readdirRecursiveWithNonExistentDirectory: function(test) { + wrench.readdirRecursive('', function (e, files) { + test.ok(e); + test.equal(e.code, 'ENOENT'); + test.equal(files, null); + test.done(); + }); } }); -- 2.39.5 From 14ed84beb6f69dd6410b99b99990a270d8d3890f Mon Sep 17 00:00:00 2001 From: tmont Date: Fri, 18 Jan 2013 11:21:45 -0800 Subject: [PATCH 3/3] removed unused variables --- lib/wrench.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/wrench.js b/lib/wrench.js index 98b94be..adec9a6 100644 --- a/lib/wrench.js +++ b/lib/wrench.js @@ -71,12 +71,9 @@ exports.readdirRecursive = function(baseDir, fn) { var waitCount = 0; function readdirRecursive(curDir) { - var files = [], - curFiles, - nextDirs, - prependcurDir = function(fname){ - return _path.join(curDir, fname); - }; + var prependcurDir = function(fname){ + return _path.join(curDir, fname); + }; waitCount++; fs.readdir(curDir, function(e, curFiles) { -- 2.39.5