From a12a7e166de21d0fda68027f52f3e4c6ac4e10b7 Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Fri, 17 Jul 2015 16:11:36 +1200 Subject: [PATCH 01/29] bump few packages --- package.json | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 2110003..cc7a16c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "0.2.5", + "version": "0.2.6", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", @@ -18,14 +18,14 @@ "file stats" ], "dependencies": { - "fmerge": "^1.2.0", - "rimraf": "^2.2.0" + "fmerge": "1.2.0", + "rimraf": "2.4.1" }, "devDependencies": { - "nodeunit": "^0.9.0", - "randomstring": "^1.0.2", - "mkdirp": "^0.5.0", - "async": "^0.9.0" + "nodeunit": "0.9.1", + "randomstring": "1.0.7", + "mkdirp": "0.5.1", + "async": "1.3.0" }, "engines": { "node": ">=0.10.24" @@ -39,7 +39,6 @@ }, "license": "MIT", "readmeFilename": "README.md", - "gitHead": "4054ab4121d6a2023812bb720ffcd9a514efb092", "directories": { "test": "tests" } From c3b98fb6dcec976662aa55d7f26b654d037c0de3 Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Tue, 28 Jul 2015 12:56:32 +1200 Subject: [PATCH 02/29] just bump few packages --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index cc7a16c..1f95f27 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "0.2.6", + "version": "0.2.7", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", @@ -19,13 +19,13 @@ ], "dependencies": { "fmerge": "1.2.0", - "rimraf": "2.4.1" + "rimraf": "2.4.2" }, "devDependencies": { "nodeunit": "0.9.1", "randomstring": "1.0.7", "mkdirp": "0.5.1", - "async": "1.3.0" + "async": "1.4.0" }, "engines": { "node": ">=0.10.24" From 9a259806fd36a2e85775c4fc49965d512cb8cd44 Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Sun, 6 Sep 2015 13:09:54 +1200 Subject: [PATCH 03/29] bump some packages --- .gitignore | 3 --- LICENSE | 2 +- find-remove.js | 20 +++++++++----------- package.json | 6 +++--- tests/basics.js | 30 ++++++++++++++++-------------- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index de97924..3c3629e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -.DS_Store -*.log node_modules -.idea/ \ No newline at end of file diff --git a/LICENSE b/LICENSE index 08d4716..ca95de6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013 Michael Heuberger +Copyright (c) 2013 - 2015 Michael Heuberger Permission is hereby granted, free of charge, to any person obtaining a copy of this software and diff --git a/find-remove.js b/find-remove.js index 26ffa4c..b03bbb4 100644 --- a/find-remove.js +++ b/find-remove.js @@ -1,14 +1,12 @@ -"use strict"; - module.exports = findRemoveSync; -var fs = require('fs') - , path = require('path') - , merge = require('fmerge') - , util = require('util') - , rimraf = require('rimraf') - , now - , testRun; +var fs = require('fs'), + path = require('path'), + merge = require('fmerge'), + util = require('util'), + rimraf = require('rimraf'), + now, + testRun /** * findRemoveSync(currentDir, options) takes any start directory and searches files from there for removal. @@ -121,8 +119,8 @@ function doDeleteDirectory(currentDir, options, currentLevel) { } function isOlder(path, ageSeconds) { - var stats = fs.statSync(path) - , ctime = stats.ctime.getTime(); + var stats = fs.statSync(path), + ctime = stats.ctime.getTime() return (ctime + (ageSeconds * 1000)) < now; } diff --git a/package.json b/package.json index 1f95f27..88ee1c1 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,13 @@ ], "dependencies": { "fmerge": "1.2.0", - "rimraf": "2.4.2" + "rimraf": "2.4.3" }, "devDependencies": { "nodeunit": "0.9.1", - "randomstring": "1.0.7", + "randomstring": "1.0.8", "mkdirp": "0.5.1", - "async": "1.4.0" + "async": "1.4.2" }, "engines": { "node": ">=0.10.24" diff --git a/tests/basics.js b/tests/basics.js index b9138e3..a5fb06b 100644 --- a/tests/basics.js +++ b/tests/basics.js @@ -1,13 +1,11 @@ -"use strict"; - -var testCase = require('nodeunit').testCase - , randomstring = require('randomstring') - , mkdirp = require('mkdirp') - , path = require('path') - , fs = require('fs') - , async = require('async') - , rimraf = require('rimraf') - , findRemoveSync; +var testCase = require('nodeunit').testCase, + randomstring = require('randomstring'), + mkdirp = require('mkdirp'), + path = require('path'), + fs = require('fs'), + async = require('async'), + rimraf = require('rimraf'), + findRemoveSync var rootDirectory = path.join(require('os').tmpDir(), 'find-remove'); @@ -80,12 +78,17 @@ var fixFile1_2_1_4 = path.join(directory1_2_1, fixFilename1_2_1_4); var fixFilename1_2_1_5 = 'something.png'; var fixFile1_2_1_5 = path.join(directory1_2_1, fixFilename1_2_1_5); -function makeFile(file, callback) { +function makeFile(file, options, callback) { fs.writeFile(file, '', function(err) { if (err) callback(err); - else + else { + if (options.mode) { + fs.chmodSync(file, options.mode) + } + callback(null); + } }) } @@ -130,7 +133,6 @@ function destroyFakeDirectoryTree(callback) { } module.exports = testCase({ - 'TC 1: tests without real files': testCase({ 'loading findRemoveSync function (require)': function(t) { findRemoveSync = require('../find-remove.js'); @@ -517,7 +519,7 @@ module.exports = testCase({ t.equal(exists1_1, true, 'findRemoveSync(test run) did not remove directory1_1'); t.done(); - } + }, }), 'TC 3: age checks': testCase({ From 9b5f800914ab04c670c73c64968d869a53effa6a Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Sun, 6 Sep 2015 17:20:30 +1200 Subject: [PATCH 04/29] optimize files a bit and remove obsolete stuff --- find-remove.js | 172 ++++++++++++++++++++++++------------------------ tests/basics.js | 42 +++++------- 2 files changed, 103 insertions(+), 111 deletions(-) diff --git a/find-remove.js b/find-remove.js index b03bbb4..dd2f510 100644 --- a/find-remove.js +++ b/find-remove.js @@ -1,5 +1,3 @@ -module.exports = findRemoveSync; - var fs = require('fs'), path = require('path'), merge = require('fmerge'), @@ -8,80 +6,19 @@ var fs = require('fs'), now, testRun -/** - * findRemoveSync(currentDir, options) takes any start directory and searches files from there for removal. - * the selection of files for removal depends on the given options. when no options are given, or only the maxLevel - * parameter is given, then everything is removed as if there were no filters. - * - * beware: everything happens synchronously. - * - * - * @param {String} currentDir any directory to operate within. it will seek files and/or directories recursively from there. - * beware that it deletes the given currentDir when no options or only the maxLevel parameter are given. - * @param options json object with optional properties like extensions, files, ignore, maxLevel and age.seconds. - * @return {Object} json object of files and/or directories that were found and successfully removed. - * @api public - */ -function findRemoveSync(currentDir, options, currentLevel) { - - var removed = []; - - if (fs.existsSync(currentDir)) { - - var maxLevel = getMaxLevel(options); - - if (currentLevel === undefined) - currentLevel = 0; - else - currentLevel++; - - if (currentLevel < 1) { - now = new Date().getTime(); - testRun = isTestRun(options); - } - - // check directore before deleting files inside to maintain the original creation time, because - // linux modifies creation date of folders when files have been deleted inside. - var deleteDirectory = doDeleteDirectory(currentDir, options, currentLevel); - - if (maxLevel === -1 || currentLevel < maxLevel) { - var filesInDir = fs.readdirSync(currentDir); - - filesInDir.forEach(function(file) { - - var currentFile = path.join(currentDir, file); - - if (fs.statSync(currentFile).isDirectory()) { - // the recursive call - var result = findRemoveSync(currentFile, options, currentLevel); - - // merge results - removed = merge(removed, result); - } else { - - if (doDeleteFile(currentFile, options)) { - if (!testRun) - fs.unlinkSync(currentFile); - - removed[currentFile] = true; - } - } - }); - } +function isOlder(path, ageSeconds) { + var stats = fs.statSync(path), + ctime = stats.ctime.getTime() - if (deleteDirectory) { - try { - if (!testRun) - rimraf.sync(currentDir); + return (ctime + (ageSeconds * 1000)) < now; +} - removed[currentDir] = true - } catch (err) { - throw err; - } - } - } +function getMaxLevel(options) { + return (options && options.hasOwnProperty('maxLevel')) ? options.maxLevel : -1; +} - return removed; +function getAgeSeconds(options) { + return (options && options.age && options.age.seconds) ? options.age.seconds : null; } function doDeleteDirectory(currentDir, options, currentLevel) { @@ -118,13 +55,6 @@ function doDeleteDirectory(currentDir, options, currentLevel) { return doDelete; } -function isOlder(path, ageSeconds) { - var stats = fs.statSync(path), - ctime = stats.ctime.getTime() - - return (ctime + (ageSeconds * 1000)) < now; -} - function doDeleteFile(currentFile, options) { var extensions = (options && options.extensions) ? options.extensions : null; @@ -175,14 +105,82 @@ function doDeleteFile(currentFile, options) { return doDelete; } -function getMaxLevel(options) { - return (options && options.hasOwnProperty('maxLevel')) ? options.maxLevel : -1; +function isTestRun(options) { + return (options && options.hasOwnProperty('test')) ? options.test : false; } -function getAgeSeconds(options) { - return (options && options.age && options.age.seconds) ? options.age.seconds : null; -} +/** + * findRemoveSync(currentDir, options) takes any start directory and searches files from there for removal. + * the selection of files for removal depends on the given options. when no options are given, or only the maxLevel + * parameter is given, then everything is removed as if there were no filters. + * + * beware: everything happens synchronously. + * + * + * @param {String} currentDir any directory to operate within. it will seek files and/or directories recursively from there. + * beware that it deletes the given currentDir when no options or only the maxLevel parameter are given. + * @param options json object with optional properties like extensions, files, ignore, maxLevel and age.seconds. + * @return {Object} json object of files and/or directories that were found and successfully removed. + * @api public + */ +var findRemoveSync = module.exports = function(currentDir, options, currentLevel) { -function isTestRun(options) { - return (options && options.hasOwnProperty('test')) ? options.test : false; + var removed = []; + + if (fs.existsSync(currentDir)) { + + var maxLevel = getMaxLevel(options); + + if (currentLevel === undefined) + currentLevel = 0; + else + currentLevel++; + + if (currentLevel < 1) { + now = new Date().getTime(); + testRun = isTestRun(options); + } + + // check directore before deleting files inside to maintain the original creation time, because + // linux modifies creation date of folders when files have been deleted inside. + var deleteDirectory = doDeleteDirectory(currentDir, options, currentLevel); + + if (maxLevel === -1 || currentLevel < maxLevel) { + var filesInDir = fs.readdirSync(currentDir); + + filesInDir.forEach(function(file) { + + var currentFile = path.join(currentDir, file); + + if (fs.statSync(currentFile).isDirectory()) { + // the recursive call + var result = findRemoveSync(currentFile, options, currentLevel); + + // merge results + removed = merge(removed, result); + } else { + + if (doDeleteFile(currentFile, options)) { + if (!testRun) + fs.unlinkSync(currentFile); + + removed[currentFile] = true; + } + } + }); + } + + if (deleteDirectory) { + try { + if (!testRun) + rimraf.sync(currentDir); + + removed[currentDir] = true + } catch (err) { + throw err; + } + } + } + + return removed; } diff --git a/tests/basics.js b/tests/basics.js index a5fb06b..84d86dd 100644 --- a/tests/basics.js +++ b/tests/basics.js @@ -1,11 +1,11 @@ -var testCase = require('nodeunit').testCase, - randomstring = require('randomstring'), - mkdirp = require('mkdirp'), - path = require('path'), - fs = require('fs'), - async = require('async'), - rimraf = require('rimraf'), - findRemoveSync +var testCase = require('nodeunit').testCase, + randomstring = require('randomstring'), + mkdirp = require('mkdirp'), + path = require('path'), + fs = require('fs'), + async = require('async'), + rimraf = require('rimraf'), + findRemoveSync; var rootDirectory = path.join(require('os').tmpDir(), 'find-remove'); @@ -64,31 +64,24 @@ var randomFile2 = path.join(rootDirectory, randomFilename2); var randomFile3 = path.join(rootDirectory, generateRandomFilename('log')); var randomFile2_1 = path.join(directory2, generateRandomFilename('bak')); -var randomFile3_1 = path.join(directory3, generateRandomFilename()); var randomFilename1_2_1_1 = generateRandomFilename('log'); var randomFile1_2_1_1 = path.join(directory1_2_1, randomFilename1_2_1_1); var randomFile1_2_1_2 = path.join(directory1_2_1, generateRandomFilename('bak')); var randomFilename1_2_1_3 = generateRandomFilename('bak'); var randomFile1_2_1_3 = path.join(directory1_2_1, randomFilename1_2_1_3); -var randomFile1_3_1 = path.join(directory1_3, generateRandomFilename()); var fixFilename1_2_1_4 = 'something.jpg'; var fixFile1_2_1_4 = path.join(directory1_2_1, fixFilename1_2_1_4); var fixFilename1_2_1_5 = 'something.png'; var fixFile1_2_1_5 = path.join(directory1_2_1, fixFilename1_2_1_5); -function makeFile(file, options, callback) { +function makeFile(file, callback) { fs.writeFile(file, '', function(err) { if (err) callback(err); - else { - if (options.mode) { - fs.chmodSync(file, options.mode) - } - + else callback(null); - } }) } @@ -133,6 +126,7 @@ function destroyFakeDirectoryTree(callback) { } module.exports = testCase({ + 'TC 1: tests without real files': testCase({ 'loading findRemoveSync function (require)': function(t) { findRemoveSync = require('../find-remove.js'); @@ -463,7 +457,7 @@ module.exports = testCase({ }, 'findRemoveSync(single dir)': function(t) { - var result = findRemoveSync(rootDirectory, {dir: 'directory1_2'}); + findRemoveSync(rootDirectory, {dir: 'directory1_2'}); var exists1_1 = fs.existsSync(directory1_1); t.equal(exists1_1, true, 'findRemoveSync(single dir) did not remove directory1_1'); @@ -475,7 +469,7 @@ module.exports = testCase({ }, 'findRemoveSync(two directories)': function(t) { - var result = findRemoveSync(rootDirectory, {dir: ['directory1_1', 'directory1_2']}); + findRemoveSync(rootDirectory, {dir: ['directory1_1', 'directory1_2']}); var exists1_1 = fs.existsSync(directory1_1); t.equal(exists1_1, false, 'findRemoveSync(remove single dir) removed directory1_1'); @@ -487,7 +481,7 @@ module.exports = testCase({ }, 'findRemoveSync(directories with the same basename)': function(t) { - var result = findRemoveSync(rootDirectory, {dir: 'CVS'}); + findRemoveSync(rootDirectory, {dir: 'CVS'}); var exists1_3 = fs.existsSync(directory1_3); t.equal(exists1_3, false, 'findRemoveSync(directories with the same basename) removed root/directory1/CVS'); @@ -519,7 +513,7 @@ module.exports = testCase({ t.equal(exists1_1, true, 'findRemoveSync(test run) did not remove directory1_1'); t.done(); - }, + } }), 'TC 3: age checks': testCase({ @@ -547,10 +541,10 @@ module.exports = testCase({ t.done(); }, - 'findRemoveSync(files older than .001 sec)': function(t) { - var result = findRemoveSync(rootDirectory, {age: {seconds: .001}}); + 'findRemoveSync(files older than .005 sec)': function(t) { + var result = findRemoveSync(rootDirectory, {age: {seconds: .005}}); - t.strictEqual(Object.keys(result).length, 15, 'findRemoveSync(files older than .001 sec) returned 15 entries.'); + t.strictEqual(Object.keys(result).length, 15, 'findRemoveSync(files older than .005 sec) returned 15 entries.'); t.done(); }, From 4edeccc8b345e7506e0b3dc71d012404a8e7498f Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Sun, 6 Sep 2015 17:20:54 +1200 Subject: [PATCH 05/29] version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 88ee1c1..7303ace 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "0.2.7", + "version": "0.2.8", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", From f9f3555c3cc70df70a2dba3b81a37c41aa1899dc Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Mon, 9 Nov 2015 16:06:36 +1300 Subject: [PATCH 06/29] another small maintenance bump --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7303ace..4992bfa 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,9 @@ }, "devDependencies": { "nodeunit": "0.9.1", - "randomstring": "1.0.8", + "randomstring": "1.1.3", "mkdirp": "0.5.1", - "async": "1.4.2" + "async": "1.5.0" }, "engines": { "node": ">=0.10.24" From 0423de622ce859f329aa74caa97af38f3b844fbf Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Mon, 9 Nov 2015 16:07:32 +1300 Subject: [PATCH 07/29] version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4992bfa..92571e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "0.2.8", + "version": "0.2.9", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", From 235825ac1463e5600c8234e17545ab17a0da7d4b Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Tue, 26 Jan 2016 15:22:28 +1300 Subject: [PATCH 08/29] bump few packs --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 92571e0..84cb903 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "0.2.9", + "version": "0.2.10", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", @@ -19,13 +19,13 @@ ], "dependencies": { "fmerge": "1.2.0", - "rimraf": "2.4.3" + "rimraf": "2.5.1" }, "devDependencies": { "nodeunit": "0.9.1", "randomstring": "1.1.3", "mkdirp": "0.5.1", - "async": "1.5.0" + "async": "1.5.2" }, "engines": { "node": ">=0.10.24" From c63ec1802cc1ef365eaa0e4333ed3be3d2805ed9 Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Sun, 3 Apr 2016 13:28:40 +1200 Subject: [PATCH 09/29] maintenance bump --- package.json | 4 ++-- tests/basics.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 84cb903..6d41a95 100644 --- a/package.json +++ b/package.json @@ -19,11 +19,11 @@ ], "dependencies": { "fmerge": "1.2.0", - "rimraf": "2.5.1" + "rimraf": "2.5.2" }, "devDependencies": { "nodeunit": "0.9.1", - "randomstring": "1.1.3", + "randomstring": "1.1.4", "mkdirp": "0.5.1", "async": "1.5.2" }, diff --git a/tests/basics.js b/tests/basics.js index 84d86dd..3de8bc1 100644 --- a/tests/basics.js +++ b/tests/basics.js @@ -541,10 +541,10 @@ module.exports = testCase({ t.done(); }, - 'findRemoveSync(files older than .005 sec)': function(t) { - var result = findRemoveSync(rootDirectory, {age: {seconds: .005}}); + 'findRemoveSync(files older than .0005 sec)': function(t) { + var result = findRemoveSync(rootDirectory, {age: {seconds: 0.0005}}); - t.strictEqual(Object.keys(result).length, 15, 'findRemoveSync(files older than .005 sec) returned 15 entries.'); + t.strictEqual(Object.keys(result).length, 15, 'findRemoveSync(files older than .0005 sec) returned 15 entries.'); t.done(); }, From e12dcfd48e9169f6543d8a675e65caca7e24813d Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Sun, 3 Apr 2016 13:29:19 +1200 Subject: [PATCH 10/29] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d41a95..58974e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "0.2.10", + "version": "0.2.11", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", From f22ecabc8fd6bae89ea2c6d17594fb87b1c4ccf1 Mon Sep 17 00:00:00 2001 From: Nahuel Rullo Date: Thu, 19 May 2016 14:27:00 -0300 Subject: [PATCH 11/29] mtime instead of ctime --- find-remove.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/find-remove.js b/find-remove.js index dd2f510..701de23 100644 --- a/find-remove.js +++ b/find-remove.js @@ -8,9 +8,9 @@ var fs = require('fs'), function isOlder(path, ageSeconds) { var stats = fs.statSync(path), - ctime = stats.ctime.getTime() + mtime = stats.mtime.getTime() - return (ctime + (ageSeconds * 1000)) < now; + return (mtime + (ageSeconds * 1000)) < now; } function getMaxLevel(options) { From 8a325be8bde598e434cc13f477444ab4680fcf51 Mon Sep 17 00:00:00 2001 From: Nahuel Rullo Date: Thu, 19 May 2016 14:27:00 -0300 Subject: [PATCH 12/29] mtime instead of ctime. When you try to find a file by timestamp, you always use de mtime. ctime is used when the permissions file changes, but mtime, when the content file is changed. --- find-remove.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/find-remove.js b/find-remove.js index dd2f510..701de23 100644 --- a/find-remove.js +++ b/find-remove.js @@ -8,9 +8,9 @@ var fs = require('fs'), function isOlder(path, ageSeconds) { var stats = fs.statSync(path), - ctime = stats.ctime.getTime() + mtime = stats.mtime.getTime() - return (ctime + (ageSeconds * 1000)) < now; + return (mtime + (ageSeconds * 1000)) < now; } function getMaxLevel(options) { From bab9f397173953d52ebfc15244bdbbdb8c0f0e58 Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Sat, 21 May 2016 15:56:14 +1200 Subject: [PATCH 13/29] Patch version, using mtime now --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 58974e3..d6195cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "0.2.11", + "version": "0.2.12", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", @@ -23,7 +23,7 @@ }, "devDependencies": { "nodeunit": "0.9.1", - "randomstring": "1.1.4", + "randomstring": "1.1.5", "mkdirp": "0.5.1", "async": "1.5.2" }, From cc4b4aeaaee442e732af7b8341f4b50c5e25360a Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Tue, 27 Sep 2016 19:46:54 +1300 Subject: [PATCH 14/29] bump few packages and remove semi colons --- find-remove.js | 105 ++++++++++++++++++++++++------------------------- package.json | 8 ++-- 2 files changed, 56 insertions(+), 57 deletions(-) diff --git a/find-remove.js b/find-remove.js index 701de23..ef1e2a6 100644 --- a/find-remove.js +++ b/find-remove.js @@ -10,103 +10,101 @@ function isOlder(path, ageSeconds) { var stats = fs.statSync(path), mtime = stats.mtime.getTime() - return (mtime + (ageSeconds * 1000)) < now; + return (mtime + (ageSeconds * 1000)) < now } function getMaxLevel(options) { - return (options && options.hasOwnProperty('maxLevel')) ? options.maxLevel : -1; + return (options && options.hasOwnProperty('maxLevel')) ? options.maxLevel : -1 } function getAgeSeconds(options) { - return (options && options.age && options.age.seconds) ? options.age.seconds : null; + return (options && options.age && options.age.seconds) ? options.age.seconds : null } function doDeleteDirectory(currentDir, options, currentLevel) { - var dir = (options && options.dir) ? options.dir : null; - var optionsCount = options ? Object.keys(options).length : 0; - var doDelete = optionsCount < 1; + var dir = (options && options.dir) ? options.dir : null + var optionsCount = options ? Object.keys(options).length : 0 + var doDelete = optionsCount < 1 - var basename = path.basename(currentDir); + var basename = path.basename(currentDir) if (!doDelete && dir) { if (util.isArray(dir)) - doDelete = dir.indexOf(basename) !== -1; - else { - doDelete = (basename === dir); - } + doDelete = dir.indexOf(basename) !== -1 + else + doDelete = (basename === dir) } if (!doDelete && currentLevel > 0) { if (options.maxLevel && optionsCount === 1) { - var maxLevel = getMaxLevel(options); - doDelete = currentLevel <= maxLevel; + doDelete = currentLevel <= getMaxLevel(options) } else { - var ageSeconds = getAgeSeconds(options); + var ageSeconds = getAgeSeconds(options) if (ageSeconds) - doDelete = isOlder(currentDir, ageSeconds); + doDelete = isOlder(currentDir, ageSeconds) } } - return doDelete; + return doDelete } function doDeleteFile(currentFile, options) { - var extensions = (options && options.extensions) ? options.extensions : null; - var files = (options && options.files) ? options.files : null; - var dir = (options && options.dir) ? options.dir : null; - var ignore = (options && options.ignore) ? options.ignore : null; + var extensions = (options && options.extensions) ? options.extensions : null + var files = (options && options.files) ? options.files : null + var dir = (options && options.dir) ? options.dir : null + var ignore = (options && options.ignore) ? options.ignore : null // return the last portion of a path, the filename aka basename - var basename = path.basename(currentFile); + var basename = path.basename(currentFile) // by default it deletes anything - var doDelete = !extensions && !files && !dir; + var doDelete = !extensions && !files && !dir if (!doDelete && extensions) { - var currentExt = path.extname(currentFile); + var currentExt = path.extname(currentFile) if (util.isArray(extensions)) - doDelete = extensions.indexOf(currentExt) !== -1; + doDelete = extensions.indexOf(currentExt) !== -1 else - doDelete = (currentExt === extensions); + doDelete = (currentExt === extensions) } if (!doDelete && files) { if (util.isArray(files)) - doDelete = files.indexOf(basename) !== -1; + doDelete = files.indexOf(basename) !== -1 else { if (files === '*.*') - doDelete = true; + doDelete = true else - doDelete = (basename === files); + doDelete = (basename === files) } } if (doDelete && ignore) { if (util.isArray(ignore)) - doDelete = !(ignore.indexOf(basename) !== -1); + doDelete = !(ignore.indexOf(basename) !== -1) else - doDelete = !(basename === ignore); + doDelete = !(basename === ignore) } if (doDelete) { - var ageSeconds = getAgeSeconds(options); + var ageSeconds = getAgeSeconds(options) if (ageSeconds) - doDelete = isOlder(currentFile, ageSeconds); + doDelete = isOlder(currentFile, ageSeconds) } - return doDelete; + return doDelete } function isTestRun(options) { - return (options && options.hasOwnProperty('test')) ? options.test : false; + return (options && options.hasOwnProperty('test')) ? options.test : false } /** @@ -125,62 +123,63 @@ function isTestRun(options) { */ var findRemoveSync = module.exports = function(currentDir, options, currentLevel) { - var removed = []; + var removed = [] if (fs.existsSync(currentDir)) { - var maxLevel = getMaxLevel(options); + var maxLevel = getMaxLevel(options) if (currentLevel === undefined) - currentLevel = 0; + currentLevel = 0 else - currentLevel++; + currentLevel++ if (currentLevel < 1) { - now = new Date().getTime(); - testRun = isTestRun(options); + now = new Date().getTime() + testRun = isTestRun(options) } - // check directore before deleting files inside to maintain the original creation time, because - // linux modifies creation date of folders when files have been deleted inside. - var deleteDirectory = doDeleteDirectory(currentDir, options, currentLevel); + // check directories before deleting files inside. + // this to maintain the original creation time, + // because linux modifies creation date of folders when files within have been deleted. + var deleteDirectory = doDeleteDirectory(currentDir, options, currentLevel) if (maxLevel === -1 || currentLevel < maxLevel) { - var filesInDir = fs.readdirSync(currentDir); + var filesInDir = fs.readdirSync(currentDir) filesInDir.forEach(function(file) { - var currentFile = path.join(currentDir, file); + var currentFile = path.join(currentDir, file) if (fs.statSync(currentFile).isDirectory()) { // the recursive call - var result = findRemoveSync(currentFile, options, currentLevel); + var result = findRemoveSync(currentFile, options, currentLevel) // merge results - removed = merge(removed, result); + removed = merge(removed, result) } else { if (doDeleteFile(currentFile, options)) { if (!testRun) - fs.unlinkSync(currentFile); + fs.unlinkSync(currentFile) - removed[currentFile] = true; + removed[currentFile] = true } } - }); + }) } if (deleteDirectory) { try { if (!testRun) - rimraf.sync(currentDir); + rimraf.sync(currentDir) removed[currentDir] = true } catch (err) { - throw err; + throw err } } } - return removed; + return removed } diff --git a/package.json b/package.json index d6195cc..2f4808f 100644 --- a/package.json +++ b/package.json @@ -19,16 +19,16 @@ ], "dependencies": { "fmerge": "1.2.0", - "rimraf": "2.5.2" + "rimraf": "2.5.4" }, "devDependencies": { - "nodeunit": "0.9.1", + "nodeunit": "0.10.2", "randomstring": "1.1.5", "mkdirp": "0.5.1", - "async": "1.5.2" + "async": "2.0.1" }, "engines": { - "node": ">=0.10.24" + "node": ">=4.1.0" }, "scripts": { "test": "nodeunit tests/basics.js" From 30a7c476517cff6d3cf023ea410fc26be65d1182 Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Wed, 28 Sep 2016 22:39:00 +1300 Subject: [PATCH 15/29] rewrite unit tests and api for v1.0 --- README.md | 81 +++--- find-remove.js | 91 +++--- package.json | 2 +- tests/basics.js | 759 ++++++++++++++++++++++++++++-------------------- 4 files changed, 535 insertions(+), 398 deletions(-) diff --git a/README.md b/README.md index 4b61c4d..b6098e9 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# find-remove +# find-remove v1.0 (breaking!) [![Build Status](https://travis-ci.org/binarykitchen/find-remove.png?branch=master)](https://travis-ci.org/binarykitchen/find-remove) -recursively finds files by filter options from a start directory onwards and deletes these. useful if you want to clean up a directory in your node.js app. +recursively finds files by filter options from a start directory onwards and deletes those who meet conditions you can define. useful if you want to clean up a directory in your node.js app. -you can filter by extensions, names, level in directory structure and file creation date yeah! +you can filter by extensions, names, level in directory structure, file creation date and ignore by name, yeah! ## installation @@ -15,15 +15,15 @@ to install find-remove, use [npm](http://github.com/isaacs/npm): then in your node.js app, get reference to the function like that: ```javascript -var findRemoveSync = require('find-remove'); +var findRemoveSync = require('find-remove') ``` ## quick examples -### delete all *.bak and *.log files within the /temp/ directory +### delete all *.bak or *.log files within the /temp/ directory ```javascript -var result = findRemoveSync('/temp', {extensions: ['.bak', '.log']}); +var result = findRemoveSync('/temp', {extensions: ['.bak', '.log']}) ``` the return value `result` is a json object with successfully deleted files. if you output `result` to the console, you will get something like this: @@ -35,57 +35,53 @@ the return value `result` is a json object with successfully deleted files. if y } ``` -### delete all files called 'dump.log' within the /temp/ directory and any of its subfolders +### delete all files called 'dump.log' within the /temp/ directory and within its subfolders ```javascript -var result = findRemoveSync(rootDirectory, {files: 'dump.log'}); +var result = findRemoveSync(rootDirectory, {files: 'dump.log'}) ``` -### same as above but do not delete file 'haumiblau.bak' +### same as above, but also deletes any subfolders ```javascript -var result = findRemoveSync(rootDirectory, {files: 'dump.log', ignore: 'haumiblau.bak'}); +var result = findRemoveSync(rootDirectory, {files: 'dump.log', dir: '*'}) ``` -### delete recursively all files called 'dump.log' AND also all files with the extension '.dmp' within /temp/ +### delete all *.bak files but not file 'haumiblau.bak' ```javascript -var result = findRemoveSync('/tmp', {files: 'dump.log', extension: '.dmp'}); +var result = findRemoveSync(rootDirectory, {extensions: ['.bak'], ignore: 'haumiblau.bak'}) ``` -### delete recursively all directories called 'CVS' within /dist/ +### delete recursively any subdirectory called 'CVS' within /dist/ ```javascript -var result = findRemoveSync('/dist', {dir: 'CVS'}); +var result = findRemoveSync('/dist', {dir: 'CVS'}) ``` -### delete everything inside AND including the /temp directory - -just call it without options because no options means nothing is filtered. +### delete all jpg files older than one hour ```javascript -var result = findRemoveSync('/tmp'); +var result = findRemoveSync('/tmp', {age: {seconds: 3600}, extensions: '.jpg'}) ``` -### delete all jpg files older than one hour +### apply filter options only for two levels inside the /temp directory for all tmp files ```javascript -var result = findRemoveSync('/tmp', {age: {seconds: 3600}, extensions: '.jpg'}); +var result = findRemoveSync('/tmp', {maxLevel: 2, extensions: '.tmp'}) ``` -### apply filter options only for two levels inside the /temp directory +this deletes any `.tmp` files up to two levels, for example: `/tmp/level1/level2/a.tmp` -```javascript -var result = findRemoveSync('/tmp', {maxLevel: 2, extensions: '.tmp'}); -``` +but not `/tmp/level1/level2/level3/b.tmp` -this deletes any `.tmp` files up to two levels, for example: -/tmp/level1/level2/a.tmp +why the heck do we have this maxLevel option? because of performance. if you care about deep subfolders, apply that option to get a speed boost. -but not: -/tmp/level1/level2/level3/b.tmp +### delete everything recursively (hey, who needs that when you can use nodejs' fs.unlink?) -why the heck do we have this option? because of performance. if you do not care about deep subfolders, apply that option to get a speed boost. +```javascript +var result = findRemoveSync(rootDirectory, {dir: "*", files: "*.*"}) +``` ## api @@ -95,25 +91,28 @@ findRemoveSync takes any start directory and searches files from there for remov __arguments__ -* dir - any directory to search for files for deletion -* options - currently two properties are supported: - * files - can be a string or an array of files you want to delete within `dir`. also `*.*` is allowed here if you want to remove all files (but not directories). - * dir - can be a string or an array of directories you want to delete within `dir`. - * extensions - this too, can be a string or an array of file extenstions you want to delete within `dir` - * ignore - useful to exclude some files. again, can be a string or an array of file names you do NOT want to delete within `dir` - * age.seconds - can be any float number. findRemoveSync then compares it with the file stats and deletes those with creation times older than `age.seconds` - * maxLevel - advanced: limits filtering to a certain level. useful for performance. recommended for crawling huge directory trees. - * test - advanced: set to true for a test run, meaning it does not delete anything but returns an array of files/directories it would have deleted. +* `dir` - any directory to search for files and/or directories for deletion (does not delete that directory itself) +* options - currently those properties are supported: + * `files` - can be a string or an array of files you want to delete within `dir`. + * `dir` - can be a string or an array of directories you want to delete within `dir`. + * `extensions` - this too, can be a string or an array of file extenstions you want to delete within `dir`. + * `ignore` - useful to exclude some files. again, can be a string or an array of file names you do NOT want to delete within `dir` + * `age.seconds` - can be any float number. findRemoveSync then compares it with the file stats and deletes those with creation times older than `age.seconds` + * `maxLevel` - advanced: limits filtering to a certain level. useful for performance. recommended for crawling huge directory trees. + * `test` - advanced: set to true for a test run, meaning it does not delete anything but returns a JSON of files/directories it would have deleted. useful for testing. + +as a precaution, nothing happens when there are no options. -when no options are given, are undefined or null, then everything including directories are removed as if there were no filters. this also applies when only the `maxLevel` parameter is given. +the unit tests are good examples on how to use the above arguments. __returns__ -associative array of files/directories that were deleted. +JSON of files/directories that were deleted. ## todo -* add more filtering options (combinations, regex, etc.) +* needs a rewrite +* add more filtering options (combinations, regex, etc.) * have an asynchronous solution * use streams instead diff --git a/find-remove.js b/find-remove.js index ef1e2a6..818b601 100644 --- a/find-remove.js +++ b/find-remove.js @@ -3,18 +3,24 @@ var fs = require('fs'), merge = require('fmerge'), util = require('util'), rimraf = require('rimraf'), + now, testRun function isOlder(path, ageSeconds) { - var stats = fs.statSync(path), - mtime = stats.mtime.getTime() + var stats = fs.statSync(path), + mtime = stats.mtime.getTime(), + expirationTime = (mtime + (ageSeconds * 1000)) + + return now > expirationTime +} - return (mtime + (ageSeconds * 1000)) < now +function hasMaxLevel(options) { + return options && options.hasOwnProperty('maxLevel') } function getMaxLevel(options) { - return (options && options.hasOwnProperty('maxLevel')) ? options.maxLevel : -1 + return hasMaxLevel(options) ? options.maxLevel : -1 } function getAgeSeconds(options) { @@ -23,30 +29,25 @@ function getAgeSeconds(options) { function doDeleteDirectory(currentDir, options, currentLevel) { - var dir = (options && options.dir) ? options.dir : null - var optionsCount = options ? Object.keys(options).length : 0 - var doDelete = optionsCount < 1 - - var basename = path.basename(currentDir) - - if (!doDelete && dir) { - if (util.isArray(dir)) - doDelete = dir.indexOf(basename) !== -1 - else - doDelete = (basename === dir) - } + var doDelete = false + var dir = options && options.dir - if (!doDelete && currentLevel > 0) { + if (dir) { + var ageSeconds = getAgeSeconds(options) + var basename = path.basename(currentDir) - if (options.maxLevel && optionsCount === 1) { + if (util.isArray(dir)) { + doDelete = (dir.indexOf("*") !== 1) || (dir.indexOf(basename) !== -1) + } else if (basename === dir || dir === "*") { + doDelete = true + } + if (doDelete && hasMaxLevel(options) && currentLevel > 0) { doDelete = currentLevel <= getMaxLevel(options) + } - } else { - var ageSeconds = getAgeSeconds(options) - - if (ageSeconds) - doDelete = isOlder(currentDir, ageSeconds) + if (ageSeconds && doDelete) { + doDelete = isOlder(currentDir, ageSeconds) } } @@ -54,6 +55,8 @@ function doDeleteDirectory(currentDir, options, currentLevel) { } function doDeleteFile(currentFile, options) { + // by default it deletes nothing + var doDelete = false var extensions = (options && options.extensions) ? options.extensions : null var files = (options && options.files) ? options.files : null @@ -63,26 +66,25 @@ function doDeleteFile(currentFile, options) { // return the last portion of a path, the filename aka basename var basename = path.basename(currentFile) - // by default it deletes anything - var doDelete = !extensions && !files && !dir + if (files) { + if (util.isArray(files)) + doDelete = (files.indexOf("*.*") !== -1) || (files.indexOf(basename) !== -1) + else { + if (files === '*.*') { + doDelete = true + } else { + doDelete = (basename === files) + } + } + } if (!doDelete && extensions) { var currentExt = path.extname(currentFile) - if (util.isArray(extensions)) + if (util.isArray(extensions)) { doDelete = extensions.indexOf(currentExt) !== -1 - else + } else { doDelete = (currentExt === extensions) - } - - if (!doDelete && files) { - if (util.isArray(files)) - doDelete = files.indexOf(basename) !== -1 - else { - if (files === '*.*') - doDelete = true - else - doDelete = (basename === files) } } @@ -123,11 +125,12 @@ function isTestRun(options) { */ var findRemoveSync = module.exports = function(currentDir, options, currentLevel) { - var removed = [] + var removed = {} if (fs.existsSync(currentDir)) { - var maxLevel = getMaxLevel(options) + var maxLevel = getMaxLevel(options), + deleteDirectory = false if (currentLevel === undefined) currentLevel = 0 @@ -137,13 +140,13 @@ var findRemoveSync = module.exports = function(currentDir, options, currentLevel if (currentLevel < 1) { now = new Date().getTime() testRun = isTestRun(options) + } else { + // check directories before deleting files inside. + // this to maintain the original creation time, + // because linux modifies creation date of folders when files within have been deleted. + deleteDirectory = doDeleteDirectory(currentDir, options, currentLevel) } - // check directories before deleting files inside. - // this to maintain the original creation time, - // because linux modifies creation date of folders when files within have been deleted. - var deleteDirectory = doDeleteDirectory(currentDir, options, currentLevel) - if (maxLevel === -1 || currentLevel < maxLevel) { var filesInDir = fs.readdirSync(currentDir) diff --git a/package.json b/package.json index 2f4808f..37405ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "0.2.12", + "version": "1.0.0", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", diff --git a/tests/basics.js b/tests/basics.js index 3de8bc1..a396bda 100644 --- a/tests/basics.js +++ b/tests/basics.js @@ -5,17 +5,17 @@ var testCase = require('nodeunit').testCase, fs = require('fs'), async = require('async'), rimraf = require('rimraf'), - findRemoveSync; + findRemoveSync -var rootDirectory = path.join(require('os').tmpDir(), 'find-remove'); +var rootDirectory = path.join(require('os').tmpDir(), 'find-remove') function generateRandomFilename(ext) { - var filename = randomstring.generate(24); + var filename = randomstring.generate(24) if (ext) - filename += '.' + ext; + filename += '.' + ext - return filename; + return filename } /* @@ -25,8 +25,11 @@ function generateRandomFilename(ext) { * randomFile1 (*.bak) * randomFile2 (*.log) * randomFile3 (*.log) + * randomFile4 (*.csv) + + CVS (directory3) + directory1 + + CVS (directory1_3) + directory1_1 + directory1_2 + directory1_2_1 @@ -36,537 +39,669 @@ function generateRandomFilename(ext) { * fixFile1_2_1_4 (something.jpg) * fixFile1_2_1_5 (something.png) + directory1_2_2 - + CVS (directory1_3) - * randomFile1_3_1 + directory2 * randomFile2_1 (*.bak) - + CVS (directory3) - * randomFile3_1 - + * randomFile2_2 (*.csv) */ -var directory1 = path.join(rootDirectory, 'directory1'); -var directory2 = path.join(rootDirectory, 'directory2'); -var directory3 = path.join(rootDirectory, 'CVS'); +var directory1 = path.join(rootDirectory, 'directory1') +var directory2 = path.join(rootDirectory, 'directory2') +var directory3 = path.join(rootDirectory, 'CVS') -var directory1_1 = path.join(directory1, 'directory1_1'); -var directory1_2 = path.join(directory1, 'directory1_2'); -var directory1_3 = path.join(directory1, 'CVS'); +var directory1_1 = path.join(directory1, 'directory1_1') +var directory1_2 = path.join(directory1, 'directory1_2') +var directory1_3 = path.join(directory1, 'CVS') -var directory1_2_1 = path.join(directory1_2, 'directory1_2_1'); -var directory1_2_2 = path.join(directory1_2, 'directory1_2_2'); +var directory1_2_1 = path.join(directory1_2, 'directory1_2_1') +var directory1_2_2 = path.join(directory1_2, 'directory1_2_2') // mix of pre defined and random file names -var randomFilename1 = generateRandomFilename('bak'); -var randomFile1 = path.join(rootDirectory, randomFilename1); -var randomFilename2 = generateRandomFilename('log'); -var randomFile2 = path.join(rootDirectory, randomFilename2); -var randomFile3 = path.join(rootDirectory, generateRandomFilename('log')); - -var randomFile2_1 = path.join(directory2, generateRandomFilename('bak')); - -var randomFilename1_2_1_1 = generateRandomFilename('log'); -var randomFile1_2_1_1 = path.join(directory1_2_1, randomFilename1_2_1_1); -var randomFile1_2_1_2 = path.join(directory1_2_1, generateRandomFilename('bak')); -var randomFilename1_2_1_3 = generateRandomFilename('bak'); -var randomFile1_2_1_3 = path.join(directory1_2_1, randomFilename1_2_1_3); - -var fixFilename1_2_1_4 = 'something.jpg'; -var fixFile1_2_1_4 = path.join(directory1_2_1, fixFilename1_2_1_4); -var fixFilename1_2_1_5 = 'something.png'; -var fixFile1_2_1_5 = path.join(directory1_2_1, fixFilename1_2_1_5); - -function makeFile(file, callback) { +var randomFilename1 = generateRandomFilename('bak') +var randomFile1 = path.join(rootDirectory, randomFilename1) +var randomFilename2 = generateRandomFilename('log') +var randomFile2 = path.join(rootDirectory, randomFilename2) +var randomFile3 = path.join(rootDirectory, generateRandomFilename('log')) +var randomFile4 = path.join(rootDirectory, generateRandomFilename('csv')) + +var randomFile2_1 = path.join(directory2, generateRandomFilename('bak')) +var randomFile2_2 = path.join(directory2, generateRandomFilename('csv')) + +var randomFilename1_2_1_1 = generateRandomFilename('log') +var randomFile1_2_1_1 = path.join(directory1_2_1, randomFilename1_2_1_1) +var randomFile1_2_1_2 = path.join(directory1_2_1, generateRandomFilename('bak')) +var randomFilename1_2_1_3 = generateRandomFilename('bak') +var randomFile1_2_1_3 = path.join(directory1_2_1, randomFilename1_2_1_3) + +var fixFilename1_2_1_4 = 'something.jpg' +var fixFile1_2_1_4 = path.join(directory1_2_1, fixFilename1_2_1_4) +var fixFilename1_2_1_5 = 'something.png' +var fixFile1_2_1_5 = path.join(directory1_2_1, fixFilename1_2_1_5) + +function makeFile(file, cb) { fs.writeFile(file, '', function(err) { if (err) - callback(err); + cb(err) else - callback(null); + cb(null) }) } -function createFakeDirectoryTree(callback) { +function createFakeDirectoryTree(cb) { async.series( [ - function(callback) {mkdirp(directory1, callback);}, - function(callback) {mkdirp(directory2, callback);}, - - function(callback) {mkdirp(directory1_1, callback);}, - function(callback) {mkdirp(directory1_2, callback);}, - - function(callback) {mkdirp(directory1_2_1, callback);}, - function(callback) {mkdirp(directory1_2_2, callback);}, - - function(callback) {makeFile(randomFile1, callback);}, - function(callback) {makeFile(randomFile2, callback);}, - function(callback) {makeFile(randomFile3, callback);}, - - function(callback) {makeFile(randomFile2_1, callback);}, - - function(callback) {makeFile(randomFile1_2_1_1, callback);}, - function(callback) {makeFile(randomFile1_2_1_2, callback);}, - function(callback) {makeFile(randomFile1_2_1_3, callback);}, - function(callback) {makeFile(fixFile1_2_1_4, callback);}, - function(callback) {makeFile(fixFile1_2_1_5, callback);} + function(cb) {mkdirp(directory1, cb)}, + function(cb) {mkdirp(directory2, cb)}, + function(cb) {mkdirp(directory3, cb)}, + + function(cb) {mkdirp(directory1_1, cb)}, + function(cb) {mkdirp(directory1_2, cb)}, + function(cb) {mkdirp(directory1_3, cb)}, + + function(cb) {mkdirp(directory1_2_1, cb)}, + function(cb) {mkdirp(directory1_2_2, cb)}, + + function(cb) {makeFile(randomFile1, cb)}, + function(cb) {makeFile(randomFile2, cb)}, + function(cb) {makeFile(randomFile3, cb)}, + function(cb) {makeFile(randomFile4, cb)}, + + function(cb) {makeFile(randomFile2_1, cb)}, + function(cb) {makeFile(randomFile2_2, cb)}, + + function(cb) {makeFile(randomFile1_2_1_1, cb)}, + function(cb) {makeFile(randomFile1_2_1_2, cb)}, + function(cb) {makeFile(randomFile1_2_1_3, cb)}, + function(cb) {makeFile(fixFile1_2_1_4, cb)}, + function(cb) {makeFile(fixFile1_2_1_5, cb)} ], function(err) { if (err) { - console.error(err); + console.error(err) } else { - callback(); + cb() } } - ); + ) } -function destroyFakeDirectoryTree(callback) { - rimraf(rootDirectory, callback); +function destroyFakeDirectoryTree(cb) { + rimraf(rootDirectory, cb) } module.exports = testCase({ 'TC 1: tests without real files': testCase({ 'loading findRemoveSync function (require)': function(t) { - findRemoveSync = require('../find-remove.js'); + findRemoveSync = require('../find-remove.js') - t.ok(findRemoveSync, 'findRemoveSync is loaded.'); - t.done(); + t.ok(findRemoveSync, 'findRemoveSync is loaded.') + t.done() }, 'removing non-existing directory': function(t) { - var result, dir = generateRandomFilename(); + var result, dir = generateRandomFilename() - result = findRemoveSync(dir); - t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync() returned empty an array.'); + result = findRemoveSync(dir) + t.strictEqual(Object.keys(result).length, 0, 'returned empty') - t.done(); + t.done() } }), 'TC 2: tests with real files': testCase({ - setUp: function(callback) { - createFakeDirectoryTree(callback); + + setUp: function(cb) { + createFakeDirectoryTree(cb) + }, + tearDown: function(cb) { + destroyFakeDirectoryTree(cb) }, - tearDown: function(callback) { - destroyFakeDirectoryTree(callback); + + 'findRemoveSync(nonexisting)': function(t) { + var result = findRemoveSync('/tmp/blahblah/hehehe/yo/what/') + + t.strictEqual(Object.keys(result).length, 0, 'did nothing.') + + t.done() + }, + + 'findRemoveSync(no params)': function(t) { + var result = findRemoveSync(rootDirectory) + + t.strictEqual(Object.keys(result).length, 0, 'did nothing.') + + var exists = fs.existsSync(rootDirectory) + t.equal(exists, true, 'did not remove root directory') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveSync(no params) did not remove directory1_1') + + t.done() + }, + + 'findRemoveSync(all files)': function(t) { + var result = findRemoveSync(rootDirectory, {files: "*.*"}) + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'removed randomFile1_2_1_2 fine') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'removed randomFile1_2_1_3 fine') + + t.done() + }, + + 'findRemoveSync(all directories)': function(t) { + var result = findRemoveSync(rootDirectory, {dir: "*"}) + + t.strictEqual(Object.keys(result).length, 8, 'all 8 directories deleted') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, false, 'removed directory1_1') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'removed randomFile1_2_1_2') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'removed randomFile1_2_1_3') + + t.done() + }, + + 'findRemoveSync(everything)': function(t) { + var result = findRemoveSync(rootDirectory, {dir: "*", files: "*.*"}) + + t.strictEqual(Object.keys(result).length, 19, 'all 19 directories + files deleted') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, false, 'removed directory1_1') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'did not remove randomFile1_2_1_2 fine') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'dit not remove randomFile1_2_1_3 fine') + + t.done() }, - 'findRemoveSync(rootDirectory)': function(t) { - findRemoveSync(rootDirectory); + 'findRemoveSync(files no hit)': function(t) { + var result = findRemoveSync(rootDirectory, {files: "no.hit.me"}) - var exists = fs.existsSync(rootDirectory); - t.equal(exists, false, 'findRemoveSync(rootDirectory) removed everything fine'); + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3); - t.equal(exists1_2_1_3, false, 'findRemoveSync(rootDirectory) also removed randomFile1_2_1_3 fine'); + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, true, 'did not remove randomFile1_2_1_3') - t.done(); + t.done() }, 'findRemoveSync(directory1_2_1)': function(t) { - var result = findRemoveSync(directory1_2_1); + var result = findRemoveSync(rootDirectory, {dir: 'directory1_2_1'}) - var exists1_2_1 = fs.existsSync(directory1_2_1); - var exists1_1 = fs.existsSync(directory1_1); - t.equal(exists1_2_1, false, 'findRemoveSync(directory1_2_1) removed everything fine'); - t.equal(exists1_1, true, 'findRemoveSync(directory1_2_1) did not remove exists1_1'); + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, false, 'did remove directory1_2_1') - t.ok(result[randomFile1_2_1_1], 'randomFile1_2_1_1 is in result'); - t.ok(result[randomFile1_2_1_2], 'randomFile1_2_1_2 is in result'); - t.ok(result[randomFile1_2_1_3], 'randomFile1_2_1_3 is in result'); - t.ok(result[directory1_2_1], 'directory1_2_1 is in result'); + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') - t.done(); + t.done() }, - 'findRemoveSync(directory2)': function(t) { - var result = findRemoveSync(directory2); - var exists2 = fs.existsSync(directory2); - var exists1_2 = fs.existsSync(directory1_2); - t.equal(exists2, false, 'findRemoveSync(directory2) removed everything fine'); - t.equal(exists1_2, true, 'findRemoveSync(directory2) did not remove directory1_2'); + 'findRemoveSync(one directory and all files)': function(t) { + var result = findRemoveSync(rootDirectory, {dir: 'directory1_2_1', files: '*.*'}) + + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, false, 'did remove directory1_2_1') - t.ok(result[randomFile2_1], 'randomFile2_1 is in result'); + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') - t.strictEqual(typeof result[randomFile1], 'undefined', 'randomFile1_2_1_2 is NOT in result'); - t.strictEqual(typeof result[randomFile1_2_1_3], 'undefined', 'randomFile1_2_1_3 is NOT in result'); + t.ok(result[randomFile1_2_1_1], 'randomFile1_2_1_1 is in result') + t.ok(result[randomFile1_2_1_2], 'randomFile1_2_1_2 is in result') + t.ok(result[randomFile1_2_1_3], 'randomFile1_2_1_3 is in result') + t.ok(result[directory1_2_1], 'directory1_2_1 is in result') - t.done(); + t.done() + }, + + 'findRemoveSync(another directory and all files)': function(t) { + var result = findRemoveSync(rootDirectory, {dir: 'directory2', files: '*.*'}) + + var exists2 = fs.existsSync(directory2) + t.equal(exists2, false, 'directory2 not removed') + + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, true, 'directory1_2 not removed') + + t.ok(result[randomFile2_1], 'randomFile2_1 is in result') + + t.done() }, 'findRemoveSync(all bak files from root)': function(t) { - findRemoveSync(rootDirectory, {extensions: '.bak'}); + findRemoveSync(rootDirectory, {extensions: '.bak'}) - var exists1 = fs.existsSync(randomFile1); - var exists2_1 = fs.existsSync(randomFile2_1); - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2); - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3); + var exists1 = fs.existsSync(randomFile1) + var exists2_1 = fs.existsSync(randomFile2_1) + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1, false, 'findRemoveSync(all bak files from root) removed randomFile1 fine'); - t.equal(exists2_1, false, 'findRemoveSync(all bak files from root) removed exists2_1 fine'); - t.equal(exists1_2_1_2, false, 'findRemoveSync(all bak files from root) removed exists1_2_1_2 fine'); - t.equal(exists1_2_1_3, false, 'findRemoveSync(all bak files from root) removed exists1_2_1_3 fine'); + t.equal(exists1, false, 'findRemoveSync(all bak files from root) removed randomFile1 fine') + t.equal(exists2_1, false, 'findRemoveSync(all bak files from root) removed exists2_1 fine') + t.equal(exists1_2_1_2, false, 'findRemoveSync(all bak files from root) removed exists1_2_1_2 fine') + t.equal(exists1_2_1_3, false, 'findRemoveSync(all bak files from root) removed exists1_2_1_3 fine') - var exists3 = fs.existsSync(randomFile3); - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - var exists0 = fs.existsSync(rootDirectory); - var exists1_2_1 = fs.existsSync(directory1_2_1); + var exists3 = fs.existsSync(randomFile3) + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + var exists0 = fs.existsSync(rootDirectory) + var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists3, true, 'findRemoveSync(all bak files from root) did not remove log file exists3'); - t.equal(exists1_2_1_1, true, 'findRemoveSync(all bak files from root) did not remove log file exists1_2_1_1'); - t.equal(exists0, true, 'findRemoveSync(all bak files from root) did not remove root directory'); - t.equal(exists1_2_1, true, 'findRemoveSync(all bak files from root) did not remove directory directory1_2_1'); + t.equal(exists3, true, 'findRemoveSync(all bak files from root) did not remove log file exists3') + t.equal(exists1_2_1_1, true, 'findRemoveSync(all bak files from root) did not remove log file exists1_2_1_1') + t.equal(exists0, true, 'findRemoveSync(all bak files from root) did not remove root directory') + t.equal(exists1_2_1, true, 'findRemoveSync(all bak files from root) did not remove directory directory1_2_1') - t.done(); + t.done() }, 'findRemoveSync(all log files from directory1_2_1)': function(t) { - findRemoveSync(directory1_2_1, {extensions: '.log'}); + findRemoveSync(directory1_2_1, {extensions: '.log'}) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - t.equal(exists1_2_1_1, false, 'findRemoveSync(all log files from directory1_2_1) removed randomFile1_2_1_1 fine'); + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveSync(all log files from directory1_2_1) removed randomFile1_2_1_1 fine') - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2); - t.equal(exists1_2_1_2, true, 'findRemoveSync(all log files from directory1_2_1) did not remove file randomFile1_2_1_2'); + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, true, 'findRemoveSync(all log files from directory1_2_1) did not remove file randomFile1_2_1_2') - var exists1_2_1 = fs.existsSync(directory1_2_1); - t.equal(exists1_2_1, true, 'findRemoveSync(all log files from directory1_2_1) did not remove directory directory1_2_1'); + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, true, 'findRemoveSync(all log files from directory1_2_1) did not remove directory directory1_2_1') - t.done(); + t.done() }, - 'findRemoveSync(all bak and log files from root)': function(t) { - findRemoveSync(rootDirectory, {extensions: ['.bak', '.log']}); + 'findRemoveSync(all bak or log files from root)': function(t) { + findRemoveSync(rootDirectory, {extensions: ['.bak', '.log']}) - var exists1 = fs.existsSync(randomFile1); - var exists2_1 = fs.existsSync(randomFile2_1); - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2); - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3); + var exists1 = fs.existsSync(randomFile1) + var exists2_1 = fs.existsSync(randomFile2_1) + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - var exists2 = fs.existsSync(randomFile2); - var exists3 = fs.existsSync(randomFile3); - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); + var exists2 = fs.existsSync(randomFile2) + var exists3 = fs.existsSync(randomFile3) + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1, false, 'findRemoveSync(all bak and log files from root) removed randomFile1 fine'); - t.equal(exists2_1, false, 'findRemoveSync(all bak and log files from root) removed exists2_1 fine'); - t.equal(exists1_2_1_2, false, 'findRemoveSync(all bak and log files from root) removed exists1_2_1_2 fine'); - t.equal(exists1_2_1_3, false, 'findRemoveSync(all bak and log files from root) removed exists1_2_1_3 fine'); + t.equal(exists1, false, 'findRemoveSync(all bak and log files from root) removed randomFile1 fine') + t.equal(exists2_1, false, 'findRemoveSync(all bak and log files from root) removed exists2_1 fine') + t.equal(exists1_2_1_2, false, 'findRemoveSync(all bak and log files from root) removed exists1_2_1_2 fine') + t.equal(exists1_2_1_3, false, 'findRemoveSync(all bak and log files from root) removed exists1_2_1_3 fine') - t.equal(exists2, false, 'findRemoveSync(all bak and log files from root) removed exists2 fine'); - t.equal(exists3, false, 'findRemoveSync(all bak and log files from root) removed exists3 fine'); - t.equal(exists1_2_1_1, false, 'findRemoveSync(all bak and log files from root) removed exists1_2_1_1 fine'); + t.equal(exists2, false, 'findRemoveSync(all bak and log files from root) removed exists2 fine') + t.equal(exists3, false, 'findRemoveSync(all bak and log files from root) removed exists3 fine') + t.equal(exists1_2_1_1, false, 'findRemoveSync(all bak and log files from root) removed exists1_2_1_1 fine') - var exists1_1 = fs.existsSync(directory1_1); - t.equal(exists1_1, true, 'findRemoveSync(all bak and log files from root) did not remove directory1_1'); + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveSync(all bak and log files from root) did not remove directory1_1') - t.done(); + t.done() }, 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2)': function(t) { - findRemoveSync(directory1_2, {files: randomFilename1_2_1_1}); + findRemoveSync(directory1_2, {files: randomFilename1_2_1_1}) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - t.equal(exists1_2_1_1, false, 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2) removed randomFile1_2_1_1 fine'); + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2) removed randomFile1_2_1_1 fine') - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2); - t.equal(exists1_2_1_2, true, 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2) did not remove randomFile1_2_1_2'); + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, true, 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2) did not remove randomFile1_2_1_2') - var exists1_2 = fs.existsSync(directory1_2); - t.equal(exists1_2, true, 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2) did not remove directory1_2'); + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, true, 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2) did not remove directory1_2') - t.done(); + t.done() }, 'findRemoveSync(two files from root)': function(t) { - findRemoveSync(rootDirectory, {files: [randomFilename2, randomFilename1_2_1_3]}); + var result = findRemoveSync(rootDirectory, {files: [randomFilename2, randomFilename1_2_1_3]}) - var exists2 = fs.existsSync(randomFile2); - t.equal(exists2, false, 'findRemoveSync(two files from root) removed randomFile2 fine'); + var exists2 = fs.existsSync(randomFile2) + t.equal(exists2, false, 'findRemoveSync(two files from root) removed randomFile2 fine') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3); - t.equal(exists1_2_1_3, false, 'findRemoveSync(two files from root) removed randomFile1_2_1_3 fine'); + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'findRemoveSync(two files from root) removed randomFile1_2_1_3 fine') - var exists1 = fs.existsSync(randomFile1); - t.equal(exists1, true, 'findRemoveSync(two files from root) did not remove randomFile1'); + var exists1 = fs.existsSync(randomFile1) + t.equal(exists1, true, 'findRemoveSync(two files from root) did not remove randomFile1') - var exists0 = fs.existsSync(rootDirectory); - t.equal(exists0, true, 'findRemoveSync(two files from root) did not remove root directory'); + var exists0 = fs.existsSync(rootDirectory) + t.equal(exists0, true, 'findRemoveSync(two files from root) did not remove root directory') - t.done(); + t.done() }, 'findRemoveSync(files set to *.*)': function(t) { - findRemoveSync(directory1_2_1, {files: '*.*'}); + findRemoveSync(directory1_2_1, {files: '*.*'}) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - t.equal(exists1_2_1_1, false, 'findRemoveSync(files set to *.*) removed randomFile1_2_1_1 fine'); + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveSync(files set to *.*) removed randomFile1_2_1_1 fine') - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2); - t.equal(exists1_2_1_2, false, 'findRemoveSync(files set to *.*) removed randomFile1_2_1_2 fine'); + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'findRemoveSync(files set to *.*) removed randomFile1_2_1_2 fine') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3); - t.equal(exists1_2_1_3, false, 'findRemoveSync(files set to *.*) removed randomFile1_2_1_3 fine'); + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'findRemoveSync(files set to *.*) removed randomFile1_2_1_3 fine') - var exists1_2_1 = fs.existsSync(directory1_2_1); - t.equal(exists1_2_1, true, 'findRemoveSync(files set to *.* did not remove directory1_2_1'); + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, true, 'findRemoveSync(files set to *.* did not remove directory1_2_1') - t.done(); + t.done() }, 'findRemoveSync(with mixed ext and file params)': function(t) { - var result = findRemoveSync(rootDirectory, {files: randomFilename1, extensions: ['.log']}); + var result = findRemoveSync(rootDirectory, {files: randomFilename1, extensions: ['.log']}) - var exists1 = fs.existsSync(randomFile1); - var exists2 = fs.existsSync(randomFile2); - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - t.equal(exists1, false, 'findRemoveSync(with mixed ext and file params) removed randomFile1 fine'); - t.equal(exists2, false, 'findRemoveSync(with mixed ext and file params) removed randomFile2 fine'); - t.equal(exists1_2_1_1, false, 'findRemoveSync(with mixed ext and file params) removed randomFile1_2_1_1 fine'); + var exists1 = fs.existsSync(randomFile1) + var exists2 = fs.existsSync(randomFile2) + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1, false, 'findRemoveSync(with mixed ext and file params) removed randomFile1 fine') + t.equal(exists2, false, 'findRemoveSync(with mixed ext and file params) removed randomFile2 fine') + t.equal(exists1_2_1_1, false, 'findRemoveSync(with mixed ext and file params) removed randomFile1_2_1_1 fine') - var exists1_2_1 = fs.existsSync(directory1_2_1); - t.equal(exists1_2_1, true, 'findRemoveSync(two files from root) did not remove directory1_2_1'); + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, true, 'did not remove directory1_2_1') - t.strictEqual(typeof result[randomFile1], 'boolean', 'randomFile1 in result is boolean'); - t.strictEqual(typeof result[randomFile1_2_1_2], 'undefined', 'randomFile1_2_1_2 is NOT in result'); + t.strictEqual(typeof result[randomFile1], 'boolean', 'randomFile1 in result is boolean') + t.strictEqual(typeof result[randomFile1_2_1_2], 'undefined', 'randomFile1_2_1_2 is NOT in result') - t.done(); + t.done() }, - 'findRemoveSync(with ignore param only)': function(t) { - var result = findRemoveSync(rootDirectory, {ignore: fixFilename1_2_1_4}); + 'findRemoveSync(with ignore param)': function(t) { + var result = findRemoveSync(rootDirectory, {files: "*.*", ignore: fixFilename1_2_1_4}) + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveSync(with ignore) did remove file randomFile1_2_1_1') + + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'file fixFile1_2_1_4 not removed') - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4); - t.equal(exists1_2_1_1, false, 'findRemoveSync(with ignore) did remove file randomFile1_2_1_1'); - t.equal(exists1_2_1_4, true, 'findRemoveSync(with ignore) did not remove file fixFile1_2_1_4'); - t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 in result is boolean'); - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result'); + t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 in result is boolean') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - t.done(); + t.done() }, 'findRemoveSync(with ignore and jpg extension params)': function(t) { - var result = findRemoveSync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.jpg'}); + var result = findRemoveSync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.jpg'}) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4); - t.equal(exists1_2_1_1, true, 'findRemoveSync(with ignore + jpg extension) did not remove file randomFile1_2_1_1'); - t.equal(exists1_2_1_4, true, 'findRemoveSync(with ignore + jpg extension) did not remove file fixFile1_2_1_4'); - t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result'); - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result'); + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_1, true, 'findRemoveSync(with ignore + jpg extension) did not remove file randomFile1_2_1_1') + t.equal(exists1_2_1_4, true, 'findRemoveSync(with ignore + jpg extension) did not remove file fixFile1_2_1_4') + t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - t.done(); + t.done() }, 'findRemoveSync(with multiple ignore)': function(t) { - var result = findRemoveSync(rootDirectory, {ignore: [fixFilename1_2_1_4, fixFilename1_2_1_5]}); + var result = findRemoveSync(rootDirectory, {files: "*.*", ignore: [fixFilename1_2_1_4, fixFilename1_2_1_5]}) + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveSync(with multiple ignore) did remove file randomFile1_2_1_1') + + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'findRemoveSync(with multiple ignore) did not remove file fixFile1_2_1_4') - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4); - var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5); - t.equal(exists1_2_1_1, false, 'findRemoveSync(with multiple ignore) did remove file randomFile1_2_1_1'); - t.equal(exists1_2_1_4, true, 'findRemoveSync(with multiple ignore) did not remove file fixFile1_2_1_4'); - t.equal(exists1_2_1_5, true, 'findRemoveSync(with multiple ignore) did not remove file fixFile1_2_1_5'); - t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result'); - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result'); - t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result'); + var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5) + t.equal(exists1_2_1_5, true, 'findRemoveSync(with multiple ignore) did not remove file fixFile1_2_1_5') - t.done(); + t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result') + + t.done() }, 'findRemoveSync(with ignore and bak extension params)': function(t) { - var result = findRemoveSync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.bak'}); + var result = findRemoveSync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.bak'}) + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, true, 'findRemoveSync(with ignore + bak extension) did not remove file randomFile1_2_1_1') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'findRemoveSync(with ignore + bak extension) did remove file randomFile1_2_1_2') + + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'findRemoveSync(with ignore + bak extension) did not remove file fixFile1_2_1_4') - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2); - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4); - t.equal(exists1_2_1_1, true, 'findRemoveSync(with ignore + bak extension) did not remove file randomFile1_2_1_1'); - t.equal(exists1_2_1_2, false, 'findRemoveSync(with ignore + bak extension) did remove file randomFile1_2_1_2'); - t.equal(exists1_2_1_4, true, 'findRemoveSync(with ignore + bak extension) did not remove file fixFile1_2_1_4'); - t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result'); - t.strictEqual(typeof result[randomFile1_2_1_2], 'boolean', 'randomFile1_2_1_2 is in result'); - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result'); + t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result') + t.strictEqual(typeof result[randomFile1_2_1_2], 'boolean', 'randomFile1_2_1_2 is in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - t.done(); + t.done() }, 'findRemoveSync(two files and check others)': function(t) { - var result = findRemoveSync(rootDirectory, {files: [randomFilename1_2_1_1, randomFilename1_2_1_3]}); + var result = findRemoveSync(rootDirectory, {files: [randomFilename1_2_1_1, randomFilename1_2_1_3]}) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - t.equal(exists1_2_1_1, false, 'findRemoveSync(two files and check others) removed randomFile1_2_1_1 fine'); + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveSync(two files and check others) removed randomFile1_2_1_1 fine') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3); - t.equal(exists1_2_1_3, false, 'findRemoveSync(two files and check others) removed randomFile1_2_1_3 fine'); + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'findRemoveSync(two files and check others) removed randomFile1_2_1_3 fine') - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4); - t.equal(exists1_2_1_4, true, 'findRemoveSync(two files and check others) did not remove fixFile1_2_1_4'); + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'findRemoveSync(two files and check others) did not remove fixFile1_2_1_4') - var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5); - t.equal(exists1_2_1_5, true, 'findRemoveSync(two files and check others) did not remove fixFile1_2_1_5'); + var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5) + t.equal(exists1_2_1_5, true, 'findRemoveSync(two files and check others) did not remove fixFile1_2_1_5') - t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result'); - t.strictEqual(typeof result[randomFile1_2_1_3], 'boolean', 'randomFile1_2_1_3 is in result'); - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result'); - t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result'); + t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result') + t.strictEqual(typeof result[randomFile1_2_1_3], 'boolean', 'randomFile1_2_1_3 is in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result') - t.done(); + t.done() }, 'findRemoveSync(limit to maxLevel = 0)': function(t) { - var result = findRemoveSync(rootDirectory, {maxLevel: 0}); + var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 0}) - t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(limit to maxLevel = 0) returned empty an array.'); + t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(limit to maxLevel = 0) returned empty an array.') - t.done(); + t.done() }, 'findRemoveSync(limit to maxLevel = 1)': function(t) { - var result = findRemoveSync(rootDirectory, {maxLevel: 1}); + var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 1}) - t.strictEqual(Object.keys(result).length, 5, 'findRemoveSync(limit to maxLevel = 1) returned 5 entries.'); + t.strictEqual(Object.keys(result).length, 7, 'findRemoveSync(limit to maxLevel = 1) returned 7 entries.') - t.done(); + t.done() }, 'findRemoveSync(limit to maxLevel = 2)': function(t) { - var result = findRemoveSync(rootDirectory, {maxLevel: 2}); + var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 2}) - t.strictEqual(Object.keys(result).length, 8, 'findRemoveSync(limit to maxLevel = 2) returned 8 entries.'); + t.strictEqual(Object.keys(result).length, 12, 'findRemoveSync(limit to maxLevel = 2) returned 12 entries.') - t.done(); + t.done() }, 'findRemoveSync(limit to maxLevel = 3)': function(t) { - var result = findRemoveSync(rootDirectory, {maxLevel: 3}); + var result = findRemoveSync(rootDirectory, {files: "*.*", maxLevel: 3}) - t.strictEqual(Object.keys(result).length, 10, 'findRemoveSync(limit to maxLevel = 3) returned 10 entries.'); + t.strictEqual(Object.keys(result).length, 6, 'findRemoveSync(limit to maxLevel = 3) returned 6 entries.') - t.done(); + t.done() }, 'findRemoveSync(limit to maxLevel = 3 + bak only)': function(t) { - var result = findRemoveSync(rootDirectory, {maxLevel: 2, extensions: '.bak'}); + var result = findRemoveSync(rootDirectory, {maxLevel: 3, extensions: '.bak'}) - t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(limit to maxLevel = 3 + bak only) returned 2 entries.'); + t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(limit to maxLevel = 3 + bak only) returned 2 entries.') - t.done(); + t.done() }, 'findRemoveSync(single dir)': function(t) { - findRemoveSync(rootDirectory, {dir: 'directory1_2'}); + var result = findRemoveSync(rootDirectory, {dir: 'directory1_2'}) - var exists1_1 = fs.existsSync(directory1_1); - t.equal(exists1_1, true, 'findRemoveSync(single dir) did not remove directory1_1'); + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveSync(single dir) did not remove directory1_1') - var exists1_2 = fs.existsSync(directory1_2); - t.equal(exists1_2, false, 'findRemoveSync(single dir) removed directory1_2'); + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, false, 'findRemoveSync(single dir) removed directory1_2') - t.done(); + t.done() }, 'findRemoveSync(two directories)': function(t) { - findRemoveSync(rootDirectory, {dir: ['directory1_1', 'directory1_2']}); + findRemoveSync(rootDirectory, {dir: ['directory1_1', 'directory1_2']}) - var exists1_1 = fs.existsSync(directory1_1); - t.equal(exists1_1, false, 'findRemoveSync(remove single dir) removed directory1_1'); + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, false, 'findRemoveSync(remove single dir) removed directory1_1') - var exists1_2 = fs.existsSync(directory1_2); - t.equal(exists1_2, false, 'findRemoveSync(remove single dir) removed directory1_2'); + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, false, 'findRemoveSync(remove single dir) removed directory1_2') - t.done(); + t.done() }, 'findRemoveSync(directories with the same basename)': function(t) { - findRemoveSync(rootDirectory, {dir: 'CVS'}); + findRemoveSync(rootDirectory, {dir: 'CVS'}) - var exists1_3 = fs.existsSync(directory1_3); - t.equal(exists1_3, false, 'findRemoveSync(directories with the same basename) removed root/directory1/CVS'); + var exists1_3 = fs.existsSync(directory1_3) + t.equal(exists1_3, false, 'findRemoveSync(directories with the same basename) removed root/directory1/CVS') - var exists3 = fs.existsSync(directory3); - t.equal(exists3, false, 'findRemoveSync(directories with the same basename) removed root/CVS'); + var exists3 = fs.existsSync(directory3) + t.equal(exists3, false, 'findRemoveSync(directories with the same basename) removed root/CVS') - var exists1_1 = fs.existsSync(directory1_1); - t.equal(exists1_1, true, 'findRemoveSync(remove single dir) did not remove directory1_1'); + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveSync(remove single dir) did not remove directory1_1') - var exists1_2 = fs.existsSync(directory1_2); - t.equal(exists1_2, true, 'findRemoveSync(remove single dir) did not remove directory1_2'); + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, true, 'findRemoveSync(remove single dir) did not remove directory1_2') - t.done(); + t.done() }, 'findRemoveSync(test run)': function(t) { - var result = findRemoveSync(rootDirectory, {test: true}); + var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", test: true}) - t.strictEqual(Object.keys(result).length, 9, 'findRemoveSync(test run) returned 9 entries.'); + t.strictEqual(Object.keys(result).length, 19, 'findRemoveSync(test run) returned 19 entries.') - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1); - t.equal(exists1_2_1_1, true, 'findRemoveSync(test run) did not remove randomFile1_2_1_1'); + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, true, 'findRemoveSync(test run) did not remove randomFile1_2_1_1') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3); - t.equal(exists1_2_1_3, true, 'findRemoveSync(test run) did not remove randomFile1_2_1_3'); + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, true, 'findRemoveSync(test run) did not remove randomFile1_2_1_3') - var exists1_1 = fs.existsSync(directory1_1); - t.equal(exists1_1, true, 'findRemoveSync(test run) did not remove directory1_1'); + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveSync(test run) did not remove directory1_1') - t.done(); + t.done() } }), 'TC 3: age checks': testCase({ - setUp: function(callback) { - createFakeDirectoryTree(callback); + setUp: function(cb) { + createFakeDirectoryTree(cb) }, - tearDown: function(callback) { - destroyFakeDirectoryTree(callback); + tearDown: function(cb) { + destroyFakeDirectoryTree(cb) }, - 'findRemoveSync(files older than 10000000000000000 sec)': function(t) { - var result = findRemoveSync(rootDirectory, {age: {seconds: 10000000000000000}}); + 'findRemoveSync(files and dirs older than 10000000000000000 sec)': function(t) { + var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 10000000000000000}}) - t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(files older than 10000000000000000 sec) returned zero entries.'); + t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(files older than 10000000000000000 sec) returned zero entries.') - t.done(); + t.done() }, - 'findRemoveSync(files older than 10 sec)': function(t) { - var result = findRemoveSync(rootDirectory, {age: {seconds: 10}}); + 'findRemoveSync(files and dirs older than 10 sec)': function(t) { + var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 10}}) - t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(files older than 10 sec) returned zero entries.'); + t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(files older than 10 sec) returned zero entries.') - t.done(); + t.done() }, 'findRemoveSync(files older than .0005 sec)': function(t) { - var result = findRemoveSync(rootDirectory, {age: {seconds: 0.0005}}); + var result = findRemoveSync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}}) - t.strictEqual(Object.keys(result).length, 15, 'findRemoveSync(files older than .0005 sec) returned 15 entries.'); + t.strictEqual(Object.keys(result).length, 11, 'findRemoveSync(files older than .0005 sec) returned 11 entries.') - t.done(); + t.done() + }, + + 'findRemoveSync(files and dirs older than .0005 sec)': function(t) { + var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}}) + + t.strictEqual(Object.keys(result).length, 19, 'findRemoveSync(files older than .0005 sec) returned 19 entries.') + + t.done() }, 'findRemoveSync(files older than 2 sec with wait)': function(t) { setTimeout(function() { - var result = findRemoveSync(rootDirectory, {age: {seconds: 2}}); + var result = findRemoveSync(rootDirectory, {files: "*.*", age: {seconds: 2}}) - t.strictEqual(Object.keys(result).length, 15, 'findRemoveSync(files older than 2 sec with wait) returned 15 entries.'); + t.strictEqual(Object.keys(result).length, 11, 'findRemoveSync(files older than 2 sec with wait) returned 11 entries.') - t.done(); - }, 2100); + t.done() + }, 2100) }, 'findRemoveSync(files older than 2 sec with wait + maxLevel = 1)': function(t) { setTimeout(function() { - var result = findRemoveSync(rootDirectory, {maxLevel: 1, age: {seconds: 2}}); + var result = findRemoveSync(rootDirectory, {files: "*.*", maxLevel: 1, age: {seconds: 2}}) + + t.strictEqual(Object.keys(result).length, 4, 'findRemoveSync(files older than 2 sec with wait + maxLevel = 1) returned 4 entries.') + + t.done() + }, 2100) + } + }), + + 'TC 4: github issues': testCase({ + + setUp: function(cb) { + createFakeDirectoryTree(cb) + }, + tearDown: function(cb) { + destroyFakeDirectoryTree(cb) + }, + + // from https://github.com/binarykitchen/find-remove/issues/7 + 'findRemoveSync(issues/7a)': function(t) { + setTimeout(function() { + var result = findRemoveSync(rootDirectory, {age: {seconds: 2}, extensions: '.csv'}) + + t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(issues/7) deleted 2 files.') + + t.done() + }, 3 * 1000) + }, + + // from https://github.com/binarykitchen/find-remove/issues/7 + 'findRemoveSync(issues/7b)': function(t) { + var result = findRemoveSync(rootDirectory, {extensions: '.dontexist'}) - t.strictEqual(Object.keys(result).length, 5, 'findRemoveSync(files older than 2 sec with wait + maxLevel = 1) returned 5 entries.'); + t.deepEqual(result, {}, 'is an empty json') - t.done(); - }, 2100); + t.done() } }) -}); +}) From b8dc0e191f98d4c49515837bdc6caef020244082 Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Wed, 28 Sep 2016 22:43:18 +1300 Subject: [PATCH 16/29] improve readme further --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b6098e9..2dfcf48 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ you can filter by extensions, names, level in directory structure, file creation to install find-remove, use [npm](http://github.com/isaacs/npm): - $ npm install find-remove + $ npm install -S find-remove then in your node.js app, get reference to the function like that: @@ -20,7 +20,7 @@ var findRemoveSync = require('find-remove') ## quick examples -### delete all *.bak or *.log files within the /temp/ directory +### 1. delete all *.bak or *.log files within the /temp/ directory ```javascript var result = findRemoveSync('/temp', {extensions: ['.bak', '.log']}) @@ -35,37 +35,37 @@ the return value `result` is a json object with successfully deleted files. if y } ``` -### delete all files called 'dump.log' within the /temp/ directory and within its subfolders +### 2. delete all files called 'dump.log' within the /temp/ directory and within its subfolders ```javascript -var result = findRemoveSync(rootDirectory, {files: 'dump.log'}) +var result = findRemoveSync(/temp', {files: 'dump.log'}) ``` -### same as above, but also deletes any subfolders +### 3. same as above, but also deletes any subfolders ```javascript -var result = findRemoveSync(rootDirectory, {files: 'dump.log', dir: '*'}) +var result = findRemoveSync(/temp', {files: 'dump.log', dir: '*'}) ``` -### delete all *.bak files but not file 'haumiblau.bak' +### 4. delete all *.bak files but not file 'haumiblau.bak' ```javascript -var result = findRemoveSync(rootDirectory, {extensions: ['.bak'], ignore: 'haumiblau.bak'}) +var result = findRemoveSync(/temp', {extensions: ['.bak'], ignore: 'haumiblau.bak'}) ``` -### delete recursively any subdirectory called 'CVS' within /dist/ +### 5. delete recursively any subdirectory called 'CVS' within /dist/ ```javascript var result = findRemoveSync('/dist', {dir: 'CVS'}) ``` -### delete all jpg files older than one hour +### 6. delete all jpg files older than one hour ```javascript var result = findRemoveSync('/tmp', {age: {seconds: 3600}, extensions: '.jpg'}) ``` -### apply filter options only for two levels inside the /temp directory for all tmp files +### 7. apply filter options only for two levels inside the /temp directory for all tmp files ```javascript var result = findRemoveSync('/tmp', {maxLevel: 2, extensions: '.tmp'}) @@ -75,9 +75,9 @@ this deletes any `.tmp` files up to two levels, for example: `/tmp/level1/level2 but not `/tmp/level1/level2/level3/b.tmp` -why the heck do we have this maxLevel option? because of performance. if you care about deep subfolders, apply that option to get a speed boost. +why the heck do we have this `maxLevel` option? because of performance. if you care about deep subfolders, apply that option to get a speed boost. -### delete everything recursively (hey, who needs that when you can use nodejs' fs.unlink?) +### 8. delete everything recursively (hey, who needs that when you can use nodejs' fs.unlink?) ```javascript var result = findRemoveSync(rootDirectory, {dir: "*", files: "*.*"}) From d94e1ced2ff67f14f25ed95475ad7d9b46405ec2 Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Wed, 28 Sep 2016 22:45:14 +1300 Subject: [PATCH 17/29] fix syntax in readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2dfcf48..b699eea 100644 --- a/README.md +++ b/README.md @@ -38,19 +38,19 @@ the return value `result` is a json object with successfully deleted files. if y ### 2. delete all files called 'dump.log' within the /temp/ directory and within its subfolders ```javascript -var result = findRemoveSync(/temp', {files: 'dump.log'}) +var result = findRemoveSync('/temp', {files: 'dump.log'}) ``` ### 3. same as above, but also deletes any subfolders ```javascript -var result = findRemoveSync(/temp', {files: 'dump.log', dir: '*'}) +var result = findRemoveSync('/temp', {files: 'dump.log', dir: '*'}) ``` ### 4. delete all *.bak files but not file 'haumiblau.bak' ```javascript -var result = findRemoveSync(/temp', {extensions: ['.bak'], ignore: 'haumiblau.bak'}) +var result = findRemoveSync('/temp', {extensions: ['.bak'], ignore: 'haumiblau.bak'}) ``` ### 5. delete recursively any subdirectory called 'CVS' within /dist/ From c58ed1aca560f54033ce88f4fdd49cf6afc7dac2 Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Sat, 18 Mar 2017 15:43:26 +1300 Subject: [PATCH 18/29] bump rimraf, nodeunit and async for v1.0.1 --- LICENSE | 2 +- package.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index ca95de6..b3791cc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013 - 2015 Michael Heuberger +Copyright (c) 2013 - 2017 Michael Heuberger Permission is hereby granted, free of charge, to any person obtaining a copy of this software and diff --git a/package.json b/package.json index 37405ab..f8202a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "1.0.0", + "version": "1.0.1", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", @@ -19,13 +19,13 @@ ], "dependencies": { "fmerge": "1.2.0", - "rimraf": "2.5.4" + "rimraf": "2.6.1" }, "devDependencies": { - "nodeunit": "0.10.2", + "nodeunit": "0.11.0", "randomstring": "1.1.5", "mkdirp": "0.5.1", - "async": "2.0.1" + "async": "2.1.5" }, "engines": { "node": ">=4.1.0" From ca81be919a19ddb905b6a37476a742c9f7d42a4c Mon Sep 17 00:00:00 2001 From: nirs Date: Mon, 4 Dec 2017 16:08:31 +0200 Subject: [PATCH 19/29] Adding an option to limit the number of files to be deleted at a single operation. The returned Json will only include files deleted. Tests added too. --- README.md | 7 ++++--- find-remove.js | 45 +++++++++++++++++++++++++++++++++++++++++++-- tests/basics.js | 27 +++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b699eea..ab79c61 100644 --- a/README.md +++ b/README.md @@ -59,10 +59,10 @@ var result = findRemoveSync('/temp', {extensions: ['.bak'], ignore: 'haumiblau.b var result = findRemoveSync('/dist', {dir: 'CVS'}) ``` -### 6. delete all jpg files older than one hour +### 6. delete all jpg files older than one hour with limit of 100 files deletion per operation ```javascript -var result = findRemoveSync('/tmp', {age: {seconds: 3600}, extensions: '.jpg'}) +var result = findRemoveSync('/tmp', {age: {seconds: 3600}, extensions: '.jpg', limit: 100}) ``` ### 7. apply filter options only for two levels inside the /temp directory for all tmp files @@ -98,6 +98,7 @@ __arguments__ * `extensions` - this too, can be a string or an array of file extenstions you want to delete within `dir`. * `ignore` - useful to exclude some files. again, can be a string or an array of file names you do NOT want to delete within `dir` * `age.seconds` - can be any float number. findRemoveSync then compares it with the file stats and deletes those with creation times older than `age.seconds` + * `limit` - can be any integer number. Will limit the number of files to be deleted at single operation to be `limit` * `maxLevel` - advanced: limits filtering to a certain level. useful for performance. recommended for crawling huge directory trees. * `test` - advanced: set to true for a test run, meaning it does not delete anything but returns a JSON of files/directories it would have deleted. useful for testing. @@ -107,7 +108,7 @@ the unit tests are good examples on how to use the above arguments. __returns__ -JSON of files/directories that were deleted. +JSON of files/directories that were deleted. For limit option - will only return number of files deleted. ## todo diff --git a/find-remove.js b/find-remove.js index 818b601..fdd3824 100644 --- a/find-remove.js +++ b/find-remove.js @@ -15,6 +15,26 @@ function isOlder(path, ageSeconds) { return now > expirationTime } +function hasLimit(options) { + return options && options.hasOwnProperty('limit') +} + +function getLimit(options) { + return hasLimit(options) ? options.limit : -1 +} + +function hasTotalRemoved(options) { + return options && options.hasOwnProperty('totalRemoved') +} + +function getTotalRemoved(options) { + return hasTotalRemoved(options) ? options.totalRemoved : -2 +} + +function isOverTheLimit(options) { + return getTotalRemoved(options) >= getLimit(options) +} + function hasMaxLevel(options) { return options && options.hasOwnProperty('maxLevel') } @@ -42,6 +62,10 @@ function doDeleteDirectory(currentDir, options, currentLevel) { doDelete = true } + if (doDelete && hasLimit(options)) { + doDelete = !isOverTheLimit(options) + } + if (doDelete && hasMaxLevel(options) && currentLevel > 0) { doDelete = currentLevel <= getMaxLevel(options) } @@ -88,6 +112,10 @@ function doDeleteFile(currentFile, options) { } } + if (doDelete && hasLimit(options)) { + doDelete = !isOverTheLimit(options) + } + if (doDelete && ignore) { if (util.isArray(ignore)) doDelete = !(ignore.indexOf(basename) !== -1) @@ -127,11 +155,15 @@ var findRemoveSync = module.exports = function(currentDir, options, currentLevel var removed = {} - if (fs.existsSync(currentDir)) { + if (!isOverTheLimit(options) && fs.existsSync(currentDir)) { var maxLevel = getMaxLevel(options), deleteDirectory = false + if (hasLimit(options)) { + options.totalRemoved = hasTotalRemoved(options) ? getTotalRemoved(options) : 0 + } + if (currentLevel === undefined) currentLevel = 0 else @@ -160,6 +192,9 @@ var findRemoveSync = module.exports = function(currentDir, options, currentLevel // merge results removed = merge(removed, result) + if (hasTotalRemoved(options)) + options.totalRemoved += Object.keys(result).length + } else { if (doDeleteFile(currentFile, options)) { @@ -167,6 +202,9 @@ var findRemoveSync = module.exports = function(currentDir, options, currentLevel fs.unlinkSync(currentFile) removed[currentFile] = true + if (hasTotalRemoved(options)) + options.totalRemoved ++ + } } }) @@ -177,7 +215,10 @@ var findRemoveSync = module.exports = function(currentDir, options, currentLevel if (!testRun) rimraf.sync(currentDir) - removed[currentDir] = true + if (!hasTotalRemoved(options)) + // for limit of files - we do not want to count the directories + removed[currentDir] = true + } catch (err) { throw err } diff --git a/tests/basics.js b/tests/basics.js index a396bda..1e555ec 100644 --- a/tests/basics.js +++ b/tests/basics.js @@ -703,5 +703,32 @@ module.exports = testCase({ t.done() } + }), + + 'TC 5: limit checks': testCase({ + + setUp: function(cb) { + createFakeDirectoryTree(cb) + }, + tearDown: function(cb) { + destroyFakeDirectoryTree(cb) + }, + + 'findRemoveSync(files older than .0005 sec with limit of 2)': function(t) { + var result = findRemoveSync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}, limit: 2}) + + t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(files older than .0005 sec) returned 2 entries (out of 11).') + + t.done() + }, + + 'findRemoveSync(files and dirs older than .0005 sec with limit of 5)': function(t) { + var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}, limit: 5}) + + t.strictEqual(Object.keys(result).length, 5, 'findRemoveSync(files older than .0005 sec) returned 5 entries (out of 19).') + + t.done() + } + }) }) From a13c849bef8096872234e0b326df92267200919a Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Tue, 5 Dec 2017 08:57:07 +1300 Subject: [PATCH 20/29] v1.1.0 with limit number option, yarn.lock and few pack bumps --- package.json | 8 +- yarn.lock | 1758 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1762 insertions(+), 4 deletions(-) create mode 100644 yarn.lock diff --git a/package.json b/package.json index f8202a8..3af3c7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "1.0.1", + "version": "1.1.0", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", @@ -19,13 +19,13 @@ ], "dependencies": { "fmerge": "1.2.0", - "rimraf": "2.6.1" + "rimraf": "2.6.2" }, "devDependencies": { - "nodeunit": "0.11.0", + "nodeunit": "0.11.1", "randomstring": "1.1.5", "mkdirp": "0.5.1", - "async": "2.1.5" + "async": "2.6.0" }, "engines": { "node": ">=4.1.0" diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..9c51d98 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,1758 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +align-text@^0.1.1, align-text@^0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" + dependencies: + kind-of "^3.0.2" + longest "^1.0.1" + repeat-string "^1.5.2" + +amdefine@>=0.0.4: + version "1.0.1" + resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + +append-transform@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991" + dependencies: + default-require-extensions "^1.0.0" + +archy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + +argparse@^1.0.7: + version "1.0.9" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86" + dependencies: + sprintf-js "~1.0.2" + +arr-diff@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" + dependencies: + arr-flatten "^1.0.1" + +arr-flatten@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + +array-uniq@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.2.tgz#5fcc373920775723cfd64d65c64bef53bf9eba6d" + +array-unique@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" + +arrify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + +asn1@~0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + +assert-plus@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" + +async@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" + dependencies: + lodash "^4.14.0" + +async@^1.4.0: + version "1.5.2" + resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + +aws-sign2@~0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" + +aws4@^1.2.1: + version "1.6.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" + +babel-code-frame@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + dependencies: + chalk "^1.1.3" + esutils "^2.0.2" + js-tokens "^3.0.2" + +babel-generator@^6.18.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5" + dependencies: + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + detect-indent "^4.0.0" + jsesc "^1.3.0" + lodash "^4.17.4" + source-map "^0.5.6" + trim-right "^1.0.1" + +babel-messages@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" + dependencies: + babel-runtime "^6.22.0" + +babel-runtime@^6.22.0, babel-runtime@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +babel-template@^6.16.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" + dependencies: + babel-runtime "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + lodash "^4.17.4" + +babel-traverse@^6.18.0, babel-traverse@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" + dependencies: + babel-code-frame "^6.26.0" + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + debug "^2.6.8" + globals "^9.18.0" + invariant "^2.2.2" + lodash "^4.17.4" + +babel-types@^6.18.0, babel-types@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" + dependencies: + babel-runtime "^6.26.0" + esutils "^2.0.2" + lodash "^4.17.4" + to-fast-properties "^1.0.3" + +babylon@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + +bcrypt-pbkdf@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" + dependencies: + tweetnacl "^0.14.3" + +bind-obj-methods@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/bind-obj-methods/-/bind-obj-methods-1.0.0.tgz#4f5979cac15793adf70e488161e463e209ca509c" + +bluebird@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" + +boom@2.x.x: + version "2.10.1" + resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" + dependencies: + hoek "2.x.x" + +brace-expansion@^1.1.7: + version "1.1.8" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^1.8.2: + version "1.8.5" + resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" + dependencies: + expand-range "^1.8.1" + preserve "^0.2.0" + repeat-element "^1.1.2" + +builtin-modules@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + +caching-transform@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-1.0.1.tgz#6dbdb2f20f8d8fbce79f3e94e9d1742dcdf5c0a1" + dependencies: + md5-hex "^1.2.0" + mkdirp "^0.5.1" + write-file-atomic "^1.1.4" + +camelcase@^1.0.2: + version "1.2.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" + +camelcase@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" + +caseless@~0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" + +center-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" + dependencies: + align-text "^0.1.3" + lazy-cache "^1.0.3" + +chalk@^1.1.1, chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +clean-yaml-object@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68" + +cliui@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" + dependencies: + center-align "^0.1.1" + right-align "^0.1.1" + wordwrap "0.0.2" + +cliui@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi "^2.0.0" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + +color-support@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + +combined-stream@^1.0.5, combined-stream@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" + dependencies: + delayed-stream "~1.0.0" + +commander@^2.9.0: + version "2.12.2" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555" + +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + +convert-source-map@^1.3.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" + +core-js@^2.4.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b" + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + +coveralls@^2.13.3: + version "2.13.3" + resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.3.tgz#9ad7c2ae527417f361e8b626483f48ee92dd2bc7" + dependencies: + js-yaml "3.6.1" + lcov-parse "0.0.10" + log-driver "1.2.5" + minimist "1.2.0" + request "2.79.0" + +cross-spawn@^4: + version "4.0.2" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" + dependencies: + lru-cache "^4.0.1" + which "^1.2.9" + +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + +cryptiles@2.x.x: + version "2.0.5" + resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" + dependencies: + boom "2.x.x" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + dependencies: + assert-plus "^1.0.0" + +debug-log@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f" + +debug@^2.1.3, debug@^2.6.8: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + dependencies: + ms "2.0.0" + +debug@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + dependencies: + ms "2.0.0" + +decamelize@^1.0.0, decamelize@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + +default-require-extensions@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8" + dependencies: + strip-bom "^2.0.0" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + +detect-indent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" + dependencies: + repeating "^2.0.0" + +diff@^1.3.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf" + +ecc-jsbn@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" + dependencies: + jsbn "~0.1.0" + +ejs@^2.5.2: + version "2.5.7" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" + +error-ex@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" + dependencies: + is-arrayish "^0.2.1" + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + +esprima@^2.6.0: + version "2.7.3" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" + +esprima@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" + +esutils@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" + +events-to-array@^1.0.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6" + +execa@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +expand-brackets@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" + dependencies: + is-posix-bracket "^0.1.0" + +expand-range@^1.8.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" + dependencies: + fill-range "^2.1.0" + +extend@~3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" + +extglob@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" + dependencies: + is-extglob "^1.0.0" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + +filename-regex@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" + +fill-range@^2.1.0: + version "2.2.3" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" + dependencies: + is-number "^2.1.0" + isobject "^2.0.0" + randomatic "^1.1.3" + repeat-element "^1.1.2" + repeat-string "^1.5.2" + +find-cache-dir@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9" + dependencies: + commondir "^1.0.1" + mkdirp "^0.5.1" + pkg-dir "^1.0.0" + +find-up@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + dependencies: + path-exists "^2.0.0" + pinkie-promise "^2.0.0" + +find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + dependencies: + locate-path "^2.0.0" + +fmerge@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fmerge/-/fmerge-1.2.0.tgz#36e99d2ae255e3ee1af666b4df780553671cf692" + +for-in@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + +for-own@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" + dependencies: + for-in "^1.0.1" + +foreground-child@^1.3.3, foreground-child@^1.5.3, foreground-child@^1.5.6: + version "1.5.6" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9" + dependencies: + cross-spawn "^4" + signal-exit "^3.0.0" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + +form-data@~2.1.1: + version "2.1.4" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.5" + mime-types "^2.1.12" + +fs-exists-cached@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-exists-cached/-/fs-exists-cached-1.0.0.tgz#cf25554ca050dc49ae6656b41de42258989dcbce" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + +function-loop@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/function-loop/-/function-loop-1.0.1.tgz#8076bb305e8e6a3cceee2920765f330d190f340c" + +generate-function@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74" + +generate-object-property@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0" + dependencies: + is-property "^1.0.0" + +get-caller-file@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" + +get-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + dependencies: + assert-plus "^1.0.0" + +glob-base@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" + dependencies: + glob-parent "^2.0.0" + is-glob "^2.0.0" + +glob-parent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" + dependencies: + is-glob "^2.0.0" + +glob@^7.0.0, glob@^7.0.5, glob@^7.0.6: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^9.18.0: + version "9.18.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2: + version "4.1.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" + +handlebars@^4.0.3: + version "4.0.11" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" + dependencies: + async "^1.4.0" + optimist "^0.6.1" + source-map "^0.4.4" + optionalDependencies: + uglify-js "^2.6" + +har-validator@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" + dependencies: + chalk "^1.1.1" + commander "^2.9.0" + is-my-json-valid "^2.12.4" + pinkie-promise "^2.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + dependencies: + ansi-regex "^2.0.0" + +has-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" + +hawk@~3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" + dependencies: + boom "2.x.x" + cryptiles "2.x.x" + hoek "2.x.x" + sntp "1.x.x" + +hoek@2.x.x: + version "2.16.3" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" + +hosted-git-info@^2.1.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" + +http-signature@~1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" + dependencies: + assert-plus "^0.2.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + +invariant@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" + dependencies: + loose-envify "^1.0.0" + +invert-kv@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + +is-builtin-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" + dependencies: + builtin-modules "^1.0.0" + +is-dotfile@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" + +is-equal-shallow@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" + dependencies: + is-primitive "^2.0.0" + +is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + +is-extglob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" + +is-finite@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + +is-glob@^2.0.0, is-glob@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" + dependencies: + is-extglob "^1.0.0" + +is-my-json-valid@^2.12.4: + version "2.16.1" + resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11" + dependencies: + generate-function "^2.0.0" + generate-object-property "^1.1.0" + jsonpointer "^4.0.0" + xtend "^4.0.0" + +is-number@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + dependencies: + kind-of "^3.0.2" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + dependencies: + kind-of "^3.0.2" + +is-posix-bracket@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" + +is-primitive@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" + +is-property@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" + +is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + +is-utf8@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + dependencies: + isarray "1.0.0" + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + +istanbul-lib-coverage@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da" + +istanbul-lib-hook@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b" + dependencies: + append-transform "^0.4.0" + +istanbul-lib-instrument@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e" + dependencies: + babel-generator "^6.18.0" + babel-template "^6.16.0" + babel-traverse "^6.18.0" + babel-types "^6.18.0" + babylon "^6.18.0" + istanbul-lib-coverage "^1.1.1" + semver "^5.3.0" + +istanbul-lib-report@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz#922be27c13b9511b979bd1587359f69798c1d425" + dependencies: + istanbul-lib-coverage "^1.1.1" + mkdirp "^0.5.1" + path-parse "^1.0.5" + supports-color "^3.1.2" + +istanbul-lib-source-maps@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz#750578602435f28a0c04ee6d7d9e0f2960e62c1c" + dependencies: + debug "^3.1.0" + istanbul-lib-coverage "^1.1.1" + mkdirp "^0.5.1" + rimraf "^2.6.1" + source-map "^0.5.3" + +istanbul-reports@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.3.tgz#3b9e1e8defb6d18b1d425da8e8b32c5a163f2d10" + dependencies: + handlebars "^4.0.3" + +js-tokens@^3.0.0, js-tokens@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + +js-yaml@3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30" + dependencies: + argparse "^1.0.7" + esprima "^2.6.0" + +js-yaml@^3.10.0, js-yaml@^3.2.7, js-yaml@^3.3.1: + version "3.10.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + +jsesc@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + +jsonpointer@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +kind-of@^3.0.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + dependencies: + is-buffer "^1.1.5" + +lazy-cache@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" + +lcid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + dependencies: + invert-kv "^1.0.0" + +lcov-parse@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3" + +load-json-file@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + pinkie-promise "^2.0.0" + strip-bom "^2.0.0" + +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + dependencies: + p-locate "^2.0.0" + path-exists "^3.0.0" + +lodash@^4.14.0, lodash@^4.17.4: + version "4.17.4" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" + +log-driver@1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056" + +longest@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" + +loose-envify@^1.0.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" + dependencies: + js-tokens "^3.0.0" + +lru-cache@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55" + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +md5-hex@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4" + dependencies: + md5-o-matic "^0.1.1" + +md5-o-matic@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3" + +mem@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" + dependencies: + mimic-fn "^1.0.0" + +merge-source-map@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f" + dependencies: + source-map "^0.5.6" + +micromatch@^2.3.11: + version "2.3.11" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" + dependencies: + arr-diff "^2.0.0" + array-unique "^0.2.1" + braces "^1.8.2" + expand-brackets "^0.1.4" + extglob "^0.3.1" + filename-regex "^2.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.1" + kind-of "^3.0.2" + normalize-path "^2.0.1" + object.omit "^2.0.0" + parse-glob "^3.0.4" + regex-cache "^0.4.2" + +mime-db@~1.30.0: + version "1.30.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01" + +mime-types@^2.1.12, mime-types@~2.1.7: + version "2.1.17" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a" + dependencies: + mime-db "~1.30.0" + +mimic-fn@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + +minimist@~0.0.1: + version "0.0.10" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" + +mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + dependencies: + minimist "0.0.8" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + +nodeunit@0.11.1: + version "0.11.1" + resolved "https://registry.yarnpkg.com/nodeunit/-/nodeunit-0.11.1.tgz#23d80fd78b43d6c24ee1e4b64600d1579176195c" + dependencies: + ejs "^2.5.2" + tap "^10.0.2" + +normalize-package-data@^2.3.2: + version "2.4.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" + dependencies: + hosted-git-info "^2.1.4" + is-builtin-module "^1.0.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + dependencies: + path-key "^2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + +nyc@^11.3.0: + version "11.3.0" + resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.3.0.tgz#a42bc17b3cfa41f7b15eb602bc98b2633ddd76f0" + dependencies: + archy "^1.0.0" + arrify "^1.0.1" + caching-transform "^1.0.0" + convert-source-map "^1.3.0" + debug-log "^1.0.1" + default-require-extensions "^1.0.0" + find-cache-dir "^0.1.1" + find-up "^2.1.0" + foreground-child "^1.5.3" + glob "^7.0.6" + istanbul-lib-coverage "^1.1.1" + istanbul-lib-hook "^1.1.0" + istanbul-lib-instrument "^1.9.1" + istanbul-lib-report "^1.1.2" + istanbul-lib-source-maps "^1.2.2" + istanbul-reports "^1.1.3" + md5-hex "^1.2.0" + merge-source-map "^1.0.2" + micromatch "^2.3.11" + mkdirp "^0.5.0" + resolve-from "^2.0.0" + rimraf "^2.5.4" + signal-exit "^3.0.1" + spawn-wrap "=1.3.8" + test-exclude "^4.1.1" + yargs "^10.0.3" + yargs-parser "^8.0.0" + +oauth-sign@~0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + +object.omit@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" + dependencies: + for-own "^0.1.4" + is-extendable "^0.1.1" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +opener@^1.4.1: + version "1.4.3" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8" + +optimist@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" + dependencies: + minimist "~0.0.1" + wordwrap "~0.0.2" + +os-homedir@^1.0.1, os-homedir@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + +os-locale@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" + dependencies: + execa "^0.7.0" + lcid "^1.0.0" + mem "^1.1.0" + +own-or-env@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/own-or-env/-/own-or-env-1.0.0.tgz#9ef920fc81e2e63cf59d41101258368cf4fca4fb" + +own-or@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/own-or/-/own-or-1.0.0.tgz#4e877fbeda9a2ec8000fbc0bcae39645ee8bf8dc" + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + +p-limit@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" + +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + dependencies: + p-limit "^1.1.0" + +parse-glob@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" + dependencies: + glob-base "^0.3.0" + is-dotfile "^1.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.0" + +parse-json@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + dependencies: + error-ex "^1.2.0" + +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + dependencies: + pinkie-promise "^2.0.0" + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-key@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + +path-parse@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" + +path-type@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + dependencies: + graceful-fs "^4.1.2" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +pify@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + +pkg-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" + dependencies: + find-up "^1.0.0" + +preserve@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" + +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + +punycode@^1.3.2, punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + +qs@~6.3.0: + version "6.3.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" + +randomatic@^1.1.3: + version "1.1.7" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +randomstring@1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/randomstring/-/randomstring-1.1.5.tgz#6df0628f75cbd5932930d9fe3ab4e956a18518c3" + dependencies: + array-uniq "1.0.2" + +read-pkg-up@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + dependencies: + find-up "^1.0.0" + read-pkg "^1.0.0" + +read-pkg@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" + dependencies: + load-json-file "^1.0.0" + normalize-package-data "^2.3.2" + path-type "^1.0.0" + +readable-stream@^2, readable-stream@^2.1.5, readable-stream@^2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + safe-buffer "~5.1.1" + string_decoder "~1.0.3" + util-deprecate "~1.0.1" + +regenerator-runtime@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1" + +regex-cache@^0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" + dependencies: + is-equal-shallow "^0.1.3" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + +repeat-element@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" + +repeat-string@^1.5.2: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + +repeating@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + dependencies: + is-finite "^1.0.0" + +request@2.79.0: + version "2.79.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.11.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~2.0.6" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + qs "~6.3.0" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "~0.4.1" + uuid "^3.0.0" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + +require-main-filename@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" + +resolve-from@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57" + +right-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" + dependencies: + align-text "^0.1.1" + +rimraf@2.6.2, rimraf@^2.3.3, rimraf@^2.5.4, rimraf@^2.6.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" + +"semver@2 || 3 || 4 || 5", semver@^5.3.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + dependencies: + shebang-regex "^1.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + +signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + +slide@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" + +sntp@1.x.x: + version "1.0.9" + resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" + dependencies: + hoek "2.x.x" + +source-map-support@^0.4.18: + version "0.4.18" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" + dependencies: + source-map "^0.5.6" + +source-map@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" + dependencies: + amdefine ">=0.0.4" + +source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + +spawn-wrap@=1.3.8: + version "1.3.8" + resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.8.tgz#fa2a79b990cbb0bb0018dca6748d88367b19ec31" + dependencies: + foreground-child "^1.5.6" + mkdirp "^0.5.0" + os-homedir "^1.0.1" + rimraf "^2.3.3" + signal-exit "^3.0.2" + which "^1.2.4" + +spdx-correct@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" + dependencies: + spdx-license-ids "^1.0.2" + +spdx-expression-parse@~1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c" + +spdx-license-ids@^1.0.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + +sshpk@^1.7.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + dashdash "^1.12.0" + getpass "^0.1.1" + optionalDependencies: + bcrypt-pbkdf "^1.0.0" + ecc-jsbn "~0.1.1" + jsbn "~0.1.0" + tweetnacl "~0.14.0" + +stack-utils@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620" + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string-width@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string_decoder@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" + dependencies: + safe-buffer "~5.1.0" + +stringstream@~0.0.4: + version "0.0.5" + resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + dependencies: + ansi-regex "^3.0.0" + +strip-bom@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + dependencies: + is-utf8 "^0.2.0" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + +supports-color@^3.1.2: + version "3.2.3" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + dependencies: + has-flag "^1.0.0" + +tap-mocha-reporter@^3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/tap-mocha-reporter/-/tap-mocha-reporter-3.0.6.tgz#12abe97ff409a5a6ecc3d70b6dba34d82184a770" + dependencies: + color-support "^1.1.0" + debug "^2.1.3" + diff "^1.3.2" + escape-string-regexp "^1.0.3" + glob "^7.0.5" + js-yaml "^3.3.1" + tap-parser "^5.1.0" + unicode-length "^1.0.0" + optionalDependencies: + readable-stream "^2.1.5" + +tap-parser@^5.1.0, tap-parser@^5.3.1: + version "5.4.0" + resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-5.4.0.tgz#6907e89725d7b7fa6ae41ee2c464c3db43188aec" + dependencies: + events-to-array "^1.0.1" + js-yaml "^3.2.7" + optionalDependencies: + readable-stream "^2" + +tap@^10.0.2: + version "10.7.3" + resolved "https://registry.yarnpkg.com/tap/-/tap-10.7.3.tgz#f5c20c072151a8b6877e78112714a07007b97e4f" + dependencies: + bind-obj-methods "^1.0.0" + bluebird "^3.5.1" + clean-yaml-object "^0.1.0" + color-support "^1.1.0" + coveralls "^2.13.3" + foreground-child "^1.3.3" + fs-exists-cached "^1.0.0" + function-loop "^1.0.1" + glob "^7.0.0" + isexe "^2.0.0" + js-yaml "^3.10.0" + nyc "^11.3.0" + opener "^1.4.1" + os-homedir "^1.0.2" + own-or "^1.0.0" + own-or-env "^1.0.0" + readable-stream "^2.3.2" + signal-exit "^3.0.0" + source-map-support "^0.4.18" + stack-utils "^1.0.0" + tap-mocha-reporter "^3.0.6" + tap-parser "^5.3.1" + tmatch "^3.1.0" + trivial-deferred "^1.0.1" + tsame "^1.1.2" + yapool "^1.0.0" + +test-exclude@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26" + dependencies: + arrify "^1.0.1" + micromatch "^2.3.11" + object-assign "^4.1.0" + read-pkg-up "^1.0.1" + require-main-filename "^1.0.1" + +tmatch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-3.1.0.tgz#701264fd7582d0144a80c85af3358cca269c71e3" + +to-fast-properties@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" + +tough-cookie@~2.3.0: + version "2.3.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" + dependencies: + punycode "^1.4.1" + +trim-right@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" + +trivial-deferred@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trivial-deferred/-/trivial-deferred-1.0.1.tgz#376d4d29d951d6368a6f7a0ae85c2f4d5e0658f3" + +tsame@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/tsame/-/tsame-1.1.2.tgz#5ce0002acf685942789c63018797a2aa5e6b03c5" + +tunnel-agent@~0.4.1: + version "0.4.3" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + +uglify-js@^2.6: + version "2.8.29" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" + dependencies: + source-map "~0.5.1" + yargs "~3.10.0" + optionalDependencies: + uglify-to-browserify "~1.0.0" + +uglify-to-browserify@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" + +unicode-length@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/unicode-length/-/unicode-length-1.0.3.tgz#5ada7a7fed51841a418a328cf149478ac8358abb" + dependencies: + punycode "^1.3.2" + strip-ansi "^3.0.1" + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + +uuid@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + +validate-npm-package-license@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" + dependencies: + spdx-correct "~1.0.0" + spdx-expression-parse "~1.0.0" + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + +which@^1.2.4, which@^1.2.9: + version "1.3.0" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" + dependencies: + isexe "^2.0.0" + +window-size@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" + +wordwrap@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" + +wordwrap@~0.0.2: + version "0.0.3" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" + +wrap-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +write-file-atomic@^1.1.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f" + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + slide "^1.1.5" + +xtend@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" + +y18n@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + +yapool@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/yapool/-/yapool-1.0.0.tgz#f693f29a315b50d9a9da2646a7a6645c96985b6a" + +yargs-parser@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.0.0.tgz#21d476330e5a82279a4b881345bf066102e219c6" + dependencies: + camelcase "^4.1.0" + +yargs@^10.0.3: + version "10.0.3" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.0.3.tgz#6542debd9080ad517ec5048fb454efe9e4d4aaae" + dependencies: + cliui "^3.2.0" + decamelize "^1.1.1" + find-up "^2.1.0" + get-caller-file "^1.0.1" + os-locale "^2.0.0" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^2.0.0" + which-module "^2.0.0" + y18n "^3.2.1" + yargs-parser "^8.0.0" + +yargs@~3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" + dependencies: + camelcase "^1.0.2" + cliui "^2.1.0" + decamelize "^1.0.0" + window-size "0.1.0" From 4d20807c63d1c9e904b04931ae112620aac6cd9f Mon Sep 17 00:00:00 2001 From: nir Date: Tue, 5 Dec 2017 09:42:22 +0200 Subject: [PATCH 21/29] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ab79c61..051f04c 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ __arguments__ * `dir` - can be a string or an array of directories you want to delete within `dir`. * `extensions` - this too, can be a string or an array of file extenstions you want to delete within `dir`. * `ignore` - useful to exclude some files. again, can be a string or an array of file names you do NOT want to delete within `dir` - * `age.seconds` - can be any float number. findRemoveSync then compares it with the file stats and deletes those with creation times older than `age.seconds` + * `age.seconds` - can be any float number. findRemoveSync then compares it with the file stats and deletes those with modification times older than `age.seconds` * `limit` - can be any integer number. Will limit the number of files to be deleted at single operation to be `limit` * `maxLevel` - advanced: limits filtering to a certain level. useful for performance. recommended for crawling huge directory trees. * `test` - advanced: set to true for a test run, meaning it does not delete anything but returns a JSON of files/directories it would have deleted. useful for testing. From 7f6daf4bd11a958a807b794bec4dd17f6fb01580 Mon Sep 17 00:00:00 2001 From: nirs Date: Wed, 6 Dec 2017 16:50:27 +0200 Subject: [PATCH 22/29] Adding an option to delete by prefix. Tests added too. --- README.md | 15 +++++++++++---- find-remove.js | 5 +++++ tests/basics.js | 31 +++++++++++++++++++++++++++++-- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ab79c61..8f44265 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,13 @@ var result = findRemoveSync('/dist', {dir: 'CVS'}) var result = findRemoveSync('/tmp', {age: {seconds: 3600}, extensions: '.jpg', limit: 100}) ``` -### 7. apply filter options only for two levels inside the /temp directory for all tmp files +### 7. delete all files with prefix 'filenamestartswith' + +```javascript +var result = findRemoveSync('/tmp', {prefix: 'filenamestartswith'}) +``` + +### 8. apply filter options only for two levels inside the /temp directory for all tmp files ```javascript var result = findRemoveSync('/tmp', {maxLevel: 2, extensions: '.tmp'}) @@ -77,7 +83,7 @@ but not `/tmp/level1/level2/level3/b.tmp` why the heck do we have this `maxLevel` option? because of performance. if you care about deep subfolders, apply that option to get a speed boost. -### 8. delete everything recursively (hey, who needs that when you can use nodejs' fs.unlink?) +### 9. delete everything recursively (hey, who needs that when you can use nodejs' fs.unlink?) ```javascript var result = findRemoveSync(rootDirectory, {dir: "*", files: "*.*"}) @@ -95,11 +101,12 @@ __arguments__ * options - currently those properties are supported: * `files` - can be a string or an array of files you want to delete within `dir`. * `dir` - can be a string or an array of directories you want to delete within `dir`. - * `extensions` - this too, can be a string or an array of file extenstions you want to delete within `dir`. + * `extensions` - this too, can be a string or an array of file extentions you want to delete within `dir`. * `ignore` - useful to exclude some files. again, can be a string or an array of file names you do NOT want to delete within `dir` * `age.seconds` - can be any float number. findRemoveSync then compares it with the file stats and deletes those with creation times older than `age.seconds` * `limit` - can be any integer number. Will limit the number of files to be deleted at single operation to be `limit` - * `maxLevel` - advanced: limits filtering to a certain level. useful for performance. recommended for crawling huge directory trees. + * `prefix` - can be any string. Will delete any files that start with `prefix`. + * `maxLevel` - advanced: limits filtering to a certain level. useful for performance. recommended for crawling huge directory trees. * `test` - advanced: set to true for a test run, meaning it does not delete anything but returns a JSON of files/directories it would have deleted. useful for testing. as a precaution, nothing happens when there are no options. diff --git a/find-remove.js b/find-remove.js index fdd3824..5fcee00 100644 --- a/find-remove.js +++ b/find-remove.js @@ -84,6 +84,7 @@ function doDeleteFile(currentFile, options) { var extensions = (options && options.extensions) ? options.extensions : null var files = (options && options.files) ? options.files : null + var prefix = (options && options.prefix) ? options.prefix: null var dir = (options && options.dir) ? options.dir : null var ignore = (options && options.ignore) ? options.ignore : null @@ -112,6 +113,10 @@ function doDeleteFile(currentFile, options) { } } + if (!doDelete && prefix) { + doDelete = basename.indexOf(prefix) === 0 + } + if (doDelete && hasLimit(options)) { doDelete = !isOverTheLimit(options) } diff --git a/tests/basics.js b/tests/basics.js index 1e555ec..3979a9e 100644 --- a/tests/basics.js +++ b/tests/basics.js @@ -717,7 +717,7 @@ module.exports = testCase({ 'findRemoveSync(files older than .0005 sec with limit of 2)': function(t) { var result = findRemoveSync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}, limit: 2}) - t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(files older than .0005 sec) returned 2 entries (out of 11).') + t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(files older than .0005 sec with limit of 2) returned 2 entries (out of 11).') t.done() }, @@ -725,7 +725,34 @@ module.exports = testCase({ 'findRemoveSync(files and dirs older than .0005 sec with limit of 5)': function(t) { var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}, limit: 5}) - t.strictEqual(Object.keys(result).length, 5, 'findRemoveSync(files older than .0005 sec) returned 5 entries (out of 19).') + t.strictEqual(Object.keys(result).length, 5, 'findRemoveSync(files and dirs older than .0005 sec with limit of 5) returned 5 entries (out of 19).') + + t.done() + } + + }), + + 'TC 6: prefix checks': testCase({ + + setUp: function(cb) { + createFakeDirectoryTree(cb) + }, + tearDown: function(cb) { + destroyFakeDirectoryTree(cb) + }, + + 'findRemoveSync(files with exiting prefix "someth")': function(t) { + var result = findRemoveSync(rootDirectory, {prefix: "someth"}) + + t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(files with prefix "someth") returned 2 entries (out of 11).') + + t.done() + }, + + 'findRemoveSync(files with non-existing prefix "ssssssssssssssssssssssssss" - too many chars)': function(t) { + var result = findRemoveSync(rootDirectory, {prefix: "ssssssssssssssssssssssssss"}) + + t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(files with non-existing prefix "ssssssssssssssssssssssssss"- too many chars) returned 0 entries (out of 11).') t.done() } From 92dd66d55b023636881125e2ee886a987412d63d Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Thu, 7 Dec 2017 17:38:20 +1300 Subject: [PATCH 23/29] v1.2.0 --- package.json | 4 ++-- yarn.lock | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3af3c7b..d7fa092 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "find-remove", - "version": "1.1.0", + "version": "1.2.0", "description": "recursively finds files and/or directories by filter options from a start directory onwards and deletes these according to plenty of options you can configure. useful if you want to clean up stuff within a directory in your node.js app.", "main": "find-remove.js", "author": "Michael Heuberger ", @@ -22,7 +22,7 @@ "rimraf": "2.6.2" }, "devDependencies": { - "nodeunit": "0.11.1", + "nodeunit": "0.11.2", "randomstring": "1.1.5", "mkdirp": "0.5.1", "async": "2.6.0" diff --git a/yarn.lock b/yarn.lock index 9c51d98..92655a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1038,9 +1038,9 @@ ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" -nodeunit@0.11.1: - version "0.11.1" - resolved "https://registry.yarnpkg.com/nodeunit/-/nodeunit-0.11.1.tgz#23d80fd78b43d6c24ee1e4b64600d1579176195c" +nodeunit@0.11.2: + version "0.11.2" + resolved "https://registry.yarnpkg.com/nodeunit/-/nodeunit-0.11.2.tgz#f45a9c8542b8be83d1936b2c967229ba50b5424a" dependencies: ejs "^2.5.2" tap "^10.0.2" From 07c9e9ee8c479b07fdd81f5f4ca22365e958dba1 Mon Sep 17 00:00:00 2001 From: David Langer Date: Mon, 12 Feb 2018 00:10:23 +0100 Subject: [PATCH 24/29] Add promise version --- find-remove-async.js | 256 +++++++++++++ package.json | 2 +- tests/basics-async.js | 811 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1068 insertions(+), 1 deletion(-) create mode 100644 find-remove-async.js create mode 100644 tests/basics-async.js diff --git a/find-remove-async.js b/find-remove-async.js new file mode 100644 index 0000000..de2e523 --- /dev/null +++ b/find-remove-async.js @@ -0,0 +1,256 @@ +var fs = require('fs'), + path = require('path'), + merge = require('fmerge'), + util = require('util'), + rimraf = require('rimraf'), + + now, + testRun + +function promisify (fn) { + return (...args) => { + return new Promise((resolve, reject) => { + fn(...args, (err, ...args2) => { + return err ? reject(err) : resolve(...args2) + }); + }); + }; +} +function promisifyWithOutErr (fn) { + return (...args) => { + return new Promise((resolve, reject) => { + fn(...args, (...args2) => { + return resolve(...args2); + }); + }); + }; +} +const statAsync = promisify(fs.stat); +const existsAsync = promisifyWithOutErr(fs.exists); +const readdirAsync = promisify(fs.readdir); +const unlinkAsync = promisify(fs.unlink); + +async function isOlder(path, ageSeconds) { + var stats = await statAsync(path), + mtime = stats.mtime.getTime(), + expirationTime = (mtime + (ageSeconds * 1000)) + + return now > expirationTime +} + +function hasLimit(options) { + return options && options.hasOwnProperty('limit') +} + +function getLimit(options) { + return hasLimit(options) ? options.limit : -1 +} + +function hasTotalRemoved(options) { + return options && options.hasOwnProperty('totalRemoved') +} + +function getTotalRemoved(options) { + return hasTotalRemoved(options) ? options.totalRemoved : -2 +} + +function isOverTheLimit(options) { + return getTotalRemoved(options) >= getLimit(options) +} + +function hasMaxLevel(options) { + return options && options.hasOwnProperty('maxLevel') +} + +function getMaxLevel(options) { + return hasMaxLevel(options) ? options.maxLevel : -1 +} + +function getAgeSeconds(options) { + return (options && options.age && options.age.seconds) ? options.age.seconds : null +} + +async function doDeleteDirectory(currentDir, options, currentLevel) { + + var doDelete = false + var dir = options && options.dir + + if (dir) { + var ageSeconds = getAgeSeconds(options) + var basename = path.basename(currentDir) + + if (util.isArray(dir)) { + doDelete = (dir.indexOf("*") !== 1) || (dir.indexOf(basename) !== -1) + } else if (basename === dir || dir === "*") { + doDelete = true + } + + if (doDelete && hasLimit(options)) { + doDelete = !isOverTheLimit(options) + } + + if (doDelete && hasMaxLevel(options) && currentLevel > 0) { + doDelete = currentLevel <= getMaxLevel(options) + } + + if (ageSeconds && doDelete) { + doDelete = await isOlder(currentDir, ageSeconds) + } + } + + return doDelete +} + +async function doDeleteFile(currentFile, options) { + // by default it deletes nothing + var doDelete = false + + var extensions = (options && options.extensions) ? options.extensions : null + var files = (options && options.files) ? options.files : null + var prefix = (options && options.prefix) ? options.prefix: null + var dir = (options && options.dir) ? options.dir : null + var ignore = (options && options.ignore) ? options.ignore : null + + // return the last portion of a path, the filename aka basename + var basename = path.basename(currentFile) + + if (files) { + if (util.isArray(files)) + doDelete = (files.indexOf("*.*") !== -1) || (files.indexOf(basename) !== -1) + else { + if (files === '*.*') { + doDelete = true + } else { + doDelete = (basename === files) + } + } + } + + if (!doDelete && extensions) { + var currentExt = path.extname(currentFile) + + if (util.isArray(extensions)) { + doDelete = extensions.indexOf(currentExt) !== -1 + } else { + doDelete = (currentExt === extensions) + } + } + + if (!doDelete && prefix) { + doDelete = basename.indexOf(prefix) === 0 + } + + if (doDelete && hasLimit(options)) { + doDelete = !isOverTheLimit(options) + } + + if (doDelete && ignore) { + if (util.isArray(ignore)) + doDelete = !(ignore.indexOf(basename) !== -1) + else + doDelete = !(basename === ignore) + } + + if (doDelete) { + var ageSeconds = getAgeSeconds(options) + + if (ageSeconds) + doDelete = await isOlder(currentFile, ageSeconds) + } + + return doDelete +} + +function isTestRun(options) { + return (options && options.hasOwnProperty('test')) ? options.test : false +} + +/** + * findRemoveSync(currentDir, options) takes any start directory and searches files from there for removal. + * the selection of files for removal depends on the given options. when no options are given, or only the maxLevel + * parameter is given, then everything is removed as if there were no filters. + * + * beware: everything happens synchronously. + * + * + * @param {String} currentDir any directory to operate within. it will seek files and/or directories recursively from there. + * beware that it deletes the given currentDir when no options or only the maxLevel parameter are given. + * @param options json object with optional properties like extensions, files, ignore, maxLevel and age.seconds. + * @return {Object} json object of files and/or directories that were found and successfully removed. + * @api public + */ +var findRemoveAsync = module.exports = async function(currentDir, options, currentLevel) { + + var removed = {} + + if (!isOverTheLimit(options) && await existsAsync(currentDir)) { + + var maxLevel = getMaxLevel(options), + deleteDirectory = false + + if (hasLimit(options)) { + options.totalRemoved = hasTotalRemoved(options) ? getTotalRemoved(options) : 0 + } + + if (currentLevel === undefined) + currentLevel = 0 + else + currentLevel++ + + if (currentLevel < 1) { + now = new Date().getTime() + testRun = isTestRun(options) + } else { + // check directories before deleting files inside. + // this to maintain the original creation time, + // because linux modifies creation date of folders when files within have been deleted. + deleteDirectory = await doDeleteDirectory(currentDir, options, currentLevel) + } + + if (maxLevel === -1 || currentLevel < maxLevel) { + var filesInDir = await readdirAsync(currentDir) + + for (const file of filesInDir) { + + var currentFile = path.join(currentDir, file) + + if ((await statAsync(currentFile)).isDirectory()) { + // the recursive call + var result = await findRemoveAsync(currentFile, options, currentLevel) + + // merge results + removed = merge(removed, result) + if (hasTotalRemoved(options)) + options.totalRemoved += Object.keys(result).length + + } else { + + if (await doDeleteFile(currentFile, options)) { + if (!testRun) + await unlinkAsync(currentFile) + + removed[currentFile] = true + if (hasTotalRemoved(options)) + options.totalRemoved ++ + + } + } + } + } + if (deleteDirectory) { + try { + if (!testRun) + rimraf.sync(currentDir) + + if (!hasTotalRemoved(options)) + // for limit of files - we do not want to count the directories + removed[currentDir] = true + + } catch (err) { + throw err + } + } + } + + return removed +} diff --git a/package.json b/package.json index d7fa092..ae680a2 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "node": ">=4.1.0" }, "scripts": { - "test": "nodeunit tests/basics.js" + "test": "nodeunit tests/basics-async.js" }, "repository": { "type": "git", diff --git a/tests/basics-async.js b/tests/basics-async.js new file mode 100644 index 0000000..618c7c5 --- /dev/null +++ b/tests/basics-async.js @@ -0,0 +1,811 @@ +var testCase = require('nodeunit').testCase, + randomstring = require('randomstring'), + mkdirp = require('mkdirp'), + path = require('path'), + fs = require('fs'), + async = require('async'), + rimraf = require('rimraf'), + findRemoveAsync = require('../find-remove-async.js') + +var rootDirectory = path.join(require('os').tmpDir(), 'find-remove') + +function generateRandomFilename(ext) { + var filename = randomstring.generate(24) + + if (ext) + filename += '.' + ext + + return filename +} + +/* + pre defined directories: + + rootDirectory + + * randomFile1 (*.bak) + * randomFile2 (*.log) + * randomFile3 (*.log) + * randomFile4 (*.csv) + + + CVS (directory3) + + directory1 + + CVS (directory1_3) + + directory1_1 + + directory1_2 + + directory1_2_1 + * randomFile1_2_1_1 (*.log) + * randomFile1_2_1_2 (*.bak) + * randomFile1_2_1_3 (*.bak) + * fixFile1_2_1_4 (something.jpg) + * fixFile1_2_1_5 (something.png) + + directory1_2_2 + + directory2 + * randomFile2_1 (*.bak) + * randomFile2_2 (*.csv) + */ + +var directory1 = path.join(rootDirectory, 'directory1') +var directory2 = path.join(rootDirectory, 'directory2') +var directory3 = path.join(rootDirectory, 'CVS') + +var directory1_1 = path.join(directory1, 'directory1_1') +var directory1_2 = path.join(directory1, 'directory1_2') +var directory1_3 = path.join(directory1, 'CVS') + +var directory1_2_1 = path.join(directory1_2, 'directory1_2_1') +var directory1_2_2 = path.join(directory1_2, 'directory1_2_2') + +// mix of pre defined and random file names +var randomFilename1 = generateRandomFilename('bak') +var randomFile1 = path.join(rootDirectory, randomFilename1) +var randomFilename2 = generateRandomFilename('log') +var randomFile2 = path.join(rootDirectory, randomFilename2) +var randomFile3 = path.join(rootDirectory, generateRandomFilename('log')) +var randomFile4 = path.join(rootDirectory, generateRandomFilename('csv')) + +var randomFile2_1 = path.join(directory2, generateRandomFilename('bak')) +var randomFile2_2 = path.join(directory2, generateRandomFilename('csv')) + +var randomFilename1_2_1_1 = generateRandomFilename('log') +var randomFile1_2_1_1 = path.join(directory1_2_1, randomFilename1_2_1_1) +var randomFile1_2_1_2 = path.join(directory1_2_1, generateRandomFilename('bak')) +var randomFilename1_2_1_3 = generateRandomFilename('bak') +var randomFile1_2_1_3 = path.join(directory1_2_1, randomFilename1_2_1_3) + +var fixFilename1_2_1_4 = 'something.jpg' +var fixFile1_2_1_4 = path.join(directory1_2_1, fixFilename1_2_1_4) +var fixFilename1_2_1_5 = 'something.png' +var fixFile1_2_1_5 = path.join(directory1_2_1, fixFilename1_2_1_5) + +function makeFile(file, cb) { + fs.writeFile(file, '', function(err) { + if (err) + cb(err) + else + cb(null) + }) +} + +function createFakeDirectoryTree(cb) { + + async.series( + [ + function(cb) {mkdirp(directory1, cb)}, + function(cb) {mkdirp(directory2, cb)}, + function(cb) {mkdirp(directory3, cb)}, + + function(cb) {mkdirp(directory1_1, cb)}, + function(cb) {mkdirp(directory1_2, cb)}, + function(cb) {mkdirp(directory1_3, cb)}, + + function(cb) {mkdirp(directory1_2_1, cb)}, + function(cb) {mkdirp(directory1_2_2, cb)}, + + function(cb) {makeFile(randomFile1, cb)}, + function(cb) {makeFile(randomFile2, cb)}, + function(cb) {makeFile(randomFile3, cb)}, + function(cb) {makeFile(randomFile4, cb)}, + + function(cb) {makeFile(randomFile2_1, cb)}, + function(cb) {makeFile(randomFile2_2, cb)}, + + function(cb) {makeFile(randomFile1_2_1_1, cb)}, + function(cb) {makeFile(randomFile1_2_1_2, cb)}, + function(cb) {makeFile(randomFile1_2_1_3, cb)}, + function(cb) {makeFile(fixFile1_2_1_4, cb)}, + function(cb) {makeFile(fixFile1_2_1_5, cb)} + ], + + function(err) { + if (err) { + console.error(err) + } else { + cb() + } + } + ) +} + +function destroyFakeDirectoryTree(cb) { + rimraf(rootDirectory, cb) +} + +module.exports = testCase({ + + 'TC 1: tests without real files': testCase({ + 'loading findRemoveAsync function (require)': function(t) { + findRemoveAsync = require('../find-remove-async.js') + + t.ok(findRemoveAsync, 'findRemoveAsync is loaded.') + t.done() + }, + + 'removing non-existing directory': function(t) { + var result, dir = generateRandomFilename() + + result = findRemoveAsync(dir) + t.strictEqual(Object.keys(result).length, 0, 'returned empty') + + t.done() + } + }), + + 'TC 2: tests with real files': testCase({ + + setUp: function(cb) { + createFakeDirectoryTree(cb) + }, + tearDown: function(cb) { + destroyFakeDirectoryTree(cb) + }, + + 'findRemoveAsync(nonexisting)': function(t) { + findRemoveAsync('/tmp/blahblah/hehehe/yo/what/').then((result) => { + t.strictEqual(Object.keys(result).length, 0, 'did nothing.') + + t.done() + }).catch((err) => { + console.log(err); + }) + }, + + 'findRemoveAsync(no params)': function(t) { + findRemoveAsync(rootDirectory).then((result) => { + + t.strictEqual(Object.keys(result).length, 0, 'did nothing.') + + var exists = fs.existsSync(rootDirectory) + t.equal(exists, true, 'did not remove root directory') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveAsync(no params) did not remove directory1_1') + + t.done() + }) + }, + + 'findRemoveAsync(all files)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*"}).then((result) => { + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'removed randomFile1_2_1_2 fine') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'removed randomFile1_2_1_3 fine') + + t.done() + }) + }, + + 'findRemoveAsync(all directories)': function(t) { + findRemoveAsync(rootDirectory, {dir: "*"}).then((result) => { + + t.strictEqual(Object.keys(result).length, 8, 'all 8 directories deleted') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, false, 'removed directory1_1') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'removed randomFile1_2_1_2') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'removed randomFile1_2_1_3') + + t.done() + }) + }, + + 'findRemoveAsync(everything)': function(t) { + findRemoveAsync(rootDirectory, {dir: "*", files: "*.*"}).then((result) => { + + t.strictEqual(Object.keys(result).length, 19, 'all 19 directories + files deleted') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, false, 'removed directory1_1') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'did not remove randomFile1_2_1_2 fine') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'dit not remove randomFile1_2_1_3 fine') + + t.done() + }) + }, + + 'findRemoveAsync(files no hit)': function(t) { + findRemoveAsync(rootDirectory, {files: "no.hit.me"}).then((result) => { + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, true, 'did not remove randomFile1_2_1_3') + + t.done() + }) + }, + + 'findRemoveAsync(directory1_2_1)': function(t) { + findRemoveAsync(rootDirectory, {dir: 'directory1_2_1'}).then((result) => { + + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, false, 'did remove directory1_2_1') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') + + t.done() + }) + }, + + + 'findRemoveAsync(one directory and all files)': function(t) { + findRemoveAsync(rootDirectory, {dir: 'directory1_2_1', files: '*.*'}).then((result) => { + + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, false, 'did remove directory1_2_1') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') + + t.ok(result[randomFile1_2_1_1], 'randomFile1_2_1_1 is in result') + t.ok(result[randomFile1_2_1_2], 'randomFile1_2_1_2 is in result') + t.ok(result[randomFile1_2_1_3], 'randomFile1_2_1_3 is in result') + t.ok(result[directory1_2_1], 'directory1_2_1 is in result') + + t.done() + }) + }, + + 'findRemoveAsync(another directory and all files)': function(t) { + findRemoveAsync(rootDirectory, {dir: 'directory2', files: '*.*'}).then((result) => { + + var exists2 = fs.existsSync(directory2) + t.equal(exists2, false, 'directory2 not removed') + + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, true, 'directory1_2 not removed') + + t.ok(result[randomFile2_1], 'randomFile2_1 is in result') + + t.done() + }) + }, + + 'findRemoveAsync(all bak files from root)': function(t) { + findRemoveAsync(rootDirectory, {extensions: '.bak'}).then(() => { + + var exists1 = fs.existsSync(randomFile1) + var exists2_1 = fs.existsSync(randomFile2_1) + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + + t.equal(exists1, false, 'findRemoveAsync(all bak files from root) removed randomFile1 fine') + t.equal(exists2_1, false, 'findRemoveAsync(all bak files from root) removed exists2_1 fine') + t.equal(exists1_2_1_2, false, 'findRemoveAsync(all bak files from root) removed exists1_2_1_2 fine') + t.equal(exists1_2_1_3, false, 'findRemoveAsync(all bak files from root) removed exists1_2_1_3 fine') + + var exists3 = fs.existsSync(randomFile3) + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + var exists0 = fs.existsSync(rootDirectory) + var exists1_2_1 = fs.existsSync(directory1_2_1) + + t.equal(exists3, true, 'findRemoveAsync(all bak files from root) did not remove log file exists3') + t.equal(exists1_2_1_1, true, 'findRemoveAsync(all bak files from root) did not remove log file exists1_2_1_1') + t.equal(exists0, true, 'findRemoveAsync(all bak files from root) did not remove root directory') + t.equal(exists1_2_1, true, 'findRemoveAsync(all bak files from root) did not remove directory directory1_2_1') + + t.done() + }) + }, + + 'findRemoveAsync(all log files from directory1_2_1)': function(t) { + findRemoveAsync(directory1_2_1, {extensions: '.log'}).then(() => { + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(all log files from directory1_2_1) removed randomFile1_2_1_1 fine') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, true, 'findRemoveAsync(all log files from directory1_2_1) did not remove file randomFile1_2_1_2') + + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, true, 'findRemoveAsync(all log files from directory1_2_1) did not remove directory directory1_2_1') + + t.done() + }); + }, + + 'findRemoveAsync(all bak or log files from root)': function(t) { + findRemoveAsync(rootDirectory, {extensions: ['.bak', '.log']}).then(() => { + + var exists1 = fs.existsSync(randomFile1) + var exists2_1 = fs.existsSync(randomFile2_1) + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + + var exists2 = fs.existsSync(randomFile2) + var exists3 = fs.existsSync(randomFile3) + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + + t.equal(exists1, false, 'findRemoveAsync(all bak and log files from root) removed randomFile1 fine') + t.equal(exists2_1, false, 'findRemoveAsync(all bak and log files from root) removed exists2_1 fine') + t.equal(exists1_2_1_2, false, 'findRemoveAsync(all bak and log files from root) removed exists1_2_1_2 fine') + t.equal(exists1_2_1_3, false, 'findRemoveAsync(all bak and log files from root) removed exists1_2_1_3 fine') + + t.equal(exists2, false, 'findRemoveAsync(all bak and log files from root) removed exists2 fine') + t.equal(exists3, false, 'findRemoveAsync(all bak and log files from root) removed exists3 fine') + t.equal(exists1_2_1_1, false, 'findRemoveAsync(all bak and log files from root) removed exists1_2_1_1 fine') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveAsync(all bak and log files from root) did not remove directory1_1') + + t.done() + }) + }, + + 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2)': function(t) { + findRemoveAsync(directory1_2, {files: randomFilename1_2_1_1}).then(() => { + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2) removed randomFile1_2_1_1 fine') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, true, 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2) did not remove randomFile1_2_1_2') + + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, true, 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2) did not remove directory1_2') + + t.done() + }) + }, + + 'findRemoveAsync(two files from root)': function(t) { + findRemoveAsync(rootDirectory, {files: [randomFilename2, randomFilename1_2_1_3]}).then((result) => { + + var exists2 = fs.existsSync(randomFile2) + t.equal(exists2, false, 'findRemoveAsync(two files from root) removed randomFile2 fine') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'findRemoveAsync(two files from root) removed randomFile1_2_1_3 fine') + + var exists1 = fs.existsSync(randomFile1) + t.equal(exists1, true, 'findRemoveAsync(two files from root) did not remove randomFile1') + + var exists0 = fs.existsSync(rootDirectory) + t.equal(exists0, true, 'findRemoveAsync(two files from root) did not remove root directory') + + t.done() + }) + }, + + 'findRemoveAsync(files set to *.*)': function(t) { + findRemoveAsync(directory1_2_1, {files: '*.*'}).then(() => { + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(files set to *.*) removed randomFile1_2_1_1 fine') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'findRemoveAsync(files set to *.*) removed randomFile1_2_1_2 fine') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'findRemoveAsync(files set to *.*) removed randomFile1_2_1_3 fine') + + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, true, 'findRemoveAsync(files set to *.* did not remove directory1_2_1') + + t.done() + }) + }, + + 'findRemoveAsync(with mixed ext and file params)': function(t) { + findRemoveAsync(rootDirectory, {files: randomFilename1, extensions: ['.log']}).then((result) => { + + var exists1 = fs.existsSync(randomFile1) + var exists2 = fs.existsSync(randomFile2) + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1, false, 'findRemoveAsync(with mixed ext and file params) removed randomFile1 fine') + t.equal(exists2, false, 'findRemoveAsync(with mixed ext and file params) removed randomFile2 fine') + t.equal(exists1_2_1_1, false, 'findRemoveAsync(with mixed ext and file params) removed randomFile1_2_1_1 fine') + + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, true, 'did not remove directory1_2_1') + + t.strictEqual(typeof result[randomFile1], 'boolean', 'randomFile1 in result is boolean') + t.strictEqual(typeof result[randomFile1_2_1_2], 'undefined', 'randomFile1_2_1_2 is NOT in result') + + t.done() + }) + }, + + 'findRemoveAsync(with ignore param)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", ignore: fixFilename1_2_1_4}).then((result) => { + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(with ignore) did remove file randomFile1_2_1_1') + + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'file fixFile1_2_1_4 not removed') + + t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 in result is boolean') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + + t.done() + }) + }, + + 'findRemoveAsync(with ignore and jpg extension params)': function(t) { + findRemoveAsync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.jpg'}).then((result) => { + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_1, true, 'findRemoveAsync(with ignore + jpg extension) did not remove file randomFile1_2_1_1') + t.equal(exists1_2_1_4, true, 'findRemoveAsync(with ignore + jpg extension) did not remove file fixFile1_2_1_4') + t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + + t.done() + }) + }, + + 'findRemoveAsync(with multiple ignore)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", ignore: [fixFilename1_2_1_4, fixFilename1_2_1_5]}).then((result) => { + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(with multiple ignore) did remove file randomFile1_2_1_1') + + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'findRemoveAsync(with multiple ignore) did not remove file fixFile1_2_1_4') + + var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5) + t.equal(exists1_2_1_5, true, 'findRemoveAsync(with multiple ignore) did not remove file fixFile1_2_1_5') + + t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result') + + t.done() + }) + }, + + 'findRemoveAsync(with ignore and bak extension params)': function(t) { + findRemoveAsync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.bak'}).then((result) => { + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, true, 'findRemoveAsync(with ignore + bak extension) did not remove file randomFile1_2_1_1') + + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'findRemoveAsync(with ignore + bak extension) did remove file randomFile1_2_1_2') + + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'findRemoveAsync(with ignore + bak extension) did not remove file fixFile1_2_1_4') + + t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result') + t.strictEqual(typeof result[randomFile1_2_1_2], 'boolean', 'randomFile1_2_1_2 is in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + + t.done() + }) + }, + + 'findRemoveAsync(two files and check others)': function(t) { + findRemoveAsync(rootDirectory, {files: [randomFilename1_2_1_1, randomFilename1_2_1_3]}).then((result) => { + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(two files and check others) removed randomFile1_2_1_1 fine') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'findRemoveAsync(two files and check others) removed randomFile1_2_1_3 fine') + + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'findRemoveAsync(two files and check others) did not remove fixFile1_2_1_4') + + var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5) + t.equal(exists1_2_1_5, true, 'findRemoveAsync(two files and check others) did not remove fixFile1_2_1_5') + + t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result') + t.strictEqual(typeof result[randomFile1_2_1_3], 'boolean', 'randomFile1_2_1_3 is in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result') + + t.done() + }) + }, + + 'findRemoveAsync(limit to maxLevel = 0)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 0}).then((result) => { + + t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(limit to maxLevel = 0) returned empty an array.') + + t.done() + }) + }, + + 'findRemoveAsync(limit to maxLevel = 1)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 1}).then((result) => { + + t.strictEqual(Object.keys(result).length, 7, 'findRemoveAsync(limit to maxLevel = 1) returned 7 entries.') + + t.done() + }) + }, + + 'findRemoveAsync(limit to maxLevel = 2)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 2}).then((result) => { + + t.strictEqual(Object.keys(result).length, 12, 'findRemoveAsync(limit to maxLevel = 2) returned 12 entries.') + + t.done() + }) + }, + + 'findRemoveAsync(limit to maxLevel = 3)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", maxLevel: 3}).then((result) => { + + t.strictEqual(Object.keys(result).length, 6, 'findRemoveAsync(limit to maxLevel = 3) returned 6 entries.') + + t.done() + }) + }, + + 'findRemoveAsync(limit to maxLevel = 3 + bak only)': function(t) { + findRemoveAsync(rootDirectory, {maxLevel: 3, extensions: '.bak'}).then((result) => { + + t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(limit to maxLevel = 3 + bak only) returned 2 entries.') + + t.done() + }) + }, + + 'findRemoveAsync(single dir)': function(t) { + findRemoveAsync(rootDirectory, {dir: 'directory1_2'}).then((result) => { + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveAsync(single dir) did not remove directory1_1') + + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, false, 'findRemoveAsync(single dir) removed directory1_2') + + t.done() + }) + }, + + 'findRemoveAsync(two directories)': function(t) { + findRemoveAsync(rootDirectory, {dir: ['directory1_1', 'directory1_2']}).then(() => { + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, false, 'findRemoveAsync(remove single dir) removed directory1_1') + + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, false, 'findRemoveAsync(remove single dir) removed directory1_2') + + t.done() + }) + }, + + 'findRemoveAsync(directories with the same basename)': function(t) { + findRemoveAsync(rootDirectory, {dir: 'CVS'}).then(() => { + + var exists1_3 = fs.existsSync(directory1_3) + t.equal(exists1_3, false, 'findRemoveAsync(directories with the same basename) removed root/directory1/CVS') + + var exists3 = fs.existsSync(directory3) + t.equal(exists3, false, 'findRemoveAsync(directories with the same basename) removed root/CVS') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveAsync(remove single dir) did not remove directory1_1') + + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, true, 'findRemoveAsync(remove single dir) did not remove directory1_2') + + t.done() + }) + }, + + 'findRemoveAsync(test run)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", test: true}).then((result) => { + + t.strictEqual(Object.keys(result).length, 19, 'findRemoveAsync(test run) returned 19 entries.') + + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, true, 'findRemoveAsync(test run) did not remove randomFile1_2_1_1') + + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, true, 'findRemoveAsync(test run) did not remove randomFile1_2_1_3') + + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveAsync(test run) did not remove directory1_1') + + t.done() + }) + } + }), + + 'TC 3: age checks': testCase({ + + setUp: function(cb) { + createFakeDirectoryTree(cb) + }, + tearDown: function(cb) { + destroyFakeDirectoryTree(cb) + }, + + 'findRemoveAsync(files and dirs older than 10000000000000000 sec)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 10000000000000000}}).then((result) => { + + t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(files older than 10000000000000000 sec) returned zero entries.') + + t.done() + }) + }, + + 'findRemoveAsync(files and dirs older than 10 sec)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 10}}).then((result) => { + + t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(files older than 10 sec) returned zero entries.') + + t.done() + }) + }, + + 'findRemoveAsync(files older than .0005 sec)': function(t) { + setTimeout(() => { + findRemoveAsync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}}).then((result) => { + + t.strictEqual(Object.keys(result).length, 11, 'findRemoveAsync(files older than .0005 sec) returned 11 entries.') + + t.done() + }) + }, 1) + }, + + 'findRemoveAsync(files and dirs older than .0005 sec)': function(t) { + setTimeout(() => { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}}).then((result) => { + + t.strictEqual(Object.keys(result).length, 19, 'findRemoveAsync(files older than .0005 sec) returned 19 entries.') + + t.done() + }) + }, 1) + }, + + 'findRemoveAsync(files older than 2 sec with wait)': function(t) { + setTimeout(function() { + findRemoveAsync(rootDirectory, {files: "*.*", age: {seconds: 2}}).then((result) => { + + t.strictEqual(Object.keys(result).length, 11, 'findRemoveAsync(files older than 2 sec with wait) returned 11 entries.') + + t.done() + }) + }, 2100) + }, + + 'findRemoveAsync(files older than 2 sec with wait + maxLevel = 1)': function(t) { + setTimeout(function() { + findRemoveAsync(rootDirectory, {files: "*.*", maxLevel: 1, age: {seconds: 2}}).then((result) => { + + t.strictEqual(Object.keys(result).length, 4, 'findRemoveAsync(files older than 2 sec with wait + maxLevel = 1) returned 4 entries.') + + t.done() + }) + }, 2100) + } + }), + + 'TC 4: github issues': testCase({ + + setUp: function(cb) { + createFakeDirectoryTree(cb) + }, + tearDown: function(cb) { + destroyFakeDirectoryTree(cb) + }, + + // from https://github.com/binarykitchen/find-remove/issues/7 + 'findRemoveAsync(issues/7a)': function(t) { + setTimeout(function() { + findRemoveAsync(rootDirectory, {age: {seconds: 2}, extensions: '.csv'}).then((result) => { + + t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(issues/7) deleted 2 files.') + + t.done() + }) + }, 3 * 1000) + }, + + // from https://github.com/binarykitchen/find-remove/issues/7 + 'findRemoveAsync(issues/7b)': function(t) { + findRemoveAsync(rootDirectory, {extensions: '.dontexist'}).then((result) => { + + t.deepEqual(result, {}, 'is an empty json') + + t.done() + }) + } + }), + + 'TC 5: limit checks': testCase({ + + setUp: function(cb) { + createFakeDirectoryTree(cb) + }, + tearDown: function(cb) { + destroyFakeDirectoryTree(cb) + }, + + 'findRemoveAsync(files older than .0005 sec with limit of 2)': function(t) { + setTimeout(() => { + findRemoveAsync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}, limit: 2}).then((result) => { + + t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(files older than .0005 sec with limit of 2) returned 2 entries (out of 11).') + + t.done() + }) + }, 1) + }, + + 'findRemoveAsync(files and dirs older than .0005 sec with limit of 5)': function(t) { + setTimeout(() => { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}, limit: 5}).then((result) => { + + t.strictEqual(Object.keys(result).length, 5, 'findRemoveAsync(files and dirs older than .0005 sec with limit of 5) returned 5 entries (out of 19).') + + t.done() + }) + }, 1) + } + + }), + + 'TC 6: prefix checks': testCase({ + + setUp: function(cb) { + createFakeDirectoryTree(cb) + }, + tearDown: function(cb) { + destroyFakeDirectoryTree(cb) + }, + + 'findRemoveAsync(files with exiting prefix "someth")': function(t) { + findRemoveAsync(rootDirectory, {prefix: "someth"}).then((result) => { + + t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(files with prefix "someth") returned 2 entries (out of 11).') + + t.done() + }) + }, + + 'findRemoveAsync(files with non-existing prefix "ssssssssssssssssssssssssss" - too many chars)': function(t) { + findRemoveAsync(rootDirectory, {prefix: "ssssssssssssssssssssssssss"}).then((result) => { + + t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(files with non-existing prefix "ssssssssssssssssssssssssss"- too many chars) returned 0 entries (out of 11).') + + t.done() + }) + } + + }) +}) From fdf98075f2e4df6e88ee4a6e7f328187c5a80a82 Mon Sep 17 00:00:00 2001 From: David Langer Date: Tue, 13 Feb 2018 10:25:16 +0100 Subject: [PATCH 25/29] Replace files instead of adding new ones (lib and test) --- find-remove-async.js | 256 ------------- find-remove.js | 56 ++- package.json | 2 +- tests/basics-async.js | 811 ------------------------------------------ 4 files changed, 40 insertions(+), 1085 deletions(-) delete mode 100644 find-remove-async.js delete mode 100644 tests/basics-async.js diff --git a/find-remove-async.js b/find-remove-async.js deleted file mode 100644 index de2e523..0000000 --- a/find-remove-async.js +++ /dev/null @@ -1,256 +0,0 @@ -var fs = require('fs'), - path = require('path'), - merge = require('fmerge'), - util = require('util'), - rimraf = require('rimraf'), - - now, - testRun - -function promisify (fn) { - return (...args) => { - return new Promise((resolve, reject) => { - fn(...args, (err, ...args2) => { - return err ? reject(err) : resolve(...args2) - }); - }); - }; -} -function promisifyWithOutErr (fn) { - return (...args) => { - return new Promise((resolve, reject) => { - fn(...args, (...args2) => { - return resolve(...args2); - }); - }); - }; -} -const statAsync = promisify(fs.stat); -const existsAsync = promisifyWithOutErr(fs.exists); -const readdirAsync = promisify(fs.readdir); -const unlinkAsync = promisify(fs.unlink); - -async function isOlder(path, ageSeconds) { - var stats = await statAsync(path), - mtime = stats.mtime.getTime(), - expirationTime = (mtime + (ageSeconds * 1000)) - - return now > expirationTime -} - -function hasLimit(options) { - return options && options.hasOwnProperty('limit') -} - -function getLimit(options) { - return hasLimit(options) ? options.limit : -1 -} - -function hasTotalRemoved(options) { - return options && options.hasOwnProperty('totalRemoved') -} - -function getTotalRemoved(options) { - return hasTotalRemoved(options) ? options.totalRemoved : -2 -} - -function isOverTheLimit(options) { - return getTotalRemoved(options) >= getLimit(options) -} - -function hasMaxLevel(options) { - return options && options.hasOwnProperty('maxLevel') -} - -function getMaxLevel(options) { - return hasMaxLevel(options) ? options.maxLevel : -1 -} - -function getAgeSeconds(options) { - return (options && options.age && options.age.seconds) ? options.age.seconds : null -} - -async function doDeleteDirectory(currentDir, options, currentLevel) { - - var doDelete = false - var dir = options && options.dir - - if (dir) { - var ageSeconds = getAgeSeconds(options) - var basename = path.basename(currentDir) - - if (util.isArray(dir)) { - doDelete = (dir.indexOf("*") !== 1) || (dir.indexOf(basename) !== -1) - } else if (basename === dir || dir === "*") { - doDelete = true - } - - if (doDelete && hasLimit(options)) { - doDelete = !isOverTheLimit(options) - } - - if (doDelete && hasMaxLevel(options) && currentLevel > 0) { - doDelete = currentLevel <= getMaxLevel(options) - } - - if (ageSeconds && doDelete) { - doDelete = await isOlder(currentDir, ageSeconds) - } - } - - return doDelete -} - -async function doDeleteFile(currentFile, options) { - // by default it deletes nothing - var doDelete = false - - var extensions = (options && options.extensions) ? options.extensions : null - var files = (options && options.files) ? options.files : null - var prefix = (options && options.prefix) ? options.prefix: null - var dir = (options && options.dir) ? options.dir : null - var ignore = (options && options.ignore) ? options.ignore : null - - // return the last portion of a path, the filename aka basename - var basename = path.basename(currentFile) - - if (files) { - if (util.isArray(files)) - doDelete = (files.indexOf("*.*") !== -1) || (files.indexOf(basename) !== -1) - else { - if (files === '*.*') { - doDelete = true - } else { - doDelete = (basename === files) - } - } - } - - if (!doDelete && extensions) { - var currentExt = path.extname(currentFile) - - if (util.isArray(extensions)) { - doDelete = extensions.indexOf(currentExt) !== -1 - } else { - doDelete = (currentExt === extensions) - } - } - - if (!doDelete && prefix) { - doDelete = basename.indexOf(prefix) === 0 - } - - if (doDelete && hasLimit(options)) { - doDelete = !isOverTheLimit(options) - } - - if (doDelete && ignore) { - if (util.isArray(ignore)) - doDelete = !(ignore.indexOf(basename) !== -1) - else - doDelete = !(basename === ignore) - } - - if (doDelete) { - var ageSeconds = getAgeSeconds(options) - - if (ageSeconds) - doDelete = await isOlder(currentFile, ageSeconds) - } - - return doDelete -} - -function isTestRun(options) { - return (options && options.hasOwnProperty('test')) ? options.test : false -} - -/** - * findRemoveSync(currentDir, options) takes any start directory and searches files from there for removal. - * the selection of files for removal depends on the given options. when no options are given, or only the maxLevel - * parameter is given, then everything is removed as if there were no filters. - * - * beware: everything happens synchronously. - * - * - * @param {String} currentDir any directory to operate within. it will seek files and/or directories recursively from there. - * beware that it deletes the given currentDir when no options or only the maxLevel parameter are given. - * @param options json object with optional properties like extensions, files, ignore, maxLevel and age.seconds. - * @return {Object} json object of files and/or directories that were found and successfully removed. - * @api public - */ -var findRemoveAsync = module.exports = async function(currentDir, options, currentLevel) { - - var removed = {} - - if (!isOverTheLimit(options) && await existsAsync(currentDir)) { - - var maxLevel = getMaxLevel(options), - deleteDirectory = false - - if (hasLimit(options)) { - options.totalRemoved = hasTotalRemoved(options) ? getTotalRemoved(options) : 0 - } - - if (currentLevel === undefined) - currentLevel = 0 - else - currentLevel++ - - if (currentLevel < 1) { - now = new Date().getTime() - testRun = isTestRun(options) - } else { - // check directories before deleting files inside. - // this to maintain the original creation time, - // because linux modifies creation date of folders when files within have been deleted. - deleteDirectory = await doDeleteDirectory(currentDir, options, currentLevel) - } - - if (maxLevel === -1 || currentLevel < maxLevel) { - var filesInDir = await readdirAsync(currentDir) - - for (const file of filesInDir) { - - var currentFile = path.join(currentDir, file) - - if ((await statAsync(currentFile)).isDirectory()) { - // the recursive call - var result = await findRemoveAsync(currentFile, options, currentLevel) - - // merge results - removed = merge(removed, result) - if (hasTotalRemoved(options)) - options.totalRemoved += Object.keys(result).length - - } else { - - if (await doDeleteFile(currentFile, options)) { - if (!testRun) - await unlinkAsync(currentFile) - - removed[currentFile] = true - if (hasTotalRemoved(options)) - options.totalRemoved ++ - - } - } - } - } - if (deleteDirectory) { - try { - if (!testRun) - rimraf.sync(currentDir) - - if (!hasTotalRemoved(options)) - // for limit of files - we do not want to count the directories - removed[currentDir] = true - - } catch (err) { - throw err - } - } - } - - return removed -} diff --git a/find-remove.js b/find-remove.js index 5fcee00..de2e523 100644 --- a/find-remove.js +++ b/find-remove.js @@ -7,8 +7,31 @@ var fs = require('fs'), now, testRun -function isOlder(path, ageSeconds) { - var stats = fs.statSync(path), +function promisify (fn) { + return (...args) => { + return new Promise((resolve, reject) => { + fn(...args, (err, ...args2) => { + return err ? reject(err) : resolve(...args2) + }); + }); + }; +} +function promisifyWithOutErr (fn) { + return (...args) => { + return new Promise((resolve, reject) => { + fn(...args, (...args2) => { + return resolve(...args2); + }); + }); + }; +} +const statAsync = promisify(fs.stat); +const existsAsync = promisifyWithOutErr(fs.exists); +const readdirAsync = promisify(fs.readdir); +const unlinkAsync = promisify(fs.unlink); + +async function isOlder(path, ageSeconds) { + var stats = await statAsync(path), mtime = stats.mtime.getTime(), expirationTime = (mtime + (ageSeconds * 1000)) @@ -47,7 +70,7 @@ function getAgeSeconds(options) { return (options && options.age && options.age.seconds) ? options.age.seconds : null } -function doDeleteDirectory(currentDir, options, currentLevel) { +async function doDeleteDirectory(currentDir, options, currentLevel) { var doDelete = false var dir = options && options.dir @@ -71,14 +94,14 @@ function doDeleteDirectory(currentDir, options, currentLevel) { } if (ageSeconds && doDelete) { - doDelete = isOlder(currentDir, ageSeconds) + doDelete = await isOlder(currentDir, ageSeconds) } } return doDelete } -function doDeleteFile(currentFile, options) { +async function doDeleteFile(currentFile, options) { // by default it deletes nothing var doDelete = false @@ -132,7 +155,7 @@ function doDeleteFile(currentFile, options) { var ageSeconds = getAgeSeconds(options) if (ageSeconds) - doDelete = isOlder(currentFile, ageSeconds) + doDelete = await isOlder(currentFile, ageSeconds) } return doDelete @@ -156,11 +179,11 @@ function isTestRun(options) { * @return {Object} json object of files and/or directories that were found and successfully removed. * @api public */ -var findRemoveSync = module.exports = function(currentDir, options, currentLevel) { +var findRemoveAsync = module.exports = async function(currentDir, options, currentLevel) { var removed = {} - if (!isOverTheLimit(options) && fs.existsSync(currentDir)) { + if (!isOverTheLimit(options) && await existsAsync(currentDir)) { var maxLevel = getMaxLevel(options), deleteDirectory = false @@ -181,19 +204,19 @@ var findRemoveSync = module.exports = function(currentDir, options, currentLevel // check directories before deleting files inside. // this to maintain the original creation time, // because linux modifies creation date of folders when files within have been deleted. - deleteDirectory = doDeleteDirectory(currentDir, options, currentLevel) + deleteDirectory = await doDeleteDirectory(currentDir, options, currentLevel) } if (maxLevel === -1 || currentLevel < maxLevel) { - var filesInDir = fs.readdirSync(currentDir) + var filesInDir = await readdirAsync(currentDir) - filesInDir.forEach(function(file) { + for (const file of filesInDir) { var currentFile = path.join(currentDir, file) - if (fs.statSync(currentFile).isDirectory()) { + if ((await statAsync(currentFile)).isDirectory()) { // the recursive call - var result = findRemoveSync(currentFile, options, currentLevel) + var result = await findRemoveAsync(currentFile, options, currentLevel) // merge results removed = merge(removed, result) @@ -202,9 +225,9 @@ var findRemoveSync = module.exports = function(currentDir, options, currentLevel } else { - if (doDeleteFile(currentFile, options)) { + if (await doDeleteFile(currentFile, options)) { if (!testRun) - fs.unlinkSync(currentFile) + await unlinkAsync(currentFile) removed[currentFile] = true if (hasTotalRemoved(options)) @@ -212,9 +235,8 @@ var findRemoveSync = module.exports = function(currentDir, options, currentLevel } } - }) + } } - if (deleteDirectory) { try { if (!testRun) diff --git a/package.json b/package.json index ae680a2..d7fa092 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "node": ">=4.1.0" }, "scripts": { - "test": "nodeunit tests/basics-async.js" + "test": "nodeunit tests/basics.js" }, "repository": { "type": "git", diff --git a/tests/basics-async.js b/tests/basics-async.js deleted file mode 100644 index 618c7c5..0000000 --- a/tests/basics-async.js +++ /dev/null @@ -1,811 +0,0 @@ -var testCase = require('nodeunit').testCase, - randomstring = require('randomstring'), - mkdirp = require('mkdirp'), - path = require('path'), - fs = require('fs'), - async = require('async'), - rimraf = require('rimraf'), - findRemoveAsync = require('../find-remove-async.js') - -var rootDirectory = path.join(require('os').tmpDir(), 'find-remove') - -function generateRandomFilename(ext) { - var filename = randomstring.generate(24) - - if (ext) - filename += '.' + ext - - return filename -} - -/* - pre defined directories: - + rootDirectory - - * randomFile1 (*.bak) - * randomFile2 (*.log) - * randomFile3 (*.log) - * randomFile4 (*.csv) - - + CVS (directory3) - + directory1 - + CVS (directory1_3) - + directory1_1 - + directory1_2 - + directory1_2_1 - * randomFile1_2_1_1 (*.log) - * randomFile1_2_1_2 (*.bak) - * randomFile1_2_1_3 (*.bak) - * fixFile1_2_1_4 (something.jpg) - * fixFile1_2_1_5 (something.png) - + directory1_2_2 - + directory2 - * randomFile2_1 (*.bak) - * randomFile2_2 (*.csv) - */ - -var directory1 = path.join(rootDirectory, 'directory1') -var directory2 = path.join(rootDirectory, 'directory2') -var directory3 = path.join(rootDirectory, 'CVS') - -var directory1_1 = path.join(directory1, 'directory1_1') -var directory1_2 = path.join(directory1, 'directory1_2') -var directory1_3 = path.join(directory1, 'CVS') - -var directory1_2_1 = path.join(directory1_2, 'directory1_2_1') -var directory1_2_2 = path.join(directory1_2, 'directory1_2_2') - -// mix of pre defined and random file names -var randomFilename1 = generateRandomFilename('bak') -var randomFile1 = path.join(rootDirectory, randomFilename1) -var randomFilename2 = generateRandomFilename('log') -var randomFile2 = path.join(rootDirectory, randomFilename2) -var randomFile3 = path.join(rootDirectory, generateRandomFilename('log')) -var randomFile4 = path.join(rootDirectory, generateRandomFilename('csv')) - -var randomFile2_1 = path.join(directory2, generateRandomFilename('bak')) -var randomFile2_2 = path.join(directory2, generateRandomFilename('csv')) - -var randomFilename1_2_1_1 = generateRandomFilename('log') -var randomFile1_2_1_1 = path.join(directory1_2_1, randomFilename1_2_1_1) -var randomFile1_2_1_2 = path.join(directory1_2_1, generateRandomFilename('bak')) -var randomFilename1_2_1_3 = generateRandomFilename('bak') -var randomFile1_2_1_3 = path.join(directory1_2_1, randomFilename1_2_1_3) - -var fixFilename1_2_1_4 = 'something.jpg' -var fixFile1_2_1_4 = path.join(directory1_2_1, fixFilename1_2_1_4) -var fixFilename1_2_1_5 = 'something.png' -var fixFile1_2_1_5 = path.join(directory1_2_1, fixFilename1_2_1_5) - -function makeFile(file, cb) { - fs.writeFile(file, '', function(err) { - if (err) - cb(err) - else - cb(null) - }) -} - -function createFakeDirectoryTree(cb) { - - async.series( - [ - function(cb) {mkdirp(directory1, cb)}, - function(cb) {mkdirp(directory2, cb)}, - function(cb) {mkdirp(directory3, cb)}, - - function(cb) {mkdirp(directory1_1, cb)}, - function(cb) {mkdirp(directory1_2, cb)}, - function(cb) {mkdirp(directory1_3, cb)}, - - function(cb) {mkdirp(directory1_2_1, cb)}, - function(cb) {mkdirp(directory1_2_2, cb)}, - - function(cb) {makeFile(randomFile1, cb)}, - function(cb) {makeFile(randomFile2, cb)}, - function(cb) {makeFile(randomFile3, cb)}, - function(cb) {makeFile(randomFile4, cb)}, - - function(cb) {makeFile(randomFile2_1, cb)}, - function(cb) {makeFile(randomFile2_2, cb)}, - - function(cb) {makeFile(randomFile1_2_1_1, cb)}, - function(cb) {makeFile(randomFile1_2_1_2, cb)}, - function(cb) {makeFile(randomFile1_2_1_3, cb)}, - function(cb) {makeFile(fixFile1_2_1_4, cb)}, - function(cb) {makeFile(fixFile1_2_1_5, cb)} - ], - - function(err) { - if (err) { - console.error(err) - } else { - cb() - } - } - ) -} - -function destroyFakeDirectoryTree(cb) { - rimraf(rootDirectory, cb) -} - -module.exports = testCase({ - - 'TC 1: tests without real files': testCase({ - 'loading findRemoveAsync function (require)': function(t) { - findRemoveAsync = require('../find-remove-async.js') - - t.ok(findRemoveAsync, 'findRemoveAsync is loaded.') - t.done() - }, - - 'removing non-existing directory': function(t) { - var result, dir = generateRandomFilename() - - result = findRemoveAsync(dir) - t.strictEqual(Object.keys(result).length, 0, 'returned empty') - - t.done() - } - }), - - 'TC 2: tests with real files': testCase({ - - setUp: function(cb) { - createFakeDirectoryTree(cb) - }, - tearDown: function(cb) { - destroyFakeDirectoryTree(cb) - }, - - 'findRemoveAsync(nonexisting)': function(t) { - findRemoveAsync('/tmp/blahblah/hehehe/yo/what/').then((result) => { - t.strictEqual(Object.keys(result).length, 0, 'did nothing.') - - t.done() - }).catch((err) => { - console.log(err); - }) - }, - - 'findRemoveAsync(no params)': function(t) { - findRemoveAsync(rootDirectory).then((result) => { - - t.strictEqual(Object.keys(result).length, 0, 'did nothing.') - - var exists = fs.existsSync(rootDirectory) - t.equal(exists, true, 'did not remove root directory') - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'findRemoveAsync(no params) did not remove directory1_1') - - t.done() - }) - }, - - 'findRemoveAsync(all files)': function(t) { - findRemoveAsync(rootDirectory, {files: "*.*"}).then((result) => { - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'did not remove directory1_1') - - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, false, 'removed randomFile1_2_1_2 fine') - - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'removed randomFile1_2_1_3 fine') - - t.done() - }) - }, - - 'findRemoveAsync(all directories)': function(t) { - findRemoveAsync(rootDirectory, {dir: "*"}).then((result) => { - - t.strictEqual(Object.keys(result).length, 8, 'all 8 directories deleted') - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, false, 'removed directory1_1') - - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, false, 'removed randomFile1_2_1_2') - - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'removed randomFile1_2_1_3') - - t.done() - }) - }, - - 'findRemoveAsync(everything)': function(t) { - findRemoveAsync(rootDirectory, {dir: "*", files: "*.*"}).then((result) => { - - t.strictEqual(Object.keys(result).length, 19, 'all 19 directories + files deleted') - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, false, 'removed directory1_1') - - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, false, 'did not remove randomFile1_2_1_2 fine') - - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'dit not remove randomFile1_2_1_3 fine') - - t.done() - }) - }, - - 'findRemoveAsync(files no hit)': function(t) { - findRemoveAsync(rootDirectory, {files: "no.hit.me"}).then((result) => { - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'did not remove directory1_1') - - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, true, 'did not remove randomFile1_2_1_3') - - t.done() - }) - }, - - 'findRemoveAsync(directory1_2_1)': function(t) { - findRemoveAsync(rootDirectory, {dir: 'directory1_2_1'}).then((result) => { - - var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists1_2_1, false, 'did remove directory1_2_1') - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'did not remove directory1_1') - - t.done() - }) - }, - - - 'findRemoveAsync(one directory and all files)': function(t) { - findRemoveAsync(rootDirectory, {dir: 'directory1_2_1', files: '*.*'}).then((result) => { - - var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists1_2_1, false, 'did remove directory1_2_1') - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'did not remove directory1_1') - - t.ok(result[randomFile1_2_1_1], 'randomFile1_2_1_1 is in result') - t.ok(result[randomFile1_2_1_2], 'randomFile1_2_1_2 is in result') - t.ok(result[randomFile1_2_1_3], 'randomFile1_2_1_3 is in result') - t.ok(result[directory1_2_1], 'directory1_2_1 is in result') - - t.done() - }) - }, - - 'findRemoveAsync(another directory and all files)': function(t) { - findRemoveAsync(rootDirectory, {dir: 'directory2', files: '*.*'}).then((result) => { - - var exists2 = fs.existsSync(directory2) - t.equal(exists2, false, 'directory2 not removed') - - var exists1_2 = fs.existsSync(directory1_2) - t.equal(exists1_2, true, 'directory1_2 not removed') - - t.ok(result[randomFile2_1], 'randomFile2_1 is in result') - - t.done() - }) - }, - - 'findRemoveAsync(all bak files from root)': function(t) { - findRemoveAsync(rootDirectory, {extensions: '.bak'}).then(() => { - - var exists1 = fs.existsSync(randomFile1) - var exists2_1 = fs.existsSync(randomFile2_1) - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - - t.equal(exists1, false, 'findRemoveAsync(all bak files from root) removed randomFile1 fine') - t.equal(exists2_1, false, 'findRemoveAsync(all bak files from root) removed exists2_1 fine') - t.equal(exists1_2_1_2, false, 'findRemoveAsync(all bak files from root) removed exists1_2_1_2 fine') - t.equal(exists1_2_1_3, false, 'findRemoveAsync(all bak files from root) removed exists1_2_1_3 fine') - - var exists3 = fs.existsSync(randomFile3) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - var exists0 = fs.existsSync(rootDirectory) - var exists1_2_1 = fs.existsSync(directory1_2_1) - - t.equal(exists3, true, 'findRemoveAsync(all bak files from root) did not remove log file exists3') - t.equal(exists1_2_1_1, true, 'findRemoveAsync(all bak files from root) did not remove log file exists1_2_1_1') - t.equal(exists0, true, 'findRemoveAsync(all bak files from root) did not remove root directory') - t.equal(exists1_2_1, true, 'findRemoveAsync(all bak files from root) did not remove directory directory1_2_1') - - t.done() - }) - }, - - 'findRemoveAsync(all log files from directory1_2_1)': function(t) { - findRemoveAsync(directory1_2_1, {extensions: '.log'}).then(() => { - - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveAsync(all log files from directory1_2_1) removed randomFile1_2_1_1 fine') - - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, true, 'findRemoveAsync(all log files from directory1_2_1) did not remove file randomFile1_2_1_2') - - var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists1_2_1, true, 'findRemoveAsync(all log files from directory1_2_1) did not remove directory directory1_2_1') - - t.done() - }); - }, - - 'findRemoveAsync(all bak or log files from root)': function(t) { - findRemoveAsync(rootDirectory, {extensions: ['.bak', '.log']}).then(() => { - - var exists1 = fs.existsSync(randomFile1) - var exists2_1 = fs.existsSync(randomFile2_1) - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - - var exists2 = fs.existsSync(randomFile2) - var exists3 = fs.existsSync(randomFile3) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - - t.equal(exists1, false, 'findRemoveAsync(all bak and log files from root) removed randomFile1 fine') - t.equal(exists2_1, false, 'findRemoveAsync(all bak and log files from root) removed exists2_1 fine') - t.equal(exists1_2_1_2, false, 'findRemoveAsync(all bak and log files from root) removed exists1_2_1_2 fine') - t.equal(exists1_2_1_3, false, 'findRemoveAsync(all bak and log files from root) removed exists1_2_1_3 fine') - - t.equal(exists2, false, 'findRemoveAsync(all bak and log files from root) removed exists2 fine') - t.equal(exists3, false, 'findRemoveAsync(all bak and log files from root) removed exists3 fine') - t.equal(exists1_2_1_1, false, 'findRemoveAsync(all bak and log files from root) removed exists1_2_1_1 fine') - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'findRemoveAsync(all bak and log files from root) did not remove directory1_1') - - t.done() - }) - }, - - 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2)': function(t) { - findRemoveAsync(directory1_2, {files: randomFilename1_2_1_1}).then(() => { - - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2) removed randomFile1_2_1_1 fine') - - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, true, 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2) did not remove randomFile1_2_1_2') - - var exists1_2 = fs.existsSync(directory1_2) - t.equal(exists1_2, true, 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2) did not remove directory1_2') - - t.done() - }) - }, - - 'findRemoveAsync(two files from root)': function(t) { - findRemoveAsync(rootDirectory, {files: [randomFilename2, randomFilename1_2_1_3]}).then((result) => { - - var exists2 = fs.existsSync(randomFile2) - t.equal(exists2, false, 'findRemoveAsync(two files from root) removed randomFile2 fine') - - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'findRemoveAsync(two files from root) removed randomFile1_2_1_3 fine') - - var exists1 = fs.existsSync(randomFile1) - t.equal(exists1, true, 'findRemoveAsync(two files from root) did not remove randomFile1') - - var exists0 = fs.existsSync(rootDirectory) - t.equal(exists0, true, 'findRemoveAsync(two files from root) did not remove root directory') - - t.done() - }) - }, - - 'findRemoveAsync(files set to *.*)': function(t) { - findRemoveAsync(directory1_2_1, {files: '*.*'}).then(() => { - - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveAsync(files set to *.*) removed randomFile1_2_1_1 fine') - - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, false, 'findRemoveAsync(files set to *.*) removed randomFile1_2_1_2 fine') - - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'findRemoveAsync(files set to *.*) removed randomFile1_2_1_3 fine') - - var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists1_2_1, true, 'findRemoveAsync(files set to *.* did not remove directory1_2_1') - - t.done() - }) - }, - - 'findRemoveAsync(with mixed ext and file params)': function(t) { - findRemoveAsync(rootDirectory, {files: randomFilename1, extensions: ['.log']}).then((result) => { - - var exists1 = fs.existsSync(randomFile1) - var exists2 = fs.existsSync(randomFile2) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1, false, 'findRemoveAsync(with mixed ext and file params) removed randomFile1 fine') - t.equal(exists2, false, 'findRemoveAsync(with mixed ext and file params) removed randomFile2 fine') - t.equal(exists1_2_1_1, false, 'findRemoveAsync(with mixed ext and file params) removed randomFile1_2_1_1 fine') - - var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists1_2_1, true, 'did not remove directory1_2_1') - - t.strictEqual(typeof result[randomFile1], 'boolean', 'randomFile1 in result is boolean') - t.strictEqual(typeof result[randomFile1_2_1_2], 'undefined', 'randomFile1_2_1_2 is NOT in result') - - t.done() - }) - }, - - 'findRemoveAsync(with ignore param)': function(t) { - findRemoveAsync(rootDirectory, {files: "*.*", ignore: fixFilename1_2_1_4}).then((result) => { - - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveAsync(with ignore) did remove file randomFile1_2_1_1') - - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) - t.equal(exists1_2_1_4, true, 'file fixFile1_2_1_4 not removed') - - t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 in result is boolean') - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - - t.done() - }) - }, - - 'findRemoveAsync(with ignore and jpg extension params)': function(t) { - findRemoveAsync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.jpg'}).then((result) => { - - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) - t.equal(exists1_2_1_1, true, 'findRemoveAsync(with ignore + jpg extension) did not remove file randomFile1_2_1_1') - t.equal(exists1_2_1_4, true, 'findRemoveAsync(with ignore + jpg extension) did not remove file fixFile1_2_1_4') - t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result') - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - - t.done() - }) - }, - - 'findRemoveAsync(with multiple ignore)': function(t) { - findRemoveAsync(rootDirectory, {files: "*.*", ignore: [fixFilename1_2_1_4, fixFilename1_2_1_5]}).then((result) => { - - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveAsync(with multiple ignore) did remove file randomFile1_2_1_1') - - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) - t.equal(exists1_2_1_4, true, 'findRemoveAsync(with multiple ignore) did not remove file fixFile1_2_1_4') - - var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5) - t.equal(exists1_2_1_5, true, 'findRemoveAsync(with multiple ignore) did not remove file fixFile1_2_1_5') - - t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result') - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result') - - t.done() - }) - }, - - 'findRemoveAsync(with ignore and bak extension params)': function(t) { - findRemoveAsync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.bak'}).then((result) => { - - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, true, 'findRemoveAsync(with ignore + bak extension) did not remove file randomFile1_2_1_1') - - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, false, 'findRemoveAsync(with ignore + bak extension) did remove file randomFile1_2_1_2') - - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) - t.equal(exists1_2_1_4, true, 'findRemoveAsync(with ignore + bak extension) did not remove file fixFile1_2_1_4') - - t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result') - t.strictEqual(typeof result[randomFile1_2_1_2], 'boolean', 'randomFile1_2_1_2 is in result') - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - - t.done() - }) - }, - - 'findRemoveAsync(two files and check others)': function(t) { - findRemoveAsync(rootDirectory, {files: [randomFilename1_2_1_1, randomFilename1_2_1_3]}).then((result) => { - - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveAsync(two files and check others) removed randomFile1_2_1_1 fine') - - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'findRemoveAsync(two files and check others) removed randomFile1_2_1_3 fine') - - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) - t.equal(exists1_2_1_4, true, 'findRemoveAsync(two files and check others) did not remove fixFile1_2_1_4') - - var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5) - t.equal(exists1_2_1_5, true, 'findRemoveAsync(two files and check others) did not remove fixFile1_2_1_5') - - t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result') - t.strictEqual(typeof result[randomFile1_2_1_3], 'boolean', 'randomFile1_2_1_3 is in result') - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result') - - t.done() - }) - }, - - 'findRemoveAsync(limit to maxLevel = 0)': function(t) { - findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 0}).then((result) => { - - t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(limit to maxLevel = 0) returned empty an array.') - - t.done() - }) - }, - - 'findRemoveAsync(limit to maxLevel = 1)': function(t) { - findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 1}).then((result) => { - - t.strictEqual(Object.keys(result).length, 7, 'findRemoveAsync(limit to maxLevel = 1) returned 7 entries.') - - t.done() - }) - }, - - 'findRemoveAsync(limit to maxLevel = 2)': function(t) { - findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 2}).then((result) => { - - t.strictEqual(Object.keys(result).length, 12, 'findRemoveAsync(limit to maxLevel = 2) returned 12 entries.') - - t.done() - }) - }, - - 'findRemoveAsync(limit to maxLevel = 3)': function(t) { - findRemoveAsync(rootDirectory, {files: "*.*", maxLevel: 3}).then((result) => { - - t.strictEqual(Object.keys(result).length, 6, 'findRemoveAsync(limit to maxLevel = 3) returned 6 entries.') - - t.done() - }) - }, - - 'findRemoveAsync(limit to maxLevel = 3 + bak only)': function(t) { - findRemoveAsync(rootDirectory, {maxLevel: 3, extensions: '.bak'}).then((result) => { - - t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(limit to maxLevel = 3 + bak only) returned 2 entries.') - - t.done() - }) - }, - - 'findRemoveAsync(single dir)': function(t) { - findRemoveAsync(rootDirectory, {dir: 'directory1_2'}).then((result) => { - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'findRemoveAsync(single dir) did not remove directory1_1') - - var exists1_2 = fs.existsSync(directory1_2) - t.equal(exists1_2, false, 'findRemoveAsync(single dir) removed directory1_2') - - t.done() - }) - }, - - 'findRemoveAsync(two directories)': function(t) { - findRemoveAsync(rootDirectory, {dir: ['directory1_1', 'directory1_2']}).then(() => { - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, false, 'findRemoveAsync(remove single dir) removed directory1_1') - - var exists1_2 = fs.existsSync(directory1_2) - t.equal(exists1_2, false, 'findRemoveAsync(remove single dir) removed directory1_2') - - t.done() - }) - }, - - 'findRemoveAsync(directories with the same basename)': function(t) { - findRemoveAsync(rootDirectory, {dir: 'CVS'}).then(() => { - - var exists1_3 = fs.existsSync(directory1_3) - t.equal(exists1_3, false, 'findRemoveAsync(directories with the same basename) removed root/directory1/CVS') - - var exists3 = fs.existsSync(directory3) - t.equal(exists3, false, 'findRemoveAsync(directories with the same basename) removed root/CVS') - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'findRemoveAsync(remove single dir) did not remove directory1_1') - - var exists1_2 = fs.existsSync(directory1_2) - t.equal(exists1_2, true, 'findRemoveAsync(remove single dir) did not remove directory1_2') - - t.done() - }) - }, - - 'findRemoveAsync(test run)': function(t) { - findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", test: true}).then((result) => { - - t.strictEqual(Object.keys(result).length, 19, 'findRemoveAsync(test run) returned 19 entries.') - - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, true, 'findRemoveAsync(test run) did not remove randomFile1_2_1_1') - - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, true, 'findRemoveAsync(test run) did not remove randomFile1_2_1_3') - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'findRemoveAsync(test run) did not remove directory1_1') - - t.done() - }) - } - }), - - 'TC 3: age checks': testCase({ - - setUp: function(cb) { - createFakeDirectoryTree(cb) - }, - tearDown: function(cb) { - destroyFakeDirectoryTree(cb) - }, - - 'findRemoveAsync(files and dirs older than 10000000000000000 sec)': function(t) { - findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 10000000000000000}}).then((result) => { - - t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(files older than 10000000000000000 sec) returned zero entries.') - - t.done() - }) - }, - - 'findRemoveAsync(files and dirs older than 10 sec)': function(t) { - findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 10}}).then((result) => { - - t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(files older than 10 sec) returned zero entries.') - - t.done() - }) - }, - - 'findRemoveAsync(files older than .0005 sec)': function(t) { - setTimeout(() => { - findRemoveAsync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}}).then((result) => { - - t.strictEqual(Object.keys(result).length, 11, 'findRemoveAsync(files older than .0005 sec) returned 11 entries.') - - t.done() - }) - }, 1) - }, - - 'findRemoveAsync(files and dirs older than .0005 sec)': function(t) { - setTimeout(() => { - findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}}).then((result) => { - - t.strictEqual(Object.keys(result).length, 19, 'findRemoveAsync(files older than .0005 sec) returned 19 entries.') - - t.done() - }) - }, 1) - }, - - 'findRemoveAsync(files older than 2 sec with wait)': function(t) { - setTimeout(function() { - findRemoveAsync(rootDirectory, {files: "*.*", age: {seconds: 2}}).then((result) => { - - t.strictEqual(Object.keys(result).length, 11, 'findRemoveAsync(files older than 2 sec with wait) returned 11 entries.') - - t.done() - }) - }, 2100) - }, - - 'findRemoveAsync(files older than 2 sec with wait + maxLevel = 1)': function(t) { - setTimeout(function() { - findRemoveAsync(rootDirectory, {files: "*.*", maxLevel: 1, age: {seconds: 2}}).then((result) => { - - t.strictEqual(Object.keys(result).length, 4, 'findRemoveAsync(files older than 2 sec with wait + maxLevel = 1) returned 4 entries.') - - t.done() - }) - }, 2100) - } - }), - - 'TC 4: github issues': testCase({ - - setUp: function(cb) { - createFakeDirectoryTree(cb) - }, - tearDown: function(cb) { - destroyFakeDirectoryTree(cb) - }, - - // from https://github.com/binarykitchen/find-remove/issues/7 - 'findRemoveAsync(issues/7a)': function(t) { - setTimeout(function() { - findRemoveAsync(rootDirectory, {age: {seconds: 2}, extensions: '.csv'}).then((result) => { - - t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(issues/7) deleted 2 files.') - - t.done() - }) - }, 3 * 1000) - }, - - // from https://github.com/binarykitchen/find-remove/issues/7 - 'findRemoveAsync(issues/7b)': function(t) { - findRemoveAsync(rootDirectory, {extensions: '.dontexist'}).then((result) => { - - t.deepEqual(result, {}, 'is an empty json') - - t.done() - }) - } - }), - - 'TC 5: limit checks': testCase({ - - setUp: function(cb) { - createFakeDirectoryTree(cb) - }, - tearDown: function(cb) { - destroyFakeDirectoryTree(cb) - }, - - 'findRemoveAsync(files older than .0005 sec with limit of 2)': function(t) { - setTimeout(() => { - findRemoveAsync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}, limit: 2}).then((result) => { - - t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(files older than .0005 sec with limit of 2) returned 2 entries (out of 11).') - - t.done() - }) - }, 1) - }, - - 'findRemoveAsync(files and dirs older than .0005 sec with limit of 5)': function(t) { - setTimeout(() => { - findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}, limit: 5}).then((result) => { - - t.strictEqual(Object.keys(result).length, 5, 'findRemoveAsync(files and dirs older than .0005 sec with limit of 5) returned 5 entries (out of 19).') - - t.done() - }) - }, 1) - } - - }), - - 'TC 6: prefix checks': testCase({ - - setUp: function(cb) { - createFakeDirectoryTree(cb) - }, - tearDown: function(cb) { - destroyFakeDirectoryTree(cb) - }, - - 'findRemoveAsync(files with exiting prefix "someth")': function(t) { - findRemoveAsync(rootDirectory, {prefix: "someth"}).then((result) => { - - t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(files with prefix "someth") returned 2 entries (out of 11).') - - t.done() - }) - }, - - 'findRemoveAsync(files with non-existing prefix "ssssssssssssssssssssssssss" - too many chars)': function(t) { - findRemoveAsync(rootDirectory, {prefix: "ssssssssssssssssssssssssss"}).then((result) => { - - t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(files with non-existing prefix "ssssssssssssssssssssssssss"- too many chars) returned 0 entries (out of 11).') - - t.done() - }) - } - - }) -}) From f1d2e14c389971d8b40623ee13448387ad0f6e29 Mon Sep 17 00:00:00 2001 From: David Langer Date: Tue, 13 Feb 2018 10:27:07 +0100 Subject: [PATCH 26/29] Update node version to 8,x --- .travis.yml | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e158506..072c20e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: node_js +node_js: + - "8.9.4" deploy: provider: npm email: michael.heuberger@binarykitchen.com diff --git a/package.json b/package.json index d7fa092..1e881b6 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "async": "2.6.0" }, "engines": { - "node": ">=4.1.0" + "node": ">=8.0.0" }, "scripts": { "test": "nodeunit tests/basics.js" From 37fc0ad72308f23fae9968e7f8a8d18fd5532f36 Mon Sep 17 00:00:00 2001 From: David Langer Date: Tue, 13 Feb 2018 14:23:27 +0100 Subject: [PATCH 27/29] Update tests for async --- tests/basics.js | 712 +++++++++++++++++++++++++----------------------- 1 file changed, 378 insertions(+), 334 deletions(-) diff --git a/tests/basics.js b/tests/basics.js index 3979a9e..3ea7d9f 100644 --- a/tests/basics.js +++ b/tests/basics.js @@ -5,7 +5,7 @@ var testCase = require('nodeunit').testCase, fs = require('fs'), async = require('async'), rimraf = require('rimraf'), - findRemoveSync + findRemoveAsync var rootDirectory = path.join(require('os').tmpDir(), 'find-remove') @@ -133,20 +133,22 @@ function destroyFakeDirectoryTree(cb) { module.exports = testCase({ 'TC 1: tests without real files': testCase({ - 'loading findRemoveSync function (require)': function(t) { - findRemoveSync = require('../find-remove.js') + 'loading findRemoveAsync function (require)': function(t) { + findRemoveAsync = require('../find-remove.js') - t.ok(findRemoveSync, 'findRemoveSync is loaded.') + t.ok(findRemoveAsync, 'findRemoveAsync is loaded.') t.done() }, 'removing non-existing directory': function(t) { var result, dir = generateRandomFilename() - result = findRemoveSync(dir) - t.strictEqual(Object.keys(result).length, 0, 'returned empty') + result = findRemoveAsync(dir).then(() => { - t.done() + t.strictEqual(Object.keys(result).length, 0, 'returned empty') + + t.done() + }); } }), @@ -159,457 +161,487 @@ module.exports = testCase({ destroyFakeDirectoryTree(cb) }, - 'findRemoveSync(nonexisting)': function(t) { - var result = findRemoveSync('/tmp/blahblah/hehehe/yo/what/') + 'findRemoveAsync(nonexisting)': function(t) { + findRemoveAsync('/tmp/blahblah/hehehe/yo/what/').then((result) => { + t.strictEqual(Object.keys(result).length, 0, 'did nothing.') - t.strictEqual(Object.keys(result).length, 0, 'did nothing.') - - t.done() + t.done() + }).catch((err) => { + console.log(err); + }) }, - 'findRemoveSync(no params)': function(t) { - var result = findRemoveSync(rootDirectory) + 'findRemoveAsync(no params)': function(t) { + findRemoveAsync(rootDirectory).then((result) => { - t.strictEqual(Object.keys(result).length, 0, 'did nothing.') + t.strictEqual(Object.keys(result).length, 0, 'did nothing.') - var exists = fs.existsSync(rootDirectory) - t.equal(exists, true, 'did not remove root directory') + var exists = fs.existsSync(rootDirectory) + t.equal(exists, true, 'did not remove root directory') - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'findRemoveSync(no params) did not remove directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveAsync(no params) did not remove directory1_1') - t.done() + t.done() + }) }, - 'findRemoveSync(all files)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*"}) - - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'did not remove directory1_1') + 'findRemoveAsync(all files)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*"}).then((result) => { + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, false, 'removed randomFile1_2_1_2 fine') + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'removed randomFile1_2_1_2 fine') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'removed randomFile1_2_1_3 fine') + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'removed randomFile1_2_1_3 fine') - t.done() + t.done() + }) }, - 'findRemoveSync(all directories)': function(t) { - var result = findRemoveSync(rootDirectory, {dir: "*"}) + 'findRemoveAsync(all directories)': function(t) { + findRemoveAsync(rootDirectory, {dir: "*"}).then((result) => { - t.strictEqual(Object.keys(result).length, 8, 'all 8 directories deleted') + t.strictEqual(Object.keys(result).length, 8, 'all 8 directories deleted') - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, false, 'removed directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, false, 'removed directory1_1') - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, false, 'removed randomFile1_2_1_2') + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'removed randomFile1_2_1_2') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'removed randomFile1_2_1_3') + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'removed randomFile1_2_1_3') - t.done() + t.done() + }) }, - 'findRemoveSync(everything)': function(t) { - var result = findRemoveSync(rootDirectory, {dir: "*", files: "*.*"}) + 'findRemoveAsync(everything)': function(t) { + findRemoveAsync(rootDirectory, {dir: "*", files: "*.*"}).then((result) => { - t.strictEqual(Object.keys(result).length, 19, 'all 19 directories + files deleted') + t.strictEqual(Object.keys(result).length, 19, 'all 19 directories + files deleted') - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, false, 'removed directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, false, 'removed directory1_1') - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, false, 'did not remove randomFile1_2_1_2 fine') + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'did not remove randomFile1_2_1_2 fine') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'dit not remove randomFile1_2_1_3 fine') + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'dit not remove randomFile1_2_1_3 fine') - t.done() + t.done() + }) }, - 'findRemoveSync(files no hit)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "no.hit.me"}) + 'findRemoveAsync(files no hit)': function(t) { + findRemoveAsync(rootDirectory, {files: "no.hit.me"}).then((result) => { - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'did not remove directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, true, 'did not remove randomFile1_2_1_3') + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, true, 'did not remove randomFile1_2_1_3') - t.done() + t.done() + }) }, - 'findRemoveSync(directory1_2_1)': function(t) { - var result = findRemoveSync(rootDirectory, {dir: 'directory1_2_1'}) + 'findRemoveAsync(directory1_2_1)': function(t) { + findRemoveAsync(rootDirectory, {dir: 'directory1_2_1'}).then((result) => { - var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists1_2_1, false, 'did remove directory1_2_1') + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, false, 'did remove directory1_2_1') - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'did not remove directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') - t.done() + t.done() + }) }, - 'findRemoveSync(one directory and all files)': function(t) { - var result = findRemoveSync(rootDirectory, {dir: 'directory1_2_1', files: '*.*'}) + 'findRemoveAsync(one directory and all files)': function(t) { + findRemoveAsync(rootDirectory, {dir: 'directory1_2_1', files: '*.*'}).then((result) => { - var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists1_2_1, false, 'did remove directory1_2_1') + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, false, 'did remove directory1_2_1') - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'did not remove directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'did not remove directory1_1') - t.ok(result[randomFile1_2_1_1], 'randomFile1_2_1_1 is in result') - t.ok(result[randomFile1_2_1_2], 'randomFile1_2_1_2 is in result') - t.ok(result[randomFile1_2_1_3], 'randomFile1_2_1_3 is in result') - t.ok(result[directory1_2_1], 'directory1_2_1 is in result') + t.ok(result[randomFile1_2_1_1], 'randomFile1_2_1_1 is in result') + t.ok(result[randomFile1_2_1_2], 'randomFile1_2_1_2 is in result') + t.ok(result[randomFile1_2_1_3], 'randomFile1_2_1_3 is in result') + t.ok(result[directory1_2_1], 'directory1_2_1 is in result') - t.done() + t.done() + }) }, - 'findRemoveSync(another directory and all files)': function(t) { - var result = findRemoveSync(rootDirectory, {dir: 'directory2', files: '*.*'}) + 'findRemoveAsync(another directory and all files)': function(t) { + findRemoveAsync(rootDirectory, {dir: 'directory2', files: '*.*'}).then((result) => { - var exists2 = fs.existsSync(directory2) - t.equal(exists2, false, 'directory2 not removed') + var exists2 = fs.existsSync(directory2) + t.equal(exists2, false, 'directory2 not removed') - var exists1_2 = fs.existsSync(directory1_2) - t.equal(exists1_2, true, 'directory1_2 not removed') + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, true, 'directory1_2 not removed') - t.ok(result[randomFile2_1], 'randomFile2_1 is in result') + t.ok(result[randomFile2_1], 'randomFile2_1 is in result') - t.done() + t.done() + }) }, - 'findRemoveSync(all bak files from root)': function(t) { - findRemoveSync(rootDirectory, {extensions: '.bak'}) + 'findRemoveAsync(all bak files from root)': function(t) { + findRemoveAsync(rootDirectory, {extensions: '.bak'}).then(() => { - var exists1 = fs.existsSync(randomFile1) - var exists2_1 = fs.existsSync(randomFile2_1) - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + var exists1 = fs.existsSync(randomFile1) + var exists2_1 = fs.existsSync(randomFile2_1) + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1, false, 'findRemoveSync(all bak files from root) removed randomFile1 fine') - t.equal(exists2_1, false, 'findRemoveSync(all bak files from root) removed exists2_1 fine') - t.equal(exists1_2_1_2, false, 'findRemoveSync(all bak files from root) removed exists1_2_1_2 fine') - t.equal(exists1_2_1_3, false, 'findRemoveSync(all bak files from root) removed exists1_2_1_3 fine') + t.equal(exists1, false, 'findRemoveAsync(all bak files from root) removed randomFile1 fine') + t.equal(exists2_1, false, 'findRemoveAsync(all bak files from root) removed exists2_1 fine') + t.equal(exists1_2_1_2, false, 'findRemoveAsync(all bak files from root) removed exists1_2_1_2 fine') + t.equal(exists1_2_1_3, false, 'findRemoveAsync(all bak files from root) removed exists1_2_1_3 fine') - var exists3 = fs.existsSync(randomFile3) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - var exists0 = fs.existsSync(rootDirectory) - var exists1_2_1 = fs.existsSync(directory1_2_1) + var exists3 = fs.existsSync(randomFile3) + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + var exists0 = fs.existsSync(rootDirectory) + var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists3, true, 'findRemoveSync(all bak files from root) did not remove log file exists3') - t.equal(exists1_2_1_1, true, 'findRemoveSync(all bak files from root) did not remove log file exists1_2_1_1') - t.equal(exists0, true, 'findRemoveSync(all bak files from root) did not remove root directory') - t.equal(exists1_2_1, true, 'findRemoveSync(all bak files from root) did not remove directory directory1_2_1') + t.equal(exists3, true, 'findRemoveAsync(all bak files from root) did not remove log file exists3') + t.equal(exists1_2_1_1, true, 'findRemoveAsync(all bak files from root) did not remove log file exists1_2_1_1') + t.equal(exists0, true, 'findRemoveAsync(all bak files from root) did not remove root directory') + t.equal(exists1_2_1, true, 'findRemoveAsync(all bak files from root) did not remove directory directory1_2_1') - t.done() + t.done() + }) }, - 'findRemoveSync(all log files from directory1_2_1)': function(t) { - findRemoveSync(directory1_2_1, {extensions: '.log'}) + 'findRemoveAsync(all log files from directory1_2_1)': function(t) { + findRemoveAsync(directory1_2_1, {extensions: '.log'}).then(() => { - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveSync(all log files from directory1_2_1) removed randomFile1_2_1_1 fine') + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(all log files from directory1_2_1) removed randomFile1_2_1_1 fine') - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, true, 'findRemoveSync(all log files from directory1_2_1) did not remove file randomFile1_2_1_2') + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, true, 'findRemoveAsync(all log files from directory1_2_1) did not remove file randomFile1_2_1_2') - var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists1_2_1, true, 'findRemoveSync(all log files from directory1_2_1) did not remove directory directory1_2_1') + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, true, 'findRemoveAsync(all log files from directory1_2_1) did not remove directory directory1_2_1') - t.done() + t.done() + }); }, - 'findRemoveSync(all bak or log files from root)': function(t) { - findRemoveSync(rootDirectory, {extensions: ['.bak', '.log']}) + 'findRemoveAsync(all bak or log files from root)': function(t) { + findRemoveAsync(rootDirectory, {extensions: ['.bak', '.log']}).then(() => { - var exists1 = fs.existsSync(randomFile1) - var exists2_1 = fs.existsSync(randomFile2_1) - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + var exists1 = fs.existsSync(randomFile1) + var exists2_1 = fs.existsSync(randomFile2_1) + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - var exists2 = fs.existsSync(randomFile2) - var exists3 = fs.existsSync(randomFile3) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + var exists2 = fs.existsSync(randomFile2) + var exists3 = fs.existsSync(randomFile3) + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1, false, 'findRemoveSync(all bak and log files from root) removed randomFile1 fine') - t.equal(exists2_1, false, 'findRemoveSync(all bak and log files from root) removed exists2_1 fine') - t.equal(exists1_2_1_2, false, 'findRemoveSync(all bak and log files from root) removed exists1_2_1_2 fine') - t.equal(exists1_2_1_3, false, 'findRemoveSync(all bak and log files from root) removed exists1_2_1_3 fine') + t.equal(exists1, false, 'findRemoveAsync(all bak and log files from root) removed randomFile1 fine') + t.equal(exists2_1, false, 'findRemoveAsync(all bak and log files from root) removed exists2_1 fine') + t.equal(exists1_2_1_2, false, 'findRemoveAsync(all bak and log files from root) removed exists1_2_1_2 fine') + t.equal(exists1_2_1_3, false, 'findRemoveAsync(all bak and log files from root) removed exists1_2_1_3 fine') - t.equal(exists2, false, 'findRemoveSync(all bak and log files from root) removed exists2 fine') - t.equal(exists3, false, 'findRemoveSync(all bak and log files from root) removed exists3 fine') - t.equal(exists1_2_1_1, false, 'findRemoveSync(all bak and log files from root) removed exists1_2_1_1 fine') + t.equal(exists2, false, 'findRemoveAsync(all bak and log files from root) removed exists2 fine') + t.equal(exists3, false, 'findRemoveAsync(all bak and log files from root) removed exists3 fine') + t.equal(exists1_2_1_1, false, 'findRemoveAsync(all bak and log files from root) removed exists1_2_1_1 fine') - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'findRemoveSync(all bak and log files from root) did not remove directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveAsync(all bak and log files from root) did not remove directory1_1') - t.done() + t.done() + }) }, - 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2)': function(t) { - findRemoveSync(directory1_2, {files: randomFilename1_2_1_1}) + 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2)': function(t) { + findRemoveAsync(directory1_2, {files: randomFilename1_2_1_1}).then(() => { - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2) removed randomFile1_2_1_1 fine') + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2) removed randomFile1_2_1_1 fine') - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, true, 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2) did not remove randomFile1_2_1_2') + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, true, 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2) did not remove randomFile1_2_1_2') - var exists1_2 = fs.existsSync(directory1_2) - t.equal(exists1_2, true, 'findRemoveSync(filename randomFilename1_2_1_1 from directory1_2) did not remove directory1_2') + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, true, 'findRemoveAsync(filename randomFilename1_2_1_1 from directory1_2) did not remove directory1_2') - t.done() + t.done() + }) }, - 'findRemoveSync(two files from root)': function(t) { - var result = findRemoveSync(rootDirectory, {files: [randomFilename2, randomFilename1_2_1_3]}) + 'findRemoveAsync(two files from root)': function(t) { + findRemoveAsync(rootDirectory, {files: [randomFilename2, randomFilename1_2_1_3]}).then((result) => { - var exists2 = fs.existsSync(randomFile2) - t.equal(exists2, false, 'findRemoveSync(two files from root) removed randomFile2 fine') + var exists2 = fs.existsSync(randomFile2) + t.equal(exists2, false, 'findRemoveAsync(two files from root) removed randomFile2 fine') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'findRemoveSync(two files from root) removed randomFile1_2_1_3 fine') + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'findRemoveAsync(two files from root) removed randomFile1_2_1_3 fine') - var exists1 = fs.existsSync(randomFile1) - t.equal(exists1, true, 'findRemoveSync(two files from root) did not remove randomFile1') + var exists1 = fs.existsSync(randomFile1) + t.equal(exists1, true, 'findRemoveAsync(two files from root) did not remove randomFile1') - var exists0 = fs.existsSync(rootDirectory) - t.equal(exists0, true, 'findRemoveSync(two files from root) did not remove root directory') + var exists0 = fs.existsSync(rootDirectory) + t.equal(exists0, true, 'findRemoveAsync(two files from root) did not remove root directory') - t.done() + t.done() + }) }, - 'findRemoveSync(files set to *.*)': function(t) { - findRemoveSync(directory1_2_1, {files: '*.*'}) + 'findRemoveAsync(files set to *.*)': function(t) { + findRemoveAsync(directory1_2_1, {files: '*.*'}).then(() => { - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveSync(files set to *.*) removed randomFile1_2_1_1 fine') + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(files set to *.*) removed randomFile1_2_1_1 fine') - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, false, 'findRemoveSync(files set to *.*) removed randomFile1_2_1_2 fine') + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'findRemoveAsync(files set to *.*) removed randomFile1_2_1_2 fine') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'findRemoveSync(files set to *.*) removed randomFile1_2_1_3 fine') + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'findRemoveAsync(files set to *.*) removed randomFile1_2_1_3 fine') - var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists1_2_1, true, 'findRemoveSync(files set to *.* did not remove directory1_2_1') + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, true, 'findRemoveAsync(files set to *.* did not remove directory1_2_1') - t.done() + t.done() + }) }, - 'findRemoveSync(with mixed ext and file params)': function(t) { - var result = findRemoveSync(rootDirectory, {files: randomFilename1, extensions: ['.log']}) + 'findRemoveAsync(with mixed ext and file params)': function(t) { + findRemoveAsync(rootDirectory, {files: randomFilename1, extensions: ['.log']}).then((result) => { - var exists1 = fs.existsSync(randomFile1) - var exists2 = fs.existsSync(randomFile2) - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1, false, 'findRemoveSync(with mixed ext and file params) removed randomFile1 fine') - t.equal(exists2, false, 'findRemoveSync(with mixed ext and file params) removed randomFile2 fine') - t.equal(exists1_2_1_1, false, 'findRemoveSync(with mixed ext and file params) removed randomFile1_2_1_1 fine') + var exists1 = fs.existsSync(randomFile1) + var exists2 = fs.existsSync(randomFile2) + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1, false, 'findRemoveAsync(with mixed ext and file params) removed randomFile1 fine') + t.equal(exists2, false, 'findRemoveAsync(with mixed ext and file params) removed randomFile2 fine') + t.equal(exists1_2_1_1, false, 'findRemoveAsync(with mixed ext and file params) removed randomFile1_2_1_1 fine') - var exists1_2_1 = fs.existsSync(directory1_2_1) - t.equal(exists1_2_1, true, 'did not remove directory1_2_1') + var exists1_2_1 = fs.existsSync(directory1_2_1) + t.equal(exists1_2_1, true, 'did not remove directory1_2_1') - t.strictEqual(typeof result[randomFile1], 'boolean', 'randomFile1 in result is boolean') - t.strictEqual(typeof result[randomFile1_2_1_2], 'undefined', 'randomFile1_2_1_2 is NOT in result') + t.strictEqual(typeof result[randomFile1], 'boolean', 'randomFile1 in result is boolean') + t.strictEqual(typeof result[randomFile1_2_1_2], 'undefined', 'randomFile1_2_1_2 is NOT in result') - t.done() + t.done() + }) }, - 'findRemoveSync(with ignore param)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", ignore: fixFilename1_2_1_4}) + 'findRemoveAsync(with ignore param)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", ignore: fixFilename1_2_1_4}).then((result) => { - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveSync(with ignore) did remove file randomFile1_2_1_1') + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(with ignore) did remove file randomFile1_2_1_1') - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) - t.equal(exists1_2_1_4, true, 'file fixFile1_2_1_4 not removed') + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'file fixFile1_2_1_4 not removed') - t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 in result is boolean') - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 in result is boolean') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - t.done() + t.done() + }) }, - 'findRemoveSync(with ignore and jpg extension params)': function(t) { - var result = findRemoveSync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.jpg'}) + 'findRemoveAsync(with ignore and jpg extension params)': function(t) { + findRemoveAsync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.jpg'}).then((result) => { - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) - t.equal(exists1_2_1_1, true, 'findRemoveSync(with ignore + jpg extension) did not remove file randomFile1_2_1_1') - t.equal(exists1_2_1_4, true, 'findRemoveSync(with ignore + jpg extension) did not remove file fixFile1_2_1_4') - t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result') - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_1, true, 'findRemoveAsync(with ignore + jpg extension) did not remove file randomFile1_2_1_1') + t.equal(exists1_2_1_4, true, 'findRemoveAsync(with ignore + jpg extension) did not remove file fixFile1_2_1_4') + t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - t.done() + t.done() + }) }, - 'findRemoveSync(with multiple ignore)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", ignore: [fixFilename1_2_1_4, fixFilename1_2_1_5]}) + 'findRemoveAsync(with multiple ignore)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", ignore: [fixFilename1_2_1_4, fixFilename1_2_1_5]}).then((result) => { - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveSync(with multiple ignore) did remove file randomFile1_2_1_1') + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(with multiple ignore) did remove file randomFile1_2_1_1') - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) - t.equal(exists1_2_1_4, true, 'findRemoveSync(with multiple ignore) did not remove file fixFile1_2_1_4') + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'findRemoveAsync(with multiple ignore) did not remove file fixFile1_2_1_4') - var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5) - t.equal(exists1_2_1_5, true, 'findRemoveSync(with multiple ignore) did not remove file fixFile1_2_1_5') + var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5) + t.equal(exists1_2_1_5, true, 'findRemoveAsync(with multiple ignore) did not remove file fixFile1_2_1_5') - t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result') - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result') + t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result') - t.done() + t.done() + }) }, - 'findRemoveSync(with ignore and bak extension params)': function(t) { - var result = findRemoveSync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.bak'}) + 'findRemoveAsync(with ignore and bak extension params)': function(t) { + findRemoveAsync(rootDirectory, {ignore: fixFilename1_2_1_4, extensions: '.bak'}).then((result) => { - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, true, 'findRemoveSync(with ignore + bak extension) did not remove file randomFile1_2_1_1') + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, true, 'findRemoveAsync(with ignore + bak extension) did not remove file randomFile1_2_1_1') - var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) - t.equal(exists1_2_1_2, false, 'findRemoveSync(with ignore + bak extension) did remove file randomFile1_2_1_2') + var exists1_2_1_2 = fs.existsSync(randomFile1_2_1_2) + t.equal(exists1_2_1_2, false, 'findRemoveAsync(with ignore + bak extension) did remove file randomFile1_2_1_2') - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) - t.equal(exists1_2_1_4, true, 'findRemoveSync(with ignore + bak extension) did not remove file fixFile1_2_1_4') + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'findRemoveAsync(with ignore + bak extension) did not remove file fixFile1_2_1_4') - t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result') - t.strictEqual(typeof result[randomFile1_2_1_2], 'boolean', 'randomFile1_2_1_2 is in result') - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + t.strictEqual(typeof result[randomFile1_2_1_1], 'undefined', 'randomFile1_2_1_1 is NOT in result') + t.strictEqual(typeof result[randomFile1_2_1_2], 'boolean', 'randomFile1_2_1_2 is in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - t.done() + t.done() + }) }, - 'findRemoveSync(two files and check others)': function(t) { - var result = findRemoveSync(rootDirectory, {files: [randomFilename1_2_1_1, randomFilename1_2_1_3]}) + 'findRemoveAsync(two files and check others)': function(t) { + findRemoveAsync(rootDirectory, {files: [randomFilename1_2_1_1, randomFilename1_2_1_3]}).then((result) => { - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, false, 'findRemoveSync(two files and check others) removed randomFile1_2_1_1 fine') + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, false, 'findRemoveAsync(two files and check others) removed randomFile1_2_1_1 fine') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, false, 'findRemoveSync(two files and check others) removed randomFile1_2_1_3 fine') + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, false, 'findRemoveAsync(two files and check others) removed randomFile1_2_1_3 fine') - var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) - t.equal(exists1_2_1_4, true, 'findRemoveSync(two files and check others) did not remove fixFile1_2_1_4') + var exists1_2_1_4 = fs.existsSync(fixFile1_2_1_4) + t.equal(exists1_2_1_4, true, 'findRemoveAsync(two files and check others) did not remove fixFile1_2_1_4') - var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5) - t.equal(exists1_2_1_5, true, 'findRemoveSync(two files and check others) did not remove fixFile1_2_1_5') + var exists1_2_1_5 = fs.existsSync(fixFile1_2_1_5) + t.equal(exists1_2_1_5, true, 'findRemoveAsync(two files and check others) did not remove fixFile1_2_1_5') - t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result') - t.strictEqual(typeof result[randomFile1_2_1_3], 'boolean', 'randomFile1_2_1_3 is in result') - t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') - t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result') + t.strictEqual(typeof result[randomFile1_2_1_1], 'boolean', 'randomFile1_2_1_1 is in result') + t.strictEqual(typeof result[randomFile1_2_1_3], 'boolean', 'randomFile1_2_1_3 is in result') + t.strictEqual(typeof result[fixFile1_2_1_4], 'undefined', 'fixFile1_2_1_4 is NOT in result') + t.strictEqual(typeof result[fixFile1_2_1_5], 'undefined', 'fixFile1_2_1_5 is NOT in result') - t.done() + t.done() + }) }, - 'findRemoveSync(limit to maxLevel = 0)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 0}) + 'findRemoveAsync(limit to maxLevel = 0)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 0}).then((result) => { - t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(limit to maxLevel = 0) returned empty an array.') + t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(limit to maxLevel = 0) returned empty an array.') - t.done() + t.done() + }) }, - 'findRemoveSync(limit to maxLevel = 1)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 1}) + 'findRemoveAsync(limit to maxLevel = 1)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 1}).then((result) => { - t.strictEqual(Object.keys(result).length, 7, 'findRemoveSync(limit to maxLevel = 1) returned 7 entries.') + t.strictEqual(Object.keys(result).length, 7, 'findRemoveAsync(limit to maxLevel = 1) returned 7 entries.') - t.done() + t.done() + }) }, - 'findRemoveSync(limit to maxLevel = 2)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 2}) + 'findRemoveAsync(limit to maxLevel = 2)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", maxLevel: 2}).then((result) => { - t.strictEqual(Object.keys(result).length, 12, 'findRemoveSync(limit to maxLevel = 2) returned 12 entries.') + t.strictEqual(Object.keys(result).length, 12, 'findRemoveAsync(limit to maxLevel = 2) returned 12 entries.') - t.done() + t.done() + }) }, - 'findRemoveSync(limit to maxLevel = 3)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", maxLevel: 3}) + 'findRemoveAsync(limit to maxLevel = 3)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", maxLevel: 3}).then((result) => { - t.strictEqual(Object.keys(result).length, 6, 'findRemoveSync(limit to maxLevel = 3) returned 6 entries.') + t.strictEqual(Object.keys(result).length, 6, 'findRemoveAsync(limit to maxLevel = 3) returned 6 entries.') - t.done() + t.done() + }) }, - 'findRemoveSync(limit to maxLevel = 3 + bak only)': function(t) { - var result = findRemoveSync(rootDirectory, {maxLevel: 3, extensions: '.bak'}) + 'findRemoveAsync(limit to maxLevel = 3 + bak only)': function(t) { + findRemoveAsync(rootDirectory, {maxLevel: 3, extensions: '.bak'}).then((result) => { - t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(limit to maxLevel = 3 + bak only) returned 2 entries.') + t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(limit to maxLevel = 3 + bak only) returned 2 entries.') - t.done() + t.done() + }) }, - 'findRemoveSync(single dir)': function(t) { - var result = findRemoveSync(rootDirectory, {dir: 'directory1_2'}) + 'findRemoveAsync(single dir)': function(t) { + findRemoveAsync(rootDirectory, {dir: 'directory1_2'}).then((result) => { - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'findRemoveSync(single dir) did not remove directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveAsync(single dir) did not remove directory1_1') - var exists1_2 = fs.existsSync(directory1_2) - t.equal(exists1_2, false, 'findRemoveSync(single dir) removed directory1_2') + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, false, 'findRemoveAsync(single dir) removed directory1_2') - t.done() + t.done() + }) }, - 'findRemoveSync(two directories)': function(t) { - findRemoveSync(rootDirectory, {dir: ['directory1_1', 'directory1_2']}) + 'findRemoveAsync(two directories)': function(t) { + findRemoveAsync(rootDirectory, {dir: ['directory1_1', 'directory1_2']}).then(() => { - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, false, 'findRemoveSync(remove single dir) removed directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, false, 'findRemoveAsync(remove single dir) removed directory1_1') - var exists1_2 = fs.existsSync(directory1_2) - t.equal(exists1_2, false, 'findRemoveSync(remove single dir) removed directory1_2') + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, false, 'findRemoveAsync(remove single dir) removed directory1_2') - t.done() + t.done() + }) }, - 'findRemoveSync(directories with the same basename)': function(t) { - findRemoveSync(rootDirectory, {dir: 'CVS'}) + 'findRemoveAsync(directories with the same basename)': function(t) { + findRemoveAsync(rootDirectory, {dir: 'CVS'}).then(() => { - var exists1_3 = fs.existsSync(directory1_3) - t.equal(exists1_3, false, 'findRemoveSync(directories with the same basename) removed root/directory1/CVS') + var exists1_3 = fs.existsSync(directory1_3) + t.equal(exists1_3, false, 'findRemoveAsync(directories with the same basename) removed root/directory1/CVS') - var exists3 = fs.existsSync(directory3) - t.equal(exists3, false, 'findRemoveSync(directories with the same basename) removed root/CVS') + var exists3 = fs.existsSync(directory3) + t.equal(exists3, false, 'findRemoveAsync(directories with the same basename) removed root/CVS') - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'findRemoveSync(remove single dir) did not remove directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveAsync(remove single dir) did not remove directory1_1') - var exists1_2 = fs.existsSync(directory1_2) - t.equal(exists1_2, true, 'findRemoveSync(remove single dir) did not remove directory1_2') + var exists1_2 = fs.existsSync(directory1_2) + t.equal(exists1_2, true, 'findRemoveAsync(remove single dir) did not remove directory1_2') - t.done() + t.done() + }) }, - 'findRemoveSync(test run)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", test: true}) + 'findRemoveAsync(test run)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", test: true}).then((result) => { - t.strictEqual(Object.keys(result).length, 19, 'findRemoveSync(test run) returned 19 entries.') + t.strictEqual(Object.keys(result).length, 19, 'findRemoveAsync(test run) returned 19 entries.') - var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) - t.equal(exists1_2_1_1, true, 'findRemoveSync(test run) did not remove randomFile1_2_1_1') + var exists1_2_1_1 = fs.existsSync(randomFile1_2_1_1) + t.equal(exists1_2_1_1, true, 'findRemoveAsync(test run) did not remove randomFile1_2_1_1') - var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) - t.equal(exists1_2_1_3, true, 'findRemoveSync(test run) did not remove randomFile1_2_1_3') + var exists1_2_1_3 = fs.existsSync(randomFile1_2_1_3) + t.equal(exists1_2_1_3, true, 'findRemoveAsync(test run) did not remove randomFile1_2_1_3') - var exists1_1 = fs.existsSync(directory1_1) - t.equal(exists1_1, true, 'findRemoveSync(test run) did not remove directory1_1') + var exists1_1 = fs.existsSync(directory1_1) + t.equal(exists1_1, true, 'findRemoveAsync(test run) did not remove directory1_1') - t.done() + t.done() + }) } }), @@ -622,55 +654,61 @@ module.exports = testCase({ destroyFakeDirectoryTree(cb) }, - 'findRemoveSync(files and dirs older than 10000000000000000 sec)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 10000000000000000}}) + 'findRemoveAsync(files and dirs older than 10000000000000000 sec)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 10000000000000000}}).then((result) => { - t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(files older than 10000000000000000 sec) returned zero entries.') + t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(files older than 10000000000000000 sec) returned zero entries.') - t.done() + t.done() + }) }, - 'findRemoveSync(files and dirs older than 10 sec)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 10}}) + 'findRemoveAsync(files and dirs older than 10 sec)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 10}}).then((result) => { - t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(files older than 10 sec) returned zero entries.') + t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(files older than 10 sec) returned zero entries.') - t.done() + t.done() + }) }, - 'findRemoveSync(files older than .0005 sec)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}}) + 'findRemoveAsync(files older than .0005 sec)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}}).then((result) => { - t.strictEqual(Object.keys(result).length, 11, 'findRemoveSync(files older than .0005 sec) returned 11 entries.') + t.strictEqual(Object.keys(result).length, 11, 'findRemoveAsync(files older than .0005 sec) returned 11 entries.') - t.done() + t.done() + }) }, - 'findRemoveSync(files and dirs older than .0005 sec)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}}) + 'findRemoveAsync(files and dirs older than .0005 sec)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}}).then((result) => { - t.strictEqual(Object.keys(result).length, 19, 'findRemoveSync(files older than .0005 sec) returned 19 entries.') + t.strictEqual(Object.keys(result).length, 19, 'findRemoveAsync(files older than .0005 sec) returned 19 entries.') - t.done() + t.done() + }) }, - 'findRemoveSync(files older than 2 sec with wait)': function(t) { + 'findRemoveAsync(files older than 2 sec with wait)': function(t) { setTimeout(function() { - var result = findRemoveSync(rootDirectory, {files: "*.*", age: {seconds: 2}}) + findRemoveAsync(rootDirectory, {files: "*.*", age: {seconds: 2}}).then((result) => { - t.strictEqual(Object.keys(result).length, 11, 'findRemoveSync(files older than 2 sec with wait) returned 11 entries.') + t.strictEqual(Object.keys(result).length, 11, 'findRemoveAsync(files older than 2 sec with wait) returned 11 entries.') - t.done() + t.done() + }) }, 2100) }, - 'findRemoveSync(files older than 2 sec with wait + maxLevel = 1)': function(t) { + 'findRemoveAsync(files older than 2 sec with wait + maxLevel = 1)': function(t) { setTimeout(function() { - var result = findRemoveSync(rootDirectory, {files: "*.*", maxLevel: 1, age: {seconds: 2}}) + findRemoveAsync(rootDirectory, {files: "*.*", maxLevel: 1, age: {seconds: 2}}).then((result) => { - t.strictEqual(Object.keys(result).length, 4, 'findRemoveSync(files older than 2 sec with wait + maxLevel = 1) returned 4 entries.') + t.strictEqual(Object.keys(result).length, 4, 'findRemoveAsync(files older than 2 sec with wait + maxLevel = 1) returned 4 entries.') - t.done() + t.done() + }) }, 2100) } }), @@ -685,23 +723,25 @@ module.exports = testCase({ }, // from https://github.com/binarykitchen/find-remove/issues/7 - 'findRemoveSync(issues/7a)': function(t) { + 'findRemoveAsync(issues/7a)': function(t) { setTimeout(function() { - var result = findRemoveSync(rootDirectory, {age: {seconds: 2}, extensions: '.csv'}) + findRemoveAsync(rootDirectory, {age: {seconds: 2}, extensions: '.csv'}).then((result) => { - t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(issues/7) deleted 2 files.') + t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(issues/7) deleted 2 files.') - t.done() + t.done() + }) }, 3 * 1000) }, // from https://github.com/binarykitchen/find-remove/issues/7 - 'findRemoveSync(issues/7b)': function(t) { - var result = findRemoveSync(rootDirectory, {extensions: '.dontexist'}) + 'findRemoveAsync(issues/7b)': function(t) { + findRemoveAsync(rootDirectory, {extensions: '.dontexist'}).then((result) => { - t.deepEqual(result, {}, 'is an empty json') + t.deepEqual(result, {}, 'is an empty json') - t.done() + t.done() + }) } }), @@ -714,20 +754,22 @@ module.exports = testCase({ destroyFakeDirectoryTree(cb) }, - 'findRemoveSync(files older than .0005 sec with limit of 2)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}, limit: 2}) + 'findRemoveAsync(files older than .0005 sec with limit of 2)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", age: {seconds: 0.0005}, limit: 2}).then((result) => { - t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(files older than .0005 sec with limit of 2) returned 2 entries (out of 11).') + t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(files older than .0005 sec with limit of 2) returned 2 entries (out of 11).') - t.done() + t.done() + }) }, - 'findRemoveSync(files and dirs older than .0005 sec with limit of 5)': function(t) { - var result = findRemoveSync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}, limit: 5}) + 'findRemoveAsync(files and dirs older than .0005 sec with limit of 5)': function(t) { + findRemoveAsync(rootDirectory, {files: "*.*", dir: "*", age: {seconds: 0.0005}, limit: 5}).then((result) => { - t.strictEqual(Object.keys(result).length, 5, 'findRemoveSync(files and dirs older than .0005 sec with limit of 5) returned 5 entries (out of 19).') + t.strictEqual(Object.keys(result).length, 5, 'findRemoveAsync(files and dirs older than .0005 sec with limit of 5) returned 5 entries (out of 19).') - t.done() + t.done() + }) } }), @@ -741,20 +783,22 @@ module.exports = testCase({ destroyFakeDirectoryTree(cb) }, - 'findRemoveSync(files with exiting prefix "someth")': function(t) { - var result = findRemoveSync(rootDirectory, {prefix: "someth"}) + 'findRemoveAsync(files with exiting prefix "someth")': function(t) { + findRemoveAsync(rootDirectory, {prefix: "someth"}).then((result) => { - t.strictEqual(Object.keys(result).length, 2, 'findRemoveSync(files with prefix "someth") returned 2 entries (out of 11).') + t.strictEqual(Object.keys(result).length, 2, 'findRemoveAsync(files with prefix "someth") returned 2 entries (out of 11).') - t.done() + t.done() + }) }, - 'findRemoveSync(files with non-existing prefix "ssssssssssssssssssssssssss" - too many chars)': function(t) { - var result = findRemoveSync(rootDirectory, {prefix: "ssssssssssssssssssssssssss"}) + 'findRemoveAsync(files with non-existing prefix "ssssssssssssssssssssssssss" - too many chars)': function(t) { + findRemoveAsync(rootDirectory, {prefix: "ssssssssssssssssssssssssss"}).then((result) => { - t.strictEqual(Object.keys(result).length, 0, 'findRemoveSync(files with non-existing prefix "ssssssssssssssssssssssssss"- too many chars) returned 0 entries (out of 11).') + t.strictEqual(Object.keys(result).length, 0, 'findRemoveAsync(files with non-existing prefix "ssssssssssssssssssssssssss"- too many chars) returned 0 entries (out of 11).') - t.done() + t.done() + }) } }) From 146af387ed3788f33c0762d27a10040cf555b229 Mon Sep 17 00:00:00 2001 From: David Langer Date: Tue, 13 Feb 2018 14:25:46 +0100 Subject: [PATCH 28/29] Remove unused reject callback --- find-remove.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/find-remove.js b/find-remove.js index de2e523..4f49e85 100644 --- a/find-remove.js +++ b/find-remove.js @@ -18,7 +18,7 @@ function promisify (fn) { } function promisifyWithOutErr (fn) { return (...args) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { fn(...args, (...args2) => { return resolve(...args2); }); From fb7ccc6c8c3802d97002b627e5934f7f2959dcd6 Mon Sep 17 00:00:00 2001 From: David Langer Date: Tue, 13 Feb 2018 14:26:13 +0100 Subject: [PATCH 29/29] Replace deprecated os.tmpDir call --- tests/basics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/basics.js b/tests/basics.js index 3ea7d9f..a462b62 100644 --- a/tests/basics.js +++ b/tests/basics.js @@ -7,7 +7,7 @@ var testCase = require('nodeunit').testCase, rimraf = require('rimraf'), findRemoveAsync -var rootDirectory = path.join(require('os').tmpDir(), 'find-remove') +var rootDirectory = path.join(require('os').tmpdir(), 'find-remove') function generateRandomFilename(ext) { var filename = randomstring.generate(24)