Merge pull request #613 from attomos/master

Added GeneratorUtilities.prototype.isBaseDirExists function.
1602 · Mar 4, 2014 · 5c3b77c · 5c3b77c
2 parents 831d5ea + f31d44e
commit 5c3b77c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/server/generators/app_generator.js b/lib/server/generators/app_generator.js
@@ -47,7 +47,9 @@ AppGenerator.prototype.perform = function (args) {
   if (this.options.appName) {
     this.baseDir = path.join(this.baseDir, this.options.appName);
   }
-
+  if (this.isBaseDirExists()) {
+    return;
+  }
   this.createDirectoryStructure();
   this.copyFiles();
 };

diff --git a/lib/server/generators/generator_utils.js b/lib/server/generators/generator_utils.js
@@ -425,7 +425,7 @@ GeneratorUtilities.prototype.getDatabaseDependency = function() {
     }
 };
 
-GeneratorUtilities.prototype.isEvalAllowed = function () {
+GeneratorUtilities.prototype.isEvalAllowed = function() {
   return !('noeval' in this.options);
 };
 
@@ -436,4 +436,12 @@ GeneratorUtilities.prototype.generateSecret = function() {
     .digest('hex');
 };
 
+GeneratorUtilities.prototype.isBaseDirExists = function() {
+  var exists = fs.existsSync(this.baseDir);
+  if (exists) {
+    this.log($('"' + this.baseDir + '" exists', this.baseDir).bold.red);
+  }
+  return exists;
+};
+
 module.exports = GeneratorUtilities;