Merge remote-tracking branch 'origin/master'

Author: firecow

package-lock.json

@@ -36,7 +36,7 @@
     "@types/pretty-hrtime": "1.x",
     "@types/shelljs": "0.x",
     "@types/yaml": "1.x",
-    "@types/yargs": "13.x",
+    "@types/yargs": "15.x",
     "pkg": "4.x",
     "source-map-support": "0.x",
     "tslint": "5.x",

package.json

@@ -1,16 +1,17 @@
-import c = require("ansi-colors");
+import * as c from "ansi-colors";
 import * as winston from "winston";
-import yargs = require("yargs");
-import {Parser} from "./parser";
+import * as yargs from "yargs";
+
+import { Parser } from "./parser";
 
 const colorizer = winston.format.colorize();
 
 // Array polyfill
 declare global {
     // tslint:disable-next-line:interface-name
     interface Array<T> {
-        last(): T | undefined;
         first(): T | undefined;
+        last(): T | undefined;
     }
 }
 Array.prototype.last = function() {
@@ -49,7 +50,7 @@ const runJobs = async () => {
         }
 
         const jobNames = `${jobs.map((j) => j.name).join(" ")}`;
-        console.log(`=> ${c.yellow(`${stageName}`)} > ${c.blueBright(`${jobNames}`)} ${c.magentaBright(`starting`)}...`);
+        console.log(`=> ${c.yellow(`${stageName}`)} > ${c.blueBright(`${jobNames}`)} ${c.magentaBright("starting")}...`);
         for (const job of jobs) {
             const jobPromise = job.start();
             promises.push(jobPromise);
@@ -68,7 +69,7 @@ const runJobs = async () => {
 };
 
 process.on("uncaughtException", (err) => {
-    // handle the error safely
+    // Handle the error safely
     console.log(err);
 });
 

src/index.ts

@@ -1,28 +1,28 @@
-import c = require("ansi-colors");
-import prettyHrtime = require("pretty-hrtime");
+import * as c from "ansi-colors";
+import * as prettyHrtime from "pretty-hrtime";
 import * as shelljs from "shelljs";
 
 const shell = process.env.EXEPATH ? `${process.env.EXEPATH}/bash.exe` : "/bin/bash";
 
 export class Job {
-
-    public readonly stage: string;
     public readonly name: string;
 
-    private readonly cwd: any;
-    private readonly globals: any;
-
-    private readonly variables: { [key: string]: string };
+    public readonly stage: string;
+    private readonly afterScripts: string[] = [];
 
     private readonly allowFailure: boolean;
 
     private readonly beforeScripts: string[] = [];
+
+    private readonly cwd: any;
+    private readonly globals: any;
+
+    private running = false;
     private readonly scripts: string[] = [];
-    private readonly afterScripts: string[] = [];
 
-    private running: boolean = false;
+    private readonly variables: { [key: string]: string };
 
-    constructor(jobData: any, name: string, cwd: any, globals: any) {
+    public constructor(jobData: any, name: string, cwd: any, globals: any) {
         this.name = name;
         this.cwd = cwd;
         this.globals = globals;
@@ -41,7 +41,7 @@ export class Job {
         this.running = true;
 
         if (this.scripts.length === 0) {
-            console.error(`${c.blueBright(`${this.name}`)} ${c.red(`must have script specified`)}`);
+            console.error(`${c.blueBright(`${this.name}`)} ${c.red("must have script specified")}`);
             process.exit(1);
         }
 
@@ -57,6 +57,7 @@ export class Job {
             console.error(this.getExitedString(prescriptsExitCode, true));
             console.log(this.getFinishedString(startTime));
             this.running = false;
+
             return;
         }
 
@@ -83,28 +84,14 @@ export class Job {
 
         console.log(this.getFinishedString(startTime));
         this.running = false;
+
         return;
     }
 
     public toString() {
         return this.name;
     }
 
-    private getFinishedString(startTime: [number, number]) {
-        const endTime = process.hrtime(startTime);
-        const timeStr = prettyHrtime(endTime);
-        return `${c.blueBright(`${this.name}`)} ${c.magentaBright(`finished`)} in ${c.magenta(`${timeStr}`)}`;
-    }
-
-    private getExitedString(code: number, warning: boolean = false, prependString: string = "") {
-        const mistakeStr = warning ? c.yellowBright(`warning with code ${code}`) + prependString : c.red(`exited with code ${code}`) + prependString;
-        return `${c.blueBright(`${this.name}`)} ${mistakeStr}`;
-    }
-
-    private getEnvs(): { [key: string]: string } {
-        return {...this.globals.variables || {}, ...this.variables, ...process.env};
-    }
-
     private async exec(script: string): Promise<number> {
         return new Promise<any>((resolve, reject) => {
             const child = shelljs.exec(`${script}`, {
@@ -116,7 +103,7 @@ export class Job {
             });
 
             child.on("error", (e) => {
-                reject(`${c.blueBright(`${this.name}`)} ${c.red(`error ${e}`)}`);
+                reject(`${c.blueBright(`${this.name}`)} ${c.red(`error ${String(e)}`)}`);
             });
 
             if (child.stdout) {
@@ -126,7 +113,7 @@ export class Job {
                         if (!l) {
                             return;
                         }
-                        process.stdout.write(`${c.blueBright(`${this.name}`)} ${c.greenBright(`>`)} ${c.green(`${l}`)}\n`);
+                        process.stdout.write(`${c.blueBright(`${this.name}`)} ${c.greenBright(">")} ${c.green(`${l}`)}\n`);
                     });
                 });
             }
@@ -138,12 +125,29 @@ export class Job {
                         if (!l) {
                             return;
                         }
-                        process.stderr.write(`${c.blueBright(`${this.name}`)} ${c.redBright(`>`)} ${c.red(`${l}`)}\n`);
+                        process.stderr.write(`${c.blueBright(`${this.name}`)} ${c.redBright(">")} ${c.red(`${l}`)}\n`);
                     });
                 });
             }
 
             child.on("exit", resolve);
         });
     }
+
+    private getEnvs(): { [key: string]: string } {
+        return {...this.globals.variables || {}, ...this.variables, ...process.env};
+    }
+
+    private getExitedString(code: number, warning: boolean = false, prependString: string = "") {
+        const mistakeStr = warning ? c.yellowBright(`warning with code ${code}`) + prependString : c.red(`exited with code ${code}`) + prependString;
+
+        return `${c.blueBright(`${this.name}`)} ${mistakeStr}`;
+    }
+
+    private getFinishedString(startTime: [number, number]) {
+        const endTime = process.hrtime(startTime);
+        const timeStr = prettyHrtime(endTime);
+
+        return `${c.blueBright(`${this.name}`)} ${c.magentaBright("finished")} in ${c.magenta(`${timeStr}`)}`;
+    }
 }

src/job.ts

@@ -1,10 +1,11 @@
-import c = require("ansi-colors");
-import deepExtend = require("deep-extend");
-import fs = require("fs");
-import yaml = require("js-yaml");
+import * as c from "ansi-colors";
+import * as deepExtend from "deep-extend";
+import * as fs from "fs";
+import * as yaml from "js-yaml";
 import * as winston from "winston";
-import {Job} from "./job";
-import {Stage} from "./stage";
+
+import { Job } from "./job";
+import { Stage } from "./stage";
 
 export class Parser {
 
@@ -16,7 +17,7 @@ export class Parser {
     private readonly jobs: Map<string, Job> = new Map();
     private readonly stages: Map<string, Stage> = new Map();
 
-    constructor(cwd: any, logger: winston.Logger) {
+    public constructor(cwd: any, logger: winston.Logger) {
         // Fail if .gitlab-ci.yml missing
         const gitlabCiYmlPath = `${cwd}/.gitlab-ci.yml`;
         if (!fs.existsSync(gitlabCiYmlPath)) {
@@ -77,19 +78,19 @@ export class Parser {
                 stage.addJob(job);
             } else {
                 const stagesJoin = Array.from(this.stages.keys()).join(", ");
-                console.error(`${c.blueBright(`${job.name}`)} ${c.yellow(`${job.stage}`)} ${c.red(`isn't specified in stages. Must be one of the following`)} ${c.yellow(`${stagesJoin}`)}`);
+                console.error(`${c.blueBright(`${job.name}`)} ${c.yellow(`${job.stage}`)} ${c.red("isn't specified in stages. Must be one of the following")} ${c.yellow(`${stagesJoin}`)}`);
                 process.exit(1);
             }
 
             this.jobs.set(key, job);
         }
     }
 
-    public getStages(): ReadonlyMap<string, Stage> {
-        return this.stages;
-    }
-
     public getJobs(): ReadonlyMap<string, Job> {
         return this.jobs;
     }
+
+    public getStages(): ReadonlyMap<string, Stage> {
+        return this.stages;
+    }
 }

src/parser.ts

@@ -1,11 +1,11 @@
-import {Job} from "./job";
+import { Job } from "./job";
 
 export class Stage {
 
     public readonly name: string;
     private readonly jobs: Job[] = [];
 
-    constructor(name: string) {
+    public constructor(name: string) {
         this.name = name;
     }
 

src/stage.ts

@@ -1,10 +1,17 @@
 {
     "defaultSeverity": "error",
     "extends": [
-        "tslint:recommended"
+        "tslint:all"
     ],
     "jsRules": {},
     "rules": {
+        "strict-boolean-expressions": false,
+        "newline-per-chained-call": false,
+        "no-any": false,
+        "no-unsafe-any": false,
+        "completed-docs": false,
+        "typedef": false,
+        "no-use-before-declare": false,
         "no-string-throw": false,
         "no-console": false,
         "object-literal-sort-keys": false,