Patch/discard remove git (#46)

* Update fetch.js * Update discard.js * Update discard.js * Updating with sync methods * lint * Updating check to remove .git * ensuring conditional check for keep history flag works as expected
howardroark · Feb 21, 2017 · 102d275 · 102d275
1 parent f67fa31
commit 102d275
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/lib/discard.js b/lib/discard.js
@@ -11,9 +11,16 @@
 
 var rimraf = require('rimraf');
 var async = require('async');
+var isDirectory = require('is-directory');
 
 module.exports = function (state, callback) {
-    var discard = state.data.discard;
+    var discard = state.data.discard,
+        tmpPath = state.template.tmp;
+
+    // Remove the .git directory unless told otherwise
+    if (isDirectory.sync(tmpPath + '/.git') && !state.data.keepHistory && (!state.flags || !state.flags['keep-history'])) {
+        rimraf.sync(tmpPath + '/.git');
+    }
 
     if (discard === undefined || discard.length === 0) {
         callback(null, state);
@@ -22,7 +29,7 @@ module.exports = function (state, callback) {
 
     async.parallel(discard.map(function (path) {
         return function (next) {
-            rimraf(state.template.tmp + '/' + path, next);
+            rimraf(tmpPath + '/' + path, next);
         };
     }), function (err) {
         if (err) {
@@ -34,4 +41,3 @@ module.exports = function (state, callback) {
     });
 
 };
-
diff --git a/lib/fetch.js b/lib/fetch.js
@@ -123,19 +123,6 @@ var fetchGit = function (state, callback) {
             } else {
                 next(null);
             }
-        },
-        function (next) {
-            if (isDirectory(tmpPath + '/.git') && !state.options.keepHistory && !(state.flags && state.flags['keep-history'])) {
-                fsExtra.remove(tmpPath + '/.git', function (err) {
-                    if (err) {
-                        next(err);
-                        return;
-                    }
-                    next(null);
-                });
-            } else {
-                next(null);
-            }
         }
     ], function (err) {
         if (err) {

diff --git a/tests/test.js b/tests/test.js
@@ -87,10 +87,9 @@ describe('Test basic example', function () {
         pollinate({
             "inputs": [
                 "https://github.com/howardroark/webapp.git",
-                "{\"name\":\"newproject\",\"container\":\"alpine\"}"
+                "{\"name\":\"newproject\",\"container\":\"alpine\", \"keepHistory\":true}"
             ],
             "options": {
-                "keepHistory": true
                 //..
             }
         }, function (err, result) {