Merge remote-tracking branch 'upstream/main' into feature/wikiRunner

Author: GuentherJulian

.github/workflows/linuxMain.yml

@@ -23,4 +23,6 @@ jobs:
         run: bash checkout.sh
 
       - name: run buildRun.sh
-        run: sh buildRun.sh
+        uses: GabrielBB/[email protected]
+        with:
+          run: sh buildRun.sh

documentation/Functions.md

@@ -17,6 +17,7 @@ The following functions are already implemented:
 * downloadFile
 * nextKatacodaStep
 * adaptTemplatesCobiGen
+* createDevon4ngProject
 
 ***
 
@@ -240,11 +241,27 @@ image: Path to an image to be displayed in the katacoda step.
 
 ***
 
-
 ### adaptTemplatesCobiGen
 #### parameter
 * No parameters
 #### example
 adaptTemplatesCobiGen()
 
 ***
+
+### createDevon4ngProject
+#### parameter 
+1. Name of the Project.
+2. Path to where the Project should be created (relative to workspace). Folder should exist.
+3. (Optional) String array of parameters, according to https://angular.io/cli/new.
+#### example 
+createDevon4ngProject("exampleAngularProject", "")
+Will create the angular project to the current workspace with the name exampleAngularProject.
+
+createDevon4ngProject("exampleAngularProject", "projects", ["--verbose"])
+Will create the angular project to the directory projects within the current workspace and adds more details to output logging.
+
+#### Details
+This command also works if the devonfw IDE is not installed, but then you have to make sure that the Angular cli is installed.
+
+***

engine/engine.ts

@@ -13,6 +13,10 @@ export class Engine {
     constructor(private environmentName: string, private environment: Environment, private playbook: Playbook) { }
 
     async run() {
+        for (let runnerIndex in this.environment.runners) {
+            (await this.getRunner(this.environment.runners[runnerIndex])).init(this.playbook);
+        }
+
         console.log("Environment: " + this.environmentName);
         if (! await this.isEnvironmentComplete()) {
             if (this.environment.failOnIncomplete) {
@@ -21,17 +25,14 @@ export class Engine {
             console.log("Environment incomplete: " + this.environmentName);
             return;
         }
-        for (let runnerIndex in this.environment.runners) {
-            (await this.getRunner(this.environment.runners[runnerIndex])).init(this.playbook);
-        }
 
         mainloop: for (let stepIndex = 0; stepIndex < this.playbook.steps.length; stepIndex++) {
             for (let lineIndex = 0; lineIndex < this.playbook.steps[stepIndex].lines.length; lineIndex++) {
                 let runCommand = this.initRunCommand(stepIndex, lineIndex);
                 let foundRunnerToExecuteCommand = false;
                 for (let runnerIndex in this.environment.runners) {
                     let runner = await this.getRunner(this.environment.runners[runnerIndex]);
-                    if (runner.supports(this.playbook.steps[stepIndex].lines[lineIndex].name)) {
+                    if (runner.supports(this.playbook.steps[stepIndex].lines[lineIndex].name, this.playbook.steps[stepIndex].lines[lineIndex].parameters)) {
                         var result = new RunResult();
                         if(runner.commandIsSkippable(runCommand.command.name)) {
                             console.log("Command " + runCommand.command.name + " will be skipped.");
@@ -70,7 +71,7 @@ export class Engine {
             for (let lineIndex in this.playbook.steps[stepIndex].lines) {
                 let isSupported = false;
                 for (let runnerIndex in this.environment.runners) {
-                    if ((await this.getRunner(this.environment.runners[runnerIndex])).supports(this.playbook.steps[stepIndex].lines[lineIndex].name)) {
+                    if ((await this.getRunner(this.environment.runners[runnerIndex])).supports(this.playbook.steps[stepIndex].lines[lineIndex].name, this.playbook.steps[stepIndex].lines[lineIndex].parameters)) {
                         isSupported = true;
                         break;
                     }

engine/runner.ts

@@ -74,7 +74,7 @@ export abstract class Runner {
         return dir;
     }
 
-    supports(name: string): boolean {
+    supports(name: string, parameters: any[]): boolean {
         return !!this[this.getMethodName("run", name)];
     }
 
@@ -105,7 +105,7 @@ export abstract class Runner {
             if(deleteFolerIfExist) {
                 rimraf.sync(path);
                 fs.mkdirSync(path, { recursive: true });
-            } else return
+            } else return path;
         }
         fs.mkdirSync(path, { recursive: true });
         return path;

environments/console.json renamed to environments/test_console.json

@@ -0,0 +1,7 @@
+{
+    "failOnIncomplete": true,
+    "runners": [
+        "vscode",
+        "console"
+    ]
+}