Reintroduced std out and std err output to terminal. Looking in folders makes you crazy. Kept the file output though

Author: firecow

src/job.ts

@@ -174,6 +174,13 @@ export class Job {
         return new Promise<any>((resolve, reject) => {
             const jobNameStr = this.getJobNameString();
             const outputFilesPath = this.getOutputFilesPath();
+
+            const split = script.split(" && ");
+            split.forEach((s) => {
+                console.log(`${jobNameStr} ${c.green(`\$ ${s}`)}`);
+                fs.appendFileSync(outputFilesPath, `\$ ${s}\n`);
+            });
+
             const child = shelljs.exec(`${script}`, {
                 cwd: this.cwd,
                 env: this.getEnvs(),
@@ -188,12 +195,26 @@ export class Job {
 
             if (child.stdout) {
                 child.stdout.on("data", (buf) => {
+                    const lines = `${buf}`.split(/\r?\n/);
+                    lines.forEach((l) => {
+                        if (!l) {
+                            return;
+                        }
+                        process.stdout.write(`${jobNameStr} ${c.greenBright(">")} ${l}\n`);
+                    });
                     fs.appendFileSync(outputFilesPath, `${buf}`);
                 });
             }
             if (child.stderr) {
                 child.stderr.on("data", (buf) => {
-                    fs.appendFileSync(outputFilesPath, `${c.red(`${buf}`)}`);
+                    const lines = `${buf}`.split(/\r?\n/);
+                    lines.forEach((l) => {
+                        if (!l) {
+                            return;
+                        }
+                        process.stderr.write(`${jobNameStr} ${c.redBright(">")} ${l}\n`);
+                    });
+                    fs.appendFileSync(outputFilesPath, `${buf}`);
                 });
             }
 

src/parser.ts

@@ -33,16 +33,21 @@ export class Parser {
         const orderedYml = [];
 
         // Add .gitlab-ci.yml
-        orderedYml.push(Parser.loadYaml(`${cwd}/.gitlab-ci.yml`));
-        if (!orderedYml.last()) { // Fail if empty
-            console.error(`${cwd}/.gitlab-ci.yml is empty`);
+        let path = `${cwd}/.gitlab-ci.yml`;
+        if (!fs.existsSync(path)) { // Fail if empty
+            console.error(`${cwd}/.gitlab-ci.yml is not found`);
             process.exit(1);
         }
+        orderedYml.push(Parser.loadYaml(`${cwd}/.gitlab-ci.yml`));
         orderedVariables.push(orderedYml.last().variables);
 
-        // Add .gitlab-ci.yml
-        orderedYml.push(Parser.loadYaml(`${cwd}/.gitlab-ci-local.yml`));
+        // Add .gitlab-ci-local.yml
+        path = `${cwd}/.gitlab-ci-local.yml`;
+        orderedYml.push(Parser.loadYaml(path));
         orderedVariables.push(orderedYml.last().variables || {});
+        if (!orderedYml.last() || Object.keys(orderedYml.last()).length === 0) { // Warn if empty
+            console.error(`WARN: ${cwd}/.gitlab-ci-local.yml is empty or not found`);
+        }
 
         // Add included yaml's.
         orderedYml.unshift({});