Fixes error on | character in CLI

index.js

@@ -33,6 +33,12 @@ else if (program.installModule) installModule(program, sequencer);
 else {
   // Parse step into an array to allow for multiple steps.
   if (!program.step) exit('No steps passed');
+
+  program.steps = sequencer.stringToJSON(program.step);
+
+  var stepNames = [];
+  program.step.split(',').forEach(v => stepNames.push(v.split('{')[0]));
+
   program.step = program.step.split(' ');
 
   // User must input an image.
@@ -44,7 +50,7 @@ else {
   });
 
   // User must input a step. If steps exist, check that every step is a valid step.
-  if (!program.step || !(utils.validateSteps(program.step, sequencer)))
+  if (!program.steps || !(utils.validateSteps(program.steps, sequencer)))
     exit('Please ensure all steps are valid.');
 
   // If there's no user defined output directory, select a default directory.
@@ -57,7 +63,7 @@ else {
       step.info = sequencer.modulesInfo(step.name);
 
       for (var output in step.info.outputs) {
-        console.log('[' + program.step + ']: ' + output + ' = ' + step[output]);
+        console.log('[' + stepNames + ']: ' + output + ' = ' + step[output]);
       }
     },
     notify: function(msg) {

src/CliUtils.js

@@ -20,7 +20,7 @@ function validateSteps(steps, sequencer) {
   var valid = true;
   steps.forEach(function(step) {
     // If any step in the array is not valid (not a property of modulesInfo), set valid to false.
-    if (!sequencer.modulesInfo().hasOwnProperty(step)) {
+    if (!sequencer.modulesInfo().hasOwnProperty(step.name)) {
       valid = false;
     }
   });
@@ -55,4 +55,4 @@ module.exports = exports = {
   makedir: makedir,
   validateSteps: validateSteps,
   validateConfig: validateConfig
-};
+};

src/cli/sequencerSteps.js

@@ -9,44 +9,31 @@ module.exports = function (program, sequencer, outputFilename) {
     if (program.basic)
       console.log('Basic mode is enabled, outputting only final image');
 
-    // Iterate through the steps and retrieve their inputs.
-    program.step.forEach(function(step) {
-      var options = Object.assign({}, sequencer.modulesInfo(step).inputs);
+
+    program.steps.forEach(function(step) {
+      var options = Object.assign({}, sequencer.modulesInfo(step.name).inputs);
 
       // If inputs exists, print to console.
       if (Object.keys(options).length) {
-        console.log('[' + step + ']: Inputs');
+        console.log('[' + step.name + ']: Inputs');
       }
 
       // If inputs exists, print them out with descriptions.
       Object.keys(options).forEach(function(input) {
         // The array below creates a variable number of spaces. This is done with (length + 1).
         // The extra 4 that makes it (length + 5) is to account for the []: characters
         console.log(
-          new Array(step.length + 5).join(' ') +
+          new Array(step.name.length + 5).join(' ') +
           input +
           ': ' +
           options[input].desc
         );
       });
 
-      if (program.config) {
-        try {
-          var config = JSON.parse(program.config);
-          console.log('The parsed options object: ', config);
-        } catch (e) {
-          console.error(
-            '\x1b[31m%s\x1b[0m',
-            'Options(Config) is not a not valid JSON Fallback activate'
-          );
-          program.config = false;
-          console.log(e);
-        }
-      }
-      if (program.config && utils.validateConfig(config, options)) {
+      if (Object.keys(step.options).length > 0) {
         console.log('Now using Options object');
         Object.keys(options).forEach(function(input) {
-          options[input] = config[input];
+          options[input] = step.options[input];
         });
       } else {
         // If inputs exist, iterate through them and prompt for values.
@@ -66,7 +53,7 @@ module.exports = function (program, sequencer, outputFilename) {
         });
       }
       // Add the step and its inputs to the sequencer.
-      sequencer.addSteps(step, options);
+      sequencer.addSteps(step.name, options);
     });
 
     var spinnerObj = { succeed: () => { }, stop: () => { } };