Merge branch 'devonfw-tutorials:main' into feature/wikiRunnerExecuteCommand

Author: EduardKrieger

.github/workflows/linuxMain.yml

@@ -18,6 +18,12 @@ jobs:
 
       - uses: actions/setup-node@v2-beta
 
+      - name: install Pandoc
+        run: sudo apt install pandoc
+
+      - name: install AsciiDoctor
+        run: sudo apt install asciidoctor
+
       - name: install TS
         run: npm install typescript
 

.github/workflows/linuxPullRequest.yml

@@ -11,6 +11,12 @@ jobs:
 
       - uses: actions/setup-node@v2-beta
 
+      - name: install Pandoc
+        run: sudo apt install pandoc
+
+      - name: install AsciiDoctor
+        run: sudo apt install asciidoctor
+        
       - name: install TS
         run: npm install typescript
 

.github/workflows/windowsMain.yml

@@ -18,6 +18,19 @@ jobs:
 
       - uses: actions/setup-node@v2-beta
 
+      - name: install Pandoc
+        uses: crazy-max/ghaction-chocolatey@v1
+        with:
+          args: install pandoc
+
+      - name: install Ruby
+        uses: crazy-max/ghaction-chocolatey@v1
+        with:
+          args: install ruby
+
+      - name: install AsciiDoctor
+        run: gem install asciidoctor
+        
       - name: install TS
         run: npm install typescript
 

.github/workflows/windowsPullRequest.yml

@@ -11,6 +11,19 @@ jobs:
 
       - uses: actions/setup-node@v2-beta
 
+      - name: install Pandoc
+        uses: crazy-max/ghaction-chocolatey@v1
+        with:
+          args: install pandoc
+
+      - name: install Ruby
+        uses: crazy-max/ghaction-chocolatey@v1
+        with:
+          args: install ruby
+
+      - name: install AsciiDoctor
+        run: gem install asciidoctor
+        
       - name: install TS
         run: npm install typescript
 

documentation/Functions.md

@@ -195,7 +195,7 @@ buildJava("cobigenexample", true)
 
 ### createFile <a name="createFile"></a>
 #### parameter 
-1. Path of the file to be created (relative path to the workspace directory)
+1. Path of the file to be created (relative path to the workspace directory).
 2. (Optional) Path of the file to get the content from. Relative to the playbook directory
 #### example 
 createFile("cobigenexample/core/src/main/java/com/example/application/cobigenexample/customermanagement/dataaccess/api/CustomerEntity.java", "files/CustomerEntity.java")

engine/command.ts

@@ -3,6 +3,11 @@ export class Command{
     public parameterString: string;
 
     get parameters(): any[] {
-        return JSON.parse("[" + this.parameterString + "]");
+        try {
+            return JSON.parse("[" + this.parameterString + "]");
+        } catch(e) {
+            console.error("Error parsing arguments: '" + this.parameterString + "'");
+            throw e;
+        }
     }
-}
+}

engine/engine.ts

@@ -19,7 +19,7 @@ export class Engine {
 
         console.log("Environment: " + this.environmentName);
         if (! await this.isEnvironmentComplete()) {
-            if (this.environment.failOnIncomplete) {
+            if (this.environment.failOnIncomplete && !this.syntaxErrorLogger.activated) {
                 throw "Environment incomplete: " + this.environmentName;
             } else if(!this.environment.skipMissingFunctions) {
                 console.log("Environment incomplete: " + this.environmentName);

engine/parser.ts

@@ -44,9 +44,9 @@ export class Parser {
     getLines(parseResult, index):Command[]{
         let linebreak = process.platform=="win32" ? "\r\n" : "\n";
         try {
-            return (parseResult[3][index][7].steplines || parseResult[3][index][2][7].steplines).split(linebreak).filter(e => e != '').map(e => this.createCommand(e));
+            return (parseResult[3][index][7].steplines || parseResult[3][index][2][7].steplines).split(linebreak).filter(e => e.trim() != '').map(e => this.createCommand(e));
         } catch (error) {
-            return parseResult[3][index][2][7].steplines.split(linebreak).filter(e => e != '').map(e => this.createCommand(e));
+            return parseResult[3][index][2][7].steplines.split(linebreak).filter(e => e.trim() != '').map(e => this.createCommand(e));
         }
     }
 
@@ -62,11 +62,16 @@ export class Parser {
 
     createCommand(line: string): Command{
         let re =/([^(]+)\(([^)]*)\)/;
-        let result = re.exec(line);
-        let retVal = new Command();
-        retVal.name = result[1].trim();
-        retVal.parameterString = result[2];
-        return retVal;
+        try {
+            let result = re.exec(line);
+            let retVal = new Command();
+            retVal.name = result[1].trim();
+            retVal.parameterString = result[2];
+            return retVal;
+        } catch(e) {
+            console.error("Error in method createCommand while parsing line: '" + line + "'");
+            throw e;
+        }
     }
 
     getTextAfter(parseResult, index){

engine/runner.ts

@@ -1,7 +1,6 @@
 import { RunResult } from "./run_result";
 import { Playbook } from "./playbook";
-import * as fs from 'fs';
-import * as rimraf from 'rimraf';
+import * as fs from 'fs-extra';
 import { RunCommand } from "./run_command";
 
 export abstract class Runner {
@@ -104,9 +103,9 @@ export abstract class Runner {
         if(fs.existsSync(path)) {
             if(deleteFolderIfExist) {
                 try {
-                    rimraf.sync(path);
+                    fs.removeSync(path);
                 } catch(e) {
-                    console.log("Error deleting foler " + path, e);
+                    console.log("Error deleting folder " + path, e);
                 }
             } else return path;
         }

engine/wikiRunner.ts

@@ -7,8 +7,12 @@ import * as ejs from "ejs";
 export abstract class WikiRunner extends Runner {
 
     public outputPathTutorial: string;
+    protected fileTypeMap = new Map([ [".java", "java"],[".ts", "typescript"],
+    [".js", "javascript"], [".html", "html"],
+    [".scss", "css"], [".asciidoc", "asciidoc"], ]);
     protected readonly INSTALLED_TOOLS: string = "installedTools";
 
+
     init(playbook: Playbook): void {
         let outputDirectory = this.createFolder(path.join(this.getOutputDirectory(), "wiki", this.environmentName), false)
         this.outputPathTutorial = this.createFolder(path.join(outputDirectory, playbook.name), true);