Merge pull request #113 from firecow/fix-multidimensional-scripts

Scripts can be multidimensional, lets support that

Author: ZobairQ

src/job-expanders.ts

@@ -56,11 +56,23 @@ export function image(gitlabData: any) {
     });
 }
 
+const expandMultidimension = (inputArr: any) => {
+    const arr = [];
+    for (const line of inputArr) {
+        if (typeof line == "string") {
+            arr.push(line);
+        } else {
+            line.forEach((l: string) => arr.push(l));
+        }
+    }
+    return arr;
+};
+
 export function beforeScripts(gitlabData: any) {
     Utils.forEachRealJob(gitlabData, (_, jobData) => {
         const expandedBeforeScripts = [].concat(jobData.before_script || (gitlabData.default || {}).before_script || gitlabData.before_script || []);
         if (expandedBeforeScripts.length > 0) {
-            jobData.before_script = expandedBeforeScripts;
+            jobData.before_script = expandMultidimension(expandedBeforeScripts);
         }
     });
 }
@@ -69,7 +81,7 @@ export function afterScripts(gitlabData: any) {
     Utils.forEachRealJob(gitlabData, (_, jobData) => {
         const expandedAfterScripts = [].concat(jobData.after_script || (gitlabData.default || {}).after_script || gitlabData.after_script || []);
         if (expandedAfterScripts.length > 0) {
-            jobData.after_script = expandedAfterScripts;
+            jobData.after_script = expandMultidimension(expandedAfterScripts);
         }
     });
 }
@@ -80,6 +92,8 @@ export function scripts(gitlabData: any) {
             throw new ExitError(`${blueBright(jobName)} must have script specified`);
         }
         jobData.script = typeof jobData.script === "string" ? [jobData.script] : jobData.script;
-        jobData.script = jobData.script ?? [];
+        if (jobData.script) {
+            jobData.script = expandMultidimension(jobData.script);
+        }
     });
 }

src/job.ts

@@ -274,7 +274,7 @@ export class Job {
         let time;
         let endTime;
 
-        if (scripts.length === 0) {
+        if (scripts.length === 0 || scripts[0] == null) {
             return 0;
         }
 

tests/cases.test.ts

@@ -170,6 +170,17 @@ test('before-script <test-job>', async () => {
     expect(mockProcessExit).toBeCalledTimes(0);
 });
 
+test('script-multidimension <test-job>', async () => {
+    await defaultCmd.handler({
+        cwd: 'tests/test-cases/script-multidimension',
+        job: 'test-job'
+    });
+    expect(mockProcessStdout).toHaveBeenCalledWith("Test something\n");
+    expect(mockProcessStdout).toHaveBeenCalledWith("Test something else\n");
+    expect(mockProcessStderr).toBeCalledTimes(0);
+    expect(mockProcessExit).toBeCalledTimes(0);
+});
+
 test('before-script-default <test-job>', async () => {
     await defaultCmd.handler({
         cwd: 'tests/test-cases/before-script-default',

tests/test-cases/script-multidimension/.gitconfig

@@ -0,0 +1,2 @@
+[remote "origin"]
+	url = [email protected]/gcl/test-case.git

tests/test-cases/script-multidimension/.gitlab-ci.yml

@@ -0,0 +1,5 @@
+---
+test-job:
+  script:
+    - - echo "Test something"
+    - - echo "Test something else"