Fix for prompt modulePath validation

jfmbrennan · Feb 4, 2015 · 33e7fed · 33e7fed
1 parent 3739456
commit 33e7fed
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/remove/index.js b/remove/index.js
@@ -13,27 +13,20 @@ module.exports = yeoman.generators.NamedBase.extend({
     this.projectName = pkg.name;
   },
 
-  _moduleExists: function (rootPath) {
-    var done = this.async();
-    done(true);
-    //done(fs.existsSync(this._buildModulePath(rootPath)));
-  },
-
-  _buildModulePath: function (rootPath) {
-    rootPath = rootPath || 'app';
-    return path.join(this.env.cwd, 'src', rootPath, this.name);
-  },
-
   askFor: function () {
     var done = this.async();
 
+    var moduleExists = function (rootPath) {
+      return fs.existsSync(this._buildModulePath(rootPath));
+    }.bind(this);
+
     var prompts = [
       {
         name: 'modulePath',
         message: 'Where is the location of this module?',
         default: 'app',
-        when: !this._moduleExists,
-        validate: this._moduleExists
+        when: !moduleExists,
+        validate: moduleExists
       }, {
         name: 'remove',
         message: 'Are you sure you want to remove ' + this.name + '?',
@@ -53,6 +46,11 @@ module.exports = yeoman.generators.NamedBase.extend({
     this._updateAppJs(this.name);
   },
 
+  _buildModulePath: function (rootPath) {
+    rootPath = rootPath || 'app';
+    return path.join(this.env.cwd, 'src', rootPath, this.name);
+  },
+
   _updateAppJs: function (camelModuleName) {
     var filePath = path.join(this.env.cwd, 'src', 'app', 'app.js');
     var file = this.readFileAsString(filePath);