fix regression in launch for webstorm task

Author: benholloway

tasks/webstorm.js

@@ -8,11 +8,11 @@ function setUpWebStormTask(context) {
     throw new Error('Context must specify run-sequence instance');
   }
 
-  var fs              = require('fs'),
-      path            = require('path'),
-      ideTemplate     = require('ide-template'),
-      defaults        = require('../lib/config/defaults'),
-      platform        = require('../lib/config/platform');
+  var fs          = require('fs'),
+      path        = require('path'),
+      ideTemplate = require('ide-template'),
+      defaults    = require('../lib/config/defaults'),
+      platform    = require('../lib/config/platform');
 
   var config = defaults
     .getInstance('webstorm')
@@ -107,7 +107,7 @@ function setUpWebStormTask(context) {
         }
 
         // ensure options correspond to the types that they were defined as belonging to
-        if (key !== 'defaults') {
+        if ((key !== 'defaults') && (key !== 'launch')) {
           tyRun.checkFlagType(opt, key, value);
         }
 
@@ -123,6 +123,24 @@ function setUpWebStormTask(context) {
             throw new Error('Unrecognised value for defaults flag, expected true|false|reset.');
           }
         }
+        else if (key === 'launch') {
+          switch (argv.launch) {
+            case 'false':
+              break;
+            case 'true':
+              if (!ideTemplate.webStorm.validateExecutable()) {
+                throw new Error('Cannot find Webstorm executable, you will have to specify it explicitly.');
+              }
+              break;
+            default:
+              var customPath = path.normalize(argv.launch);
+              if (fs.existsSync(customPath)) {
+                ideTemplate.webStorm.customExecutable = customPath;
+              } else {
+                throw new Error('Launch path is not valid or does not exist.');
+              }
+          }
+        }
       });
       if (!argv.defaults) {
         // when defaults are not present, check whether angularity project is present
@@ -135,33 +153,6 @@ function setUpWebStormTask(context) {
     return true;
   }
 
-  /**
-   * yargs check for a valid --launch parameter
-   * Additionally parses true|false strings to boolean literals
-   * @param argv
-   */
-  function validateLaunchPath(argv) {
-    switch (argv.launch) {
-      case false:
-      case 'false':
-        argv.launch = false;
-        break;
-      case true:
-      case 'true':
-        if (ideTemplate.webStorm.validateExecutable()) {
-          argv.launch = true;
-        } else {
-          return 'Cannot find Webstorm executable, you will have to specify it explicitly.';
-        }
-        break;
-      default:
-        if (!fs.existsSync(path.normalize(argv.launch))) {
-          return 'Launch path is not valid or does not exist.';
-        }
-    }
-    return argv;
-  }
-
   var taskDefinition = {
     name: 'webstorm',
     description: [
@@ -186,7 +177,7 @@ function setUpWebStormTask(context) {
       'angularity webstorm --defaults reset             Reset defaults'
     ].join('\n'),
     prerequisiteTasks: ['help'],
-    checks: [validateLaunchPath, checkWebstormFlags],
+    checks: [checkWebstormFlags],
     options: webstormOptionDefinitions,
     onInit: function onInitWebstormTask(yargsInstance) {
       var gulp            = context.gulp,
@@ -202,7 +193,7 @@ function setUpWebStormTask(context) {
       yargsInstance
         .strict()
         .wrap(80);
-      cliArgs = validateLaunchPath(yargsInstance.argv); // cast launch flag to boolean (mutate and return)
+      cliArgs = yargsInstance.argv;
 
       gulp.task('webstorm', function (done) {
         console.log(hr('-', 80, 'webstorm'));
@@ -218,13 +209,14 @@ function setUpWebStormTask(context) {
         }
         // else run the selected items
         else {
+          var launch   = (cliArgs.launch !== 'false');
           var taskList = [
             cliArgs.subdir    && 'webstorm:subdir',
             cliArgs.project   && 'webstorm:project',
             cliArgs.external  && 'webstorm:externaltools',
             cliArgs.codestyle && 'webstorm:codestyle',
             cliArgs.templates && 'webstorm:templates',
-            cliArgs.launch    && 'webstorm:launch'
+            launch            && 'webstorm:launch'
           ].filter(Boolean);
           if (taskList.length > 0) {
             runSequence.apply(runSequence, taskList.concat(done));