improved katacoda runner for parsing input parameter

Author: GuentherJulian

engine/runner.ts

@@ -109,4 +109,13 @@ export abstract class Runner {
         fs.mkdirSync(path, { recursive: true });
         return path;
     }
+
+    protected parseInputParameters(parameterString: string) {
+        let regex = /(((?<array>\[[^\]]+\])|(?<string>[^[,]+))\s*,?\s*)/mg;
+        let parameters = [];
+        for (let matches = regex.exec(parameterString); matches != null; matches = regex.exec(parameterString)) {
+            parameters.push(matches[2]);
+        }
+        return parameters;
+    }
 }

playbooks/cobigen-cli/index.asciidoc

@@ -19,8 +19,10 @@ Now, you have to download cobigen
 installCobiGen()
 --
 
-The CobiGen plugin for VS Code is already installed. You can use it right away.
+====
+The CobiGen plugin for VS Code is already installed. We will use it to generate code from one single java class based on existing templates.
 [step]
 --
-cobiGenJava(Test.java,[1 2 3 4])
---
+cobiGenJava(Test.java,[1,2,3,4])
+--
+====

runners/katacoda/index.ts

@@ -66,10 +66,11 @@ export class Katacoda extends Runner {
     }
 
     runInstallDevonfwIde(step: Step, command: Command): RunResult {
-        let params = command.parameters.replace(/\[/, "").replace("\]", "").replace(/,/, " ").replace(/vscode/,"").replace(/eclipse/, "").trim();
+        let params = this.parseInputParameters(command.parameters);
+        let tools = params[0].replace(/\[/, "").replace(/\]/g, "").replace(/,/, " ").replace(/vscode/,"").replace(/eclipse/, "").trim();
 
         // create script to download devonfw ide settings
-        this.renderTemplate(path.join("scripts", "cloneDevonfwIdeSettings.sh"), path.join(this.setupDir, "cloneDevonfwIdeSettings.sh"), { tools: params, cloneDir: "/root/devonfw-settings/"});
+        this.renderTemplate(path.join("scripts", "cloneDevonfwIdeSettings.sh"), path.join(this.setupDir, "cloneDevonfwIdeSettings.sh"), { tools: tools, cloneDir: "/root/devonfw-settings/"});
 
         // add the script to the setup scripts for executing it at the beginning of the tutorial
         this.setupScripts.push({
@@ -95,8 +96,8 @@ export class Katacoda extends Runner {
     }
 
     runCobiGenJava(step: Step, command: Command): RunResult {
-        let params = command.parameters.split(",");
-        let cobiGenTemplates = params[1].replace(/\[/, "").replace("\]", "").replace(/ /g, ",");
+        let params = this.parseInputParameters(command.parameters)
+        let cobiGenTemplates = params[1].replace(/\[/, "").replace(/\]/g, "");
 
         this.renderTemplate(path.join("scripts", "installCobiGenPlugin.sh"), path.join(this.setupDir, "installCobiGenPlugin.sh"), { vsixFile: "cobigen-0.0.1.vsix", pluginName: "cobigen" });
         this.setupScripts.push({

runners/katacoda/templates/cobiGenJava.md

@@ -11,4 +11,6 @@ A terminal will open on the bottom of the IDE and CobiGen CLI will start.
 
 You can choose the templates CobiGen should use by entering the numbers.
 
-`<%= cobiGenTemplates; %>`{{execute}}
+`<%= cobiGenTemplates; %>`{{execute}}
+
+<%= textAfter; %>