2.3.66

Go fully async with shelljs to reduce processor strain

Closes #2

See merge request !2

.gitignore

@@ -1,5 +1,5 @@
 node_modules/
 coverage/
-pages/
 public/
 config.json
+.yarn/

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: node:latest
+image: hosttoday/ht-docker-node:stable
 
 stages:
 - test
@@ -64,6 +64,8 @@ pages:
     - npmci command npmpage --host gitlab
   only:
     - tags
+  tags:
+    - docker
   artifacts:
     expire_in: 1 week
     paths:

dist/cli.js

@@ -1,2 +1,3 @@
 #!/usr/bin/env node
+process.env.CLI_CALL = 'true'
 var index = require("../dist/index.js");

dist/index.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const paths = require("./npmci.paths");
 let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot);
@@ -24,43 +25,71 @@ smartcli.addVersion(npmciInfo.version);
 smartcli.addCommand('build')
     .then((argv) => {
     npmci_build_1.build(argv._[1])
-        .then(NpmciEnv.configStore);
+        .then(NpmciEnv.configStore)
+        .catch(err => {
+        console.log(err);
+        process.exit(1);
+    });
 });
 // clean
 smartcli.addCommand('clean')
     .then((argv) => {
     npmci_clean_1.clean()
-        .then(NpmciEnv.configStore);
+        .then(NpmciEnv.configStore)
+        .catch(err => {
+        console.log(err);
+        process.exit(1);
+    });
 });
 // command
 smartcli.addCommand('command')
     .then((argv) => {
     npmci_command_1.command()
-        .then(NpmciEnv.configStore);
+        .then(NpmciEnv.configStore)
+        .catch(err => {
+        console.log(err);
+        process.exit(1);
+    });
 });
 // install
 smartcli.addCommand('install')
     .then((argv) => {
     npmci_install_1.install(argv._[1])
-        .then(NpmciEnv.configStore);
+        .then(NpmciEnv.configStore)
+        .catch(err => {
+        console.log(err);
+        process.exit(1);
+    });
 });
 // prepare
 smartcli.addCommand('prepare')
     .then((argv) => {
     npmci_prepare_1.prepare(argv._[1])
-        .then(NpmciEnv.configStore);
+        .then(NpmciEnv.configStore)
+        .catch(err => {
+        console.log(err);
+        process.exit(1);
+    });
 });
 // publish
 smartcli.addCommand('publish')
     .then((argv) => {
     npmci_publish_1.publish(argv._[1])
-        .then(NpmciEnv.configStore);
+        .then(NpmciEnv.configStore)
+        .catch(err => {
+        console.log(err);
+        process.exit(1);
+    });
 });
 // test
 smartcli.addCommand('test')
     .then((argv) => {
     npmci_test_1.test(argv._[1])
-        .then(NpmciEnv.configStore);
+        .then(NpmciEnv.configStore)
+        .catch(err => {
+        console.log(err);
+        process.exit(1);
+    });
 });
 // trigger
 smartcli.addCommand('trigger')
@@ -68,4 +97,4 @@ smartcli.addCommand('trigger')
     npmci_trigger_1.trigger();
 });
 smartcli.startParse();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMkNBQTBDO0FBQzFDLHVDQUFzQztBQUN0QyxJQUFJLFNBQVMsR0FBRyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQzlFLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLGlCQUFpQixHQUFHLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtBQUU1RCwrQ0FBcUM7QUFDckMsK0NBQXFDO0FBQ3JDLG1EQUF5QztBQUN6QyxtREFBeUM7QUFDekMsbURBQXlDO0FBQ3pDLG1EQUF5QztBQUN6Qyw2Q0FBbUM7QUFDbkMsbURBQXlDO0FBQ3pDLHdDQUF1QztBQUV2Qyw2Q0FBcUM7QUFBNUIsOEJBQUEsS0FBSyxDQUFBO0FBQ2QsaURBQTBDO0FBQWpDLGtDQUFBLE9BQU8sQ0FBQTtBQUNoQixpREFBMEM7QUFBakMsa0NBQUEsT0FBTyxDQUFBO0FBRWhCLElBQUksUUFBUSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUM5QyxRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtBQUV0QyxRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUM7S0FDekIsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULG1CQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBRSxDQUFDLENBQUUsQ0FBQztTQUNmLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUM7S0FDekIsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULG1CQUFLLEVBQUU7U0FDSixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQy9CLENBQUMsQ0FBQyxDQUFBO0FBRUosVUFBVTtBQUNWLFFBQVEsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO0tBQzNCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCx1QkFBTyxFQUFFO1NBQ04sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUMsQ0FBQTtBQUVKLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztLQUMzQixJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFFLENBQUMsQ0FBRSxDQUFDO1NBQ2pCLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7S0FDM0IsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBRSxDQUFDLENBQUUsQ0FBQztTQUNqQixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQy9CLENBQUMsQ0FBQyxDQUFBO0FBRUosVUFBVTtBQUNWLFFBQVEsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO0tBQzNCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCx1QkFBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFFLENBQUM7U0FDakIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUMsQ0FBQTtBQUVKLE9BQU87QUFDUCxRQUFRLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQztLQUN4QixJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsaUJBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFFLENBQUMsQ0FBRSxDQUFDO1NBQ2QsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUMsQ0FBQTtBQUVKLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztLQUMzQixJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sRUFBRSxDQUFBO0FBQ1gsQ0FBQyxDQUFDLENBQUE7QUFFSixRQUFRLENBQUMsVUFBVSxFQUFFLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFDdEMsSUFBSSxTQUFTLEdBQUcsSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtBQUM5RSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUE7QUFFNUQsK0NBQXFDO0FBQ3JDLCtDQUFxQztBQUNyQyxtREFBeUM7QUFDekMsbURBQXlDO0FBQ3pDLG1EQUF5QztBQUN6QyxtREFBeUM7QUFDekMsNkNBQW1DO0FBQ25DLG1EQUF5QztBQUN6Qyx3Q0FBdUM7QUFFdkMsNkNBQXFDO0FBQTVCLDhCQUFBLEtBQUssQ0FBQTtBQUNkLGlEQUEwQztBQUFqQyxrQ0FBQSxPQUFPLENBQUE7QUFDaEIsaURBQTBDO0FBQWpDLGtDQUFBLE9BQU8sQ0FBQTtBQUVoQixJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUE7QUFDOUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUE7QUFFdEMsUUFBUTtBQUNSLFFBQVEsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDO0tBQ3pCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCxtQkFBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFFLENBQUM7U0FDZixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQztTQUMxQixLQUFLLENBQUMsR0FBRztRQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDaEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNqQixDQUFDLENBQUMsQ0FBQTtBQUNO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

dist/npmci.bash.d.ts

@@ -1,15 +1,16 @@
-export declare let nvmAvailable: boolean;
+import * as plugins from './npmci.plugins';
+/**
+ * wether nvm is available or not
+ */
+export declare let nvmAvailable: plugins.q.Deferred<boolean>;
+export declare let yarnAvailable: plugins.q.Deferred<boolean>;
 /**
  * bash() allows using bash with nvm in path
  * @param commandArg - The command to execute
  * @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
  */
-export declare let bash: (commandArg: string, retryArg?: number, bareArg?: boolean) => string;
+export declare let bash: (commandArg: string, retryArg?: number) => Promise<string>;
-/**
- * bashBare allows usage of bash without sourcing any files like nvm
- */
-export declare let bashBare: (commandArg: string, retryArg?: number) => string;
 /**
  * bashNoError allows executing stuff without throwing an error
  */
-export declare let bashNoError: (commandArg: string) => string;
+export declare let bashNoError: (commandArg: string) => Promise<string>;

dist/npmci.bash.js

@@ -1,29 +1,66 @@
 "use strict";
-const plugins = require("./npmci.plugins");
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-let nvmSourceString = '';
+    return new (P || (P = Promise))(function (resolve, reject) {
-exports.nvmAvailable = false;
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-let checkNvm = () => {
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-    let localExec = plugins.shelljs.exec;
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-    if (localExec(`bash -c "source /usr/local/nvm/nvm.sh"`, { silent: true }).code === 0) {
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
-        nvmSourceString = `source /usr/local/nvm/nvm.sh && `;
+    });
-        exports.nvmAvailable = true;
-    }
-    else if (localExec(`bash -c "source ~/.nvm/nvm.sh"`, { silent: true }).code === 0) {
-        nvmSourceString = `source ~/.nvm/nvm.sh && `;
-        exports.nvmAvailable = true;
-    }
-    ;
 };
-checkNvm();
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./npmci.plugins");
+const paths = require("./npmci.paths");
+const smartq = require("smartq");
+/**
+ * wether nvm is available or not
+ */
+exports.nvmAvailable = smartq.defer();
+exports.yarnAvailable = smartq.defer();
+/**
+ * the smartshell instance for npmci
+ */
+let npmciSmartshell = new plugins.smartshell.Smartshell({
+    executor: 'bash',
+    sourceFilePaths: []
+});
+/**
+ * check for tools.
+ */
+let checkToolsAvailable = () => __awaiter(this, void 0, void 0, function* () {
+    // check for nvm
+    if (!process.env.NPMTS_TEST) {
+        if ((yield plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0) {
+            npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh`]);
+            exports.nvmAvailable.resolve(true);
+        }
+        else if ((yield plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0) {
+            npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh`]);
+            exports.nvmAvailable.resolve(true);
+        }
+        else {
+            exports.nvmAvailable.resolve(false);
+        }
+        // check for yarn
+        yield plugins.smartshell.which('yarn').then(() => __awaiter(this, void 0, void 0, function* () {
+            yield plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`);
+            exports.yarnAvailable.resolve(true);
+        }), () => { exports.yarnAvailable.resolve(false); });
+    }
+    else {
+        exports.nvmAvailable.resolve(true);
+        exports.yarnAvailable.resolve(true);
+    }
+});
+checkToolsAvailable();
 /**
  * bash() allows using bash with nvm in path
  * @param commandArg - The command to execute
  * @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
  */
-exports.bash = (commandArg, retryArg = 2, bareArg = false) => {
+exports.bash = (commandArg, retryArg = 2) => __awaiter(this, void 0, void 0, function* () {
-    let exitCode;
+    yield exports.nvmAvailable.promise; // make sure nvm check has run
-    let stdOut;
     let execResult;
+    // determine if we fail
     let failOnError = true;
     if (retryArg === -1) {
         failOnError = false;
@@ -31,44 +68,40 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => {
     }
     if (!process.env.NPMTS_TEST) {
         for (let i = 0; i <= retryArg; i++) {
-            if (!bareArg) {
+            if (process.env.DEBUG_NPMCI === 'true') {
-                execResult = plugins.shelljs.exec(`bash -c "${nvmSourceString} ${commandArg}"`);
+                console.log(commandArg);
             }
-            else {
+            execResult = yield npmciSmartshell.exec(commandArg);
-                execResult = plugins.shelljs.exec(commandArg);
-            }
-            exitCode = execResult.code;
-            stdOut = execResult.stdout;
             // determine how bash reacts to error and success
-            if (exitCode !== 0 && i === retryArg) {
+            if (execResult.exitCode !== 0 && i === retryArg) {
                 if (failOnError) {
+                    plugins.beautylog.error('something went wrong and retries are exhausted');
                     process.exit(1);
                 }
             }
-            else if (exitCode === 0) {
+            else if (execResult.exitCode === 0) {
                 i = retryArg + 1; // retry +1 breaks for loop, if everything works out ok retrials are not wanted
             }
             else {
-                plugins.beautylog.warn('Something went wrong! Exit Code: ' + exitCode.toString());
+                plugins.beautylog.warn('Something went wrong! Exit Code: ' + execResult.exitCode.toString());
                 plugins.beautylog.info('Retry ' + (i + 1).toString() + ' of ' + retryArg.toString());
             }
         }
     }
     else {
         plugins.beautylog.log('ShellExec would be: ' + commandArg);
+        yield plugins.smartdelay.delayFor(100);
+        execResult = {
+            exitCode: 0,
+            stdout: 'testOutput'
+        };
     }
-    return stdOut;
+    return execResult.stdout;
-};
+});
-/**
- * bashBare allows usage of bash without sourcing any files like nvm
- */
-exports.bashBare = (commandArg, retryArg = 2) => {
-    return exports.bash(commandArg, retryArg, true);
-};
 /**
  * bashNoError allows executing stuff without throwing an error
  */
-exports.bashNoError = (commandArg) => {
+exports.bashNoError = (commandArg) => __awaiter(this, void 0, void 0, function* () {
-    return exports.bash(commandArg, -1);
+    return yield exports.bash(commandArg, -1);
-};
+});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUUxQyxJQUFJLGVBQWUsR0FBVyxFQUFFLENBQUE7QUFDckIsUUFBQSxZQUFZLEdBQVksS0FBSyxDQUFBO0FBQ3hDLElBQUksUUFBUSxHQUFHO0lBQ2IsSUFBSSxTQUFTLEdBQVEsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUE7SUFDekMsRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLHdDQUF3QyxFQUFFLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDckYsZUFBZSxHQUFHLGtDQUFrQyxDQUFBO1FBQ3BELG9CQUFZLEdBQUcsSUFBSSxDQUFBO0lBQ3JCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLGdDQUFnQyxFQUFFLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDcEYsZUFBZSxHQUFHLDBCQUEwQixDQUFBO1FBQzVDLG9CQUFZLEdBQUcsSUFBSSxDQUFBO0lBQ3JCLENBQUM7SUFBQSxDQUFDO0FBQ0osQ0FBQyxDQUFBO0FBQ0QsUUFBUSxFQUFFLENBQUE7QUFFVjs7OztHQUlHO0FBQ1EsUUFBQSxJQUFJLEdBQUcsQ0FBQyxVQUFrQixFQUFFLFdBQW1CLENBQUMsRUFBRSxVQUFtQixLQUFLO0lBQ25GLElBQUksUUFBZ0IsQ0FBQTtJQUNwQixJQUFJLE1BQWMsQ0FBQTtJQUNsQixJQUFJLFVBQVUsQ0FBQTtJQUNkLElBQUksV0FBVyxHQUFZLElBQUksQ0FBQTtJQUMvQixFQUFFLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3BCLFdBQVcsR0FBRyxLQUFLLENBQUE7UUFDbkIsUUFBUSxHQUFHLENBQUMsQ0FBQTtJQUNkLENBQUM7SUFDRCxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1QixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLFFBQVEsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ25DLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztnQkFDYixVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQy9CLFlBQVksZUFBZSxJQUFJLFVBQVUsR0FBRyxDQUM3QyxDQUFBO1lBQ0gsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLFVBQVUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtZQUMvQyxDQUFDO1lBQ0QsUUFBUSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUE7WUFDMUIsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUE7WUFFMUIsaURBQWlEO1lBQ2pELEVBQUUsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7Z0JBQ3JDLEVBQUUsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7b0JBQ2hCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBQ2pCLENBQUM7WUFDSCxDQUFDO1lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUMxQixDQUFDLEdBQUcsUUFBUSxHQUFHLENBQUMsQ0FBQSxDQUFDLCtFQUErRTtZQUNsRyxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsbUNBQW1DLEdBQUcsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUE7Z0JBQ2pGLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsR0FBRyxNQUFNLEdBQUcsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUE7WUFDdEYsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsR0FBRyxVQUFVLENBQUMsQ0FBQTtJQUM1RCxDQUFDO0lBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ1EsUUFBQSxRQUFRLEdBQUcsQ0FBQyxVQUFrQixFQUFFLFdBQW1CLENBQUM7SUFDN0QsTUFBTSxDQUFDLFlBQUksQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFBO0FBQ3pDLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ1EsUUFBQSxXQUFXLEdBQUcsQ0FBQyxVQUFrQjtJQUMxQyxNQUFNLENBQUMsWUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQzdCLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFFdEMsaUNBQWdDO0FBRWhDOztHQUVHO0FBQ1EsUUFBQSxZQUFZLEdBQUcsTUFBTSxDQUFDLEtBQUssRUFBVyxDQUFBO0FBQ3RDLFFBQUEsYUFBYSxHQUFHLE1BQU0sQ0FBQyxLQUFLLEVBQVcsQ0FBQTtBQUNsRDs7R0FFRztBQUNILElBQUksZUFBZSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7SUFDdEQsUUFBUSxFQUFFLE1BQU07SUFDaEIsZUFBZSxFQUFFLEVBQUU7Q0FDcEIsQ0FBQyxDQUFBO0FBRUY7O0dBRUc7QUFDSCxJQUFJLG1CQUFtQixHQUFHO0lBQ3hCLGdCQUFnQjtJQUNoQixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1QixFQUFFLENBQUMsQ0FDRCxDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsd0NBQXdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUMvRixDQUFDLENBQUMsQ0FBQztZQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBRSx1QkFBdUIsQ0FBRSxDQUFDLENBQUE7WUFDM0Qsb0JBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDNUIsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FDUixDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsZ0NBQWdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUN2RixDQUFDLENBQUMsQ0FBQztZQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBRSxlQUFlLENBQUUsQ0FBQyxDQUFBO1lBQ25ELG9CQUFZ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

dist/npmci.build.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="q" />
-import * as plugins from './npmci.plugins';
 /**
  * defines possible build services
  */
@@ -7,4 +5,4 @@ export declare type TBuildService = 'docker';
 /**
  * builds for a specific service
  */
-export declare let build: (commandArg: any) => plugins.q.Promise<any>;
+export declare let build: (commandArg: any) => Promise<void>;

dist/npmci.build.docker.d.ts

@@ -1,43 +1,41 @@
-/// <reference types="q" />
 /// <reference types="node" />
-import * as plugins from './npmci.plugins';
 /**
  * builds a cwd of Dockerfiles by triggering a promisechain
  */
-export declare let build: () => plugins.q.Promise<{}>;
+export declare let build: () => Promise<void>;
 /**
  * creates instance of class Dockerfile for all Dockerfiles in cwd
  * @returns Promise<Dockerfile[]>
  */
-export declare let readDockerfiles: () => plugins.q.Promise<Dockerfile[]>;
+export declare let readDockerfiles: () => Promise<Dockerfile[]>;
 /**
  * sorts Dockerfiles into a dependency chain
  * @param sortableArrayArg an array of instances of class Dockerfile
  * @returns Promise<Dockerfile[]>
  */
-export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => plugins.q.Promise<Dockerfile[]>;
+export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => Promise<Dockerfile[]>;
 /**
  * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
  */
-export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => plugins.q.Promise<Dockerfile[]>;
+export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => Promise<Dockerfile[]>;
 /**
  * builds the correspoding real docker image for each Dockerfile class instance
  */
-export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
+export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise<Dockerfile[]>;
 /**
  * pushes the real Dockerfile images to a Docker registry
  */
-export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
+export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise<Dockerfile[]>;
 /**
  * pulls corresponding real Docker images for instances of Dockerfile from a registry.
  * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages.
  */
-export declare let pullDockerfileImages: (sortableArrayArg: Dockerfile[], registryArg?: string) => plugins.q.Promise<{}>;
+export declare let pullDockerfileImages: (sortableArrayArg: Dockerfile[], registryArg?: string) => Promise<Dockerfile[]>;
 /**
  * tests all Dockerfiles in by calling class Dockerfile.test();
  * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
  */
-export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
+export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise<Dockerfile[]>;
 /**
  * class Dockerfile represents a Dockerfile on disk in npmci
  */
@@ -47,7 +45,8 @@ export declare class Dockerfile {
     version: string;
     cleanTag: string;
     buildTag: string;
-    testTag: string;
+    gitlabTestTag: string;
+    gitlabReleaseTag: string;
     releaseTag: string;
     containerName: string;
     content: string;
@@ -62,26 +61,27 @@ export declare class Dockerfile {
     /**
      * builds the Dockerfile
      */
-    build(): plugins.q.Promise<{}>;
+    build(): Promise<void>;
     /**
      * pushes the Dockerfile to a registry
      */
-    push(stageArg: any): plugins.q.Promise<{}>;
+    push(stageArg: any): Promise<void>;
     /**
      * pulls the Dockerfile from a registry
      */
-    pull(registryArg: string): void;
+    pull(registryArg: string): Promise<void>;
     /**
      * tests the Dockerfile;
      */
-    test(): void;
+    test(): Promise<void>;
     /**
      * gets the id of a Dockerfile
      */
-    getId(): string;
+    getId(): Promise<string>;
 }
 /**
- *
+ * returns a version for a docker file
+ * @execution SYNC
  */
 export declare let dockerFileVersion: (dockerfileNameArg: string) => string;
 /**

dist/npmci.build.js

@@ -1,17 +1,27 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const buildDocker = require("./npmci.build.docker");
 /**
  * builds for a specific service
  */
-exports.build = function (commandArg) {
+exports.build = (commandArg) => __awaiter(this, void 0, void 0, function* () {
     switch (commandArg) {
         case 'docker':
-            return buildDocker.build();
+            yield buildDocker.build();
+            break;
         default:
             plugins.beautylog.log('build target ' + commandArg + ' not recognised!');
     }
     ;
     return;
-};
+});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5idWlsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMkNBQTBDO0FBRzFDLG9EQUFtRDtBQU9uRDs7R0FFRztBQUNRLFFBQUEsS0FBSyxHQUFHLFVBQVMsVUFBVTtJQUNsQyxNQUFNLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1FBQ2pCLEtBQUssUUFBUTtZQUNULE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDOUI7WUFDSSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEdBQUcsVUFBVSxHQUFHLGtCQUFrQixDQUFDLENBQUE7SUFDaEYsQ0FBQztJQUFBLENBQUM7SUFDRixNQUFNLENBQUE7QUFDVixDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5idWlsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsMkNBQTBDO0FBRzFDLG9EQUFtRDtBQU9uRDs7R0FFRztBQUNRLFFBQUEsS0FBSyxHQUFHLENBQU8sVUFBVTtJQUNsQyxNQUFNLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1FBQ25CLEtBQUssUUFBUTtZQUNYLE1BQU0sV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFBO1lBQ3pCLEtBQUssQ0FBQTtRQUNQO1lBQ0UsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZUFBZSxHQUFHLFVBQVUsR0FBRyxrQkFBa0IsQ0FBQyxDQUFBO0lBQzVFLENBQUM7SUFBQSxDQUFDO0lBQ0YsTUFBTSxDQUFBO0FBQ1IsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.clean.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="q" />
-import * as plugins from './npmci.plugins';
 /**
  * cleans npmci config files
  */
-export declare let clean: () => plugins.q.Promise<{}>;
+export declare let clean: () => Promise<void>;

dist/npmci.clean.js

@@ -1,13 +1,20 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const paths = require("./npmci.paths");
 /**
  * cleans npmci config files
  */
-exports.clean = () => {
+exports.clean = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
     plugins.smartfile.fs.removeSync(paths.NpmciPackageConfig);
-    done.resolve();
+    return;
-    return done.promise;
+});
-};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY2xlYW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5jbGVhbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsMkNBQTBDO0FBQzFDLHVDQUFzQztBQUV0Qzs7R0FFRztBQUNRLFFBQUEsS0FBSyxHQUFHO0lBQ2pCLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsa0JBQWtCLENBQUMsQ0FBQTtJQUN6RCxNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQSJ9
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY2xlYW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5jbGVhbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMkNBQTBDO0FBQzFDLHVDQUFzQztBQUV0Qzs7R0FFRztBQUNRLFFBQUEsS0FBSyxHQUFHO0lBQ2YsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLGtCQUFrQixDQUFDLENBQUE7SUFDekQsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ2QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDdkIsQ0FBQyxDQUFBIn0=

dist/npmci.command.d.ts

@@ -1,3 +1 @@
-/// <reference types="q" />
+export declare let command: () => Promise<void>;
-import * as plugins from './npmci.plugins';
-export declare let command: () => plugins.q.Promise<{}>;

dist/npmci.command.js

@@ -1,8 +1,15 @@
 "use strict";
-const plugins = require("./npmci.plugins");
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const npmci_bash_1 = require("./npmci.bash");
-exports.command = () => {
+exports.command = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
     let wrappedCommand = '';
     let argvArray = process.argv;
     for (let i = 3; i < argvArray.length; i++) {
@@ -11,8 +18,7 @@ exports.command = () => {
             wrappedCommand = wrappedCommand + ' ';
         }
     }
-    npmci_bash_1.bash(wrappedCommand);
+    yield npmci_bash_1.bash(wrappedCommand);
-    done.resolve();
+    return;
-    return done.promise;
+});
-};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUNBLDZDQUFtQztBQUV4QixRQUFBLE9BQU8sR0FBRztJQUNuQixJQUFJLGNBQWMsR0FBVyxFQUFFLENBQUE7SUFDL0IsSUFBSSxTQUFTLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQTtJQUM1QixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUMxQyxjQUFjLEdBQUcsY0FBYyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM5QyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQUMsY0FBYyxHQUFHLGNBQWMsR0FBRyxHQUFHLENBQUE7UUFBQyxDQUFDO0lBQzNFLENBQUM7SUFDRCxNQUFNLGlCQUFJLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDMUIsTUFBTSxDQUFBO0FBQ1IsQ0FBQyxDQUFBLENBQUEifQ==
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUMxQyw2Q0FBaUM7QUFFdEIsUUFBQSxPQUFPLEdBQUc7SUFDakIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixJQUFJLGNBQWMsR0FBVyxFQUFFLENBQUE7SUFDL0IsSUFBSSxTQUFTLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQTtJQUM1QixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUN4QyxjQUFjLEdBQUcsY0FBYyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM5QyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQUMsY0FBYyxHQUFHLGNBQWMsR0FBRyxHQUFHLENBQUE7UUFBQyxDQUFDO0lBQzdFLENBQUM7SUFDRCxpQkFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQ3BCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQSJ9

dist/npmci.config.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="q" />
-import * as q from 'q';
 export interface INpmciOptions {
     globalNpmTools: string[];
 }
-export declare let getConfig: () => q.Promise<INpmciOptions>;
+export declare let getConfig: () => Promise<INpmciOptions>;

dist/npmci.config.js

@@ -1,15 +1,21 @@
 "use strict";
-const q = require("q");
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const paths = require("./npmci.paths");
-exports.getConfig = () => {
+exports.getConfig = () => __awaiter(this, void 0, void 0, function* () {
-    let done = q.defer();
     let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
     let defaultConfig = {
         globalNpmTools: []
     };
     let npmciConfig = npmciNpmextra.dataFor('npmci', defaultConfig);
-    done.resolve(npmciConfig);
+    return npmciConfig;
-    return done.promise;
+});
-};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFFQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBTTNCLFFBQUEsU0FBUyxHQUFHO0lBQ3JCLElBQUksYUFBYSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzVELElBQUksYUFBYSxHQUFrQjtRQUNqQyxjQUFjLEVBQUUsRUFBRTtLQUNuQixDQUFBO0lBQ0QsSUFBSSxXQUFXLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBZ0IsT0FBTyxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQzlFLE1BQU0sQ0FBQyxXQUFXLENBQUE7QUFDcEIsQ0FBQyxDQUFBLENBQUEifQ==
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx1QkFBc0I7QUFFdEIsMkNBQTBDO0FBQzFDLHVDQUFzQztBQU0zQixRQUFBLFNBQVMsR0FBRztJQUNuQixJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFpQixDQUFBO0lBQ25DLElBQUksYUFBYSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzVELElBQUksYUFBYSxHQUFrQjtRQUMvQixjQUFjLEVBQUUsRUFBRTtLQUNyQixDQUFBO0lBQ0QsSUFBSSxXQUFXLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBZ0IsT0FBTyxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQzlFLElBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDekIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDdkIsQ0FBQyxDQUFBIn0=

dist/npmci.env.js

@@ -1,9 +1,10 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const paths = require("./npmci.paths");
 const smartstring_1 = require("smartstring");
-if (process.env.CI_BUILD_REPO)
+if (process.env.CI_REPOSITORY_URL)
-    exports.repo = new smartstring_1.GitRepo(process.env.CI_BUILD_REPO);
+    exports.repo = new smartstring_1.GitRepo(process.env.CI_REPOSITORY_URL);
 exports.buildStage = process.env.CI_BUILD_STAGE;
 exports.setDockerRegistry = (dockerRegistryArg) => {
     exports.dockerRegistry = dockerRegistryArg;
@@ -35,7 +36,6 @@ let configLoad = () => {
             exports.config.project = plugins.smartfile.fs.toObjectSync(paths.NpmciProjectDir, 'npmci.json');
             plugins.beautylog.ok('project config found!');
         }
-        ;
     }
     catch (err) {
         exports.config.project = {};
@@ -45,4 +45,4 @@ let configLoad = () => {
     exports.config.dockerFilesBuilt ? exports.dockerFilesBuilt = exports.config.dockerFilesBuilt : void (0);
 };
 configLoad();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBQ3RDLDZDQUFtQztBQUluQyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQztJQUFDLFlBQUksR0FBRyxJQUFJLHFCQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQTtBQUVqRSxRQUFBLFVBQVUsR0FBVyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQTtBQUkvQyxRQUFBLGlCQUFpQixHQUFHLENBQUMsaUJBQXlCO0lBQ3JELHNCQUFjLEdBQUcsaUJBQWlCLENBQUE7QUFDdEMsQ0FBQyxDQUFBO0FBQ1UsUUFBQSxnQkFBZ0IsR0FBaUIsRUFBRSxDQUFBO0FBQ25DLFFBQUEsV0FBVyxHQUFpQixFQUFFLENBQUE7QUFDOUIsUUFBQSxNQUFNLEdBQUc7SUFDaEIsY0FBYyxFQUFFLFNBQVM7SUFDekIsZ0JBQWdCLEVBQUUsd0JBQWdCO0lBQ2xDLFdBQVcsRUFBRSxtQkFBVztJQUN4QixPQUFPLEVBQUUsU0FBUztDQUNyQixDQUFBO0FBRVUsUUFBQSxXQUFXLEdBQUc7SUFDckIsY0FBTSxDQUFDLGNBQWMsR0FBRyxzQkFBYyxDQUFBO0lBQ3RDLE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FDN0IsSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFNLENBQUMsRUFDdEIsS0FBSyxDQUFDLGtCQUFrQixDQUMzQixDQUFBO0FBQ0wsQ0FBQyxDQUFBO0FBRUQsSUFBSSxVQUFVLEdBQUc7SUFDYix1RUFBdUU7SUFDdkUsSUFBSSxDQUFDO1FBQ0QsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsY0FBTSxFQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQTtJQUNwRyxDQUFDO0lBQ0QsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNULG1CQUFXLEVBQUUsQ0FBQTtRQUNiLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLENBQUE7SUFDaEQsQ0FBQztJQUVELGlCQUFpQjtJQUNqQixJQUFJLENBQUM7UUFDRCxFQUFFLENBQUMsQ0FBQyxDQUFDLGNBQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ2xCLGNBQU0sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxlQUFlLEVBQUMsWUFBWSxDQUFDLENBQUE7WUFDdEYsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtRQUNqRCxDQUFDO1FBQUEsQ0FBQztJQUNOLENBQUM7SUFDRCxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ1QsY0FBTSxDQUFDLE9BQU8sR0FBRyxFQUFFLENBQUE7UUFDbkIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZ0VBQWdFLENBQUMsQ0FBQTtJQUMzRixDQUFDO0lBRUQsY0FBTSxDQUFDLGNBQWMsR0FBRyxzQkFBYyxHQUFHLGNBQU0sQ0FBQyxjQUFjLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3hFLGNBQU0sQ0FBQyxnQkFBZ0IsR0FBRyx3QkFBZ0IsR0FBRyxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ2xGLENBQUMsQ0FBQTtBQUNELFVBQVUsRUFBRSxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMkNBQTBDO0FBQzFDLHVDQUFzQztBQUN0Qyw2Q0FBcUM7QUFJckMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQztJQUFDLFlBQUksR0FBRyxJQUFJLHFCQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFBO0FBRXpFLFFBQUEsVUFBVSxHQUFXLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFBO0FBSS9DLFFBQUEsaUJBQWlCLEdBQUcsQ0FBQyxpQkFBeUI7SUFDdkQsc0JBQWMsR0FBRyxpQkFBaUIsQ0FBQTtBQUNwQyxDQUFDLENBQUE7QUFDVSxRQUFBLGdCQUFnQixHQUFpQixFQUFFLENBQUE7QUFDbkMsUUFBQSxXQUFXLEdBQWlCLEVBQUUsQ0FBQTtBQUM5QixRQUFBLE1BQU0sR0FBRztJQUNsQixjQUFjLEVBQUUsU0FBUztJQUN6QixnQkFBZ0IsRUFBRSx3QkFBZ0I7SUFDbEMsV0FBVyxFQUFFLG1CQUFXO0lBQ3hCLE9BQU8sRUFBRSxTQUFTO0NBQ25CLENBQUE7QUFFVSxRQUFBLFdBQVcsR0FBRztJQUN2QixjQUFNLENBQUMsY0FBYyxHQUFHLHNCQUFjLENBQUE7SUFDdEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUMvQixJQUFJLENBQUMsU0FBUyxDQUFDLGNBQU0sQ0FBQyxFQUN0QixLQUFLLENBQUMsa0JBQWtCLENBQ3pCLENBQUE7QUFDSCxDQUFDLENBQUE7QUFFRCxJQUFJLFVBQVUsR0FBRztJQUNmLHVFQUF1RTtJQUN2RSxJQUFJLENBQUM7UUFDSCxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxjQUFNLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFBO0lBQ3BHLENBQUM7SUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ2IsbUJBQVcsRUFBRSxDQUFBO1FBQ2IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM5QyxDQUFDO0lBRUQsaUJBQWlCO0lBQ2pCLElBQUksQ0FBQztRQUNILEVBQUUsQ0FBQyxDQUFDLENBQUMsY0FBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7WUFDcEIsY0FBTSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLGVBQWUsRUFBRSxZQUFZLENBQUMsQ0FBQTtZQUN2RixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBQy9DLENBQUM7SUFDSCxDQUFDO0lBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNiLGNBQU0sQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFBO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLGdFQUFnRSxDQUFDLENBQUE7SUFDekYsQ0FBQztJQUVELGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsR0FBRyxjQUFNLENBQUMsY0FBYyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6RSxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsd0JBQWdCLEdBQUcsY0FBTSxDQUFDLGdCQUFnQixHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqRixDQUFDLENBQUE7QUFDRCxVQUFVLEVBQUUsQ0FBQSJ9

dist/npmci.install.d.ts

@@ -1,3 +1,5 @@
-/// <reference types="q" />
+/**
-import * as plugins from './npmci.plugins';
+ * Install a specific version of node
-export declare let install: (versionArg: any) => plugins.q.Promise<{}>;
+ * @param versionArg
+ */
+export declare let install: (versionArg: any) => Promise<void>;

dist/npmci.install.js

@@ -1,10 +1,21 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const configModule = require("./npmci.config");
 const npmci_bash_1 = require("./npmci.bash");
-const npmci_bash_2 = require("./npmci.bash");
+/**
-exports.install = (versionArg) => {
+ * Install a specific version of node
-    let done = plugins.q.defer();
+ * @param versionArg
+ */
+exports.install = (versionArg) => __awaiter(this, void 0, void 0, function* () {
     plugins.beautylog.log(`now installing node version ${versionArg}`);
     let version;
     if (versionArg === 'stable') {
@@ -20,35 +31,38 @@ exports.install = (versionArg) => {
         version = versionArg;
     }
     ;
-    if (npmci_bash_2.nvmAvailable) {
+    if (yield npmci_bash_1.nvmAvailable.promise) {
-        npmci_bash_1.bash(`nvm install ${version} && nvm alias default ${version}`);
+        yield npmci_bash_1.bash(`nvm install ${version} && nvm alias default ${version}`);
         plugins.beautylog.success(`Node version ${version} successfully installed!`);
     }
     else {
         plugins.beautylog.warn('Nvm not in path so staying at installed node version!');
     }
     ;
-    npmci_bash_1.bash('node -v');
+    yield npmci_bash_1.bash('node -v');
-    npmci_bash_1.bash('npm -v');
+    yield npmci_bash_1.bash('npm -v');
     // lets look for further config
-    configModule.getConfig()
+    yield configModule.getConfig()
-        .then(configArg => {
+        .then((configArg) => __awaiter(this, void 0, void 0, function* () {
         plugins.beautylog.log('Now checking for needed global npm tools...');
         for (let npmTool of configArg.globalNpmTools) {
             plugins.beautylog.info(`Checking for global "${npmTool}"`);
-            let whichOutput = npmci_bash_1.bashNoError(`which ${npmTool}`);
+            let whichOutput = yield npmci_bash_1.bashNoError(`which ${npmTool}`);
             let toolAvailable = !((/not\sfound/.test(whichOutput)) || whichOutput === '');
             if (toolAvailable) {
                 plugins.beautylog.log(`Tool ${npmTool} is available`);
             }
             else {
                 plugins.beautylog.info(`globally installing ${npmTool} from npm`);
-                npmci_bash_1.bash(`npm install ${npmTool} -q -g`);
+                if (yield npmci_bash_1.yarnAvailable.promise) {
+                    yield npmci_bash_1.bash(`yarn global add ${npmTool}`);
+                }
+                else {
+                    yield npmci_bash_1.bash(`npm install ${npmTool} -q -g`);
+                }
             }
         }
         plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!');
-        done.resolve();
+    }));
-    });
+});
-    return done.promise;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQywrQ0FBOEM7QUFDOUMsNkNBSXFDO0FBRXJDOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLENBQU8sVUFBVTtJQUNwQyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsVUFBVSxFQUFFLENBQUMsQ0FBQTtJQUNsRSxJQUFJLE9BQWUsQ0FBQTtJQUNuQixFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUM1QixPQUFPLEdBQUcsUUFBUSxDQUFBO0lBQ3BCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDaEMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDbkMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE9BQU8sR0FBRyxVQUFVLENBQUE7SUFDdEIsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyxNQUFNLHlCQUFZLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUMvQixNQUFNLGlCQUFJLENBQUMsZUFBZSxPQUFPLHlCQUF5QixPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBQ3BFLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLGdCQUFnQixPQUFPLDBCQUEwQixDQUFDLENBQUE7SUFDOUUsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdURBQXVELENBQUMsQ0FBQTtJQUNqRixDQUFDO0lBQUEsQ0FBQztJQUNGLE1BQU0saUJBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUNyQixNQUFNLGlCQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDcEIsK0JBQStCO0lBQy9CLE1BQU0sWUFBWSxDQUFDLFNBQVMsRUFBRTtTQUMzQixJQUFJLENBQUMsQ0FBTSxTQUFTO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLDZDQUE2QyxDQUFDLENBQUE7UUFDcEUsR0FBRyxDQUFDLENBQUMsSUFBSSxPQUFPLElBQUksU0FBUyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUM7WUFDN0MsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsd0JBQXdCLE9BQU8sR0FBRyxDQUFDLENBQUE7WUFDMUQsSUFBSSxXQUFXLEdBQVcsTUFBTSx3QkFBVyxDQUFDLFNBQVMsT0FBTyxFQUFFLENBQUMsQ0FBQTtZQUMvRCxJQUFJLGFBQWEsR0FBWSxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksV0FBVyxLQUFLLEVBQUUsQ0FBQyxDQUFBO1lBQ3RGLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7Z0JBQ2xCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLFFBQVEsT0FBTyxlQUFlLENBQUMsQ0FBQTtZQUN2RCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLE9BQU8sV0FBVyxDQUFDLENBQUE7Z0JBQ2pFLEVBQUUsQ0FBQyxDQUFDLE1BQU0sMEJBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO29CQUNoQyxNQUFNLGlCQUFJLENBQUMsbUJBQW1CLE9BQU8sRUFBRSxDQUFDLENBQUE7Z0JBQzFDLENBQUM7Z0JBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ04sTUFBTSxpQkFBSSxDQUFDLGVBQWUsT0FBTyxRQUFRLENBQUMsQ0FBQTtnQkFDNUMsQ0FBQztZQUNILENBQUM7UUFDSCxDQUFDO1FBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsb0VBQW9FLENBQUMsQ0FBQTtJQUNqRyxDQUFDLENBQUEsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBLENBQUEifQ==
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUMxQywrQ0FBOEM7QUFDOUMsNkNBQWdEO0FBQ2hELDZDQUEyQztBQUNoQyxRQUFBLE9BQU8sR0FBRyxDQUFDLFVBQVU7SUFDOUIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsVUFBVSxFQUFFLENBQUMsQ0FBQTtJQUNsRSxJQUFJLE9BQWUsQ0FBQTtJQUNuQixFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUM1QixPQUFPLEdBQUcsUUFBUSxDQUFBO0lBQ3BCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDaEMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDbkMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE9BQU8sR0FBRyxVQUFVLENBQUE7SUFDdEIsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyx5QkFBWSxDQUFDLENBQUMsQ0FBQztRQUNqQixpQkFBSSxDQUFDLGVBQWUsT0FBTyx5QkFBeUIsT0FBTyxFQUFFLENBQUMsQ0FBQTtRQUM5RCxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsT0FBTywwQkFBMEIsQ0FBQyxDQUFBO0lBQzlFLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHVEQUF1RCxDQUFDLENBQUE7SUFDakYsQ0FBQztJQUFBLENBQUM7SUFDRixpQkFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQ2YsaUJBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUNkLCtCQUErQjtJQUMvQixZQUFZLENBQUMsU0FBUyxFQUFFO1NBQ3JCLElBQUksQ0FBQyxTQUFTO1FBQ2IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsNkNBQTZDLENBQUMsQ0FBQTtRQUNwRSxHQUFHLENBQUMsQ0FBQyxJQUFJLE9BQU8sSUFBSSxTQUFTLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUM3QyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyx3QkFBd0IsT0FBTyxHQUFHLENBQUMsQ0FBQTtZQUMxRCxJQUFJLFdBQVcsR0FBRyx3QkFBVyxDQUFDLFNBQVMsT0FBTyxFQUFFLENBQUMsQ0FBQTtZQUNqRCxJQUFJLGFBQWEsR0FBWSxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksV0FBVyxLQUFLLEVBQUUsQ0FBQyxDQUFBO1lBQ3RGLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7Z0JBQ2xCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLFFBQVEsT0FBTyxlQUFlLENBQUMsQ0FBQTtZQUN2RCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLE9BQU8sV0FBVyxDQUFDLENBQUE7Z0JBQ2pFLGlCQUFJLENBQUMsZUFBZSxPQUFPLFFBQVEsQ0FBQyxDQUFBO1lBQ3RDLENBQUM7UUFDSCxDQUFDO1FBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsb0VBQW9FLENBQUMsQ0FBQTtRQUMvRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDaEIsQ0FBQyxDQUFDLENBQUE7SUFDSixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUNyQixDQUFDLENBQUEifQ==

dist/npmci.paths.js

@@ -1,8 +1,9 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 exports.cwd = process.cwd();
 exports.NpmciPackageRoot = plugins.path.join(__dirname, '../');
 exports.NpmciPackageConfig = plugins.path.join(exports.NpmciPackageRoot, './config.json');
 exports.NpmciProjectDir = exports.cwd;
 exports.NpmciTestDir = plugins.path.join(exports.cwd, './test');
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMkNBQTBDO0FBRS9CLFFBQUEsR0FBRyxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQTtBQUVuQixRQUFBLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxLQUFLLENBQUMsQ0FBQTtBQUNyRCxRQUFBLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLHdCQUFnQixFQUFDLGVBQWUsQ0FBQyxDQUFBO0FBQ3hFLFFBQUEsZUFBZSxHQUFHLFdBQUcsQ0FBQTtBQUNyQixRQUFBLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFHLEVBQUMsUUFBUSxDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJDQUEwQztBQUUvQixRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUE7QUFFbkIsUUFBQSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsS0FBSyxDQUFDLENBQUE7QUFDckQsUUFBQSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx3QkFBZ0IsRUFBQyxlQUFlLENBQUMsQ0FBQTtBQUN4RSxRQUFBLGVBQWUsR0FBRyxXQUFHLENBQUE7QUFDckIsUUFBQSxZQUFZLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBRyxFQUFDLFFBQVEsQ0FBQyxDQUFBIn0=

dist/npmci.plugins.d.ts

@@ -5,12 +5,15 @@ export import lodash = require('lodash');
 export import npmextra = require('npmextra');
 export import path = require('path');
 export import projectinfo = require('projectinfo');
-export import q = require('q');
+export import q = require('smartq');
 export declare let request: any;
-export import shelljs = require('shelljs');
 export import smartcli = require('smartcli');
+export import smartdelay = require('smartdelay');
 export import smartfile = require('smartfile');
+export import shelljs = require('shelljs');
 export import smartparam = require('smartparam');
+export import smartq = require('smartq');
+export import smartshell = require('smartshell');
 export import smartsocket = require('smartsocket');
 export import smartssh = require('smartssh');
 export import smartstring = require('smartstring');

dist/npmci.plugins.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.beautylog = require("beautylog");
 exports.gulp = require('gulp');
 exports.gulpFunction = require("gulp-function");
@@ -6,14 +7,17 @@ exports.lodash = require("lodash");
 exports.npmextra = require("npmextra");
 exports.path = require("path");
 exports.projectinfo = require("projectinfo");
-exports.q = require("q");
+exports.q = require("smartq");
 exports.request = require('request');
-exports.shelljs = require("shelljs");
 exports.smartcli = require("smartcli");
+exports.smartdelay = require("smartdelay");
 exports.smartfile = require("smartfile");
+exports.shelljs = require("shelljs");
 exports.smartparam = require("smartparam");
+exports.smartq = require("smartq");
+exports.smartshell = require("smartshell");
 exports.smartsocket = require("smartsocket");
 exports.smartssh = require("smartssh");
 exports.smartstring = require("smartstring");
 exports.through2 = require("through2");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHlDQUE4QztBQUNuQyxRQUFBLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUE7QUFDakMsZ0RBQXFEO0FBQ3JELG1DQUF3QztBQUN4Qyx1Q0FBNEM7QUFDNUMsK0JBQW9DO0FBQ3BDLDZDQUFrRDtBQUNsRCx5QkFBOEI7QUFDbkIsUUFBQSxPQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFBO0FBQ3ZDLHFDQUEwQztBQUMxQyx1Q0FBNEM7QUFDNUMseUNBQThDO0FBQzlDLDJDQUFnRDtBQUNoRCw2Q0FBa0Q7QUFDbEQsdUNBQTRDO0FBQzVDLDZDQUFrRDtBQUNsRCx1Q0FBNEMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBOEM7QUFDbkMsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ2pDLGdEQUFxRDtBQUNyRCxtQ0FBd0M7QUFDeEMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyw2Q0FBa0Q7QUFDbEQsOEJBQW1DO0FBQ3hCLFFBQUEsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUN2Qyx1Q0FBNEM7QUFDNUMsMkNBQWdEO0FBQ2hELHlDQUE4QztBQUM5QyxxQ0FBMEM7QUFDMUMsMkNBQWdEO0FBQ2hELG1DQUF3QztBQUN4QywyQ0FBZ0Q7QUFDaEQsNkNBQWtEO0FBQ2xELHVDQUE0QztBQUM1Qyw2Q0FBa0Q7QUFDbEQsdUNBQTRDIn0=

dist/npmci.prepare.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="q" />
-import * as plugins from './npmci.plugins';
 /**
  * defines possible prepare services
  */
@@ -8,4 +6,4 @@ export declare type TPrepService = 'npm' | 'docker' | 'docker-gitlab' | 'ssh';
  * the main exported prepare function
  * @param servieArg describes the service to prepare
  */
-export declare let prepare: (serviceArg: TPrepService) => plugins.q.Promise<{}>;
+export declare let prepare: (serviceArg: TPrepService) => Promise<void>;

dist/npmci.prepare.js

@@ -1,12 +1,21 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
+const npmci_bash_1 = require("./npmci.bash");
 const env = require("./npmci.env");
 const sshModule = require("./npmci.ssh");
 /**
  * authenticates npm with token from env var
  */
-let npm = function () {
+let npm = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
     let npmrcPrefix = '//registry.npmjs.org/:_authToken=';
     let npmToken = process.env.NPMCI_TOKEN_NPM;
     let npmrcFileString = npmrcPrefix + npmToken;
@@ -18,14 +27,12 @@ let npm = function () {
         process.exit(1);
     }
     plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc');
-    done.resolve();
+    return;
-    return done.promise;
+});
-};
 /**
  * logs in docker
  */
-let docker = function () {
+let docker = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
     env.setDockerRegistry('docker.io');
     let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/;
     if (!process.env.NPMCI_LOGIN_DOCKER) {
@@ -36,45 +43,39 @@ let docker = function () {
     let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER);
     let username = dockerRegexResultArray[1];
     let password = dockerRegexResultArray[2];
-    plugins.shelljs.exec('docker login -u ' + username + ' -p ' + password);
+    yield npmci_bash_1.bash('docker login -u ' + username + ' -p ' + password);
-    done.resolve();
+    return;
-    return done.promise;
+});
-};
 /**
  * prepare docker for gitlab registry
  */
-let dockerGitlab = function () {
+let dockerGitlab = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
     env.setDockerRegistry('registry.gitlab.com');
     plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com');
-    done.resolve();
+    return;
-    return done.promise;
+});
-};
 /**
  * prepare ssh
  */
-let ssh = function () {
+let ssh = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
+    yield sshModule.ssh();
-    sshModule.ssh()
+});
-        .then(done.resolve);
-    return done.promise;
-};
 /**
  * the main exported prepare function
  * @param servieArg describes the service to prepare
  */
-exports.prepare = function (serviceArg) {
+exports.prepare = (serviceArg) => __awaiter(this, void 0, void 0, function* () {
     switch (serviceArg) {
         case 'npm':
-            return npm();
+            return yield npm();
         case 'docker':
-            return docker();
+            return yield docker();
         case 'docker-gitlab':
-            return dockerGitlab();
+            return yield dockerGitlab();
         case 'ssh':
-            return ssh();
+            return yield ssh();
         default:
             break;
     }
-};
+});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHJlcGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnByZXBhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUUxQyxtQ0FBa0M7QUFDbEMseUNBQXdDO0FBVXhDOztHQUVHO0FBQ0gsSUFBSSxHQUFHLEdBQUc7SUFDTixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBRTVCLElBQUksV0FBVyxHQUFXLG1DQUFtQyxDQUFBO0lBQzdELElBQUksUUFBUSxHQUFXLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFBO0lBQ2xELElBQUksZUFBZSxHQUFHLFdBQVcsR0FBRyxRQUFRLENBQUE7SUFFNUMsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNYLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLENBQUE7SUFDaEQsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQTtRQUMxRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ25CLENBQUM7SUFDRCxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsZUFBZSxFQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQ2pFLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxNQUFNLEdBQUc7SUFDVCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsQ0FBQTtJQUNsQyxJQUFJLFdBQVcsR0FBRyxxQ0FBcUMsQ0FBQTtJQUN2RCxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO1FBQ2xDLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLHVEQUF1RCxDQUFDLENBQUE7UUFDaEYsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNuQixDQUFDO0lBQ0QsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMscUNBQXFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEdBQUcsR0FBRyxHQUFHLHFCQUFxQixDQUFDLENBQUEsQ0FBQyx1Q0FBdUM7SUFDOUosSUFBSSxzQkFBc0IsR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsQ0FBQTtJQUM3RSxJQUFJLFFBQVEsR0FBRyxzQkFBc0IsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4QyxJQUFJLFFBQVEsR0FBRyxzQkFBc0IsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4QyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxRQUFRLEdBQUcsTUFBTSxHQUFHLFFBQVEsQ0FBQyxDQUFBO0lBQ3ZFLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxZQUFZLEdBQUc7SUFDZixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0lBQzVDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxHQUFHLEdBQUcsR0FBRyxxQkFBcUIsQ0FBQyxDQUFBO0lBQ3RILElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxHQUFHLEdBQUc7SUFDTixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLFNBQVMsQ0FBQyxHQUFHLEVBQUU7U0FDVixJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLFVBQVMsVUFBd0I7SUFDbEQsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUNqQixLQUFLLEtBQUs7WUFDTixNQUFNLENBQUMsR0FBRyxFQUFFLENBQUE7UUFDaEIsS0FBSyxRQUFRO1lBQ1QsTUFBTSxDQUFDLE1BQU0sRUFBRSxDQUFBO1FBQ25CLEtBQUssZUFBZTtZQUNoQixNQUFNLENBQUMsWUFBWSxFQUFFLENBQUE7UUFDekIsS0FBSyxLQUFLO1lBQ04sTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFBO1FBQ2hCO1lBQ0ksS0FBSyxDQUFBO0lBQ2IsQ0FBQztBQUNMLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHJlcGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnByZXBhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyw2Q0FBbUM7QUFDbkMsbUNBQWtDO0FBQ2xDLHlDQUF3QztBQVV4Qzs7R0FFRztBQUNILElBQUksR0FBRyxHQUFHO0lBQ1IsSUFBSSxXQUFXLEdBQVcsbUNBQW1DLENBQUE7SUFDN0QsSUFBSSxRQUFRLEdBQVcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUE7SUFDbEQsSUFBSSxlQUFlLEdBQVcsV0FBVyxHQUFHLFFBQVEsQ0FBQTtJQUNwRCxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtJQUM5QyxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFBO1FBQzFELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDakIsQ0FBQztJQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxlQUFlLEVBQUUsY0FBYyxDQUFDLENBQUE7SUFDbEUsTUFBTSxDQUFBO0FBQ1IsQ0FBQyxDQUFBLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksTUFBTSxHQUFHO0lBQ1gsR0FBRyxDQUFDLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQ2xDLElBQUksV0FBVyxHQUFHLHFDQUFxQyxDQUFBO0lBQ3ZELEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7UUFDcEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsdURBQXVELENBQUMsQ0FBQTtRQUNoRixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2pCLENBQUM7SUFDRCxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRyxHQUFHLEdBQUcscUJBQXFCLENBQUMsQ0FBQSxDQUFDLHVDQUF1QztJQUM5SixJQUFJLHNCQUFzQixHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFBO0lBQzdFLElBQUksUUFBUSxHQUFHLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3hDLElBQUksUUFBUSxHQUFHLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3hDLE1BQU0saUJBQUksQ0FBQyxrQkFBa0IsR0FBRyxRQUFRLEdBQUcsTUFBTSxHQUFHLFFBQVEsQ0FBQyxDQUFBO0lBQzdELE1BQU0sQ0FBQTtBQUNSLENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLFlBQVksR0FBRztJQUNqQixHQUFHLENBQUMsaUJBQWlCLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM1QyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRyxHQUFHLEdBQUcscUJBQXFCLENBQUMsQ0FBQTtJQUN0SCxNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxHQUFHLEdBQUc7SUFDUixNQUFNLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQTtBQUN2QixDQUFDLENBQUEsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLENBQU8sVUFBd0I7SUFDbEQsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUNuQixLQUFLLEtBQUs7WUFDUixNQUFNLENBQUMsTUFBTSxHQUFHLEVBQUUsQ0FBQTtRQUNwQixLQUFLLFFBQVE7WUFDWCxNQUFNLENBQUMsTUFBTSxNQUFNLEVBQUUsQ0FBQTtRQUN2QixLQUFLLGVBQWU7WUFDbEIsTUFBTSxDQUFDLE1BQU0sWUFBWSxFQUFFLENBQUE7UUFDN0IsS0FBSyxLQUFLO1lBQ1IsTUFBTSxDQUFDLE1BQU0sR0FBRyxFQUFFLENBQUE7UUFDcEI7WUFDRSxLQUFLLENBQUE7SUFDVCxDQUFDO0FBQ0gsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.publish.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="q" />
+import * as NpmciBuildDocker from './npmci.build.docker';
-import * as plugins from './npmci.plugins';
 /**
  * type of supported services
  */
@@ -8,4 +7,4 @@ export declare type TPubService = 'npm' | 'docker';
  * the main exported publish function.
  * @param pubServiceArg references targeted service to publish to
  */
-export declare let publish: (pubServiceArg?: TPubService) => plugins.q.Promise<{}>;
+export declare let publish: (pubServiceArg?: TPubService) => Promise<void | NpmciBuildDocker.Dockerfile[]>;

dist/npmci.publish.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const npmci_prepare_1 = require("./npmci.prepare");
 const npmci_bash_1 = require("./npmci.bash");
@@ -7,36 +16,35 @@ const NpmciBuildDocker = require("./npmci.build.docker");
  * the main exported publish function.
  * @param pubServiceArg references targeted service to publish to
  */
-exports.publish = (pubServiceArg = 'npm') => {
+exports.publish = (pubServiceArg = 'npm') => __awaiter(this, void 0, void 0, function* () {
     switch (pubServiceArg) {
         case 'npm':
-            return publishNpm();
+            return yield publishNpm();
         case 'docker':
-            return publishDocker();
+            return yield publishDocker();
     }
-};
+});
 /**
  * tries to publish current cwd to NPM registry
  */
-let publishNpm = function () {
+let publishNpm = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
+    yield npmci_prepare_1.prepare('npm')
-    npmci_prepare_1.prepare('npm')
         .then(function () {
-        npmci_bash_1.bash('npm publish');
+        return __awaiter(this, void 0, void 0, function* () {
-        plugins.beautylog.ok('Done!');
+            yield npmci_bash_1.bash('npm publish');
-        done.resolve();
+            plugins.beautylog.ok('Done!');
+        });
     });
-    return done.promise;
+});
-};
 /**
  * tries to pubish current cwd to Docker registry
  */
-let publishDocker = function () {
+let publishDocker = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
+    return yield NpmciBuildDocker.readDockerfiles()
-    NpmciBuildDocker.readDockerfiles()
         .then(NpmciBuildDocker.pullDockerfileImages)
         .then(NpmciBuildDocker.pushDockerfiles)
-        .then(done.resolve);
+        .then(dockerfileArray => {
-    return done.promise;
+        return dockerfileArray;
-};
+    });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHVibGlzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUMxQyxtREFBdUM7QUFDdkMsNkNBQWlDO0FBRWpDLHlEQUF3RDtBQU94RDs7O0dBR0c7QUFDUSxRQUFBLE9BQU8sR0FBRyxDQUFDLGdCQUE2QixLQUFLO0lBQ3BELE1BQU0sQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFDcEIsS0FBSyxLQUFLO1lBQ04sTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFBO1FBQ3ZCLEtBQUssUUFBUTtZQUNULE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQTtJQUM5QixDQUFDO0FBQ0wsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLFVBQVUsR0FBSTtJQUNkLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDNUIsdUJBQU8sQ0FBQyxLQUFLLENBQUM7U0FDVCxJQUFJLENBQUM7UUFDRixpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzdCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNsQixDQUFDLENBQUMsQ0FBQTtJQUNQLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3RCLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxhQUFhLEdBQUc7SUFDaEIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUN4QixnQkFBZ0IsQ0FBQyxlQUFlLEVBQUU7U0FDakMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLG9CQUFvQixDQUFDO1NBQzNDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxlQUFlLENBQUM7U0FDdEMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUN2QixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUEifQ==
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHVibGlzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyxtREFBeUM7QUFDekMsNkNBQW1DO0FBRW5DLHlEQUF3RDtBQU94RDs7O0dBR0c7QUFDUSxRQUFBLE9BQU8sR0FBRyxDQUFPLGdCQUE2QixLQUFLO0lBQzVELE1BQU0sQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFDdEIsS0FBSyxLQUFLO1lBQ1IsTUFBTSxDQUFDLE1BQU0sVUFBVSxFQUFFLENBQUE7UUFDM0IsS0FBSyxRQUFRO1lBQ1gsTUFBTSxDQUFDLE1BQU0sYUFBYSxFQUFFLENBQUE7SUFDaEMsQ0FBQztBQUNILENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLFVBQVUsR0FBRztJQUNmLE1BQU0sdUJBQU8sQ0FBQyxLQUFLLENBQUM7U0FDakIsSUFBSSxDQUFDOztZQUNKLE1BQU0saUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtZQUN6QixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUMvQixDQUFDO0tBQUEsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksYUFBYSxHQUFHO0lBQ2xCLE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixDQUFDLGVBQWUsRUFBRTtTQUM1QyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsb0JBQW9CLENBQUM7U0FDM0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLGVBQWUsQ0FBQztTQUN0QyxJQUFJLENBQUMsZUFBZTtRQUNuQixNQUFNLENBQUMsZUFBZSxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.servezone.d.ts

@@ -1,4 +1,4 @@
 /**
  * the main run function to submit a service to a servezone
  */
-export declare let run: (configArg: any) => void;
+export declare let run: (configArg: any) => Promise<void>;

dist/npmci.servezone.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 /**
  * servezoneRegex is the regex that parses the servezone connection data
@@ -22,7 +31,7 @@ let smartsocketClientConstructorOptions = {
 /**
  * the main run function to submit a service to a servezone
  */
-exports.run = (configArg) => {
+exports.run = (configArg) => __awaiter(this, void 0, void 0, function* () {
     new plugins.smartsocket.SmartsocketClient(smartsocketClientConstructorOptions);
-};
+});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc2VydmV6b25lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc2VydmV6b25lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwyQ0FBMEM7QUFFMUM7OztHQUdHO0FBQ0gsSUFBSSxjQUFjLEdBQUcsbUJBQW1CLENBQUE7QUFFeEM7O0dBRUc7QUFDSCxJQUFJLHlCQUF5QixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUVoRjs7R0FFRztBQUNILElBQUksbUNBQW1DLEdBQUc7SUFDdEMsS0FBSyxFQUFFLE9BQU87SUFDZCxRQUFRLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0lBQ3RDLElBQUksRUFBRSxRQUFRLENBQUMseUJBQXlCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUMsSUFBSSxFQUFFLElBQUk7SUFDVixHQUFHLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0NBQ3BDLENBQUE7QUFFRDs7R0FFRztBQUNRLFFBQUEsR0FBRyxHQUFHLENBQUMsU0FBUztJQUN2QixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQ3JDLG1DQUFtQyxDQUN0QyxDQUFBO0FBQ0wsQ0FBQyxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc2VydmV6b25lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc2VydmV6b25lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFFMUM7OztHQUdHO0FBQ0gsSUFBSSxjQUFjLEdBQUcsbUJBQW1CLENBQUE7QUFFeEM7O0dBRUc7QUFDSCxJQUFJLHlCQUF5QixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUVoRjs7R0FFRztBQUNILElBQUksbUNBQW1DLEdBQUc7SUFDdEMsS0FBSyxFQUFFLE9BQU87SUFDZCxRQUFRLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0lBQ3RDLElBQUksRUFBRSxRQUFRLENBQUMseUJBQXlCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUMsSUFBSSxFQUFFLElBQUk7SUFDVixHQUFHLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0NBQ3BDLENBQUE7QUFFRDs7R0FFRztBQUNRLFFBQUEsR0FBRyxHQUFHLENBQU8sU0FBUztJQUM3QixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQ3JDLG1DQUFtQyxDQUN0QyxDQUFBO0FBQ0wsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.ssh.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="q" />
-import * as plugins from './npmci.plugins';
 /**
  * checks for ENV vars in form of NPMCI_SSHKEY_* and deploys any found ones
  */
-export declare let ssh: () => plugins.q.Promise<{}>;
+export declare let ssh: () => Promise<void>;

dist/npmci.ssh.js

@@ -1,12 +1,20 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 let sshRegex = /^(.*)\|(.*)\|(.*)/;
 let sshInstance;
 /**
  * checks for ENV vars in form of NPMCI_SSHKEY_* and deploys any found ones
  */
-exports.ssh = () => {
+exports.ssh = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
     sshInstance = new plugins.smartssh.SshInstance(); // init ssh instance
     plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_SSHKEY_*', evaluateSshEnv);
     if (!process.env.NPMTS_TEST) {
@@ -16,13 +24,11 @@ exports.ssh = () => {
         plugins.beautylog.log('In test mode, so not storing SSH keys to disk!');
     }
     ;
-    done.resolve();
+});
-    return done.promise;
-};
 /**
  * gets called for each found SSH ENV Var and deploys it
  */
-let evaluateSshEnv = (sshkeyEnvVarArg) => {
+let evaluateSshEnv = (sshkeyEnvVarArg) => __awaiter(this, void 0, void 0, function* () {
     let resultArray = sshRegex.exec(sshkeyEnvVarArg);
     let sshKey = new plugins.smartssh.SshKey();
     plugins.beautylog.info('Found SSH identity for ' + resultArray[1]);
@@ -41,11 +47,12 @@ let evaluateSshEnv = (sshkeyEnvVarArg) => {
     }
     ;
     sshInstance.addKey(sshKey);
-};
+    return;
+});
 /**
  * checks if not undefined
  */
 let notUndefined = (stringArg) => {
     return (stringArg && stringArg !== 'undefined' && stringArg !== '##');
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc3NoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc3NoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwyQ0FBMEM7QUFFMUMsSUFBSSxRQUFRLEdBQUcsbUJBQW1CLENBQUE7QUFDbEMsSUFBSSxXQUF5QyxDQUFBO0FBRTdDOztHQUVHO0FBQ1EsUUFBQSxHQUFHLEdBQUc7SUFDYixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLFdBQVcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLENBQUEsQ0FBQyxvQkFBb0I7SUFDckUsT0FBTyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFDLGdCQUFnQixFQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQ2hGLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1FBQzFCLFdBQVcsQ0FBQyxXQUFXLEVBQUUsQ0FBQTtJQUM3QixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxnREFBZ0QsQ0FBQyxDQUFBO0lBQzNFLENBQUM7SUFBQSxDQUFDO0lBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ2QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDdkIsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLGNBQWMsR0FBRyxDQUFDLGVBQWU7SUFDakMsSUFBSSxXQUFXLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUNoRCxJQUFJLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUE7SUFDMUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMseUJBQXlCLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDbEUsRUFBRSxDQUFDLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMvQixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO1FBQzNDLE1BQU0sQ0FBQyxJQUFJLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2hDLENBQUM7SUFDRCxFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQy9CLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLENBQUE7UUFDOUMsTUFBTSxDQUFDLGFBQWEsR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDekMsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQy9CLHNCQUFzQixDQUFBO1FBQ3RCLE1BQU0sQ0FBQyxZQUFZLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3hDLENBQUM7SUFBQSxDQUFDO0lBRUYsV0FBVyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQTtBQUM5QixDQUFDLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksWUFBWSxHQUFHLENBQUMsU0FBaUI7SUFDakMsTUFBTSxDQUFDLENBQUMsU0FBUyxJQUFJLFNBQVMsS0FBSyxXQUFXLElBQUksU0FBUyxLQUFLLElBQUksQ0FBQyxDQUFBO0FBQ3pFLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc3NoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc3NoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFFMUMsSUFBSSxRQUFRLEdBQUcsbUJBQW1CLENBQUE7QUFDbEMsSUFBSSxXQUF5QyxDQUFBO0FBRTdDOztHQUVHO0FBQ1EsUUFBQSxHQUFHLEdBQUc7SUFDZixXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFBLENBQUMsb0JBQW9CO0lBQ3JFLE9BQU8sQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxnQkFBZ0IsRUFBRSxjQUFjLENBQUMsQ0FBQTtJQUNsRixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1QixXQUFXLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDM0IsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZ0RBQWdELENBQUMsQ0FBQTtJQUN6RSxDQUFDO0lBQUEsQ0FBQztBQUNKLENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLGNBQWMsR0FBRyxDQUFPLGVBQWU7SUFDekMsSUFBSSxXQUFXLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUNoRCxJQUFJLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUE7SUFDMUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMseUJBQXlCLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDbEUsRUFBRSxDQUFDLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNqQyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO1FBQzNDLE1BQU0sQ0FBQyxJQUFJLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzlCLENBQUM7SUFDRCxFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLENBQUE7UUFDOUMsTUFBTSxDQUFDLGFBQWEsR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDdkMsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLHNCQUFzQixDQUFBO1FBQ3RCLE1BQU0sQ0FBQyxZQUFZLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3RDLENBQUM7SUFBQSxDQUFDO0lBRUYsV0FBVyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUMxQixNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxZQUFZLEdBQUcsQ0FBQyxTQUFpQjtJQUNuQyxNQUFNLENBQUMsQ0FBQyxTQUFTLElBQUksU0FBUyxLQUFLLFdBQVcsSUFBSSxTQUFTLEtBQUssSUFBSSxDQUFDLENBQUE7QUFDdkUsQ0FBQyxDQUFBIn0=

dist/npmci.test.d.ts

@@ -1,3 +1 @@
-/// <reference types="q" />
+export declare let test: (versionArg: any) => Promise<void>;
-import * as plugins from './npmci.plugins';
-export declare let test: (versionArg: any) => plugins.q.Promise<{}>;

dist/npmci.test.js

@@ -1,46 +1,43 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const npmci_bash_1 = require("./npmci.bash");
 const npmci_install_1 = require("./npmci.install");
 const NpmciBuildDocker = require("./npmci.build.docker");
-exports.test = (versionArg) => {
+exports.test = (versionArg) => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
     if (versionArg === 'docker') {
-        testDocker()
+        yield testDocker();
-            .then(() => {
-            done.resolve();
-        });
     }
     else {
-        npmci_install_1.install(versionArg)
+        yield npmci_install_1.install(versionArg)
             .then(npmDependencies)
-            .then(npmTest)
+            .then(npmTest);
-            .then(() => {
-            done.resolve();
-        });
     }
-    return done.promise;
+});
-};
+let npmDependencies = () => __awaiter(this, void 0, void 0, function* () {
-let npmDependencies = function () {
-    let done = plugins.q.defer();
     plugins.beautylog.info('now installing dependencies:');
-    npmci_bash_1.bash('npm install');
+    if (yield npmci_bash_1.yarnAvailable.promise) {
-    done.resolve();
+        yield npmci_bash_1.bash('yarn upgrade');
-    return done.promise;
+    }
-};
+    else {
-let npmTest = () => {
+        yield npmci_bash_1.bash('npm install');
-    let done = plugins.q.defer();
+    }
+});
+let npmTest = () => __awaiter(this, void 0, void 0, function* () {
     plugins.beautylog.info('now starting tests:');
-    npmci_bash_1.bash('npm test');
+    yield npmci_bash_1.bash('npm test');
-    done.resolve();
+});
-    return done.promise;
+let testDocker = () => __awaiter(this, void 0, void 0, function* () {
-};
+    return yield NpmciBuildDocker.readDockerfiles()
-let testDocker = function () {
-    let done = plugins.q.defer();
-    NpmciBuildDocker.readDockerfiles()
         .then(NpmciBuildDocker.pullDockerfileImages)
-        .then(NpmciBuildDocker.testDockerfiles)
+        .then(NpmciBuildDocker.testDockerfiles);
-        .then(done.resolve);
+});
-    return done.promise;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyw2Q0FBa0Q7QUFDbEQsbURBQXlDO0FBRXpDLHlEQUF3RDtBQUU3QyxRQUFBLElBQUksR0FBRyxDQUFPLFVBQVU7SUFDakMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDNUIsTUFBTSxVQUFVLEVBQUUsQ0FBQTtJQUNwQixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixNQUFNLHVCQUFPLENBQUMsVUFBVSxDQUFDO2FBQ3RCLElBQUksQ0FBQyxlQUFlLENBQUM7YUFDckIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ2xCLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQTtBQUVELElBQUksZUFBZSxHQUFHO0lBQ3BCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLDhCQUE4QixDQUFDLENBQUE7SUFDdEQsRUFBRSxDQUFDLENBQUMsTUFBTSwwQkFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDaEMsTUFBTSxpQkFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE1BQU0saUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUMzQixDQUFDO0FBQ0gsQ0FBQyxDQUFBLENBQUE7QUFFRCxJQUFJLE9BQU8sR0FBRztJQUNaLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLENBQUE7SUFDN0MsTUFBTSxpQkFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0FBQ3hCLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxVQUFVLEdBQUc7SUFDZixNQUFNLENBQUMsTUFBTSxnQkFBZ0IsQ0FBQyxlQUFlLEVBQUU7U0FDNUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLG9CQUFvQixDQUFDO1NBQzNDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUMzQyxDQUFDLENBQUEsQ0FBQSJ9
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUMxQyw2Q0FBaUM7QUFDakMsbURBQXVDO0FBRXZDLHlEQUF3RDtBQUU3QyxRQUFBLElBQUksR0FBRyxDQUFDLFVBQVU7SUFDekIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUMxQixVQUFVLEVBQUU7YUFDUCxJQUFJLENBQUM7WUFDRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDbEIsQ0FBQyxDQUFDLENBQUE7SUFDVixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSix1QkFBTyxDQUFDLFVBQVUsQ0FBQzthQUNkLElBQUksQ0FBQyxlQUFlLENBQUM7YUFDckIsSUFBSSxDQUFDLE9BQU8sQ0FBQzthQUNiLElBQUksQ0FBQztZQUNGLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNsQixDQUFDLENBQUMsQ0FBQTtJQUNWLENBQUM7SUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFFRCxJQUFJLGVBQWUsR0FBRztJQUNsQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLDhCQUE4QixDQUFDLENBQUE7SUFDdEQsaUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUNuQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDZCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFFRCxJQUFJLE9BQU8sR0FBRztJQUNWLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDNUIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM3QyxpQkFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0lBQ2hCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVELElBQUksVUFBVSxHQUFHO0lBQ2IsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixnQkFBZ0IsQ0FBQyxlQUFlLEVBQUU7U0FDN0IsSUFBSSxDQUFDLGdCQUFnQixDQUFDLG9CQUFvQixDQUFDO1NBQzNDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxlQUFlLENBQUM7U0FDdEMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUN2QixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUEifQ==

dist/npmci.trigger.d.ts

@@ -1,3 +1 @@
-/// <reference types="q" />
+export declare let trigger: () => Promise<void>;
-import * as plugins from './npmci.plugins';
-export declare let trigger: () => plugins.q.Promise<{}>;

dist/npmci.trigger.js

@@ -1,14 +1,20 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 let triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/;
-exports.trigger = function () {
+exports.trigger = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
     plugins.beautylog.info('now running triggers');
     plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
-    done.resolve();
+});
-    return done.promise;
+let evaluateTrigger = (triggerEnvVarArg) => __awaiter(this, void 0, void 0, function* () {
-};
-let evaluateTrigger = (triggerEnvVarArg) => {
     let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg);
     let regexDomain = triggerRegexResultArray[1];
     let regexProjectId = triggerRegexResultArray[2];
@@ -24,5 +30,5 @@ let evaluateTrigger = (triggerEnvVarArg) => {
     plugins.beautylog.info('Found Trigger!');
     plugins.beautylog.log('triggering build for ref ' + regexRefName + ' of ' + regexTriggerName);
     plugins.request.post('https://gitlab.com/api/v3/projects/' + regexProjectId + '/trigger/builds', { form: { token: regexProjectTriggerToken, ref: regexRefName } });
-};
+});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudHJpZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRyaWdnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUkxQyxJQUFJLGlCQUFpQixHQUFHLGdHQUFnRyxDQUFBO0FBRTdHLFFBQUEsT0FBTyxHQUFHO0lBQ2pCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDNUIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQTtJQUM5QyxPQUFPLENBQUMsVUFBVSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsaUJBQWlCLEVBQUUsZUFBZSxDQUFDLENBQUE7SUFDcEYsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ2QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDdkIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxlQUFlLEdBQUcsQ0FBQyxnQkFBZ0I7SUFDbkMsSUFBSSx1QkFBdUIsR0FBRyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtJQUN0RSxJQUFJLFdBQVcsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUM1QyxJQUFJLGNBQWMsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMvQyxJQUFJLHdCQUF3QixHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3pELElBQUksWUFBWSxHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzdDLElBQUksZ0JBQWdCLENBQUE7SUFDcEIsRUFBRSxDQUFDLENBQUMsdUJBQXVCLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdkMsZ0JBQWdCLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDakQsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUE7SUFDeEMsQ0FBQztJQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUE7SUFDeEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsMkJBQTJCLEdBQUcsWUFBWSxHQUFHLE1BQU0sR0FBRyxnQkFBZ0IsQ0FBQyxDQUFBO0lBQzdGLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLGNBQWMsR0FBRyxpQkFBaUIsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxHQUFHLEVBQUUsWUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFBO0FBQ3RLLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudHJpZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRyaWdnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUkxQyxJQUFJLGlCQUFpQixHQUFHLGdHQUFnRyxDQUFBO0FBRTdHLFFBQUEsT0FBTyxHQUFHO0lBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUE7SUFDOUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLGlCQUFpQixFQUFFLGVBQWUsQ0FBQyxDQUFBO0FBQ3RGLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxlQUFlLEdBQUcsQ0FBTyxnQkFBZ0I7SUFDM0MsSUFBSSx1QkFBdUIsR0FBRyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtJQUN0RSxJQUFJLFdBQVcsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUM1QyxJQUFJLGNBQWMsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMvQyxJQUFJLHdCQUF3QixHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3pELElBQUksWUFBWSxHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzdDLElBQUksZ0JBQWdCLENBQUE7SUFDcEIsRUFBRSxDQUFDLENBQUMsdUJBQXVCLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDekMsZ0JBQWdCLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDL0MsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUE7SUFDdEMsQ0FBQztJQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUE7SUFDeEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsMkJBQTJCLEdBQUcsWUFBWSxHQUFHLE1BQU0sR0FBRyxnQkFBZ0IsQ0FBQyxDQUFBO0lBQzdGLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLGNBQWMsR0FBRyxpQkFBaUIsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxHQUFHLEVBQUUsWUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFBO0FBQ3BLLENBQUMsQ0FBQSxDQUFBIn0=

npmextra.json

@@ -4,7 +4,13 @@
         "coverageTreshold": "70",
         "cli": true
     },
+    "npmci": {
+        "globalNpmTools": [
+            "npmts"
+        ]
+    },
     "npmdocker":{
-        "baseImage":"hosttoday/ht-docker-node:npmts"
+        "baseImage":"hosttoday/ht-docker-node:npmci",
+        "command": "npmci test stable"
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmci",
-  "version": "2.3.41",
+  "version": "2.3.66",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -22,34 +22,33 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "@types/should": "^8.1.30",
+    "tapbundle": "^1.0.12",
-    "npmts-g": "^6.0.0",
-    "should": "^11.2.0",
     "typings-test": "^1.0.3"
   },
   "dependencies": {
-    "@types/lodash": "^4.14.52",
+    "@types/lodash": "^4.14.64",
-    "@types/node": "^7.0.5",
+    "@types/node": "^7.0.18",
-    "@types/q": "0.x.x",
     "@types/request": "0.x.x",
-    "@types/shelljs": "^0.7.0",
+    "@types/shelljs": "^0.7.1",
     "@types/through2": "^2.0.32",
-    "beautylog": "^6.1.1",
+    "beautylog": "^6.1.10",
     "gulp": "^3.9.1",
-    "gulp-function": "^2.2.3",
+    "gulp-function": "^2.2.9",
     "lodash": "^4.17.4",
-    "npmextra": "^2.0.3",
+    "npmextra": "^2.0.5",
-    "projectinfo": "^3.0.1",
+    "projectinfo": "^3.0.2",
-    "q": "^1.4.1",
+    "request": "^2.81.0",
-    "request": "^2.79.0",
+    "shelljs": "^0.7.7",
-    "shelljs": "^0.7.6",
+    "smartcli": "^2.0.7",
-    "smartcli": "^2.0.1",
+    "smartdelay": "^1.0.1",
-    "smartfile": "^4.1.6",
+    "smartfile": "^4.2.11",
     "smartparam": "^0.1.1",
+    "smartq": "^1.1.1",
+    "smartshell": "^1.0.6",
     "smartsocket": "^1.1.7",
     "smartssh": "^1.2.1",
     "smartstring": "^2.0.24",
     "through2": "^2.0.3",
-    "typings-global": "^1.0.14"
+    "typings-global": "^1.0.16"
   }
 }

readme.md

@@ -0,0 +1,99 @@
+# npmci
+helps with pushing to npm registry from any CI
+
+## Availabililty
+[![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmci)
+[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmci)
+[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmci)
+[![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmci/)
+
+## Status for master
+[![build status](https://GitLab.com/gitzone/npmci/badges/master/build.svg)](https://GitLab.com/gitzone/npmci/commits/master)
+[![coverage report](https://GitLab.com/gitzone/npmci/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmci/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/npmci.svg)](https://www.npmjs.com/package/npmci)
+[![Dependency Status](https://david-dm.org/gitzonetools/npmci.svg)](https://david-dm.org/gitzonetools/npmci)
+[![bitHound Dependencies](https://www.bithound.io/github/gitzonetools/npmci/badges/dependencies.svg)](https://www.bithound.io/github/gitzonetools/npmci/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/gitzonetools/npmci/badges/code.svg)](https://www.bithound.io/github/gitzonetools/npmci)
+[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+
+## Usage
+Use TypeScript for best in class instellisense.
+
+npmci is designed to work in docker CI environments. The following docker images come with npmci presinstalled:
+
+Docker Hub:
+
+* [hosttoday/ht-docker-node:npmci](https://hub.docker.com/r/hosttoday/ht-docker-node/)  
+has LTS node version and npmci preinstalled.
+* [hosttoday/ht-docker-dbase](https://hub.docker.com/r/hosttoday/ht-docker-dbase/)  
+based on docker:git, can be used to build docker images in conjunction with docker:dind
+
+npmci can be called from commandline:
+```shell
+# Install any node version:
+npmci install lts # will install latest LTS node version and update PATH for node and npm versions
+npmci install stable # will install latest stable node version and update PATH for node and npm
+npmci install legacy # will install latest legacy node version and update PATH for node and npm
+npmci install x.x.x #  will install any specific node version.
+
+# Install any node version, install dependencies and run test in cwd:
+npmci test lts # will install latest lts node version and run "npm install" and "npm test".
+npmci test stable # will install latest stable node version and run "npm install" and "npm test".
+npmci test legacy # will install latest legacy node version and run "npm install" and "npm test".
+npmci test x.x.x # will install any specific node version and run "npm install" and "npm test".
+npmci test docker # will test any build image with tests defined in ./npmci/dockertest_1.sh to ./npmci/dockertest_100.sh
+## npmci test docker will look at all Dockerfiles and look for according tags on GitLab container registry
+
+
+# prepare tools
+npmci prepare npm # will look for $NPMCI_TOKEN_NPM env var and create .npmrc, so npm is authenticated
+npmci prepare docker # will look for $NPMCI_LOGIN_DOCKER in form username|password and authenticate docker
+npmci prepare docker-gitlab # will authenticate docker for gitlab container registry
+
+# build containers
+npmci build docker # will build containers
+## all Dockerfiles named Dockerfile* are picked up.
+## specify tags like this Dockerfile_[tag]
+## uploads all built images as [username]/[reponame]:[tag]_test to GitLab
+## then test in next step with "npmci test docker"
+
+# publish npm module
+npmci publish npm # will look vor $NPMCI_TOKEN_NPM env var and push any module in cwd to npm
+npmci publish docker
+
+# trigger webhooks
+npmci trigger # will look for NPMCI_TRIGGER_1 to NPMCI_TRIGGER_100 in form domain|id|token|ref|name  
+```
+
+## Configuration
+npmci supports the use of npmextra.
+
+To configure npmci create a `npmextra.json` file at the root of your project
+
+```json
+{
+    "npmci": {
+        "globalNpmTools": [
+            "npm-check-updates",
+            "protractor",
+            "npmts",
+            "gitzone"
+        ]
+    }
+}
+```
+
+**Available options**
+
+setting | example | description
+--- | --- | ---
+globalNpmTools | "globalNpmTools": ["gitbook"] | Will look for the specified package names locally and (if not yet present) install them from npm. 
+
+For further information read the linked docs at the top of this README.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

test/test.d.ts

@@ -1 +0,0 @@
-import 'typings-test';

test/test.js

@@ -1,88 +0,0 @@
-"use strict";
-require("typings-test");
-const should = require("should");
-const path = require("path");
-// set up environment
-process.env.CI_BUILD_REPO = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git';
-process.env.NPMCI_SSHKEY_1 = 'hostString|somePrivKey|##';
-process.env.NPMTS_TEST = 'true';
-process.cwd = () => {
-    return path.join(__dirname, 'assets/');
-};
-const NpmciBuildDocker = require("../dist/npmci.build.docker");
-const NpmciPublish = require("../dist/npmci.publish");
-const NpmciTest = require("../dist/npmci.test");
-const NpmciSsh = require("../dist/npmci.ssh");
-let dockerfile1;
-let dockerfile2;
-let sortableArray;
-describe('NPMCI', function () {
-    describe('build.docker', function () {
-        it('should return valid Dockerfiles', function () {
-            dockerfile1 = new NpmciBuildDocker.Dockerfile({ filePath: './Dockerfile', read: true });
-            dockerfile2 = new NpmciBuildDocker.Dockerfile({ filePath: './Dockerfile_sometag1', read: true });
-            should(dockerfile1.version).equal('latest');
-            should(dockerfile2.version).equal('sometag1');
-        });
-        it('should read a directory of Dockerfiles', function (done) {
-            NpmciBuildDocker.readDockerfiles()
-                .then(function (readDockerfilesArrayArg) {
-                should(readDockerfilesArrayArg[1].version).equal('sometag1');
-                sortableArray = readDockerfilesArrayArg;
-                done();
-            });
-        });
-        it('should sort an array of Dockerfiles', function (done) {
-            NpmciBuildDocker.sortDockerfiles(sortableArray)
-                .then(function (sortedArrayArg) {
-                console.log(sortedArrayArg);
-                done();
-            });
-        });
-        it('should correctly chain Dockerfile handling', function (done) {
-            NpmciBuildDocker.build()
-                .then(() => {
-                done();
-            });
-        });
-    });
-    describe('.publish.docker', function () {
-        it('should publish all built Dockerfiles', function (done) {
-            NpmciPublish.publish('docker')
-                .then(() => {
-                done();
-            });
-        });
-    });
-    describe('.test.npm', function () {
-        it('should source nvm using bash and install a specific node version, then test it', function (done) {
-            NpmciTest.test('legacy')
-                .then(() => {
-                return NpmciTest.test('lts');
-            })
-                .then(() => {
-                return NpmciTest.test('stable');
-            })
-                .then(() => {
-                done();
-            });
-        });
-    });
-    describe('test.docker', function () {
-        it('should test dockerfiles', function (done) {
-            NpmciTest.test('docker')
-                .then(() => {
-                done();
-            });
-        });
-    });
-    describe('npmci prepare ssh', function () {
-        it('should pick up SSH keys', function (done) {
-            NpmciSsh.ssh()
-                .then(() => {
-                done();
-            });
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFDaEMsNkJBQTRCO0FBRTVCLHFCQUFxQjtBQUNyQixPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsR0FBRyx1REFBdUQsQ0FBQTtBQUNuRixPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRywyQkFBMkIsQ0FBQTtBQUN4RCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUE7QUFDL0IsT0FBTyxDQUFDLEdBQUcsR0FBRztJQUNWLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxTQUFTLENBQUMsQ0FBQTtBQUN6QyxDQUFDLENBQUE7QUFJRCwrREFBK0Q7QUFDL0Qsc0RBQXNEO0FBQ3RELGdEQUFnRDtBQUNoRCw4Q0FBOEM7QUFHOUMsSUFBSSxXQUF3QyxDQUFBO0FBQzVDLElBQUksV0FBd0MsQ0FBQTtBQUM1QyxJQUFJLGFBQTRDLENBQUE7QUFFaEQsUUFBUSxDQUFDLE9BQU8sRUFBQztJQUNiLFFBQVEsQ0FBQyxjQUFjLEVBQUM7UUFDcEIsRUFBRSxDQUFDLGlDQUFpQyxFQUFDO1lBQ2pDLFdBQVcsR0FBRyxJQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFDLFFBQVEsRUFBRSxjQUFjLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBQyxDQUFDLENBQUE7WUFDckYsV0FBVyxHQUFHLElBQUksZ0JBQWdCLENBQUMsVUFBVSxDQUFDLEVBQUMsUUFBUSxFQUFFLHVCQUF1QixFQUFFLElBQUksRUFBRSxJQUFJLEVBQUMsQ0FBQyxDQUFBO1lBQzlGLE1BQU0sQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1lBQzNDLE1BQU0sQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLFVB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

test/test.ts

@@ -1,13 +1,12 @@
-import 'typings-test'
+import { tap, expect } from 'tapbundle'
-import * as should from 'should'
 import * as path from 'path'
 
 // set up environment
-process.env.CI_BUILD_REPO = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git'
+process.env.CI_REPOSITORY_URL = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git'
 process.env.NPMCI_SSHKEY_1 = 'hostString|somePrivKey|##'
 process.env.NPMTS_TEST = 'true'
 process.cwd = () => {
-    return path.join(__dirname,'assets/')
+  return path.join(__dirname, 'assets/')
 }
 
 // require NPMCI files
@@ -22,79 +21,59 @@ let dockerfile1: NpmciBuildDocker.Dockerfile
 let dockerfile2: NpmciBuildDocker.Dockerfile
 let sortableArray: NpmciBuildDocker.Dockerfile[]
 
-describe('NPMCI',function(){
-    describe('build.docker',function(){
-        it('should return valid Dockerfiles',function(){
-            dockerfile1 = new NpmciBuildDocker.Dockerfile({filePath: './Dockerfile', read: true})
-            dockerfile2 = new NpmciBuildDocker.Dockerfile({filePath: './Dockerfile_sometag1', read: true})
-            should(dockerfile1.version).equal('latest')
-            should(dockerfile2.version).equal('sometag1')
-        })
 
-        it('should read a directory of Dockerfiles',function(done){
+tap.test('should return valid Dockerfiles', async () => {
-            NpmciBuildDocker.readDockerfiles()
+  dockerfile1 = new NpmciBuildDocker.Dockerfile({ filePath: './Dockerfile', read: true })
-                .then(function(readDockerfilesArrayArg: NpmciBuildDocker.Dockerfile[]){
+  dockerfile2 = new NpmciBuildDocker.Dockerfile({ filePath: './Dockerfile_sometag1', read: true })
-                    should(readDockerfilesArrayArg[1].version).equal('sometag1')
+  expect(dockerfile1.version).to.equal('latest')
-                    sortableArray = readDockerfilesArrayArg
+  return expect(dockerfile2.version).to.equal('sometag1')
-                    done()
+})
-                })
-        })
 
-        it('should sort an array of Dockerfiles',function(done){
+tap.test('should read a directory of Dockerfiles', async () => {
-            NpmciBuildDocker.sortDockerfiles(sortableArray)
+  return NpmciBuildDocker.readDockerfiles()
-                .then(function(sortedArrayArg: NpmciBuildDocker.Dockerfile[]){
+    .then(async (readDockerfilesArrayArg: NpmciBuildDocker.Dockerfile[]) => {
-                    console.log(sortedArrayArg)
+      sortableArray = readDockerfilesArrayArg
-                    done()
+      return expect(readDockerfilesArrayArg[ 1 ].version).to.equal('sometag1')
-                })
-        })
-
-        it('should correctly chain Dockerfile handling', function(done){
-            NpmciBuildDocker.build()
-                .then(() => {
-                    done()
-                })
-        })
-    })
-
-    describe('.publish.docker',function(){
-        it('should publish all built Dockerfiles',function(done){
-            NpmciPublish.publish('docker')
-                .then(() => {
-                    done()
-                })
-        })
-    })
-
-    describe('.test.npm',function(){
-        it('should source nvm using bash and install a specific node version, then test it',function(done){
-            NpmciTest.test('legacy')
-                .then(() => {
-                    return NpmciTest.test('lts')
-                })
-                .then(() => {
-                    return NpmciTest.test('stable')
-                })
-                .then(() => {
-                    done()
-                })
-        })
-    })
-
-    describe('test.docker',function(){
-        it('should test dockerfiles',function(done){
-            NpmciTest.test('docker')
-                .then(() => {
-                    done()
-                })
-        })
-    })
-
-    describe('npmci prepare ssh',function(){
-        it('should pick up SSH keys',function(done){
-            NpmciSsh.ssh()
-                .then(() => {
-                    done()
-                })
-        })
     })
 })
+
+tap.test('should sort an array of Dockerfiles', async () => {
+  return NpmciBuildDocker.sortDockerfiles(sortableArray)
+    .then(async (sortedArrayArg: NpmciBuildDocker.Dockerfile[]) => {
+      console.log(sortedArrayArg)
+    })
+})
+
+tap.test('should correctly chain Dockerfile handling', async () => {
+  return NpmciBuildDocker.build()
+})
+
+tap.test('should publish all built Dockerfiles', async () => {
+  return NpmciPublish.publish('docker')
+})
+
+tap.test('should source nvm using bash and install a specific node version, then test it', async () => {
+  return NpmciTest.test('legacy')
+    .then(() => {
+      return NpmciTest.test('lts')
+    })
+    .then(() => {
+      return NpmciTest.test('stable')
+    })
+})
+
+tap.test('should test dockerfiles', async () => {
+  return NpmciTest.test('docker')
+})
+
+tap.test('should pick up SSH keys', async () => {
+  return NpmciSsh.ssh()
+})
+
+tap.test('reset paths', async () => {
+  process.cwd = () => {
+    return path.join(__dirname, '../')
+  }
+})
+
+tap.start()

ts/index.ts

@@ -25,6 +25,10 @@ smartcli.addCommand('build')
   .then((argv) => {
     build(argv._[ 1 ])
       .then(NpmciEnv.configStore)
+      .catch(err => {
+        console.log(err)
+        process.exit(1)
+      })
   })
 
 // clean
@@ -32,6 +36,10 @@ smartcli.addCommand('clean')
   .then((argv) => {
     clean()
       .then(NpmciEnv.configStore)
+      .catch(err => {
+        console.log(err)
+        process.exit(1)
+      })
   })
 
 // command
@@ -39,6 +47,10 @@ smartcli.addCommand('command')
   .then((argv) => {
     command()
       .then(NpmciEnv.configStore)
+      .catch(err => {
+        console.log(err)
+        process.exit(1)
+      })
   })
 
 // install
@@ -46,6 +58,10 @@ smartcli.addCommand('install')
   .then((argv) => {
     install(argv._[ 1 ])
       .then(NpmciEnv.configStore)
+      .catch(err => {
+        console.log(err)
+        process.exit(1)
+      })
   })
 
 // prepare
@@ -53,6 +69,10 @@ smartcli.addCommand('prepare')
   .then((argv) => {
     prepare(argv._[ 1 ])
       .then(NpmciEnv.configStore)
+      .catch(err => {
+        console.log(err)
+        process.exit(1)
+      })
   })
 
 // publish
@@ -60,6 +80,10 @@ smartcli.addCommand('publish')
   .then((argv) => {
     publish(argv._[ 1 ])
       .then(NpmciEnv.configStore)
+      .catch(err => {
+        console.log(err)
+        process.exit(1)
+      })
   })
 
 // test
@@ -67,6 +91,10 @@ smartcli.addCommand('test')
   .then((argv) => {
     test(argv._[ 1 ])
       .then(NpmciEnv.configStore)
+      .catch(err => {
+        console.log(err)
+        process.exit(1)
+      })
   })
 
 // trigger

ts/npmci.bash.ts

@@ -1,73 +1,106 @@
 import * as plugins from './npmci.plugins'
+import * as paths from './npmci.paths'
 
-let nvmSourceString: string = ''
+import * as smartq from 'smartq'
-export let nvmAvailable: boolean = false
+
-let checkNvm = () => {
+/**
-  let localExec: any = plugins.shelljs.exec
+ * wether nvm is available or not
-  if (localExec(`bash -c "source /usr/local/nvm/nvm.sh"`, { silent: true }).code === 0) {
+ */
-    nvmSourceString = `source /usr/local/nvm/nvm.sh && `
+export let nvmAvailable = smartq.defer<boolean>()
-    nvmAvailable = true
+export let yarnAvailable = smartq.defer<boolean>()
-  } else if (localExec(`bash -c "source ~/.nvm/nvm.sh"`, { silent: true }).code === 0) {
+/**
-    nvmSourceString = `source ~/.nvm/nvm.sh && `
+ * the smartshell instance for npmci
-    nvmAvailable = true
+ */
-  };
+let npmciSmartshell = new plugins.smartshell.Smartshell({
+  executor: 'bash',
+  sourceFilePaths: []
+})
+
+/**
+ * check for tools.
+ */
+let checkToolsAvailable = async () => {
+  // check for nvm
+  if (!process.env.NPMTS_TEST) {
+    if (
+      (await plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0
+    ) {
+      npmciSmartshell.addSourceFiles([ `/usr/local/nvm/nvm.sh` ])
+      nvmAvailable.resolve(true)
+    } else if (
+      (await plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0
+    ) {
+      npmciSmartshell.addSourceFiles([ `~/.nvm/nvm.sh` ])
+      nvmAvailable.resolve(true)
+    } else {
+      nvmAvailable.resolve(false)
+    }
+
+    // check for yarn
+    await plugins.smartshell.which('yarn').then(
+      async () => {
+        await plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`)
+        yarnAvailable.resolve(true)
+      },
+      () => { yarnAvailable.resolve(false) }
+    )
+  } else {
+    nvmAvailable.resolve(true)
+    yarnAvailable.resolve(true)
+  }
 }
-checkNvm()
+checkToolsAvailable()
 
 /**
  * bash() allows using bash with nvm in path
  * @param commandArg - The command to execute
  * @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
  */
-export let bash = (commandArg: string, retryArg: number = 2, bareArg: boolean = false): string => {
+export let bash = async (commandArg: string, retryArg: number = 2): Promise<string> => {
-  let exitCode: number
+  await nvmAvailable.promise // make sure nvm check has run
-  let stdOut: string
+  let execResult: plugins.smartshell.IExecResult
-  let execResult
+
+  // determine if we fail
   let failOnError: boolean = true
   if (retryArg === -1) {
     failOnError = false
     retryArg = 0
   }
+
   if (!process.env.NPMTS_TEST) { // NPMTS_TEST is used during testing
     for (let i = 0; i <= retryArg; i++) {
-      if (!bareArg) {
+      if (process.env.DEBUG_NPMCI === 'true') {
-        execResult = plugins.shelljs.exec(
+        console.log(commandArg)
-          `bash -c "${nvmSourceString} ${commandArg}"`
-        )
-      } else {
-        execResult = plugins.shelljs.exec(commandArg)
       }
-      exitCode = execResult.code
+      execResult = await npmciSmartshell.exec(commandArg)
-      stdOut = execResult.stdout
 
       // determine how bash reacts to error and success
-      if (exitCode !== 0 && i === retryArg) { // something went wrong and retries are exhausted
+      if (execResult.exitCode !== 0 && i === retryArg) { // something went wrong and retries are exhausted
         if (failOnError) {
+          plugins.beautylog.error('something went wrong and retries are exhausted')
           process.exit(1)
         }
-      } else if (exitCode === 0) { // everything went fine, or no error wanted
+      } else if (execResult.exitCode === 0) { // everything went fine, or no error wanted
         i = retryArg + 1 // retry +1 breaks for loop, if everything works out ok retrials are not wanted
       } else {
-        plugins.beautylog.warn('Something went wrong! Exit Code: ' + exitCode.toString())
+        plugins.beautylog.warn('Something went wrong! Exit Code: ' + execResult.exitCode.toString())
         plugins.beautylog.info('Retry ' + (i + 1).toString() + ' of ' + retryArg.toString())
       }
     }
   } else {
     plugins.beautylog.log('ShellExec would be: ' + commandArg)
+    await plugins.smartdelay.delayFor(100)
+    execResult = {
+      exitCode: 0,
+      stdout: 'testOutput'
+    }
   }
-  return stdOut
+  return execResult.stdout
-}
-
-/**
- * bashBare allows usage of bash without sourcing any files like nvm
- */
-export let bashBare = (commandArg: string, retryArg: number = 2) => {
-  return bash(commandArg, retryArg, true)
 }
 
 /**
  * bashNoError allows executing stuff without throwing an error
  */
-export let bashNoError = (commandArg: string): string => {
+export let bashNoError = async (commandArg: string): Promise<string> => {
-  return bash(commandArg, -1)
+  return await bash(commandArg, -1)
 }

ts/npmci.build.docker.ts

@@ -1,43 +1,41 @@
 import * as plugins from './npmci.plugins'
 import * as paths from './npmci.paths'
 import * as NpmciEnv from './npmci.env'
-import {bashBare} from './npmci.bash'
+import { bash } from './npmci.bash'
 
 /**
  * builds a cwd of Dockerfiles by triggering a promisechain
  */
-export let build = function(){
+export let build = async () => {
-    let done = plugins.q.defer()
+  plugins.beautylog.log('now building Dockerfiles...')
-    readDockerfiles()
+  await readDockerfiles()
-        .then(sortDockerfiles)
+    .then(sortDockerfiles)
-        .then(mapDockerfiles)
+    .then(mapDockerfiles)
-        .then(buildDockerfiles)
+    .then(buildDockerfiles)
-        .then(pushDockerfiles)
+    .then(pushDockerfiles)
-        .then(() => {
-            done.resolve()
-        })
-    return done.promise
 }
 
 /**
  * creates instance of class Dockerfile for all Dockerfiles in cwd
  * @returns Promise<Dockerfile[]>
  */
-export let readDockerfiles = function(): plugins.q.Promise<Dockerfile[]>{
+export let readDockerfiles = async (): Promise<Dockerfile[]> => {
-    let done = plugins.q.defer<Dockerfile[]>()
+  let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*')
-    let readDockerfilesArray: Dockerfile[] = []
+
-    plugins.gulp.src('./Dockerfile*')
+  // create the Dockerfile array
-        .pipe(plugins.through2.obj(function(file,enc,cb){
+  let readDockerfilesArray: Dockerfile[] = []
-            let myDockerfile = new Dockerfile({
+  plugins.beautylog.info(`found ${fileTree.length} Dockerfiles:`)
-                filePath: file.path,
+  console.log(fileTree)
-                read: true
+  for (let dockerfilePath of fileTree) {
-            })
+    let myDockerfile = new Dockerfile({
-            readDockerfilesArray.push(myDockerfile)
+      filePath: dockerfilePath,
-            cb(null,file)
+      read: true
-         },function(){
+    })
-             done.resolve(readDockerfilesArray)
+    readDockerfilesArray.push(myDockerfile)
-         }))
+  }
-    return done.promise
+
+  return readDockerfilesArray
+
 }
 
 /**
@@ -45,249 +43,250 @@ export let readDockerfiles = function(): plugins.q.Promise<Dockerfile[]>{
  * @param sortableArrayArg an array of instances of class Dockerfile
  * @returns Promise<Dockerfile[]>
  */
-export let sortDockerfiles = function(sortableArrayArg: Dockerfile[]): plugins.q.Promise<Dockerfile[]>{
+export let sortDockerfiles = (sortableArrayArg: Dockerfile[]): Promise<Dockerfile[]> => {
-    let done = plugins.q.defer<Dockerfile[]>()
+  let done = plugins.q.defer<Dockerfile[]>()
-    let sortedArray: Dockerfile[] = []
+  plugins.beautylog.info('sorting Dockerfiles:')
-    let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg,sortedArray)
+  let sortedArray: Dockerfile[] = []
-    let sorterFunctionCounter: number = 0
+  let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg, sortedArray)
-    let sorterFunction = function(){
+  let sorterFunctionCounter: number = 0
-        sortableArrayArg.forEach((dockerfileArg) => {
+  let sorterFunction = function () {
-            let cleanTags = cleanTagsArrayFunction(sortableArrayArg,sortedArray)
+    sortableArrayArg.forEach((dockerfileArg) => {
-            if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) {
+      let cleanTags = cleanTagsArrayFunction(sortableArrayArg, sortedArray)
-                sortedArray.push(dockerfileArg)
+      if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) {
-            };
+        sortedArray.push(dockerfileArg)
-            if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) {
+      }
-                dockerfileArg.localBaseImageDependent = true
+      if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) {
-            };
+        dockerfileArg.localBaseImageDependent = true
-        })
+      }
-        if (sortableArrayArg.length === sortedArray.length) {
+    })
-            done.resolve(sortedArray)
+    if (sortableArrayArg.length === sortedArray.length) {
-        } else if (sorterFunctionCounter < 10) {
+      let counter = 1
-            sorterFunctionCounter++
+      for (let dockerfile of sortedArray) {
-            sorterFunction()
+        plugins.beautylog.log(`tag ${counter}: -> ${dockerfile.cleanTag}`)
-        };
+        counter++
+      }
+      done.resolve(sortedArray)
+    } else if (sorterFunctionCounter < 10) {
+      sorterFunctionCounter++
+      sorterFunction()
     }
-    sorterFunction()
+  }
-    return done.promise
+  sorterFunction()
+  return done.promise
 }
 
 /**
  * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
  */
-export let mapDockerfiles = function(sortedArray: Dockerfile[]): plugins.q.Promise<Dockerfile[]>{
+export let mapDockerfiles = async (sortedArray: Dockerfile[]): Promise<Dockerfile[]> => {
-    let done = plugins.q.defer<Dockerfile[]>()
+  sortedArray.forEach((dockerfileArg) => {
-    sortedArray.forEach((dockerfileArg) => {
+    if (dockerfileArg.localBaseImageDependent) {
-        if (dockerfileArg.localBaseImageDependent) {
+      sortedArray.forEach((dockfile2: Dockerfile) => {
-            sortedArray.forEach((dockfile2: Dockerfile) => {
+        if (dockfile2.cleanTag === dockerfileArg.baseImage) {
-                if (dockfile2.cleanTag === dockerfileArg.baseImage) {
+          dockerfileArg.localBaseDockerfile = dockfile2
-                    dockerfileArg.localBaseDockerfile = dockfile2
+        }
-                }
+      })
-            })
+    };
-        };
+  })
-    })
+  return sortedArray
-    done.resolve(sortedArray)
-    return done.promise
 }
 
 /**
  * builds the correspoding real docker image for each Dockerfile class instance
  */
-export let buildDockerfiles = (sortedArrayArg: Dockerfile[]) => {
+export let buildDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
-    let done = plugins.q.defer()
+  for (let dockerfileArg of sortedArrayArg) {
-    sortedArrayArg.forEach(function(dockerfileArg){
+    await dockerfileArg.build()
-        dockerfileArg.build()
+  }
-    })
+  return sortedArrayArg
-    done.resolve(sortedArrayArg)
-    return done.promise
 }
 
 /**
  * pushes the real Dockerfile images to a Docker registry
  */
-export let pushDockerfiles = function(sortedArrayArg: Dockerfile[]){
+export let pushDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
-    let done = plugins.q.defer()
+  for (let dockerfileArg of sortedArrayArg) {
-    sortedArrayArg.forEach(function(dockerfileArg){
+    await dockerfileArg.push(NpmciEnv.buildStage)
-        dockerfileArg.push(NpmciEnv.buildStage)
+  }
-    })
+  return sortedArrayArg
-    done.resolve(sortedArrayArg)
-    return done.promise
 }
 
 /**
  * pulls corresponding real Docker images for instances of Dockerfile from a registry.
  * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages.
  */
-export let pullDockerfileImages = (sortableArrayArg: Dockerfile[],registryArg = 'registry.gitlab.com') => {
+export let pullDockerfileImages = async (sortableArrayArg: Dockerfile[], registryArg = 'registry.gitlab.com') => {
-    let done = plugins.q.defer()
+  for (let dockerfileArg of sortableArrayArg) {
-    sortableArrayArg.forEach((dockerfileArg) => {
+    await dockerfileArg.pull(registryArg)
-        dockerfileArg.pull(registryArg)
+  }
-    })
+  return sortableArrayArg
-    done.resolve(sortableArrayArg)
-    return done.promise
 }
 
 /**
  * tests all Dockerfiles in by calling class Dockerfile.test();
  * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
  */
-export let testDockerfiles = (sortedArrayArg: Dockerfile[]) => {
+export let testDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
-    let done = plugins.q.defer()
+  for (let dockerfileArg of sortedArrayArg) {
-    sortedArrayArg.forEach(function(dockerfileArg){
+    await dockerfileArg.test()
-        dockerfileArg.test()
+  }
-    })
+  return sortedArrayArg
-    done.resolve(sortedArrayArg)
-    return done.promise
 }
 
 /**
  * class Dockerfile represents a Dockerfile on disk in npmci
  */
 export class Dockerfile {
-    filePath: string
+  filePath: string
-    repo: string
+  repo: string
-    version: string
+  version: string
-    cleanTag: string
+  cleanTag: string
-    buildTag: string
+  buildTag: string
-    testTag: string
+  gitlabTestTag: string
-    releaseTag: string
+  gitlabReleaseTag: string
-    containerName: string
+  releaseTag: string
-    content: string
+  containerName: string
-    baseImage: string
+  content: string
-    localBaseImageDependent: boolean
+  baseImage: string
-    localBaseDockerfile: Dockerfile
+  localBaseImageDependent: boolean
-    constructor(options: {filePath?: string,fileContents?: string|Buffer,read?: boolean}) {
+  localBaseDockerfile: Dockerfile
-        this.filePath = options.filePath
+  constructor (options: { filePath?: string, fileContents?: string | Buffer, read?: boolean }) {
-        this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo
+    this.filePath = options.filePath
-        this.version = dockerFileVersion(plugins.path.parse(options.filePath).base)
+    this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo
-        this.cleanTag = this.repo + ':' + this.version
+    this.version = dockerFileVersion(plugins.path.parse(options.filePath).base)
-        this.buildTag = this.cleanTag
+    this.cleanTag = this.repo + ':' + this.version
-        this.testTag = dockerTag('registry.gitlab.com',this.repo,this.version,'test')
+    this.buildTag = this.cleanTag
-        this.releaseTag = dockerTag(NpmciEnv.dockerRegistry,this.repo,this.version)
+    this.gitlabTestTag = dockerTag('registry.gitlab.com', this.repo, this.version, 'test')
-        this.containerName = 'dockerfile-' + this.version
+    this.gitlabReleaseTag = dockerTag('registry.gitlab.com', this.repo, this.version)
-        if (options.filePath && options.read) {
+    this.releaseTag = dockerTag(NpmciEnv.dockerRegistry, this.repo, this.version)
-            this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath))
+    this.containerName = 'dockerfile-' + this.version
-        };
+    if (options.filePath && options.read) {
-        this.baseImage = dockerBaseImage(this.content)
+      this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath))
-        this.localBaseImageDependent = false
     };
+    this.baseImage = dockerBaseImage(this.content)
+    this.localBaseImageDependent = false
+  };
 
-    /**
+  /**
-     * builds the Dockerfile
+   * builds the Dockerfile
-     */
+   */
-    build() {
+  async build () {
-        let done = plugins.q.defer()
+    plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
-        plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
+    let buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} .`
-        bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .')
+    await bash(buildCommand)
-        NpmciEnv.dockerFilesBuilt.push(this)
+    NpmciEnv.dockerFilesBuilt.push(this)
-        done.resolve()
+    return
-        return done.promise
+  };
-    };
 
-    /**
+  /**
-     * pushes the Dockerfile to a registry
+   * pushes the Dockerfile to a registry
-     */
+   */
-    push(stageArg) {
+  async push(stageArg) {
-        let done = plugins.q.defer()
+    switch (stageArg) {
-        let pushTag
+      case 'release':
-        switch (stageArg) {
+        await bash(`docker tag ${this.buildTag} ${this.releaseTag}`)
-            case 'release':
+        await bash(`docker push ${this.releaseTag}`)
-                pushTag = this.releaseTag
+
-                break
+        // if release registry is different from gitlab
-            case 'test':
+        if (NpmciEnv.dockerRegistry !== 'registry.gitlab.com') {
-            default:
+          await bash(`docker tag ${this.buildTag} ${this.gitlabReleaseTag}`)
-                pushTag = this.testTag
+          await bash(`docker push ${this.gitlabReleaseTag}`)
-                break
         }
-        bashBare('docker tag ' + this.buildTag + ' ' + pushTag)
+        break
-        bashBare('docker push ' + pushTag)
+      case 'test':
-        done.resolve()
+      default:
-        return done.promise
+        await bash(`docker tag ${this.buildTag} ${this.gitlabTestTag}`)
-    };
+        await bash(`docker push ${this.gitlabTestTag}`)
-
+        break
-    /**
-     * pulls the Dockerfile from a registry
-     */
-    pull(registryArg: string) {
-        let pullTag = this.testTag
-        bashBare('docker pull ' + pullTag)
-        bashBare('docker tag ' + pullTag + ' ' + this.buildTag)
-    };
-
-    /**
-     * tests the Dockerfile;
-     */
-    test() {
-        let testFile: string = plugins.path.join(paths.NpmciTestDir,'test_' + this.version + '.sh')
-        let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile)
-        if (testFileExists) {
-            bashBare('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
-            bashBare('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
-            bashBare('docker commit npmci_test_container npmci_test_image')
-            bashBare('docker run npmci_test_image sh /npmci_test/test.sh')
-            bashBare('docker rm npmci_test_container')
-            bashBare('docker rmi --force npmci_test_image')
-        } else {
-            plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
-        }
-    };
-
-    /**
-     * gets the id of a Dockerfile
-     */
-    getId() {
-        let containerId = bashBare('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
-        return containerId
-    };
-}
-
-/**
- * 
- */
-export let dockerFileVersion = function(dockerfileNameArg: string): string{
-    let versionString: string
-    let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/
-    let regexResultArray = versionRegex.exec(dockerfileNameArg)
-    if (regexResultArray && regexResultArray.length === 2) {
-        versionString = regexResultArray[1]
-    } else {
-        versionString = 'latest'
     }
-    return versionString
+  };
+
+  /**
+   * pulls the Dockerfile from a registry
+   */
+  async pull(registryArg: string) {
+    let pullTag = this.gitlabTestTag
+    await bash('docker pull ' + pullTag)
+    await bash('docker tag ' + pullTag + ' ' + this.buildTag)
+  };
+
+  /**
+   * tests the Dockerfile;
+   */
+  async test() {
+    let testFile: string = plugins.path.join(paths.NpmciTestDir, 'test_' + this.version + '.sh')
+    let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile)
+    if (testFileExists) {
+      // run tests
+      await bash('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
+      await bash('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
+      await bash('docker commit npmci_test_container npmci_test_image')
+      await bash('docker run npmci_test_image sh /npmci_test/test.sh')
+      await bash('docker rm npmci_test_container')
+      await bash('docker rmi --force npmci_test_image')
+    } else {
+      plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
+    }
+  };
+
+  /**
+   * gets the id of a Dockerfile
+   */
+  async getId() {
+    let containerId = await bash('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
+    return containerId
+  };
+}
+
+/**
+ * returns a version for a docker file
+ * @execution SYNC
+ */
+export let dockerFileVersion = (dockerfileNameArg: string): string => {
+  let versionString: string
+  let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/
+  let regexResultArray = versionRegex.exec(dockerfileNameArg)
+  if (regexResultArray && regexResultArray.length === 2) {
+    versionString = regexResultArray[ 1 ]
+  } else {
+    versionString = 'latest'
+  }
+  return versionString
 }
 
 /**
  * 
  */
-export let dockerBaseImage = function(dockerfileContentArg: string){
+export let dockerBaseImage = function (dockerfileContentArg: string) {
-    let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
+  let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
-    let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
+  let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
-    return regexResultArray[1]
+  return regexResultArray[ 1 ]
 }
 
 /**
  * 
  */
-export let dockerTag = function(registryArg: string,repoArg: string,versionArg: string,suffixArg?: string): string{
+export let dockerTag = function (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string): string {
-    let tagString: string
+  let tagString: string
-    let registry = registryArg
+  let registry = registryArg
-    let repo = repoArg
+  let repo = repoArg
-    let version = versionArg
+  let version = versionArg
-    if (suffixArg) {
+  if (suffixArg) {
-        version = versionArg + '_' + suffixArg
+    version = versionArg + '_' + suffixArg
-    };
+  };
-    tagString = registry + '/' + repo + ':' + version
+  tagString = registry + '/' + repo + ':' + version
-    return tagString
+  return tagString
 }
 
 /**
  * 
  */
-export let cleanTagsArrayFunction = function(dockerfileArrayArg: Dockerfile[],trackingArrayArg: Dockerfile[]): string[]{
+export let cleanTagsArrayFunction = function (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]): string[] {
-    let cleanTagsArray: string[] = []
+  let cleanTagsArray: string[] = []
-    dockerfileArrayArg.forEach(function(dockerfileArg){
+  dockerfileArrayArg.forEach(function (dockerfileArg) {
-        if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
+    if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
-            cleanTagsArray.push(dockerfileArg.cleanTag)
+      cleanTagsArray.push(dockerfileArg.cleanTag)
-        }
+    }
-    })
+  })
-    return cleanTagsArray
+  return cleanTagsArray
 }

ts/npmci.build.ts

@@ -1,22 +1,23 @@
 import * as plugins from './npmci.plugins'
-import {bash} from './npmci.bash'
+import { bash } from './npmci.bash'
 import * as env from './npmci.env'
 import * as buildDocker from './npmci.build.docker'
 
 /**
  * defines possible build services
  */
-export type TBuildService = 'docker';
+export type TBuildService = 'docker'
 
 /**
  * builds for a specific service
  */
-export let build = function(commandArg): plugins.q.Promise<any> {
+export let build = async (commandArg): Promise<void> => {
-    switch (commandArg) {
+  switch (commandArg) {
-        case 'docker':
+    case 'docker':
-            return buildDocker.build()
+      await buildDocker.build()
-        default:
+      break
-            plugins.beautylog.log('build target ' + commandArg + ' not recognised!')
+    default:
-    };
+      plugins.beautylog.log('build target ' + commandArg + ' not recognised!')
-    return
+  };
+  return
 }

ts/npmci.clean.ts

@@ -4,9 +4,7 @@ import * as paths from './npmci.paths'
 /**
  * cleans npmci config files
  */
-export let clean = () => {
+export let clean = async (): Promise<void> => {
-    let done = plugins.q.defer()
+  plugins.smartfile.fs.removeSync(paths.NpmciPackageConfig)
-    plugins.smartfile.fs.removeSync(paths.NpmciPackageConfig)
+  return
-    done.resolve()
-    return done.promise
 }

ts/npmci.command.ts

@@ -1,15 +1,13 @@
 import * as plugins from './npmci.plugins'
-import {bash} from './npmci.bash'
+import { bash } from './npmci.bash'
 
-export let command = () => {
+export let command = async () => {
-    let done = plugins.q.defer()
+  let wrappedCommand: string = ''
-    let wrappedCommand: string = ''
+  let argvArray = process.argv
-    let argvArray = process.argv
+  for (let i = 3; i < argvArray.length; i++) {
-    for (let i = 3; i < argvArray.length; i++) {
+    wrappedCommand = wrappedCommand + argvArray[i]
-        wrappedCommand = wrappedCommand + argvArray[i]
+    if (i + 1 !== argvArray.length) { wrappedCommand = wrappedCommand + ' ' }
-        if (i + 1 !== argvArray.length) { wrappedCommand = wrappedCommand + ' ' }
+  }
-    }
+  await bash(wrappedCommand)
-    bash(wrappedCommand)
+  return
-    done.resolve()
-    return done.promise
 }

ts/npmci.config.ts

@@ -4,16 +4,14 @@ import * as plugins from './npmci.plugins'
 import * as paths from './npmci.paths'
 
 export interface INpmciOptions {
-    globalNpmTools: string[]
+  globalNpmTools: string[]
 }
 
-export let getConfig = () => {
+export let getConfig = async (): Promise<INpmciOptions> => {
-    let done = q.defer<INpmciOptions>()
+  let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd)
-    let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd)
+  let defaultConfig: INpmciOptions = {
-    let defaultConfig: INpmciOptions = {
+    globalNpmTools: []
-        globalNpmTools: []
+  }
-    }
+  let npmciConfig = npmciNpmextra.dataFor<INpmciOptions>('npmci', defaultConfig)
-    let npmciConfig = npmciNpmextra.dataFor<INpmciOptions>('npmci', defaultConfig)
+  return npmciConfig
-    done.resolve(npmciConfig)
-    return done.promise
 }

ts/npmci.env.ts

@@ -1,58 +1,56 @@
 import * as plugins from './npmci.plugins'
 import * as paths from './npmci.paths'
-import {GitRepo} from 'smartstring'
+import { GitRepo } from 'smartstring'
-import {Dockerfile} from './npmci.build.docker'
+import { Dockerfile } from './npmci.build.docker'
 
 export let repo: GitRepo
-if (process.env.CI_BUILD_REPO) repo = new GitRepo(process.env.CI_BUILD_REPO)
+if (process.env.CI_REPOSITORY_URL) repo = new GitRepo(process.env.CI_REPOSITORY_URL)
 
 export let buildStage: string = process.env.CI_BUILD_STAGE
 
 // handling config between commands
 export let dockerRegistry: string // will be set by npmci.prepare
 export let setDockerRegistry = (dockerRegistryArg: string) => {
-    dockerRegistry = dockerRegistryArg
+  dockerRegistry = dockerRegistryArg
 }
 export let dockerFilesBuilt: Dockerfile[] = []
 export let dockerFiles: Dockerfile[] = []
 export let config = {
-    dockerRegistry: undefined, // this will be set later on store
+  dockerRegistry: undefined, // this will be set later on store
-    dockerFilesBuilt: dockerFilesBuilt,
+  dockerFilesBuilt: dockerFilesBuilt,
-    dockerFiles: dockerFiles,
+  dockerFiles: dockerFiles,
-    project: undefined
+  project: undefined
 }
 
 export let configStore = () => {
-    config.dockerRegistry = dockerRegistry
+  config.dockerRegistry = dockerRegistry
-    plugins.smartfile.memory.toFsSync(
+  plugins.smartfile.memory.toFsSync(
-        JSON.stringify(config),
+    JSON.stringify(config),
-        paths.NpmciPackageConfig
+    paths.NpmciPackageConfig
-    )
+  )
 }
 
 let configLoad = () => {
-    // internal config to transfer information in between npmci shell calls
+  // internal config to transfer information in between npmci shell calls
-    try {
+  try {
-        plugins.lodash.assign(config,plugins.smartfile.fs.toObjectSync(paths.NpmciPackageConfig,'json'))
+    plugins.lodash.assign(config, plugins.smartfile.fs.toObjectSync(paths.NpmciPackageConfig, 'json'))
-    }
+  } catch (err) {
-    catch (err) {
+    configStore()
-        configStore()
+    plugins.beautylog.log('config initialized!')
-        plugins.beautylog.log('config initialized!')
+  }
-    }
 
-    // project config
+  // project config
-    try {
+  try {
-        if (!config.project) {
+    if (!config.project) {
-            config.project = plugins.smartfile.fs.toObjectSync(paths.NpmciProjectDir,'npmci.json')
+      config.project = plugins.smartfile.fs.toObjectSync(paths.NpmciProjectDir, 'npmci.json')
-            plugins.beautylog.ok('project config found!')
+      plugins.beautylog.ok('project config found!')
-        };
-    }
-    catch (err) {
-        config.project = {}
-        plugins.beautylog.log('no project config found, so proceeding with default behaviour!')
     }
+  } catch (err) {
+    config.project = {}
+    plugins.beautylog.log('no project config found, so proceeding with default behaviour!')
+  }
 
-    config.dockerRegistry ? dockerRegistry = config.dockerRegistry : void(0)
+  config.dockerRegistry ? dockerRegistry = config.dockerRegistry : void (0)
-    config.dockerFilesBuilt ? dockerFilesBuilt = config.dockerFilesBuilt : void(0)
+  config.dockerFilesBuilt ? dockerFilesBuilt = config.dockerFilesBuilt : void (0)
 }
 configLoad()

ts/npmci.install.ts

@@ -1,9 +1,16 @@
 import * as plugins from './npmci.plugins'
 import * as configModule from './npmci.config'
-import { bash, bashNoError } from './npmci.bash'
+import {
-import { nvmAvailable } from './npmci.bash'
+  bash,
-export let install = (versionArg) => {
+  bashNoError,
-  let done = plugins.q.defer()
+  nvmAvailable,
+  yarnAvailable } from './npmci.bash'
+
+/**
+ * Install a specific version of node
+ * @param versionArg
+ */
+export let install = async (versionArg) => {
   plugins.beautylog.log(`now installing node version ${versionArg}`)
   let version: string
   if (versionArg === 'stable') {
@@ -15,31 +22,33 @@ export let install = (versionArg) => {
   } else {
     version = versionArg
   };
-  if (nvmAvailable) {
+  if (await nvmAvailable.promise) {
-    bash(`nvm install ${version} && nvm alias default ${version}`)
+    await bash(`nvm install ${version} && nvm alias default ${version}`)
     plugins.beautylog.success(`Node version ${version} successfully installed!`)
   } else {
     plugins.beautylog.warn('Nvm not in path so staying at installed node version!')
   };
-  bash('node -v')
+  await bash('node -v')
-  bash('npm -v')
+  await bash('npm -v')
   // lets look for further config
-  configModule.getConfig()
+  await configModule.getConfig()
-    .then(configArg => {
+    .then(async configArg => {
       plugins.beautylog.log('Now checking for needed global npm tools...')
       for (let npmTool of configArg.globalNpmTools) {
         plugins.beautylog.info(`Checking for global "${npmTool}"`)
-        let whichOutput = bashNoError(`which ${npmTool}`)
+        let whichOutput: string = await bashNoError(`which ${npmTool}`)
         let toolAvailable: boolean = !((/not\sfound/.test(whichOutput)) || whichOutput === '')
         if (toolAvailable) {
           plugins.beautylog.log(`Tool ${npmTool} is available`)
         } else {
           plugins.beautylog.info(`globally installing ${npmTool} from npm`)
-          bash(`npm install ${npmTool} -q -g`)
+          if (await yarnAvailable.promise) {
+            await bash(`yarn global add ${npmTool}`)
+          } else {
+            await bash(`npm install ${npmTool} -q -g`)
+          }
         }
       }
       plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!')
-      done.resolve()
     })
-  return done.promise
 }

ts/npmci.plugins.ts

@@ -5,12 +5,15 @@ export import lodash = require('lodash')
 export import npmextra = require('npmextra')
 export import path = require('path')
 export import projectinfo = require('projectinfo')
-export import q = require('q')
+export import q = require('smartq')
 export let request = require('request')
-export import shelljs = require('shelljs')
 export import smartcli = require('smartcli')
+export import smartdelay = require('smartdelay')
 export import smartfile = require('smartfile')
+export import shelljs = require('shelljs')
 export import smartparam = require('smartparam')
+export import smartq = require('smartq')
+export import smartshell = require('smartshell')
 export import smartsocket = require('smartsocket')
 export import smartssh = require('smartssh')
 export import smartstring = require('smartstring')

ts/npmci.prepare.ts

@@ -1,5 +1,5 @@
 import * as plugins from './npmci.plugins'
-import {bash} from './npmci.bash'
+import { bash } from './npmci.bash'
 import * as env from './npmci.env'
 import * as sshModule from './npmci.ssh'
 
@@ -9,85 +9,74 @@ import * as sshModule from './npmci.ssh'
 /**
  * defines possible prepare services
  */
-export type TPrepService = 'npm' | 'docker' | 'docker-gitlab' | 'ssh';
+export type TPrepService = 'npm' | 'docker' | 'docker-gitlab' | 'ssh'
 
 /**
  * authenticates npm with token from env var
  */
-let npm = function(){
+let npm = async () => {
-    let done = plugins.q.defer()
+  let npmrcPrefix: string = '//registry.npmjs.org/:_authToken='
-
+  let npmToken: string = process.env.NPMCI_TOKEN_NPM
-    let npmrcPrefix: string = '//registry.npmjs.org/:_authToken='
+  let npmrcFileString: string = npmrcPrefix + npmToken
-    let npmToken: string = process.env.NPMCI_TOKEN_NPM
+  if (npmToken) {
-    let npmrcFileString = npmrcPrefix + npmToken
+    plugins.beautylog.info('found access token')
-
+  } else {
-    if (npmToken) {
+    plugins.beautylog.error('no access token found! Exiting!')
-        plugins.beautylog.info('found access token')
+    process.exit(1)
-    } else {
+  }
-        plugins.beautylog.error('no access token found! Exiting!')
+  plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc')
-        process.exit(1)
+  return
-    }
-    plugins.smartfile.memory.toFsSync(npmrcFileString,'/root/.npmrc')
-    done.resolve()
-    return done.promise
 }
 
 /**
  * logs in docker
  */
-let docker = function(){
+let docker = async () => {
-    let done = plugins.q.defer()
+  env.setDockerRegistry('docker.io')
-    env.setDockerRegistry('docker.io')
+  let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/
-    let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/
+  if (!process.env.NPMCI_LOGIN_DOCKER) {
-    if (!process.env.NPMCI_LOGIN_DOCKER) {
+    plugins.beautylog.error('You have to specify Login Data to the Docker Registry')
-        plugins.beautylog.error('You have to specify Login Data to the Docker Registry')
+    process.exit(1)
-        process.exit(1)
+  }
-    }
+  plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com') // Always also login to GitLab Registry
-    plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com') // Always also login to GitLab Registry
+  let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER)
-    let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER)
+  let username = dockerRegexResultArray[1]
-    let username = dockerRegexResultArray[1]
+  let password = dockerRegexResultArray[2]
-    let password = dockerRegexResultArray[2]
+  await bash('docker login -u ' + username + ' -p ' + password)
-    plugins.shelljs.exec('docker login -u ' + username + ' -p ' + password)
+  return
-    done.resolve()
-    return done.promise
 }
 
 /**
  * prepare docker for gitlab registry
  */
-let dockerGitlab = function(){
+let dockerGitlab = async () => {
-    let done = plugins.q.defer()
+  env.setDockerRegistry('registry.gitlab.com')
-    env.setDockerRegistry('registry.gitlab.com')
+  plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com')
-    plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com')
+  return
-    done.resolve()
-    return done.promise
 }
 
 /**
  * prepare ssh
  */
-let ssh = function(){
+let ssh = async () => {
-    let done = plugins.q.defer()
+  await sshModule.ssh()
-    sshModule.ssh()
-        .then(done.resolve)
-    return done.promise
 }
 
 /**
  * the main exported prepare function
  * @param servieArg describes the service to prepare
  */
-export let prepare = function(serviceArg: TPrepService){
+export let prepare = async (serviceArg: TPrepService) => {
-    switch (serviceArg) {
+  switch (serviceArg) {
-        case 'npm':
+    case 'npm':
-            return npm()
+      return await npm()
-        case 'docker':
+    case 'docker':
-            return docker()
+      return await docker()
-        case 'docker-gitlab':
+    case 'docker-gitlab':
-            return dockerGitlab()
+      return await dockerGitlab()
-        case 'ssh':
+    case 'ssh':
-            return ssh()
+      return await ssh()
-        default:
+    default:
-            break
+      break
-    }
+  }
 }

ts/npmci.publish.ts

@@ -1,49 +1,46 @@
 import * as plugins from './npmci.plugins'
-import {prepare} from './npmci.prepare'
+import { prepare } from './npmci.prepare'
-import {bash} from './npmci.bash'
+import { bash } from './npmci.bash'
 import * as NpmciEnv from './npmci.env'
 import * as NpmciBuildDocker from './npmci.build.docker'
 
 /**
  * type of supported services
  */
-export type TPubService = 'npm' | 'docker';
+export type TPubService = 'npm' | 'docker'
 
 /**
  * the main exported publish function.
  * @param pubServiceArg references targeted service to publish to 
  */
-export let publish = (pubServiceArg: TPubService = 'npm') => {
+export let publish = async (pubServiceArg: TPubService = 'npm') => {
-    switch (pubServiceArg) {
+  switch (pubServiceArg) {
-        case 'npm':
+    case 'npm':
-            return publishNpm()
+      return await publishNpm()
-        case 'docker':
+    case 'docker':
-            return publishDocker()
+      return await publishDocker()
-    }
+  }
 }
 
 /**
  * tries to publish current cwd to NPM registry
  */
-let publishNpm  = function(){
+let publishNpm = async () => {
-    let done = plugins.q.defer()
+  await prepare('npm')
-    prepare('npm')
+    .then(async function () {
-        .then(function(){
+      await bash('npm publish')
-            bash('npm publish')
+      plugins.beautylog.ok('Done!')
-            plugins.beautylog.ok('Done!') 
+    })
-            done.resolve()
-        })
-   return done.promise
 }
 
 /**
  * tries to pubish current cwd to Docker registry
  */
-let publishDocker = function(){
+let publishDocker = async () => {
-    let done = plugins.q.defer()
+  return await NpmciBuildDocker.readDockerfiles()
-        NpmciBuildDocker.readDockerfiles()
+    .then(NpmciBuildDocker.pullDockerfileImages)
-        .then(NpmciBuildDocker.pullDockerfileImages)
+    .then(NpmciBuildDocker.pushDockerfiles)
-        .then(NpmciBuildDocker.pushDockerfiles)
+    .then(dockerfileArray => {
-        .then(done.resolve)
+      return dockerfileArray
-    return done.promise
+    })
 }

ts/npmci.servezone.ts

@@ -25,7 +25,7 @@ let smartsocketClientConstructorOptions = {
 /**
  * the main run function to submit a service to a servezone
  */
-export let run = (configArg) => {
+export let run = async (configArg) => {
     new plugins.smartsocket.SmartsocketClient(
         smartsocketClientConstructorOptions
     )

ts/npmci.ssh.ts

@@ -6,45 +6,43 @@ let sshInstance: plugins.smartssh.SshInstance
 /**
  * checks for ENV vars in form of NPMCI_SSHKEY_* and deploys any found ones
  */
-export let ssh = () => {
+export let ssh = async () => {
-    let done = plugins.q.defer()
+  sshInstance = new plugins.smartssh.SshInstance() // init ssh instance
-    sshInstance = new plugins.smartssh.SshInstance() // init ssh instance
+  plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_SSHKEY_*', evaluateSshEnv)
-    plugins.smartparam.forEachMinimatch(process.env,'NPMCI_SSHKEY_*',evaluateSshEnv)
+  if (!process.env.NPMTS_TEST) {
-    if (!process.env.NPMTS_TEST) {
+    sshInstance.writeToDisk()
-        sshInstance.writeToDisk()
+  } else {
-    } else {
+    plugins.beautylog.log('In test mode, so not storing SSH keys to disk!')
-        plugins.beautylog.log('In test mode, so not storing SSH keys to disk!')
+  };
-    };
-    done.resolve()
-    return done.promise
 }
 
 /**
  * gets called for each found SSH ENV Var and deploys it 
  */
-let evaluateSshEnv = (sshkeyEnvVarArg) => {
+let evaluateSshEnv = async (sshkeyEnvVarArg) => {
-    let resultArray = sshRegex.exec(sshkeyEnvVarArg)
+  let resultArray = sshRegex.exec(sshkeyEnvVarArg)
-    let sshKey = new plugins.smartssh.SshKey()
+  let sshKey = new plugins.smartssh.SshKey()
-    plugins.beautylog.info('Found SSH identity for ' + resultArray[1])
+  plugins.beautylog.info('Found SSH identity for ' + resultArray[1])
-    if (notUndefined(resultArray[1])) {
+  if (notUndefined(resultArray[1])) {
-        plugins.beautylog.log('---> host defined!')
+    plugins.beautylog.log('---> host defined!')
-        sshKey.host = resultArray[1]
+    sshKey.host = resultArray[1]
-    }
+  }
-    if (notUndefined(resultArray[2])) {
+  if (notUndefined(resultArray[2])) {
-        plugins.beautylog.log('---> privKey defined!')
+    plugins.beautylog.log('---> privKey defined!')
-        sshKey.privKeyBase64 = resultArray[2]
+    sshKey.privKeyBase64 = resultArray[2]
-    };
+  };
-    if (notUndefined(resultArray[3])) {
+  if (notUndefined(resultArray[3])) {
-        '---> pubKey defined!'
+    '---> pubKey defined!'
-        sshKey.pubKeyBase64 = resultArray[3]
+    sshKey.pubKeyBase64 = resultArray[3]
-    };
+  };
 
-    sshInstance.addKey(sshKey)
+  sshInstance.addKey(sshKey)
+  return
 }
 
 /**
  * checks if not undefined
  */
 let notUndefined = (stringArg: string) => {
-    return (stringArg && stringArg !== 'undefined' && stringArg !== '##')
+  return (stringArg && stringArg !== 'undefined' && stringArg !== '##')
 }

ts/npmci.test.ts

@@ -1,49 +1,36 @@
 import * as plugins from './npmci.plugins'
-import {bash} from './npmci.bash'
+import { bash, yarnAvailable } from './npmci.bash'
-import {install} from './npmci.install'
+import { install } from './npmci.install'
 import * as env from './npmci.env'
 import * as NpmciBuildDocker from './npmci.build.docker'
 
-export let test = (versionArg) => {
+export let test = async (versionArg): Promise<void> => {
-    let done = plugins.q.defer()
+  if (versionArg === 'docker') {
-    if (versionArg === 'docker') {
+    await testDocker()
-        testDocker()
+  } else {
-            .then(() => {
+    await install(versionArg)
-                done.resolve()
+      .then(npmDependencies)
-            })
+      .then(npmTest)
-    } else {
+  }
-        install(versionArg)
-            .then(npmDependencies)
-            .then(npmTest)
-            .then(() => {
-                done.resolve()
-            })
-    }
-    return done.promise
 }
 
-let npmDependencies = function(){
+let npmDependencies = async (): Promise<void> => {
-    let done = plugins.q.defer()
+  plugins.beautylog.info('now installing dependencies:')
-    plugins.beautylog.info('now installing dependencies:')
+  if (await yarnAvailable.promise) {
-    bash('npm install')
+    await bash('yarn upgrade')
-    done.resolve()
+  } else {
-    return done.promise
+    await bash('npm install')
+  }
 }
 
-let npmTest = () => {
+let npmTest = async (): Promise<void> => {
-    let done = plugins.q.defer()
+  plugins.beautylog.info('now starting tests:')
-    plugins.beautylog.info('now starting tests:')
+  await bash('npm test')
-    bash('npm test')
-    done.resolve()
-    return done.promise
 }
 
-let testDocker = function(){
+let testDocker = async (): Promise<NpmciBuildDocker.Dockerfile[]> => {
-    let done = plugins.q.defer()
+  return await NpmciBuildDocker.readDockerfiles()
-    NpmciBuildDocker.readDockerfiles()
+    .then(NpmciBuildDocker.pullDockerfileImages)
-        .then(NpmciBuildDocker.pullDockerfileImages)
+    .then(NpmciBuildDocker.testDockerfiles)
-        .then(NpmciBuildDocker.testDockerfiles)
-        .then(done.resolve)
-    return done.promise
 }
 

ts/npmci.trigger.ts

@@ -4,27 +4,24 @@ import { bash } from './npmci.bash'
 
 let triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/
 
-export let trigger = function () {
+export let trigger = async () => {
-    let done = plugins.q.defer()
+  plugins.beautylog.info('now running triggers')
-    plugins.beautylog.info('now running triggers')
+  plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger)
-    plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger)
-    done.resolve()
-    return done.promise
 }
 
-let evaluateTrigger = (triggerEnvVarArg) => {
+let evaluateTrigger = async (triggerEnvVarArg) => {
-    let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg)
+  let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg)
-    let regexDomain = triggerRegexResultArray[1]
+  let regexDomain = triggerRegexResultArray[1]
-    let regexProjectId = triggerRegexResultArray[2]
+  let regexProjectId = triggerRegexResultArray[2]
-    let regexProjectTriggerToken = triggerRegexResultArray[3]
+  let regexProjectTriggerToken = triggerRegexResultArray[3]
-    let regexRefName = triggerRegexResultArray[4]
+  let regexRefName = triggerRegexResultArray[4]
-    let regexTriggerName
+  let regexTriggerName
-    if (triggerRegexResultArray.length === 6) {
+  if (triggerRegexResultArray.length === 6) {
-        regexTriggerName = triggerRegexResultArray[5]
+    regexTriggerName = triggerRegexResultArray[5]
-    } else {
+  } else {
-        regexTriggerName = 'Unnamed Trigger'
+    regexTriggerName = 'Unnamed Trigger'
-    }
+  }
-    plugins.beautylog.info('Found Trigger!')
+  plugins.beautylog.info('Found Trigger!')
-    plugins.beautylog.log('triggering build for ref ' + regexRefName + ' of ' + regexTriggerName)
+  plugins.beautylog.log('triggering build for ref ' + regexRefName + ' of ' + regexTriggerName)
-    plugins.request.post('https://gitlab.com/api/v3/projects/' + regexProjectId + '/trigger/builds', { form: { token: regexProjectTriggerToken, ref: regexRefName } })
+  plugins.request.post('https://gitlab.com/api/v3/projects/' + regexProjectId + '/trigger/builds', { form: { token: regexProjectTriggerToken, ref: regexRefName } })
 }