fix regression in defaults for init and webstorm tasks

Author: benholloway

tasks/init.js

@@ -34,10 +34,10 @@ function setUpInitTask(context) {
     {
       key: 'defaults',
       value: {
-        describe: 'Set defaults',
-        alias   : 'z',
-        boolean : true,
-        isOptional: true
+        describe  : 'Set defaults',
+        alias     : 'z',
+        isOptional: true,
+        default   : false
       }
     },
     {
@@ -151,7 +151,7 @@ function setUpInitTask(context) {
         if (tyRun.checkFlagMissing(opt, key, value)) {
           return;
         }
-        if (key !== 'port') {
+        if ((key !== 'port') && (key !== 'defaults')) {
           // skip the valid types test for port, as will be done later
           // ensure options correspond to the types that they were defined as belonging to
           tyRun.checkFlagType(opt, key, value);
@@ -174,6 +174,11 @@ function setUpInitTask(context) {
             throw new Error('Port must be an integer, or "random"');
           }
         }
+        else if (key === 'defaults') {
+          if (!(/^(true|false|reset)$/.test(String(argv.defaults)))) {
+            throw new Error('Unrecognised value for defaults flag, expected true|false|reset.');
+          }
+        }
       });
       return true;
     }
@@ -226,8 +231,8 @@ function setUpInitTask(context) {
           template    = require('lodash.template'),
           merge       = require('lodash.merge');
 
-      var hr              = require('../lib/util/hr'),
-          streams         = require('../lib/config/streams');
+      var hr          = require('../lib/util/hr'),
+          streams     = require('../lib/config/streams');
 
       var TEMPLATE_PATH = path.join(__dirname, '..', 'templates', 'angularity');
 

tasks/webstorm.js

@@ -30,20 +30,20 @@ function setUpWebStormTask(context) {
     {
       key: 'defaults',
       value: {
-        describe: 'Set defaults',
-        alias   : 'z',
-        boolean : true,
-        isOptional: true
+        describe  : 'Set defaults',
+        alias     : 'z',
+        isOptional: true,
+        default   : false
       }
     },
     {
       key: 'subdir',
       value: {
-        describe: 'Navigate to the sub-directory specified',
-        alias   : 's',
-        string  : true,
+        describe  : 'Navigate to the sub-directory specified',
+        alias     : 's',
+        string    : true,
         isOptional: true,
-        default : config.get('subdir')
+        default   : config.get('subdir')
       }
     },
     {
@@ -108,7 +108,9 @@ function setUpWebStormTask(context) {
         }
 
         // ensure options correspond to the types that they were defined as belonging to
-        tyRun.checkFlagType(opt, key, value);
+        if (key !== 'defaults') {
+          tyRun.checkFlagType(opt, key, value);
+        }
 
         if (key === 'subdir') {
           var subdir  = path.resolve(value);
@@ -117,6 +119,11 @@ function setUpWebStormTask(context) {
             throw new Error('The specified subdirectory does not exist.');
           }
         }
+        else if (key === 'defaults') {
+          if (!(/^(true|false|reset)$/.test(String(argv.defaults)))) {
+            throw new Error('Unrecognised value for defaults flag, expected true|false|reset.');
+          }
+        }
       });
       if (!argv.defaults) {
         // when defaults are not present, check whether angularity project is present