refactor(utils): Cleaned up code in Grunt util

Author: pilsy

lib/util/grunt.js

@@ -14,18 +14,18 @@ var Promise = require( 'bluebird' )
  * @private
  */
 
-function gruntCLI ( ) {
-  this.tasks = [ ];
+function gruntCLI() {
+  this.tasks = [];
 
-  this.option = function ( key ) {
+  this.option = function( key ) {
     return process.env[ key ];
   }
 
-  this.registerTask = function ( cmd ) {
+  this.registerTask = function( cmd ) {
     this.tasks.push( cmd );
   }
 
-  this.loadNpmTasks = function ( ) { }
+  this.loadNpmTasks = function() { }
 }
 
 /**
@@ -38,11 +38,11 @@ function gruntCLI ( ) {
  * @api public
  */
 
-var gruntUtility = exports.gruntUtility = function ( filePath ) {
-  var cli  = new gruntCLI( )
+var gruntUtility = exports.gruntUtility = function( filePath ) {
+  var cli  = new gruntCLI()
     , file = require( filePath )( cli );
 
-  if (Array.isArray( file ) && typeof file[ file.length-1 ] === "function") {
+  if ( Array.isArray( file ) && typeof file[ file.length-1 ] === "function" ) {
     file[ file.length-1 ].call( file,  cli );
   }
 
@@ -58,25 +58,25 @@ var gruntUtility = exports.gruntUtility = function ( filePath ) {
  * @api public
  */
 
-var readTasks = exports.readTasks = function ( pathSrc, silence ) {
-  var def = Promise.defer( );
+var readTasks = exports.readTasks = function( pathSrc, silence ) {
+  var def = Promise.defer();
 
-  if (typeof silence === "undefined") {
+  if ( typeof silence === "undefined" ) {
     silence = true;
   }
 
   findGruntFile( pathSrc )
-  .then( function ( filePath ) {
+  .then( function( filePath ) {
     var tasks = gruntUtility( filePath );
     def.resolve( [ tasks, pathSrc ] );
-  } )
+  })
   .catch( function ( err ) {
-    if (err.match( /^Gruntfile within/ ) !== null && silence === true) {
+    if ( err.match( /^Gruntfile within/ ) !== null && silence === true ) {
       return def.resolve( [ [ ], pathSrc ] );
     }
 
     def.reject( err );
-  } );
+  });
 
   return def.promise;
 }
@@ -89,21 +89,21 @@ var readTasks = exports.readTasks = function ( pathSrc, silence ) {
  * @api public
  */
 
-var findGruntFile = exports.findGruntFile = function ( pathSrc ) {
-  var def = Promise.defer( );
+var findGruntFile = exports.findGruntFile = function( pathSrc ) {
+  var def = Promise.defer();
 
-  async.detect( [
+  async.detect([
     path.join( pathSrc, 'Gruntfile.js' ),
     path.join( pathSrc, 'gruntfile.js' ),
     path.join( pathSrc, 'Grunt.js' ),
     path.join( pathSrc, 'grunt.js' )
-  ], fs.exists, function ( filePath ) {
-    if (typeof filePath === "undefined") {
+  ], fs.exists, function( filePath ) {
+    if ( typeof filePath === "undefined" ) {
       return def.reject( 'Gruntfile within ' + pathSrc + ' could not be found.' );
     }
 
     def.resolve( filePath );
-  } );
+  });
 
   return def.promise;
 }
@@ -117,7 +117,7 @@ var findGruntFile = exports.findGruntFile = function ( pathSrc ) {
  * @api private
  */
 
-function runTask ( projectFolder, cmd ) {
+function runTask( projectFolder, cmd ) {
   var def   = Promise.defer( )
     , proc  = spawn( !isWin ? 'grunt' : 'grunt.cmd', [ cmd ], { cwd: projectFolder, stdio: 'inherit' } );
 
@@ -147,30 +147,30 @@ function runTask ( projectFolder, cmd ) {
  * @api private
  */
 
-function runDBMigrations ( projectFolder ) {
-  var def = Promise.defer( )
+function runDBMigrations( projectFolder ) {
+  var def = Promise.defer()
     , env = process.env;
 
   lib.utils.warn( 'Running database migrations...' );
 
   // check for NODE_ENV json config file if it doesn't exist then revert to local
-  if (!fs.existsSync( path.join( projectFolder, 'config', env.NOD_ENV + '.json') ) ) {
+  if ( !fs.existsSync( path.join( projectFolder, 'config', env.NOD_ENV + '.json') ) ) {
     env.NODE_ENV  = 'local';
   }
 
-  exec( 'NODE_ENV=' + env.NODE_ENV + ' grunt db', { env: env, cwd: projectFolder }, function ( err, stdout, stderr ) {
+  exec( 'NODE_ENV=' + env.NODE_ENV + ' grunt db', { env: env, cwd: projectFolder }, function( err, stdout, stderr ) {
     if (!!err) {
       return def.reject( err );
     }
 
-    if (!!stderr && stderr !== "") {
+    if ( !!stderr && stderr !== "" ) {
       return def.reject( stderr );
     }
 
     lib.utils.progress();
 
-    def.resolve( );
-  } );
+    def.resolve();
+  });
 
   return def.promise;
 }
@@ -184,7 +184,7 @@ function runDBMigrations ( projectFolder ) {
  * @api public
  */
 
-exports.runTasks = function ( projectFolder, modulePath ) {
+exports.runTasks = function( projectFolder, modulePath ) {
   var def = Promise.defer( );
 
   readTasks( modulePath )
@@ -195,44 +195,52 @@ exports.runTasks = function ( projectFolder, modulePath ) {
     }
 
     Promise.all( tasks )
-    .then( function ( ) {
-      if (tasks.indexOf( 'readme') > -1) {
+    .then( function() {
+      if ( tasks.indexOf( 'readme' ) > -1 ) {
         lib.utils.expandProgress( 1 );
         return runTask( projectFolder, 'readme' );
       }
       return true;
-    } )
-    .then( function ( ) {
-      if (tasks.indexOf( 'prompt:clever' ) > -1) {
-        lib.utils.expandProgress( 1 );
-
-        return new Promise(function( resolve, reject ) {
-          lib.utils.stopBar(function() {
-            runTask( projectFolder, 'prompt:clever' )
-              .then(function() {
-                resolve();
-              })
-              .catch(function( err ) {
-                reject( err );
+    })
+    .then( function() {
+      return new Promise( function( resolve, reject ) {
+        async.forEach(
+          tasks,
+          function( task, callback ) {
+            if ( /^prompt:clever*/.test( task ) ) {
+              lib.utils.expandProgress( 1 );
+              lib.utils.stopBar( function() {
+                runTask( projectFolder, task )
+                  .then( function() {
+                    callback( null );
+                  })
+                  .catch( callback );
               });
-          });
-        });
-      }
-      return true;
-    } )
-    .then( function ( ) {
+            } else {
+              callback( null );
+            }
+          },
+          function( err ) {
+            !err
+              ? resolve()
+              : reject( err );
+          }
+        );
+      });
+    })
+    .then( function() {
       if (tasks.indexOf( 'db' ) > -1) {
         lib.utils.expandProgress( 1 );
         return runDBMigrations( projectFolder );
       }
       return true;
-    } )
-    .then( function ( ) {
-      def.resolve( );
-    }, function ( err ) {
+    })
+    .then( function() {
+      def.resolve();
+    }, function( err ) {
       def.reject( err );
-    } );
-  } );
+    });
+  });
 
   return def.promise;
-}
+}