fix: Only delete files we created

Fixes #22

Author: Jan Krems

lib/index.js

@@ -30,9 +30,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 'use strict';
-var existsSync = require('fs').existsSync;
+var fs = require('fs');
+var path = require('path');
 
-var rmrfSync = require('fs.extra').rmrfSync;
 var mkdirp = require('mkdirp');
 var async = require('async');
 
@@ -41,19 +41,31 @@ var ensureSelenium = require('./selenium');
 var ensureChromedriver = require('./chromedriver');
 
 var TEMP_PATH = tempdir + 'testium';
+var CHROMEDRIVER = 'chromedriver';
+var SELENIUM_JAR = 'selenium.jar';
+
+var BINARIES = [CHROMEDRIVER, SELENIUM_JAR];
 
 function makePaths(binPath, tempPath) {
   mkdirp.sync(binPath);
   return mkdirp.sync(tempPath);
 }
 
-function removeDir(dir) {
-  return rmrfSync(dir);
+function cleanupDir(dir) {
+  function deleteIfExists(filename) {
+    try {
+      fs.unlinkSync(path.join(dir, filename));
+    } catch (err) {
+      if (err.code !== 'ENOENT') throw err;
+    }
+  }
+
+  BINARIES.forEach(deleteIfExists);
 }
 
 function binariesExist(binPath) {
-  return ['selenium.jar', 'chromedriver'].every(function binaryExists(binary) {
-    return existsSync(binPath + '/' + binary);
+  return BINARIES.every(function binaryExists(binary) {
+    return fs.existsSync(binPath + '/' + binary);
   });
 }
 
@@ -69,13 +81,13 @@ function ensure(binPath, callback) {
 }
 
 function update(binPath, callback) {
-  removeDir(binPath);
+  cleanupDir(binPath);
   return ensure(binPath, callback);
 }
 
 function forceUpdate(binPath, callback) {
-  removeDir(binPath);
-  removeDir(TEMP_PATH);
+  cleanupDir(binPath);
+  cleanupDir(TEMP_PATH);
   return ensure(binPath, callback);
 }
 

package.json

@@ -40,8 +40,7 @@
     "eslint-config-groupon-es5": "^3.0.0",
     "eslint-plugin-import": "^1.6.1",
     "mocha": "^3.0.0",
-    "nlm": "^2.0.0",
-    "rimraf": "^2.2.8"
+    "nlm": "^2.0.0"
   },
   "author": {
     "name": "Groupon",

test/download.test.js

@@ -1,19 +1,24 @@
 'use strict';
 var fs = require('fs');
 var execFile = require('child_process').execFile;
+var path = require('path');
 
 var assert = require('assertive');
-var rmrf = require('rimraf');
+var rmrfSync = require('fs.extra').rmrfSync;
 
 var tempdir = require('../lib/tempdir');
 var seleniumDownload = require('..');
 
-var BIN_PATH = __dirname + '/bin';
+var BIN_PATH = path.join(__dirname, 'bin');
 var TMP_PATH = tempdir + 'testium';
 
+var CHROMEDRIVER = path.join(BIN_PATH, 'chromedriver');
+var SELENIUM_JAR = path.join(BIN_PATH, 'selenium.jar');
+var CUSTOM_SCRIPT = path.join(BIN_PATH, 'innocent-bystander');
+
 function clearFileSystem() {
-  rmrf.sync(TMP_PATH);
-  rmrf.sync(BIN_PATH);
+  rmrfSync(TMP_PATH);
+  rmrfSync(BIN_PATH);
 }
 
 clearFileSystem();
@@ -28,24 +33,27 @@ describe('seleniumDownload', function () {
   });
 
   it('downloads the proper files', function () {
-    assert.expect(fs.existsSync(BIN_PATH + '/chromedriver'));
-    assert.expect(fs.existsSync(BIN_PATH + '/selenium.jar'));
+    assert.expect(fs.existsSync(CHROMEDRIVER));
+    assert.expect(fs.existsSync(SELENIUM_JAR));
   });
 
   describe('from local tmp', function () {
     before(function (done) {
+      fs.writeFileSync(CUSTOM_SCRIPT,
+        'Hours of important work that I did not commit yet');
       seleniumDownload.update(BIN_PATH, done);
     });
 
     it('downloads the files again', function () {
-      assert.expect(fs.existsSync(BIN_PATH + '/chromedriver'));
-      assert.expect(fs.existsSync(BIN_PATH + '/selenium.jar'));
+      assert.expect(fs.existsSync(CHROMEDRIVER));
+      assert.expect(fs.existsSync(SELENIUM_JAR));
+      assert.expect(fs.existsSync(CUSTOM_SCRIPT));
     });
 
     it('did not download an invalid jar', function (done) {
       execFile('java', [
         // -h means "show usage/help". Selenium has no --version :(
-        '-jar', BIN_PATH + '/selenium.jar', '-h'
+        '-jar', SELENIUM_JAR, '-h'
       ], function (error) {
         clearFileSystem();
         done(error);