2.3.64

Go fully async with shelljs to reduce processor strain

Closes #2

See merge request !2

.gitignore

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

.gitlab-ci.yml

@@ -8,14 +8,13 @@ stages:
 
 
 before_script:
-  - npm uninstall -g npmci
-  - npm install -g npmci
+  - npm install npmci -q -g
 
 testLTS:
   stage: test
   script:
     - npmci install lts
-    - npmci command npm install -g npmts
+    - npmci command npm install -g -q npmts
     - npmci test lts
   tags:
     - docker
@@ -24,7 +23,7 @@ testSTABLE:
   stage: test
   script:
     - npmci install stable
-    - npmci command npm install -g npmts
+    - npmci command npm install -g -q npmts
     - npmci test stable
   tags:
     - docker
@@ -33,7 +32,7 @@ testLEGACY:
   stage: test
   script:
     - npmci install legacy
-    - npmci command npm install -g npmts
+    - npmci command npm install -g -q npmts
     - npmci test legacy
   tags:
     - docker
@@ -58,12 +57,15 @@ trigger:
     - docker
 
 pages:
-  image: hosttoday/ht-docker-node:npmpage
   stage: page
   script:
+    - npmci test stable
+    - npmci command npm install -g -q npmpage
     - npmci command npmpage --host gitlab
   only:
     - tags
+  tags:
+    - docker
   artifacts:
     expire_in: 1 week
     paths:

dist/cli.js

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

dist/index.d.ts

@@ -1,4 +1,3 @@
-import "typings-global";
-export { build } from "./npmci.build";
-export { install } from "./npmci.install";
-export { publish } from "./npmci.publish";
+export { build } from './npmci.build';
+export { install } from './npmci.install';
+export { publish } from './npmci.publish';

dist/index.js

@@ -1,10 +1,9 @@
-#!/usr/bin/env node
 "use strict";
-require("typings-global");
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const paths = require("./npmci.paths");
 let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot);
-plugins.beautylog.log("npmci version: " + npmciInfo.version);
+plugins.beautylog.log('npmci version: ' + npmciInfo.version);
 const npmci_build_1 = require("./npmci.build");
 const npmci_clean_1 = require("./npmci.clean");
 const npmci_command_1 = require("./npmci.command");
@@ -23,59 +22,51 @@ exports.publish = npmci_publish_2.publish;
 let smartcli = new plugins.smartcli.Smartcli();
 smartcli.addVersion(npmciInfo.version);
 // build
-smartcli.addCommand({
-    commandName: "build"
-}).then((argv) => {
+smartcli.addCommand('build')
+    .then((argv) => {
     npmci_build_1.build(argv._[1])
         .then(NpmciEnv.configStore);
 });
 // clean
-smartcli.addCommand({
-    commandName: "clean"
-}).then((argv) => {
+smartcli.addCommand('clean')
+    .then((argv) => {
     npmci_clean_1.clean()
         .then(NpmciEnv.configStore);
 });
 // command
-smartcli.addCommand({
-    commandName: "command"
-}).then((argv) => {
+smartcli.addCommand('command')
+    .then((argv) => {
     npmci_command_1.command()
         .then(NpmciEnv.configStore);
 });
 // install
-smartcli.addCommand({
-    commandName: "install"
-}).then((argv) => {
+smartcli.addCommand('install')
+    .then((argv) => {
     npmci_install_1.install(argv._[1])
         .then(NpmciEnv.configStore);
 });
 // prepare
-smartcli.addCommand({
-    commandName: "prepare"
-}).then((argv) => {
+smartcli.addCommand('prepare')
+    .then((argv) => {
     npmci_prepare_1.prepare(argv._[1])
         .then(NpmciEnv.configStore);
 });
 // publish
-smartcli.addCommand({
-    commandName: "publish"
-}).then((argv) => {
+smartcli.addCommand('publish')
+    .then((argv) => {
     npmci_publish_1.publish(argv._[1])
         .then(NpmciEnv.configStore);
 });
 // test
-smartcli.addCommand({
-    commandName: "test"
-}).then((argv) => {
+smartcli.addCommand('test')
+    .then((argv) => {
     npmci_test_1.test(argv._[1])
         .then(NpmciEnv.configStore);
 });
 // trigger
-smartcli.addCommand({
-    commandName: "trigger"
-}).then((argv) => {
+smartcli.addCommand('trigger')
+    .then((argv) => {
     npmci_trigger_1.trigger();
 });
 smartcli.startParse();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLE1BQVksS0FBSyxXQUFNLGVBQWUsQ0FBQyxDQUFBO0FBQ3ZDLElBQUksU0FBUyxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFDL0UsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRTdELDhCQUFvQixlQUNwQixDQUFDLENBRGtDO0FBQ25DLDhCQUFvQixlQUFlLENBQUMsQ0FBQTtBQUNwQyxnQ0FBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUN4QyxnQ0FBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUN4QyxnQ0FBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUN4QyxnQ0FBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUN4Qyw2QkFBbUIsY0FBYyxDQUFDLENBQUE7QUFDbEMsZ0NBQXNCLGlCQUFpQixDQUFDLENBQUE7QUFDeEMsTUFBWSxRQUFRLFdBQU0sYUFBYSxDQUFDLENBQUE7QUFFeEMsNEJBQW9CLGVBQ3BCLENBQUM7QUFETyxvQ0FBMkI7QUFDbkMsOEJBQXNCLGlCQUFpQixDQUFDO0FBQWhDLDBDQUFnQztBQUN4Qyw4QkFBc0IsaUJBQWlCLENBQUM7QUFBaEMsMENBQWdDO0FBR3hDLElBQUksUUFBUSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUMvQyxRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUV2QyxRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUMsT0FBTztDQUN0QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULG1CQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNYLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDcEMsQ0FBQyxDQUFDLENBQUM7QUFFSCxRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUMsT0FBTztDQUN0QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULG1CQUFLLEVBQUU7U0FDRixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQ3BDLENBQUMsQ0FBQyxDQUFDO0FBRUgsVUFBVTtBQUNWLFFBQVEsQ0FBQyxVQUFVLENBQUM7SUFDaEIsV0FBVyxFQUFDLFNBQVM7Q0FDeEIsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCx1QkFBTyxFQUFFO1NBQ0osSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUMsQ0FBQztBQUVILFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBQyxTQUFTO0NBQ3hCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUMsQ0FBQztBQUVILFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBQyxTQUFTO0NBQ3hCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUMsQ0FBQztBQUVILFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBQyxTQUFTO0NBQ3hCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUMsQ0FBQztBQUVILE9BQU87QUFDUCxRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBQyxNQUFNO0NBQ3JCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsaUJBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ1YsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUMsQ0FBQztBQUVILFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBQyxTQUFTO0NBQ3hCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sRUFBRSxDQUFDO0FBQ2QsQ0FBQyxDQUFDLENBQUM7QUFFSCxRQUFRLENBQUMsVUFBVSxFQUFFLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFDdEMsSUFBSSxTQUFTLEdBQUcsSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtBQUM5RSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUE7QUFFNUQsK0NBQXFDO0FBQ3JDLCtDQUFxQztBQUNyQyxtREFBeUM7QUFDekMsbURBQXlDO0FBQ3pDLG1EQUF5QztBQUN6QyxtREFBeUM7QUFDekMsNkNBQW1DO0FBQ25DLG1EQUF5QztBQUN6Qyx3Q0FBdUM7QUFFdkMsNkNBQXFDO0FBQTVCLDhCQUFBLEtBQUssQ0FBQTtBQUNkLGlEQUEwQztBQUFqQyxrQ0FBQSxPQUFPLENBQUE7QUFDaEIsaURBQTBDO0FBQWpDLGtDQUFBLE9BQU8sQ0FBQTtBQUVoQixJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUE7QUFDOUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUE7QUFFdEMsUUFBUTtBQUNSLFFBQVEsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDO0tBQ3pCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCxtQkFBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFFLENBQUM7U0FDZixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQy9CLENBQUMsQ0FBQyxDQUFBO0FBRUosUUFBUTtBQUNSLFFBQVEsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDO0tBQ3pCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCxtQkFBSyxFQUFFO1NBQ0osSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUMsQ0FBQTtBQUVKLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztLQUMzQixJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sRUFBRTtTQUNOLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7S0FDM0IsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBRSxDQUFDLENBQUUsQ0FBQztTQUNqQixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQy9CLENBQUMsQ0FBQyxDQUFBO0FBRUosVUFBVTtBQUNWLFFBQVEsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO0tBQzNCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCx1QkFBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFFLENBQUM7U0FDakIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUMsQ0FBQTtBQUVKLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztLQUMzQixJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFFLENBQUMsQ0FBRSxDQUFDO1NBQ2pCLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixPQUFPO0FBQ1AsUUFBUSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUM7S0FDeEIsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULGlCQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBRSxDQUFDLENBQUUsQ0FBQztTQUNkLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7S0FDM0IsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLEVBQUUsQ0FBQTtBQUNYLENBQUMsQ0FBQyxDQUFBO0FBRUosUUFBUSxDQUFDLFVBQVUsRUFBRSxDQUFBIn0=

dist/npmci.bash.d.ts

@@ -1,4 +1,16 @@
-import "typings-global";
-export declare let nvmAvailable: boolean;
-export declare let bash: (commandArg: string, retryArg?: number, bareArg?: boolean) => string;
-export declare let bashBare: (commandArg: any, retryArg?: number) => string;
+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) => Promise<string>;
+/**
+ * bashNoError allows executing stuff without throwing an error
+ */
+export declare let bashNoError: (commandArg: string) => Promise<string>;

dist/npmci.bash.js

@@ -1,52 +1,107 @@
 "use strict";
-require("typings-global");
-const plugins = require("./npmci.plugins");
-let nvmSourceString = "";
-exports.nvmAvailable = false;
-let checkNvm = () => {
-    if (plugins.shelljs.exec(`bash -c "source /usr/local/nvm/nvm.sh"`, { silent: true }).code === 0) {
-        nvmSourceString = `source /usr/local/nvm/nvm.sh && `;
-        exports.nvmAvailable = true;
-    }
-    else if (plugins.shelljs.exec(`bash -c "source ~/.nvm/nvm.sh"`, { silent: true }).code === 0) {
-        nvmSourceString = `source ~/.nvm/nvm.sh && `;
-        exports.nvmAvailable = true;
-    }
-    ;
+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());
+    });
 };
-checkNvm();
-exports.bash = (commandArg, retryArg = 2, bareArg = false) => {
-    let exitCode;
-    let stdOut;
+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) => __awaiter(this, void 0, void 0, function* () {
+    yield exports.nvmAvailable.promise; // make sure nvm check has run
     let execResult;
+    // determine if we fail
+    let failOnError = true;
+    if (retryArg === -1) {
+        failOnError = false;
+        retryArg = 0;
+    }
     if (!process.env.NPMTS_TEST) {
         for (let i = 0; i <= retryArg; i++) {
-            if (!bareArg) {
-                execResult = plugins.shelljs.exec(`bash -c "${nvmSourceString} ${commandArg}"`);
+            if (process.env.DEBUG_NPMCI === 'true') {
+                console.log(commandArg);
+            }
+            execResult = yield npmciSmartshell.exec(commandArg);
+            // determine how bash reacts to error and success
+            if (execResult.exitCode !== 0 && i === retryArg) {
+                if (failOnError) {
+                    plugins.beautylog.error('something went wrong and retries are exhausted');
+                    process.exit(1);
+                }
+            }
+            else if (execResult.exitCode === 0) {
+                i = retryArg + 1; // retry +1 breaks for loop, if everything works out ok retrials are not wanted
             }
             else {
-                execResult = plugins.shelljs.exec(commandArg);
-            }
-            exitCode = execResult.code;
-            stdOut = execResult.stdout;
-            if (exitCode !== 0 && i == retryArg) {
-                process.exit(1);
-            }
-            else if (exitCode == 0) {
-                i = retryArg + 1; // if everything works out ok retrials are not wanted
-            }
-            else {
-                plugins.beautylog.warn("Something went wrong! Exit Code: " + exitCode.toString());
-                plugins.beautylog.info("Retry " + (i + 1).toString() + " of " + retryArg.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);
+        plugins.beautylog.log('ShellExec would be: ' + commandArg);
+        yield plugins.smartdelay.delayFor(100);
+        execResult = {
+            exitCode: 0,
+            stdout: 'testOutput'
+        };
     }
-    return stdOut;
-};
-exports.bashBare = (commandArg, retryArg = 2) => {
-    return exports.bash(commandArg, retryArg, true);
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBRzNDLElBQUksZUFBZSxHQUFXLEVBQUUsQ0FBQztBQUN0QixvQkFBWSxHQUFZLEtBQUssQ0FBQztBQUN6QyxJQUFJLFFBQVEsR0FBRztJQUNYLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHdDQUF3QyxFQUFDLEVBQUMsTUFBTSxFQUFDLElBQUksRUFBQyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDMUYsZUFBZSxHQUFHLGtDQUFrQyxDQUFBO1FBQ3BELG9CQUFZLEdBQUcsSUFBSSxDQUFDO0lBQ3hCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLEVBQUMsRUFBQyxNQUFNLEVBQUMsSUFBSSxFQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN6RixlQUFlLEdBQUcsMEJBQTBCLENBQUE7UUFDNUMsb0JBQVksR0FBRyxJQUFJLENBQUM7SUFDeEIsQ0FBQztJQUFBLENBQUM7QUFDTixDQUFDLENBQUM7QUFDRixRQUFRLEVBQUUsQ0FBQztBQUVBLFlBQUksR0FBRyxDQUFDLFVBQWtCLEVBQUUsUUFBUSxHQUFHLENBQUMsRUFBRSxPQUFPLEdBQUcsS0FBSztJQUNoRSxJQUFJLFFBQWdCLENBQUM7SUFDckIsSUFBSSxNQUFjLENBQUM7SUFDbkIsSUFBSSxVQUFVLENBQUM7SUFDZixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUMxQixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLFFBQVEsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ2pDLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztnQkFDWCxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQzdCLFlBQVksZUFBZSxJQUFJLFVBQVUsR0FBRyxDQUMvQyxDQUFDO1lBQ04sQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLFVBQVUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNsRCxDQUFDO1lBQ0QsUUFBUSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7WUFDM0IsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUM7WUFDM0IsRUFBRSxDQUFDLENBQUMsUUFBUSxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDbEMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNwQixDQUFDO1lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUN2QixDQUFDLEdBQUcsUUFBUSxHQUFHLENBQUMsQ0FBQyxDQUFDLHFEQUFxRDtZQUMzRSxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsbUNBQW1DLEdBQUcsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7Z0JBQ2xGLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsR0FBRyxNQUFNLEdBQUcsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDekYsQ0FBQztRQUNMLENBQUM7SUFDTCxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsR0FBRyxVQUFVLENBQUMsQ0FBQTtJQUM5RCxDQUFDO0lBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQztBQUNsQixDQUFDLENBQUE7QUFFVSxnQkFBUSxHQUFHLENBQUMsVUFBVSxFQUFFLFFBQVEsR0FBRyxDQUFDO0lBQzNDLE1BQU0sQ0FBQyxZQUFJLENBQUMsVUFBVSxFQUFFLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQztBQUM1QyxDQUFDLENBQUEifQ==
+    return execResult.stdout;
+});
+/**
+ * bashNoError allows executing stuff without throwing an error
+ */
+exports.bashNoError = (commandArg) => __awaiter(this, void 0, void 0, function* () {
+    return yield exports.bash(commandArg, -1);
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFFdEMsaUNBQWdDO0FBRWhDOztHQUVHO0FBQ1EsUUFBQSxZQUFZLEdBQUcsTUFBTSxDQUFDLEtBQUssRUFBVyxDQUFBO0FBQ3RDLFFBQUEsYUFBYSxHQUFHLE1BQU0sQ0FBQyxLQUFLLEVBQVcsQ0FBQTtBQUNsRDs7R0FFRztBQUNILElBQUksZUFBZSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7SUFDdEQsUUFBUSxFQUFFLE1BQU07SUFDaEIsZUFBZSxFQUFFLEVBQUU7Q0FDcEIsQ0FBQyxDQUFBO0FBRUY7O0dBRUc7QUFDSCxJQUFJLG1CQUFtQixHQUFHO0lBQ3hCLGdCQUFnQjtJQUNoQixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1QixFQUFFLENBQUMsQ0FDRCxDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsd0NBQXdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUMvRixDQUFDLENBQUMsQ0FBQztZQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBRSx1QkFBdUIsQ0FBRSxDQUFDLENBQUE7WUFDM0Qsb0JBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDNUIsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FDUixDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsZ0NBQWdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUN2RixDQUFDLENBQUMsQ0FBQztZQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBRSxlQUFlLENBQUUsQ0FBQyxDQUFBO1lBQ25ELG9CQUFZ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

dist/npmci.build.d.ts

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

dist/npmci.build.docker.d.ts

@@ -1,21 +1,52 @@
-/// <reference types="q" />
 /// <reference types="node" />
-import * as plugins from "./npmci.plugins";
-export declare let build: () => plugins.q.Promise<{}>;
-export declare let readDockerfiles: () => plugins.q.Promise<{}>;
-export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
-export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => plugins.q.Promise<{}>;
-export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
-export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
-export declare let pullDockerfileImages: (sortableArrayArg: Dockerfile[], registryArg?: string) => plugins.q.Promise<{}>;
-export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
+/**
+ * builds a cwd of Dockerfiles by triggering a promisechain
+ */
+export declare let build: () => Promise<void>;
+/**
+ * creates instance of class Dockerfile for all Dockerfiles in cwd
+ * @returns 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[]) => Promise<Dockerfile[]>;
+/**
+ * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
+ */
+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[]) => Promise<Dockerfile[]>;
+/**
+ * pushes the real Dockerfile images to a Docker registry
+ */
+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) => 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[]) => Promise<Dockerfile[]>;
+/**
+ * class Dockerfile represents a Dockerfile on disk in npmci
+ */
 export declare class Dockerfile {
     filePath: string;
     repo: string;
     version: string;
     cleanTag: string;
     buildTag: string;
-    testTag: string;
+    gitlabTestTag: string;
+    gitlabReleaseTag: string;
     releaseTag: string;
     containerName: string;
     content: string;
@@ -27,13 +58,41 @@ export declare class Dockerfile {
         fileContents?: string | Buffer;
         read?: boolean;
     });
-    build(): plugins.q.Promise<{}>;
-    push(stageArg: any): plugins.q.Promise<{}>;
-    pull(registryArg: string): void;
-    test(): void;
-    getId(): string;
+    /**
+     * builds the Dockerfile
+     */
+    build(): Promise<void>;
+    /**
+     * pushes the Dockerfile to a registry
+     */
+    push(stageArg: any): Promise<void>;
+    /**
+     * pulls the Dockerfile from a registry
+     */
+    pull(registryArg: string): Promise<void>;
+    /**
+     * tests the Dockerfile;
+     */
+    test(): Promise<void>;
+    /**
+     * gets the id of a Dockerfile
+     */
+    getId(): Promise<string>;
 }
+/**
+ * returns a version for a docker file
+ * @execution SYNC
+ */
 export declare let dockerFileVersion: (dockerfileNameArg: string) => string;
+/**
+ *
+ */
 export declare let dockerBaseImage: (dockerfileContentArg: string) => string;
+/**
+ *
+ */
 export declare let dockerTag: (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string) => string;
+/**
+ *
+ */
 export declare let cleanTagsArrayFunction: (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]) => string[];

dist/npmci.build.js

@@ -1,13 +1,27 @@
 "use strict";
-require("typings-global");
+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");
-exports.build = function (commandArg) {
+/**
+ * builds for a specific service
+ */
+exports.build = (commandArg) => __awaiter(this, void 0, void 0, function* () {
     switch (commandArg) {
-        case "docker":
-            return buildDocker.build();
+        case 'docker':
+            yield buildDocker.build();
+            break;
         default:
-            plugins.beautylog.log("build target " + commandArg + " not recognised!");
+            plugins.beautylog.log('build target ' + commandArg + ' not recognised!');
     }
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5idWlsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLE1BQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFHM0MsTUFBWSxXQUFXLFdBQU0sc0JBRTdCLENBQUMsQ0FGa0Q7QUFFeEMsYUFBSyxHQUFHLFVBQVMsVUFBVTtJQUNsQyxNQUFNLENBQUEsQ0FBQyxVQUFVLENBQUMsQ0FBQSxDQUFDO1FBQ2YsS0FBSyxRQUFRO1lBQ1QsTUFBTSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUMvQjtZQUNJLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLGVBQWUsR0FBRyxVQUFVLEdBQUcsa0JBQWtCLENBQUMsQ0FBQztJQUNqRixDQUFDO0FBQ0wsQ0FBQyxDQUFBIn0=
+    ;
+    return;
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5idWlsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsMkNBQTBDO0FBRzFDLG9EQUFtRDtBQU9uRDs7R0FFRztBQUNRLFFBQUEsS0FBSyxHQUFHLENBQU8sVUFBVTtJQUNsQyxNQUFNLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1FBQ25CLEtBQUssUUFBUTtZQUNYLE1BQU0sV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFBO1lBQ3pCLEtBQUssQ0FBQTtRQUNQO1lBQ0UsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZUFBZSxHQUFHLFVBQVUsR0FBRyxrQkFBa0IsQ0FBQyxDQUFBO0lBQzVFLENBQUM7SUFBQSxDQUFDO0lBQ0YsTUFBTSxDQUFBO0FBQ1IsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.clean.d.ts

@@ -1,7 +1,4 @@
-/// <reference types="q" />
-import "typings-global";
-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,14 +1,20 @@
 "use strict";
-require("typings-global");
+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 = () => {
-    let done = plugins.q.defer();
+exports.clean = () => __awaiter(this, void 0, void 0, function* () {
     plugins.smartfile.fs.removeSync(paths.NpmciPackageConfig);
-    done.resolve();
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY2xlYW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5jbGVhbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLE1BQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFDM0MsTUFBWSxLQUFLLFdBQU0sZUFLdkIsQ0FBQyxDQUxxQztBQUV0Qzs7R0FFRztBQUNRLGFBQUssR0FBRztJQUNmLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQzFELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQyJ9
+    return;
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY2xlYW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5jbGVhbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsMkNBQTBDO0FBQzFDLHVDQUFzQztBQUV0Qzs7R0FFRztBQUNRLFFBQUEsS0FBSyxHQUFHO0lBQ2pCLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsa0JBQWtCLENBQUMsQ0FBQTtJQUN6RCxNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQSJ9

dist/npmci.command.d.ts

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

dist/npmci.command.js

@@ -1,18 +1,24 @@
 "use strict";
-require("typings-global");
-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 = () => {
-    let done = plugins.q.defer();
-    let wrappedCommand = "";
+exports.command = () => __awaiter(this, void 0, void 0, function* () {
+    let wrappedCommand = '';
     let argvArray = process.argv;
     for (let i = 3; i < argvArray.length; i++) {
         wrappedCommand = wrappedCommand + argvArray[i];
-        if (i + 1 != argvArray.length)
-            wrappedCommand = wrappedCommand + " ";
+        if (i + 1 !== argvArray.length) {
+            wrappedCommand = wrappedCommand + ' ';
+        }
     }
-    npmci_bash_1.bash(wrappedCommand);
-    done.resolve();
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDZCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUV2QixlQUFPLEdBQUc7SUFDakIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixJQUFJLGNBQWMsR0FBVSxFQUFFLENBQUM7SUFDL0IsSUFBSSxTQUFTLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztJQUM3QixHQUFHLENBQUEsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUMsQ0FBQztRQUN0QyxjQUFjLEdBQUcsY0FBYyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMvQyxFQUFFLENBQUEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLFNBQVMsQ0FBQyxNQUFNLENBQUM7WUFBQyxjQUFjLEdBQUcsY0FBYyxHQUFHLEdBQUcsQ0FBQztJQUN4RSxDQUFDO0lBQ0QsaUJBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUNyQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUEifQ==
+    yield npmci_bash_1.bash(wrappedCommand);
+    return;
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUNBLDZDQUFtQztBQUV4QixRQUFBLE9BQU8sR0FBRztJQUNuQixJQUFJLGNBQWMsR0FBVyxFQUFFLENBQUE7SUFDL0IsSUFBSSxTQUFTLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQTtJQUM1QixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUMxQyxjQUFjLEdBQUcsY0FBYyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM5QyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQUMsY0FBYyxHQUFHLGNBQWMsR0FBRyxHQUFHLENBQUE7UUFBQyxDQUFDO0lBQzNFLENBQUM7SUFDRCxNQUFNLGlCQUFJLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDMUIsTUFBTSxDQUFBO0FBQ1IsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.config.d.ts

@@ -0,0 +1,4 @@
+export interface INpmciOptions {
+    globalNpmTools: string[];
+}
+export declare let getConfig: () => Promise<INpmciOptions>;

dist/npmci.config.js

@@ -0,0 +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 paths = require("./npmci.paths");
+exports.getConfig = () => __awaiter(this, void 0, void 0, function* () {
+    let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
+    let defaultConfig = {
+        globalNpmTools: []
+    };
+    let npmciConfig = npmciNpmextra.dataFor('npmci', defaultConfig);
+    return npmciConfig;
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFFQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBTTNCLFFBQUEsU0FBUyxHQUFHO0lBQ3JCLElBQUksYUFBYSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzVELElBQUksYUFBYSxHQUFrQjtRQUNqQyxjQUFjLEVBQUUsRUFBRTtLQUNuQixDQUFBO0lBQ0QsSUFBSSxXQUFXLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBZ0IsT0FBTyxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQzlFLE1BQU0sQ0FBQyxXQUFXLENBQUE7QUFDcEIsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.env.d.ts

@@ -1,6 +1,5 @@
-import "typings-global";
-import { GitRepo } from "smartstring";
-import { Dockerfile } from "./npmci.build.docker";
+import { GitRepo } from 'smartstring';
+import { Dockerfile } from './npmci.build.docker';
 export declare let repo: GitRepo;
 export declare let buildStage: string;
 export declare let dockerRegistry: string;

dist/npmci.env.js

@@ -1,5 +1,5 @@
 "use strict";
-require("typings-global");
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const paths = require("./npmci.paths");
 const smartstring_1 = require("smartstring");
@@ -24,26 +24,26 @@ exports.configStore = () => {
 let configLoad = () => {
     // internal config to transfer information in between npmci shell calls
     try {
-        plugins.lodash.assign(exports.config, plugins.smartfile.fs.toObjectSync(paths.NpmciPackageConfig, "json"));
+        plugins.lodash.assign(exports.config, plugins.smartfile.fs.toObjectSync(paths.NpmciPackageConfig, 'json'));
     }
     catch (err) {
         exports.configStore();
-        plugins.beautylog.log("config initialized!");
+        plugins.beautylog.log('config initialized!');
     }
     // project config
     try {
         if (!exports.config.project) {
-            exports.config.project = plugins.smartfile.fs.toObjectSync(paths.NpmciProjectDir, "npmci.json");
-            plugins.beautylog.ok("project config found!");
+            exports.config.project = plugins.smartfile.fs.toObjectSync(paths.NpmciProjectDir, 'npmci.json');
+            plugins.beautylog.ok('project config found!');
         }
         ;
     }
     catch (err) {
         exports.config.project = {};
-        plugins.beautylog.log("no project config found, so proceeding with default behaviour!");
+        plugins.beautylog.log('no project config found, so proceeding with default behaviour!');
     }
     exports.config.dockerRegistry ? exports.dockerRegistry = exports.config.dockerRegistry : void (0);
     exports.config.dockerFilesBuilt ? exports.dockerFilesBuilt = exports.config.dockerFilesBuilt : void (0);
 };
 configLoad();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsTUFBWSxPQUFPLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUMzQyxNQUFZLEtBQUssV0FBTSxlQUFlLENBQUMsQ0FBQTtBQUN2Qyw4QkFBc0IsYUFBYSxDQUFDLENBQUE7QUFJcEMsRUFBRSxDQUFBLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUM7SUFBQyxZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFFakUsa0JBQVUsR0FBVSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQztBQUkvQyx5QkFBaUIsR0FBRyxDQUFDLGlCQUF3QjtJQUNwRCxzQkFBYyxHQUFHLGlCQUFpQixDQUFDO0FBQ3ZDLENBQUMsQ0FBQTtBQUNVLHdCQUFnQixHQUFnQixFQUFFLENBQUM7QUFDbkMsbUJBQVcsR0FBZ0IsRUFBRSxDQUFDO0FBQzlCLGNBQU0sR0FBRztJQUNoQixjQUFjLEVBQUUsU0FBUztJQUN6QixnQkFBZ0IsRUFBRSx3QkFBZ0I7SUFDbEMsV0FBVyxFQUFFLG1CQUFXO0lBQ3hCLE9BQU8sRUFBRSxTQUFTO0NBQ3JCLENBQUM7QUFFUyxtQkFBVyxHQUFHO0lBQ3JCLGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsQ0FBQztJQUN2QyxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQzdCLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBTSxDQUFDLEVBQ3RCLEtBQUssQ0FBQyxrQkFBa0IsQ0FDM0IsQ0FBQztBQUNOLENBQUMsQ0FBQTtBQUVELElBQUksVUFBVSxHQUFHO0lBQ2IsdUVBQXVFO0lBQ3ZFLElBQUksQ0FBQztRQUNELE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLGNBQU0sRUFBQyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLGtCQUFrQixFQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFDckcsQ0FDQTtJQUFBLEtBQUssQ0FBQSxDQUFDLEdBQUcsQ0FBQyxDQUFBLENBQUM7UUFDUCxtQkFBVyxFQUFFLENBQUM7UUFDZCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxpQkFBaUI7SUFDakIsSUFBSSxDQUFDO1FBQ0QsRUFBRSxDQUFBLENBQUMsQ0FBQyxjQUFNLENBQUMsT0FBTyxDQUFDLENBQUEsQ0FBQztZQUNoQixjQUFNLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsZUFBZSxFQUFDLFlBQVksQ0FBQyxDQUFDO1lBQ3ZGLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLHVCQUF1QixDQUFDLENBQUM7UUFDbEQsQ0FBQztRQUFBLENBQUM7SUFDTixDQUNBO0lBQUEsS0FBSyxDQUFBLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQztRQUNQLGNBQU0sQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1FBQ3BCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLGdFQUFnRSxDQUFDLENBQUM7SUFDNUYsQ0FBQztJQUVELGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsR0FBRyxjQUFNLENBQUMsY0FBYyxHQUFHLEtBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN6RSxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsd0JBQWdCLEdBQUcsY0FBTSxDQUFDLGdCQUFnQixHQUFHLEtBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNuRixDQUFDLENBQUE7QUFDRCxVQUFVLEVBQUUsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMkNBQTBDO0FBQzFDLHVDQUFzQztBQUN0Qyw2Q0FBcUM7QUFJckMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUM7SUFBQyxZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUE7QUFFakUsUUFBQSxVQUFVLEdBQVcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUE7QUFJL0MsUUFBQSxpQkFBaUIsR0FBRyxDQUFDLGlCQUF5QjtJQUN2RCxzQkFBYyxHQUFHLGlCQUFpQixDQUFBO0FBQ3BDLENBQUMsQ0FBQTtBQUNVLFFBQUEsZ0JBQWdCLEdBQWlCLEVBQUUsQ0FBQTtBQUNuQyxRQUFBLFdBQVcsR0FBaUIsRUFBRSxDQUFBO0FBQzlCLFFBQUEsTUFBTSxHQUFHO0lBQ2xCLGNBQWMsRUFBRSxTQUFTO0lBQ3pCLGdCQUFnQixFQUFFLHdCQUFnQjtJQUNsQyxXQUFXLEVBQUUsbUJBQVc7SUFDeEIsT0FBTyxFQUFFLFNBQVM7Q0FDbkIsQ0FBQTtBQUVVLFFBQUEsV0FBVyxHQUFHO0lBQ3ZCLGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsQ0FBQTtJQUN0QyxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQy9CLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBTSxDQUFDLEVBQ3RCLEtBQUssQ0FBQyxrQkFBa0IsQ0FDekIsQ0FBQTtBQUNILENBQUMsQ0FBQTtBQUVELElBQUksVUFBVSxHQUFHO0lBQ2YsdUVBQXVFO0lBQ3ZFLElBQUksQ0FBQztRQUNILE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLGNBQU0sRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUE7SUFDcEcsQ0FBQztJQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDYixtQkFBVyxFQUFFLENBQUE7UUFDYixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0lBQzlDLENBQUM7SUFFRCxpQkFBaUI7SUFDakIsSUFBSSxDQUFDO1FBQ0gsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztZQUNwQixjQUFNLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsZUFBZSxFQUFFLFlBQVksQ0FBQyxDQUFBO1lBQ3ZGLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLHVCQUF1QixDQUFDLENBQUE7UUFDL0MsQ0FBQztRQUFBLENBQUM7SUFDSixDQUFDO0lBQ0QsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNYLGNBQU0sQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFBO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLGdFQUFnRSxDQUFDLENBQUE7SUFDekYsQ0FBQztJQUVELGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsR0FBRyxjQUFNLENBQUMsY0FBYyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6RSxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsd0JBQWdCLEdBQUcsY0FBTSxDQUFDLGdCQUFnQixHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqRixDQUFDLENBQUE7QUFDRCxVQUFVLEVBQUUsQ0FBQSJ9

dist/npmci.install.d.ts

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

dist/npmci.install.js

@@ -1,36 +1,68 @@
 "use strict";
-require("typings-global");
+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) => {
-    let done = plugins.q.defer();
+/**
+ * Install a specific version of node
+ * @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") {
-        version = "6.3.0";
+    if (versionArg === 'stable') {
+        version = 'stable';
     }
-    else if (versionArg == "lts") {
-        version = "6.3.0";
+    else if (versionArg === 'lts') {
+        version = '6';
     }
-    else if (versionArg == "legacy") {
-        version = "6.3.0";
+    else if (versionArg === 'legacy') {
+        version = '6';
     }
     else {
         version = versionArg;
     }
     ;
-    if (npmci_bash_2.nvmAvailable) {
-        npmci_bash_1.bash(`nvm install ${version} && nvm alias default ${version}`);
+    if (yield npmci_bash_1.nvmAvailable.promise) {
+        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!");
+        plugins.beautylog.warn('Nvm not in path so staying at installed node version!');
     }
     ;
-    npmci_bash_1.bash("node -v");
-    npmci_bash_1.bash("npm -v");
-    done.resolve();
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDZCQUFxQixjQUFjLENBQUMsQ0FBQTtBQUNwQyw2QkFBNkIsY0FFN0IsQ0FBQyxDQUYwQztBQUVoQyxlQUFPLEdBQUcsQ0FBQyxVQUFVO0lBQzVCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsK0JBQStCLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDbkUsSUFBSSxPQUFlLENBQUM7SUFDcEIsRUFBRSxDQUFDLENBQUMsVUFBVSxJQUFJLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDekIsT0FBTyxHQUFHLE9BQU8sQ0FBQztJQUN0QixDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsSUFBSSxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQzdCLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDdEIsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxVQUFVLElBQUksUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNoQyxPQUFPLEdBQUcsT0FBTyxDQUFBO0lBQ3JCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE9BQU8sR0FBRyxVQUFVLENBQUM7SUFDekIsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyx5QkFBWSxDQUFDLENBQUMsQ0FBQztRQUNmLGlCQUFJLENBQUMsZUFBZSxPQUFPLHlCQUF5QixPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBQzlELE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLGdCQUFnQixPQUFPLDBCQUEwQixDQUFDLENBQUM7SUFDakYsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdURBQXVELENBQUMsQ0FBQztJQUNwRixDQUFDO0lBQUEsQ0FBQztJQUNGLGlCQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDaEIsaUJBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNmLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQSJ9
+    yield npmci_bash_1.bash('node -v');
+    yield npmci_bash_1.bash('npm -v');
+    // lets look for further config
+    yield configModule.getConfig()
+        .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 = 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`);
+                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!');
+    }));
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQywrQ0FBOEM7QUFDOUMsNkNBSXFDO0FBRXJDOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLENBQU8sVUFBVTtJQUNwQyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsVUFBVSxFQUFFLENBQUMsQ0FBQTtJQUNsRSxJQUFJLE9BQWUsQ0FBQTtJQUNuQixFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUM1QixPQUFPLEdBQUcsUUFBUSxDQUFBO0lBQ3BCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDaEMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDbkMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE9BQU8sR0FBRyxVQUFVLENBQUE7SUFDdEIsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyxNQUFNLHlCQUFZLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUMvQixNQUFNLGlCQUFJLENBQUMsZUFBZSxPQUFPLHlCQUF5QixPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBQ3BFLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLGdCQUFnQixPQUFPLDBCQUEwQixDQUFDLENBQUE7SUFDOUUsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdURBQXVELENBQUMsQ0FBQTtJQUNqRixDQUFDO0lBQUEsQ0FBQztJQUNGLE1BQU0saUJBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUNyQixNQUFNLGlCQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDcEIsK0JBQStCO0lBQy9CLE1BQU0sWUFBWSxDQUFDLFNBQVMsRUFBRTtTQUMzQixJQUFJLENBQUMsQ0FBTSxTQUFTO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLDZDQUE2QyxDQUFDLENBQUE7UUFDcEUsR0FBRyxDQUFDLENBQUMsSUFBSSxPQUFPLElBQUksU0FBUyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUM7WUFDN0MsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsd0JBQXdCLE9BQU8sR0FBRyxDQUFDLENBQUE7WUFDMUQsSUFBSSxXQUFXLEdBQVcsTUFBTSx3QkFBVyxDQUFDLFNBQVMsT0FBTyxFQUFFLENBQUMsQ0FBQTtZQUMvRCxJQUFJLGFBQWEsR0FBWSxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksV0FBVyxLQUFLLEVBQUUsQ0FBQyxDQUFBO1lBQ3RGLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7Z0JBQ2xCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLFFBQVEsT0FBTyxlQUFlLENBQUMsQ0FBQTtZQUN2RCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLE9BQU8sV0FBVyxDQUFDLENBQUE7Z0JBQ2pFLEVBQUUsQ0FBQyxDQUFDLE1BQU0sMEJBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO29CQUNoQyxNQUFNLGlCQUFJLENBQUMsbUJBQW1CLE9BQU8sRUFBRSxDQUFDLENBQUE7Z0JBQzFDLENBQUM7Z0JBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ04sTUFBTSxpQkFBSSxDQUFDLGVBQWUsT0FBTyxRQUFRLENBQUMsQ0FBQTtnQkFDNUMsQ0FBQztZQUNILENBQUM7UUFDSCxDQUFDO1FBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsb0VBQW9FLENBQUMsQ0FBQTtJQUNqRyxDQUFDLENBQUEsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.paths.d.ts

@@ -1,4 +1,3 @@
-import "typings-global";
 export declare let cwd: string;
 export declare let NpmciPackageRoot: string;
 export declare let NpmciPackageConfig: string;

dist/npmci.paths.js

@@ -1,9 +1,9 @@
 "use strict";
-require("typings-global");
+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.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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLE1BQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFFaEMsV0FBRyxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztBQUVwQix3QkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsS0FBSyxDQUFDLENBQUM7QUFDdEQsMEJBQWtCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsd0JBQWdCLEVBQUMsZUFBZSxDQUFDLENBQUM7QUFDekUsdUJBQWUsR0FBRyxXQUFHLENBQUM7QUFDdEIsb0JBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFHLEVBQUMsUUFBUSxDQUFDLENBQUMifQ==
+exports.NpmciTestDir = plugins.path.join(exports.cwd, './test');
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJDQUEwQztBQUUvQixRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUE7QUFFbkIsUUFBQSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsS0FBSyxDQUFDLENBQUE7QUFDckQsUUFBQSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx3QkFBZ0IsRUFBQyxlQUFlLENBQUMsQ0FBQTtBQUN4RSxRQUFBLGVBQWUsR0FBRyxXQUFHLENBQUE7QUFDckIsUUFBQSxZQUFZLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBRyxFQUFDLFFBQVEsQ0FBQyxDQUFBIn0=

dist/npmci.plugins.d.ts

@@ -1,17 +1,20 @@
-import "typings-global";
-export import beautylog = require("beautylog");
+export import beautylog = require('beautylog');
 export declare let gulp: any;
-export declare let gulpFunction: any;
-export declare let lodash: any;
-export import path = require("path");
-export import projectinfo = require("projectinfo");
-export import q = require("q");
+export import gulpFunction = require('gulp-function');
+export import lodash = require('lodash');
+export import npmextra = require('npmextra');
+export import path = require('path');
+export import projectinfo = require('projectinfo');
+export import q = require('smartq');
 export declare let request: any;
-export import shelljs = require("shelljs");
-export import smartcli = require("smartcli");
-export import smartfile = require("smartfile");
-export import smartparam = require("smartparam");
-export import smartsocket = require("smartsocket");
-export import smartssh = require("smartssh");
-export import smartstring = require("smartstring");
-export declare let through2: any;
+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');
+export import through2 = require('through2');

dist/npmci.plugins.js

@@ -1,19 +1,23 @@
 "use strict";
-require("typings-global");
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.beautylog = require("beautylog");
-exports.gulp = require("gulp");
+exports.gulp = require('gulp');
 exports.gulpFunction = require("gulp-function");
 exports.lodash = require("lodash");
+exports.npmextra = require("npmextra");
 exports.path = require("path");
 exports.projectinfo = require("projectinfo");
-exports.q = require("q");
-exports.request = require("request");
-exports.shelljs = require("shelljs");
+exports.q = require("smartq");
+exports.request = require('request');
 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN2QixvQkFBWSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUN4QyxjQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQ3hCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUN2QixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDO0FBQ3JDLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNwQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzFCLGVBQU8sV0FBVyxTQUFTLENBQUMsQ0FBQztBQUM3QixnQkFBUSxXQUFXLFVBQVUsQ0FBQyxDQUFDO0FBQy9CLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDakMsa0JBQVUsV0FBVyxZQUFZLENBQUMsQ0FBQztBQUNuQyxtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDO0FBQ3JDLGdCQUFRLFdBQVcsVUFBVSxDQUFDLENBQUM7QUFDL0IsbUJBQVcsV0FBVyxhQUFhLENBQUMsQ0FBQztBQUN4QyxnQkFBUSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBOEM7QUFDbkMsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ2pDLGdEQUFxRDtBQUNyRCxtQ0FBd0M7QUFDeEMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyw2Q0FBa0Q7QUFDbEQsOEJBQW1DO0FBQ3hCLFFBQUEsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUN2Qyx1Q0FBNEM7QUFDNUMsMkNBQWdEO0FBQ2hELHlDQUE4QztBQUM5QyxxQ0FBMEM7QUFDMUMsMkNBQWdEO0FBQ2hELG1DQUF3QztBQUN4QywyQ0FBZ0Q7QUFDaEQsNkNBQWtEO0FBQ2xELHVDQUE0QztBQUM1Qyw2Q0FBa0Q7QUFDbEQsdUNBQTRDIn0=

dist/npmci.prepare.d.ts

@@ -1,4 +1,9 @@
-/// <reference types="q" />
-import "typings-global";
-import * as plugins from "./npmci.plugins";
-export declare let prepare: (serviceArg: string) => plugins.q.Promise<{}>;
+/**
+ * defines possible prepare services
+ */
+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) => Promise<void>;

dist/npmci.prepare.js

@@ -1,65 +1,81 @@
 "use strict";
-require("typings-global");
+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");
-let npm = function () {
-    let done = plugins.q.defer();
-    let npmrcPrefix = "//registry.npmjs.org/:_authToken=";
+/**
+ * authenticates npm with token from env var
+ */
+let npm = () => __awaiter(this, void 0, void 0, function* () {
+    let npmrcPrefix = '//registry.npmjs.org/:_authToken=';
     let npmToken = process.env.NPMCI_TOKEN_NPM;
     let npmrcFileString = npmrcPrefix + npmToken;
     if (npmToken) {
-        plugins.beautylog.info("found access token");
+        plugins.beautylog.info('found access token');
     }
     else {
-        plugins.beautylog.error("no access token found! Exiting!");
+        plugins.beautylog.error('no access token found! Exiting!');
         process.exit(1);
     }
-    plugins.smartfile.memory.toFsSync(npmrcFileString, "/root/.npmrc");
-    done.resolve();
-    return done.promise;
-};
-let docker = function () {
-    let done = plugins.q.defer();
-    env.setDockerRegistry("docker.io");
+    plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc');
+    return;
+});
+/**
+ * logs in docker
+ */
+let docker = () => __awaiter(this, void 0, void 0, function* () {
+    env.setDockerRegistry('docker.io');
     let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/;
     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);
     }
-    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 username = dockerRegexResultArray[1];
     let password = dockerRegexResultArray[2];
-    plugins.shelljs.exec("docker login -u " + username + " -p " + password);
-    done.resolve();
-    return done.promise;
-};
-let dockerGitlab = 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 done.promise;
-};
-let ssh = function () {
-    let done = plugins.q.defer();
-    sshModule.ssh()
-        .then(done.resolve);
-    return done.promise;
-};
-exports.prepare = function (serviceArg) {
+    yield npmci_bash_1.bash('docker login -u ' + username + ' -p ' + password);
+    return;
+});
+/**
+ * prepare docker for gitlab registry
+ */
+let dockerGitlab = () => __awaiter(this, void 0, void 0, function* () {
+    env.setDockerRegistry('registry.gitlab.com');
+    plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com');
+    return;
+});
+/**
+ * prepare ssh
+ */
+let ssh = () => __awaiter(this, void 0, void 0, function* () {
+    yield sshModule.ssh();
+});
+/**
+ * the main exported prepare function
+ * @param servieArg describes the service to prepare
+ */
+exports.prepare = (serviceArg) => __awaiter(this, void 0, void 0, function* () {
     switch (serviceArg) {
-        case "npm":
-            return npm();
-        case "docker":
-            return docker();
-        case "docker-gitlab":
-            return dockerGitlab();
-        case "ssh":
-            return ssh();
+        case 'npm':
+            return yield npm();
+        case 'docker':
+            return yield docker();
+        case 'docker-gitlab':
+            return yield dockerGitlab();
+        case 'ssh':
+            return yield ssh();
         default:
             break;
     }
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHJlcGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnByZXBhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBRTNDLE1BQVksR0FBRyxXQUFNLGFBQ3JCLENBQUMsQ0FEaUM7QUFDbEMsTUFBWSxTQUFTLFdBQU0sYUFFM0IsQ0FBQyxDQUZ1QztBQUV4QyxJQUFJLEdBQUcsR0FBRztJQUNOLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFFN0IsSUFBSSxXQUFXLEdBQVUsbUNBQW1DLENBQUM7SUFDN0QsSUFBSSxRQUFRLEdBQVUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUM7SUFDbEQsSUFBSSxlQUFlLEdBQUcsV0FBVyxHQUFHLFFBQVEsQ0FBQztJQUU3QyxFQUFFLENBQUEsQ0FBQyxRQUFRLENBQUMsQ0FBQSxDQUFDO1FBQ1QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFDO1FBQzNELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDcEIsQ0FBQztJQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxlQUFlLEVBQUMsY0FBYyxDQUFDLENBQUM7SUFDbEUsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFDO0FBRUYsSUFBSSxNQUFNLEdBQUc7SUFDVCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtB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
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHJlcGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnByZXBhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyw2Q0FBbUM7QUFDbkMsbUNBQWtDO0FBQ2xDLHlDQUF3QztBQVV4Qzs7R0FFRztBQUNILElBQUksR0FBRyxHQUFHO0lBQ1IsSUFBSSxXQUFXLEdBQVcsbUNBQW1DLENBQUE7SUFDN0QsSUFBSSxRQUFRLEdBQVcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUE7SUFDbEQsSUFBSSxlQUFlLEdBQVcsV0FBVyxHQUFHLFFBQVEsQ0FBQTtJQUNwRCxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtJQUM5QyxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFBO1FBQzFELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDakIsQ0FBQztJQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxlQUFlLEVBQUUsY0FBYyxDQUFDLENBQUE7SUFDbEUsTUFBTSxDQUFBO0FBQ1IsQ0FBQyxDQUFBLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksTUFBTSxHQUFHO0lBQ1gsR0FBRyxDQUFDLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQ2xDLElBQUksV0FBVyxHQUFHLHFDQUFxQyxDQUFBO0lBQ3ZELEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7UUFDcEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsdURBQXVELENBQUMsQ0FBQTtRQUNoRixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2pCLENBQUM7SUFDRCxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRyxHQUFHLEdBQUcscUJBQXFCLENBQUMsQ0FBQSxDQUFDLHVDQUF1QztJQUM5SixJQUFJLHNCQUFzQixHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFBO0lBQzdFLElBQUksUUFBUSxHQUFHLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3hDLElBQUksUUFBUSxHQUFHLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3hDLE1BQU0saUJBQUksQ0FBQyxrQkFBa0IsR0FBRyxRQUFRLEdBQUcsTUFBTSxHQUFHLFFBQVEsQ0FBQyxDQUFBO0lBQzdELE1BQU0sQ0FBQTtBQUNSLENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLFlBQVksR0FBRztJQUNqQixHQUFHLENBQUMsaUJBQWlCLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM1QyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRyxHQUFHLEdBQUcscUJBQXFCLENBQUMsQ0FBQTtJQUN0SCxNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxHQUFHLEdBQUc7SUFDUixNQUFNLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQTtBQUN2QixDQUFDLENBQUEsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLENBQU8sVUFBd0I7SUFDbEQsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUNuQixLQUFLLEtBQUs7WUFDUixNQUFNLENBQUMsTUFBTSxHQUFHLEVBQUUsQ0FBQTtRQUNwQixLQUFLLFFBQVE7WUFDWCxNQUFNLENBQUMsTUFBTSxNQUFNLEVBQUUsQ0FBQTtRQUN2QixLQUFLLGVBQWU7WUFDbEIsTUFBTSxDQUFDLE1BQU0sWUFBWSxFQUFFLENBQUE7UUFDN0IsS0FBSyxLQUFLO1lBQ1IsTUFBTSxDQUFDLE1BQU0sR0FBRyxFQUFFLENBQUE7UUFDcEI7WUFDRSxLQUFLLENBQUE7SUFDVCxDQUFDO0FBQ0gsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.publish.d.ts

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

dist/npmci.publish.js

@@ -1,43 +1,50 @@
 "use strict";
-require("typings-global");
+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");
 const NpmciBuildDocker = require("./npmci.build.docker");
 /**
  * the main exported publish function.
- * @param registryServiceArg the serviceArg
+ * @param pubServiceArg references targeted service to publish to
  */
-exports.publish = (registryServiceArg = "npm") => {
-    switch (registryServiceArg) {
-        case "npm":
-            return publishNpm();
-        case "docker":
-            return publishDocker();
+exports.publish = (pubServiceArg = 'npm') => __awaiter(this, void 0, void 0, function* () {
+    switch (pubServiceArg) {
+        case 'npm':
+            return yield publishNpm();
+        case 'docker':
+            return yield publishDocker();
     }
-};
+});
 /**
- * tries to publish project at cwd to npm
+ * tries to publish current cwd to NPM registry
  */
-let publishNpm = function () {
-    let done = plugins.q.defer();
-    npmci_prepare_1.prepare("npm")
+let publishNpm = () => __awaiter(this, void 0, void 0, function* () {
+    yield npmci_prepare_1.prepare('npm')
         .then(function () {
-        npmci_bash_1.bash("npm publish");
-        plugins.beautylog.ok("Done!");
-        done.resolve();
+        return __awaiter(this, void 0, void 0, function* () {
+            yield npmci_bash_1.bash('npm publish');
+            plugins.beautylog.ok('Done!');
+        });
     });
-    return done.promise;
-};
+});
 /**
  * tries to pubish current cwd to Docker registry
  */
-let publishDocker = function () {
-    let done = plugins.q.defer();
-    NpmciBuildDocker.readDockerfiles()
+let publishDocker = () => __awaiter(this, void 0, void 0, function* () {
+    return yield NpmciBuildDocker.readDockerfiles()
         .then(NpmciBuildDocker.pullDockerfileImages)
         .then(NpmciBuildDocker.pushDockerfiles)
-        .then(done.resolve);
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHVibGlzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLGdDQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDZCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUVsQyxNQUFZLGdCQUFnQixXQUFNLHNCQUtsQyxDQUFDLENBTHVEO0FBT3hEOzs7R0FHRztBQUNRLGVBQU8sR0FBRyxDQUFDLGtCQUFrQixHQUFtQixLQUFLO0lBQzVELE1BQU0sQ0FBQyxDQUFDLGtCQUFrQixDQUFDLENBQUEsQ0FBQztRQUN4QixLQUFLLEtBQUs7WUFDTixNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDeEIsS0FBSyxRQUFRO1lBQ1QsTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO0lBQy9CLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFRjs7R0FFRztBQUNILElBQUksVUFBVSxHQUFJO0lBQ2QsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3Qix1QkFBTyxDQUFDLEtBQUssQ0FBQztTQUNULElBQUksQ0FBQztRQUNGLGlCQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUU7UUFDL0IsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1IsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDdkIsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLGFBQWEsR0FBRztJQUNoQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3pCLGdCQUFnQixDQUFDLGVBQWUsRUFBRTtTQUNqQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsb0JBQW9CLENBQUM7U0FDM0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLGVBQWUsQ0FBQztTQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3hCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQyJ9
+        .then(dockerfileArray => {
+        return dockerfileArray;
+    });
+});
+//# 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
@@ -13,16 +22,16 @@ let servezoneRegexResultArray = servezoneRegex.exec(process.env.NPMCI_SERVEZONE)
  * the data object that is used for the smartsocket client object
  */
 let smartsocketClientConstructorOptions = {
-    alias: "npmci",
+    alias: 'npmci',
     password: servezoneRegexResultArray[3],
     port: parseInt(servezoneRegexResultArray[2]),
-    role: "ci",
+    role: 'ci',
     url: servezoneRegexResultArray[1]
 };
 /**
  * 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc2VydmV6b25lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc2VydmV6b25lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBRTNDOzs7R0FHRztBQUNILElBQUksY0FBYyxHQUFHLG1CQUFtQixDQUFDO0FBRXpDOztHQUVHO0FBQ0gsSUFBSSx5QkFBeUIsR0FBRyxjQUFjLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLENBQUM7QUFFakY7O0dBRUc7QUFDSCxJQUFJLG1DQUFtQyxHQUFHO0lBQ3RDLEtBQUssRUFBRSxPQUFPO0lBQ2QsUUFBUSxFQUFFLHlCQUF5QixDQUFDLENBQUMsQ0FBQztJQUN0QyxJQUFJLEVBQUUsUUFBUSxDQUFDLHlCQUF5QixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzVDLElBQUksRUFBRSxJQUFJO0lBQ1YsR0FBRyxFQUFFLHlCQUF5QixDQUFDLENBQUMsQ0FBQztDQUNwQyxDQUFDO0FBRUY7O0dBRUc7QUFDUSxXQUFHLEdBQUcsQ0FBQyxTQUFTO0lBQ3ZCLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FDckMsbUNBQW1DLENBQ3RDLENBQUM7QUFDTixDQUFDLENBQUMifQ==
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc2VydmV6b25lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc2VydmV6b25lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFFMUM7OztHQUdHO0FBQ0gsSUFBSSxjQUFjLEdBQUcsbUJBQW1CLENBQUE7QUFFeEM7O0dBRUc7QUFDSCxJQUFJLHlCQUF5QixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUVoRjs7R0FFRztBQUNILElBQUksbUNBQW1DLEdBQUc7SUFDdEMsS0FBSyxFQUFFLE9BQU87SUFDZCxRQUFRLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0lBQ3RDLElBQUksRUFBRSxRQUFRLENBQUMseUJBQXlCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUMsSUFBSSxFQUFFLElBQUk7SUFDVixHQUFHLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0NBQ3BDLENBQUE7QUFFRDs7R0FFRztBQUNRLFFBQUEsR0FBRyxHQUFHLENBQU8sU0FBUztJQUM3QixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQ3JDLG1DQUFtQyxDQUN0QyxDQUFBO0FBQ0wsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.ssh.d.ts

@@ -1,7 +1,4 @@
-/// <reference types="q" />
-import "typings-global";
-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,52 +1,58 @@
 "use strict";
-require("typings-global");
+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 = () => {
-    let done = plugins.q.defer();
+exports.ssh = () => __awaiter(this, void 0, void 0, function* () {
     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) {
         sshInstance.writeToDisk();
     }
     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 = (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]);
+    plugins.beautylog.info('Found SSH identity for ' + resultArray[1]);
     if (notUndefined(resultArray[1])) {
-        plugins.beautylog.log("---> host defined!");
+        plugins.beautylog.log('---> host defined!');
         sshKey.host = resultArray[1];
     }
     if (notUndefined(resultArray[2])) {
-        plugins.beautylog.log("---> privKey defined!");
+        plugins.beautylog.log('---> privKey defined!');
         sshKey.privKeyBase64 = resultArray[2];
     }
     ;
     if (notUndefined(resultArray[3])) {
-        "---> pubKey defined!";
+        '---> pubKey defined!';
         sshKey.pubKeyBase64 = resultArray[3];
     }
     ;
     sshInstance.addKey(sshKey);
-};
+    return;
+});
 /**
  * checks if not undefined
  */
 let notUndefined = (stringArg) => {
-    return (stringArg && stringArg != "undefined" && stringArg != "##");
+    return (stringArg && stringArg !== 'undefined' && stringArg !== '##');
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc3NoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc3NoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsTUFBWSxPQUFPLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUUzQyxJQUFJLFFBQVEsR0FBRyxtQkFBbUIsQ0FBQTtBQUNsQyxJQUFJLFdBQXdDLENBQUM7QUFFN0M7O0dBRUc7QUFDUSxXQUFHLEdBQUc7SUFDYixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLFdBQVcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxvQkFBb0I7SUFDdEUsT0FBTyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFDLGdCQUFnQixFQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ2pGLEVBQUUsQ0FBQSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQSxDQUFDO1FBQ3hCLFdBQVcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUM5QixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxnREFBZ0QsQ0FBQyxDQUFDO0lBQzVFLENBQUM7SUFBQSxDQUFDO0lBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFDO0FBRUY7O0dBRUc7QUFDSCxJQUFJLGNBQWMsR0FBRyxDQUFDLGVBQWU7SUFDakMsSUFBSSxXQUFXLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUNqRCxJQUFJLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDM0MsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMseUJBQXlCLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbkUsRUFBRSxDQUFBLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUEsQ0FBQztRQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO1FBQzNDLE1BQU0sQ0FBQyxJQUFJLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFDRCxFQUFFLENBQUEsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQSxDQUFDO1FBQzdCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLENBQUE7UUFDOUMsTUFBTSxDQUFDLGFBQWEsR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUEsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQSxDQUFDO1FBQzdCLHNCQUFzQixDQUFBO1FBQ3RCLE1BQU0sQ0FBQyxZQUFZLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFBQSxDQUFDO0lBRUYsV0FBVyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUMvQixDQUFDLENBQUM7QUFFRjs7R0FFRztBQUNILElBQUksWUFBWSxHQUFHLENBQUMsU0FBZ0I7SUFDaEMsTUFBTSxDQUFDLENBQUMsU0FBUyxJQUFJLFNBQVMsSUFBSSxXQUFXLElBQUksU0FBUyxJQUFJLElBQUksQ0FBQyxDQUFDO0FBQ3hFLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc3NoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc3NoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFFMUMsSUFBSSxRQUFRLEdBQUcsbUJBQW1CLENBQUE7QUFDbEMsSUFBSSxXQUF5QyxDQUFBO0FBRTdDOztHQUVHO0FBQ1EsUUFBQSxHQUFHLEdBQUc7SUFDZixXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFBLENBQUMsb0JBQW9CO0lBQ3JFLE9BQU8sQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxnQkFBZ0IsRUFBRSxjQUFjLENBQUMsQ0FBQTtJQUNsRixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1QixXQUFXLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDM0IsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZ0RBQWdELENBQUMsQ0FBQTtJQUN6RSxDQUFDO0lBQUEsQ0FBQztBQUNKLENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLGNBQWMsR0FBRyxDQUFPLGVBQWU7SUFDekMsSUFBSSxXQUFXLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUNoRCxJQUFJLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUE7SUFDMUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMseUJBQXlCLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDbEUsRUFBRSxDQUFDLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNqQyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO1FBQzNDLE1BQU0sQ0FBQyxJQUFJLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzlCLENBQUM7SUFDRCxFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLENBQUE7UUFDOUMsTUFBTSxDQUFDLGFBQWEsR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDdkMsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLHNCQUFzQixDQUFBO1FBQ3RCLE1BQU0sQ0FBQyxZQUFZLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3RDLENBQUM7SUFBQSxDQUFDO0lBRUYsV0FBVyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUMxQixNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxZQUFZLEdBQUcsQ0FBQyxTQUFpQjtJQUNuQyxNQUFNLENBQUMsQ0FBQyxTQUFTLElBQUksU0FBUyxLQUFLLFdBQVcsSUFBSSxTQUFTLEtBQUssSUFBSSxDQUFDLENBQUE7QUFDdkUsQ0FBQyxDQUFBIn0=

dist/npmci.test.d.ts

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

dist/npmci.test.js

@@ -1,47 +1,43 @@
 "use strict";
-require("typings-global");
+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) => {
-    let done = plugins.q.defer();
-    if (versionArg == "docker") {
-        testDocker()
-            .then(() => {
-            done.resolve();
-        });
+exports.test = (versionArg) => __awaiter(this, void 0, void 0, function* () {
+    if (versionArg === 'docker') {
+        yield testDocker();
     }
     else {
-        npmci_install_1.install(versionArg)
+        yield npmci_install_1.install(versionArg)
             .then(npmDependencies)
-            .then(npmTest)
-            .then(() => {
-            done.resolve();
-        });
+            .then(npmTest);
     }
-    return done.promise;
-};
-let npmDependencies = function () {
-    let done = plugins.q.defer();
-    plugins.beautylog.info("now installing dependencies:");
-    npmci_bash_1.bash("npm install");
-    done.resolve();
-    return done.promise;
-};
-let npmTest = () => {
-    let done = plugins.q.defer();
-    plugins.beautylog.info("now starting tests:");
-    npmci_bash_1.bash("npm test");
-    done.resolve();
-    return done.promise;
-};
-let testDocker = function () {
-    let done = plugins.q.defer();
-    NpmciBuildDocker.readDockerfiles()
+});
+let npmDependencies = () => __awaiter(this, void 0, void 0, function* () {
+    plugins.beautylog.info('now installing dependencies:');
+    if (yield npmci_bash_1.yarnAvailable.promise) {
+        yield npmci_bash_1.bash('yarn upgrade');
+    }
+    else {
+        yield npmci_bash_1.bash('npm install');
+    }
+});
+let npmTest = () => __awaiter(this, void 0, void 0, function* () {
+    plugins.beautylog.info('now starting tests:');
+    yield npmci_bash_1.bash('npm test');
+});
+let testDocker = () => __awaiter(this, void 0, void 0, function* () {
+    return yield NpmciBuildDocker.readDockerfiles()
         .then(NpmciBuildDocker.pullDockerfileImages)
-        .then(NpmciBuildDocker.testDockerfiles)
-        .then(done.resolve);
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDZCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyxnQ0FBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUV4QyxNQUFZLGdCQUFnQixXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFFOUMsWUFBSSxHQUFHLENBQUMsVUFBVTtJQUN6QixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLEVBQUUsQ0FBQSxDQUFDLFVBQVUsSUFBSSxRQUFRLENBQUMsQ0FBQSxDQUFDO1FBQ3ZCLFVBQVUsRUFBRTthQUNQLElBQUksQ0FBQztZQUNGLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FBQztJQUNYLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLHVCQUFPLENBQUMsVUFBVSxDQUFDO2FBQ2QsSUFBSSxDQUFDLGVBQWUsQ0FBQzthQUNyQixJQUFJLENBQUMsT0FBTyxDQUFDO2FBQ2IsSUFBSSxDQUFDO1lBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1gsQ0FBQztJQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQTtBQUVELElBQUksZUFBZSxHQUFHO0lBQ2xCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsOEJBQThCLENBQUMsQ0FBQztJQUN2RCxpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3BCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQTtBQUVELElBQUksT0FBTyxHQUFHO0lBQ1YsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0lBQzlDLGlCQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDakIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxVQUFVLEdBQUc7SUFDYixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLGdCQUFnQixDQUFDLGVBQWUsRUFBRTtTQUM3QixJQUFJLENBQUMsZ0JBQWdCLENBQUMsb0JBQW9CLENBQUM7U0FDM0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLGVBQWUsQ0FBQztTQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQSJ9
+        .then(NpmciBuildDocker.testDockerfiles);
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyw2Q0FBa0Q7QUFDbEQsbURBQXlDO0FBRXpDLHlEQUF3RDtBQUU3QyxRQUFBLElBQUksR0FBRyxDQUFPLFVBQVU7SUFDakMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDNUIsTUFBTSxVQUFVLEVBQUUsQ0FBQTtJQUNwQixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixNQUFNLHVCQUFPLENBQUMsVUFBVSxDQUFDO2FBQ3RCLElBQUksQ0FBQyxlQUFlLENBQUM7YUFDckIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ2xCLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQTtBQUVELElBQUksZUFBZSxHQUFHO0lBQ3BCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLDhCQUE4QixDQUFDLENBQUE7SUFDdEQsRUFBRSxDQUFDLENBQUMsTUFBTSwwQkFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDaEMsTUFBTSxpQkFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE1BQU0saUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUMzQixDQUFDO0FBQ0gsQ0FBQyxDQUFBLENBQUE7QUFFRCxJQUFJLE9BQU8sR0FBRztJQUNaLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLENBQUE7SUFDN0MsTUFBTSxpQkFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0FBQ3hCLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxVQUFVLEdBQUc7SUFDZixNQUFNLENBQUMsTUFBTSxnQkFBZ0IsQ0FBQyxlQUFlLEVBQUU7U0FDNUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLG9CQUFvQixDQUFDO1NBQzNDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUMzQyxDQUFDLENBQUEsQ0FBQSJ9

dist/npmci.trigger.d.ts

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

dist/npmci.trigger.js

@@ -1,29 +1,34 @@
 "use strict";
-require("typings-global");
+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 () {
-    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) => {
+exports.trigger = () => __awaiter(this, void 0, void 0, function* () {
+    plugins.beautylog.info('now running triggers');
+    plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
+});
+let evaluateTrigger = (triggerEnvVarArg) => __awaiter(this, void 0, void 0, function* () {
     let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg);
     let regexDomain = triggerRegexResultArray[1];
     let regexProjectId = triggerRegexResultArray[2];
     let regexProjectTriggerToken = triggerRegexResultArray[3];
     let regexRefName = triggerRegexResultArray[4];
     let regexTriggerName;
-    if (triggerRegexResultArray.length == 6) {
+    if (triggerRegexResultArray.length === 6) {
         regexTriggerName = triggerRegexResultArray[5];
     }
     else {
-        regexTriggerName = "Unnamed Trigger";
+        regexTriggerName = 'Unnamed Trigger';
     }
-    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudHJpZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRyaWdnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBSzNDLElBQUksaUJBQWlCLEdBQUcsZ0dBQWdHLENBQUM7QUFFOUcsZUFBTyxHQUFHO0lBQ2pCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQztJQUMvQyxPQUFPLENBQUMsVUFBVSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsaUJBQWlCLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFDckYsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxlQUFlLEdBQUcsQ0FBQyxnQkFBZ0I7SUFDbkMsSUFBSSx1QkFBdUIsR0FBRyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUN2RSxJQUFJLFdBQVcsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM3QyxJQUFJLGNBQWMsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNoRCxJQUFJLHdCQUF3QixHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzFELElBQUksWUFBWSxHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzlDLElBQUksZ0JBQWdCLENBQUM7SUFDckIsRUFBRSxDQUFDLENBQUMsdUJBQXVCLENBQUMsTUFBTSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdEMsZ0JBQWdCLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbEQsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUM7SUFDekMsQ0FBQztJQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDekMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsMkJBQTJCLEdBQUcsWUFBWSxHQUFHLE1BQU0sR0FBRyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQzlGLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLGNBQWMsR0FBRyxpQkFBaUIsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxHQUFHLEVBQUUsWUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3ZLLENBQUMsQ0FBQSJ9
+    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudHJpZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRyaWdnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUkxQyxJQUFJLGlCQUFpQixHQUFHLGdHQUFnRyxDQUFBO0FBRTdHLFFBQUEsT0FBTyxHQUFHO0lBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUE7SUFDOUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLGlCQUFpQixFQUFFLGVBQWUsQ0FBQyxDQUFBO0FBQ3RGLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxlQUFlLEdBQUcsQ0FBTyxnQkFBZ0I7SUFDM0MsSUFBSSx1QkFBdUIsR0FBRyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtJQUN0RSxJQUFJLFdBQVcsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUM1QyxJQUFJLGNBQWMsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMvQyxJQUFJLHdCQUF3QixHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3pELElBQUksWUFBWSxHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzdDLElBQUksZ0JBQWdCLENBQUE7SUFDcEIsRUFBRSxDQUFDLENBQUMsdUJBQXVCLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDekMsZ0JBQWdCLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDL0MsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUE7SUFDdEMsQ0FBQztJQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUE7SUFDeEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsMkJBQTJCLEdBQUcsWUFBWSxHQUFHLE1BQU0sR0FBRyxnQkFBZ0IsQ0FBQyxDQUFBO0lBQzdGLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLGNBQWMsR0FBRyxpQkFBaUIsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxHQUFHLEVBQUUsWUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFBO0FBQ3BLLENBQUMsQ0FBQSxDQUFBIn0=

docs/book.json

@@ -1,15 +0,0 @@
-{
-    "structure": {
-        "readme": "index.md"
-    },
-    "plugins": [
-        "tonic",
-        "edit-link"
-    ],
-    "pluginsConfig": {
-        "edit-link": {
-            "base": "https://gitlab.com/pushrocks/npmts/edit/master/docs/",
-            "label": "Edit on GitLab"
-        }
-    }
-}

docs/index.md

@@ -2,17 +2,17 @@
 npmci is your friend when it comes to handling npm packages during CI builds. It is optimized for GitLab CI
 
 ## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmci)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/npmci)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/npmci)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/npmci/docs)
+[![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/docs)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/npmci/badges/master/build.svg)](https://gitlab.com/pushrocks/npmci/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/npmci/badges/master/coverage.svg)](https://gitlab.com/pushrocks/npmci/commits/master)
-[![Dependency Status](https://david-dm.org/pushrocks/npmci.svg)](https://david-dm.org/pushrocks/npmci)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/npmci/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/npmci/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/npmci/badges/code.svg)](https://www.bithound.io/github/pushrocks/npmci)
+[![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)
+[![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/)
 
@@ -50,8 +50,8 @@ npmci prepare docker-gitlab # will authenticate docker for gitlab container regi
 
 # build containers
 npmci build docker # will build containers
-## all Dockerfiles named DOckerfile* are picked up.
-## specify tags lake this Dockerfile_[tag]
+## 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"
 
@@ -63,3 +63,28 @@ npmci publish docker
 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. 
+
+[![npm](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

npmextra.json

@@ -1,8 +1,16 @@
 {
     "npmts":{
-        "mode":"default"
+        "mode":"default",
+        "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,51 +1,54 @@
 {
   "name": "npmci",
-  "version": "2.3.15",
+  "version": "2.3.64",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "bin": {
-    "npmci": "dist/index.js"
+    "npmci": "dist/cli.js"
   },
   "scripts": {
     "test": "(npmts) && (npm run testVersion)",
-    "testVersion": "node dist/index.js -v"
+    "testVersion": "(cd test/assets/ && node ../../dist/cli.js -v)"
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/pushrocks/npmci.git"
+    "url": "git+ssh://git@gitlab.com/gitzone/npmci.git"
   },
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://gitlab.com/pushrocks/npmci/issues"
+    "url": "https://gitlab.com/gitzone/npmci/issues"
   },
-  "homepage": "https://gitlab.com/pushrocks/npmci#README",
+  "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "npmts-g": "^5.2.8",
-    "should": "^10.0.0",
-    "typings-test": "^1.0.1"
+    "tapbundle": "^1.0.12",
+    "typings-test": "^1.0.3"
   },
   "dependencies": {
-    "@types/lodash": "^0.0.28",
-    "@types/q": "^0.0.27",
-    "@types/request": "^0.0.27",
-    "@types/shelljs": "^0.3.27",
-    "beautylog": "^5.0.18",
+    "@types/lodash": "^4.14.64",
+    "@types/node": "^7.0.18",
+    "@types/request": "0.x.x",
+    "@types/shelljs": "^0.7.1",
+    "@types/through2": "^2.0.32",
+    "beautylog": "^6.1.10",
     "gulp": "^3.9.1",
-    "gulp-function": "^1.3.6",
-    "lodash": "^4.14.1",
-    "projectinfo": "^1.0.3",
-    "q": "^1.4.1",
-    "request": "^2.74.0",
-    "shelljs": "^0.7.3",
-    "smartcli": "^1.0.4",
-    "smartfile": "^4.0.12",
+    "gulp-function": "^2.2.9",
+    "lodash": "^4.17.4",
+    "npmextra": "^2.0.5",
+    "projectinfo": "^3.0.2",
+    "request": "^2.81.0",
+    "shelljs": "^0.7.7",
+    "smartcli": "^2.0.7",
+    "smartdelay": "^1.0.1",
+    "smartfile": "^4.2.11",
     "smartparam": "^0.1.1",
-    "smartsocket": "^1.1.4",
-    "smartssh": "^1.1.5",
-    "smartstring": "^2.0.15",
-    "through2": "^2.0.1",
-    "typings-global": "^1.0.6"
+    "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.16"
   }
 }

readme.md

@@ -1,22 +1,26 @@
-# NPMCI
-npmci is your friend when it comes to handling npm packages during CI builds. It is optimized for GitLab CI
+# npmci
+helps with pushing to npm registry from any CI
 
 ## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmci)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/npmci)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/npmci)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/npmci/docs)
+[![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/pushrocks/npmci/badges/master/build.svg)](https://gitlab.com/pushrocks/npmci/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/npmci/badges/master/coverage.svg)](https://gitlab.com/pushrocks/npmci/commits/master)
-[![Dependency Status](https://david-dm.org/pushrocks/npmci.svg)](https://david-dm.org/pushrocks/npmci)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/npmci/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/npmci/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/npmci/badges/code.svg)](https://www.bithound.io/github/pushrocks/npmci)
+[![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:
@@ -50,8 +54,8 @@ npmci prepare docker-gitlab # will authenticate docker for gitlab container regi
 
 # build containers
 npmci build docker # will build containers
-## all Dockerfiles named DOckerfile* are picked up.
-## specify tags lake this Dockerfile_[tag]
+## 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"
 
@@ -63,3 +67,33 @@ npmci publish docker
 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,2 +0,0 @@
-import "typings-test";
-import "should";

test/test.js

@@ -1,91 +0,0 @@
-"use strict";
-require("typings-test");
-require("should");
-const path = require("path");
-const beautylog = require("beautylog");
-//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 });
-            dockerfile1.version.should.equal("latest");
-            dockerfile2.version.should.equal("sometag1");
-        });
-        it("should read a directory of Dockerfiles", function (done) {
-            NpmciBuildDocker.readDockerfiles()
-                .then(function (readDockerfilesArrayArg) {
-                readDockerfilesArrayArg[1].version.should.equal("sometag1");
-                sortableArray = readDockerfilesArrayArg;
-                done();
-            });
-        });
-        it("should sort an array of Dockerfiles", function (done) {
-            NpmciBuildDocker.sortDockerfiles(sortableArray)
-                .then(function (sortedArrayArg) {
-                beautylog.success("final result");
-                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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQixNQUFPLElBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUM5QixNQUFZLFNBQVMsV0FBTSxXQUUzQixDQUFDLENBRnFDO0FBQ3RDLG9CQUFvQjtBQUNwQixPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsR0FBRyx1REFBdUQsQ0FBQztBQUNwRixPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRywyQkFBMkIsQ0FBQTtBQUN4RCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUM7QUFDaEMsT0FBTyxDQUFDLEdBQUcsR0FBRztJQUNWLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxTQUFTLENBQUMsQ0FBQztBQUMxQyxDQUFDLENBQUM7QUFJRixNQUFPLGdCQUFnQixXQUFXLDRCQUE0QixDQUFDLENBQUM7QUFDaEUsTUFBTyxZQUFZLFdBQVcsdUJBQXVCLENBQUMsQ0FBQztBQUN2RCxNQUFPLFNBQVMsV0FBVyxvQkFBb0IsQ0FBQyxDQUFDO0FBQ2pELE1BQU8sUUFBUSxXQUFXLG1CQUFtQixDQUFDLENBQUE7QUFHOUMsSUFBSSxXQUF1QyxDQUFDO0FBQzVDLElBQUksV0FBdUMsQ0FBQztBQUM1QyxJQUFJLGFBQTJDLENBQUM7QUFFaEQsUUFBUSxDQUFDLE9BQU8sRUFBQztJQUNiLFFBQVEsQ0FBQyxjQUFjLEVBQUM7UUFDcEIsRUFBRSxDQUFDLGlDQUFpQyxFQUFDO1lBQ2pDLFdBQVcsR0FBRyxJQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFDLFFBQVEsRUFBQyxjQUFjLEVBQUMsSUFBSSxFQUFDLElBQUksRUFBQyxDQUFDLENBQUM7WUFDbkYsV0FBVyxHQUFHLElBQUksZ0JBQWdCLENB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

test/test.ts

@@ -1,94 +1,79 @@
-import "typings-test";
-import "should";
-import path = require("path");
-import * as beautylog from "beautylog"
-//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";
+import { tap, expect } from 'tapbundle'
+import * as path from '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/");
-};
+  return path.join(__dirname, 'assets/')
+}
 
-//require NPMCI files
-import npmci = require("../dist/index");
-import NpmciBuildDocker = require("../dist/npmci.build.docker");
-import NpmciPublish = require("../dist/npmci.publish");
-import NpmciTest = require("../dist/npmci.test");
-import NpmciSsh = require("../dist/npmci.ssh")
+// require NPMCI files
+import npmci = require('../dist/index')
+import NpmciBuildDocker = require('../dist/npmci.build.docker')
+import NpmciPublish = require('../dist/npmci.publish')
+import NpmciTest = require('../dist/npmci.test')
+import NpmciSsh = require('../dist/npmci.ssh')
 
 
-let dockerfile1:NpmciBuildDocker.Dockerfile;
-let dockerfile2:NpmciBuildDocker.Dockerfile;
-let sortableArray:NpmciBuildDocker.Dockerfile[];
+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});
-            dockerfile1.version.should.equal("latest");
-            dockerfile2.version.should.equal("sometag1");
-        });
-        it("should read a directory of Dockerfiles",function(done){
-            NpmciBuildDocker.readDockerfiles()
-                .then(function(readDockerfilesArrayArg:NpmciBuildDocker.Dockerfile[]){
-                    readDockerfilesArrayArg[1].version.should.equal("sometag1");
-                    sortableArray = readDockerfilesArrayArg
-                    done();
-                });
-        })
-        it("should sort an array of Dockerfiles",function(done){
-            NpmciBuildDocker.sortDockerfiles(sortableArray)
-                .then(function(sortedArrayArg:NpmciBuildDocker.Dockerfile[]){
-                    beautylog.success("final result");
-                    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();
-                })
-        })
+
+tap.test('should return valid Dockerfiles', async () => {
+  dockerfile1 = new NpmciBuildDocker.Dockerfile({ filePath: './Dockerfile', read: true })
+  dockerfile2 = new NpmciBuildDocker.Dockerfile({ filePath: './Dockerfile_sometag1', read: true })
+  expect(dockerfile1.version).to.equal('latest')
+  return expect(dockerfile2.version).to.equal('sometag1')
+})
+
+tap.test('should read a directory of Dockerfiles', async () => {
+  return NpmciBuildDocker.readDockerfiles()
+    .then(async (readDockerfilesArrayArg: NpmciBuildDocker.Dockerfile[]) => {
+      sortableArray = readDockerfilesArrayArg
+      return expect(readDockerfilesArrayArg[ 1 ].version).to.equal('sometag1')
     })
-})
+})
+
+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

@@ -1,89 +1,78 @@
-#!/usr/bin/env node
-import "typings-global";
-import * as plugins from "./npmci.plugins";
-import * as paths from "./npmci.paths";
-let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot);
-plugins.beautylog.log("npmci version: " + npmciInfo.version);
+import * as plugins from './npmci.plugins'
+import * as paths from './npmci.paths'
+let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot)
+plugins.beautylog.log('npmci version: ' + npmciInfo.version)
 
-import {build} from "./npmci.build"
-import {clean} from "./npmci.clean";
-import {command} from "./npmci.command";
-import {install} from "./npmci.install";
-import {publish} from "./npmci.publish";
-import {prepare} from "./npmci.prepare";
-import {test} from "./npmci.test";
-import {trigger} from "./npmci.trigger";
-import * as NpmciEnv from "./npmci.env";
+import { build } from './npmci.build'
+import { clean } from './npmci.clean'
+import { command } from './npmci.command'
+import { install } from './npmci.install'
+import { publish } from './npmci.publish'
+import { prepare } from './npmci.prepare'
+import { test } from './npmci.test'
+import { trigger } from './npmci.trigger'
+import * as NpmciEnv from './npmci.env'
 
-export {build} from "./npmci.build"
-export {install} from "./npmci.install";
-export {publish} from "./npmci.publish";
+export { build } from './npmci.build'
+export { install } from './npmci.install';
+export { publish } from './npmci.publish';
 
-
-let smartcli = new plugins.smartcli.Smartcli();
-smartcli.addVersion(npmciInfo.version);
+let smartcli = new plugins.smartcli.Smartcli()
+smartcli.addVersion(npmciInfo.version)
 
 // build
-smartcli.addCommand({
-    commandName:"build"
-}).then((argv) => {
-    build(argv._[1])
-        .then(NpmciEnv.configStore);
-});
+smartcli.addCommand('build')
+  .then((argv) => {
+    build(argv._[ 1 ])
+      .then(NpmciEnv.configStore)
+  })
 
 // clean
-smartcli.addCommand({
-    commandName:"clean"
-}).then((argv) => {
+smartcli.addCommand('clean')
+  .then((argv) => {
     clean()
-        .then(NpmciEnv.configStore);
-});
+      .then(NpmciEnv.configStore)
+  })
 
 // command
-smartcli.addCommand({
-    commandName:"command"
-}).then((argv) => {
+smartcli.addCommand('command')
+  .then((argv) => {
     command()
-        .then(NpmciEnv.configStore);
-});
+      .then(NpmciEnv.configStore)
+  })
 
 // install
-smartcli.addCommand({
-    commandName:"install"
-}).then((argv) => {
-    install(argv._[1])
-        .then(NpmciEnv.configStore);
-});
+smartcli.addCommand('install')
+  .then((argv) => {
+    install(argv._[ 1 ])
+      .then(NpmciEnv.configStore)
+  })
 
 // prepare
-smartcli.addCommand({
-    commandName:"prepare"
-}).then((argv) => {
-    prepare(argv._[1])
-        .then(NpmciEnv.configStore);
-});
+smartcli.addCommand('prepare')
+  .then((argv) => {
+    prepare(argv._[ 1 ])
+      .then(NpmciEnv.configStore)
+  })
 
 // publish
-smartcli.addCommand({
-    commandName:"publish"
-}).then((argv) => {
-    publish(argv._[1])
-        .then(NpmciEnv.configStore);
-});
+smartcli.addCommand('publish')
+  .then((argv) => {
+    publish(argv._[ 1 ])
+      .then(NpmciEnv.configStore)
+  })
 
 // test
-smartcli.addCommand({
-    commandName:"test"
-}).then((argv) => {
-    test(argv._[1])
-        .then(NpmciEnv.configStore);
-});
+smartcli.addCommand('test')
+  .then((argv) => {
+    test(argv._[ 1 ])
+      .then(NpmciEnv.configStore)
+  })
 
 // trigger
-smartcli.addCommand({
-    commandName:"trigger"
-}).then((argv) => {
-    trigger();
-});
+smartcli.addCommand('trigger')
+  .then((argv) => {
+    trigger()
+  })
 
-smartcli.startParse();
+smartcli.startParse()

ts/npmci.bash.ts

@@ -1,50 +1,106 @@
-import "typings-global";
-import * as plugins from "./npmci.plugins";
+import * as plugins from './npmci.plugins'
+import * as paths from './npmci.paths'
 
+import * as smartq from 'smartq'
 
-let nvmSourceString: string = "";
-export let nvmAvailable: boolean = false;
-let checkNvm = () => {
-    if (plugins.shelljs.exec(`bash -c "source /usr/local/nvm/nvm.sh"`,{silent:true}).code === 0) {
-        nvmSourceString = `source /usr/local/nvm/nvm.sh && `
-        nvmAvailable = true;
-    } else if (plugins.shelljs.exec(`bash -c "source ~/.nvm/nvm.sh"`,{silent:true}).code === 0) {
-        nvmSourceString = `source ~/.nvm/nvm.sh && `
-        nvmAvailable = true;
-    };
-};
-checkNvm();
+/**
+ * wether nvm is available or not
+ */
+export let nvmAvailable = smartq.defer<boolean>()
+export let yarnAvailable = smartq.defer<boolean>()
+/**
+ * the smartshell instance for npmci
+ */
+let npmciSmartshell = new plugins.smartshell.Smartshell({
+  executor: 'bash',
+  sourceFilePaths: []
+})
 
-export let bash = (commandArg: string, retryArg = 2, bareArg = false) => {
-    let exitCode: number;
-    let stdOut: string;
-    let execResult;
-    if (!process.env.NPMTS_TEST) { // NPMTS_TEST is used during testing
-        for (let i = 0; i <= retryArg; i++) {
-            if (!bareArg) {
-                execResult = plugins.shelljs.exec(
-                    `bash -c "${nvmSourceString} ${commandArg}"`
-                );
-            } else {
-                execResult = plugins.shelljs.exec(commandArg);
-            }
-            exitCode = execResult.code;
-            stdOut = execResult.stdout;
-            if (exitCode !== 0 && i == retryArg) {
-                process.exit(1);
-            } else if (exitCode == 0) {
-                i = retryArg + 1; // if everything works out ok retrials are not wanted
-            } else {
-                plugins.beautylog.warn("Something went wrong! Exit Code: " + exitCode.toString());
-                plugins.beautylog.info("Retry " + (i + 1).toString() + " of " + retryArg.toString());
-            }
-        }
+/**
+ * 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 {
-        plugins.beautylog.log("ShellExec would be: " + commandArg)
+      nvmAvailable.resolve(false)
     }
-    return stdOut;
+
+    // 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)
+  }
+}
+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 = async (commandArg: string, retryArg: number = 2): Promise<string> => {
+  await nvmAvailable.promise // make sure nvm check has run
+  let execResult: plugins.smartshell.IExecResult
+
+  // 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 (process.env.DEBUG_NPMCI === 'true') {
+        console.log(commandArg)
+      }
+      execResult = await npmciSmartshell.exec(commandArg)
+
+      // determine how bash reacts to error and success
+      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 (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: ' + 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 execResult.stdout
 }
 
-export let bashBare = (commandArg, retryArg = 2) => {
-    return bash(commandArg, retryArg, true);
-}
+/**
+ * bashNoError allows executing stuff without throwing an error
+ */
+export let bashNoError = async (commandArg: string): Promise<string> => {
+  return await bash(commandArg, -1)
+}

ts/npmci.build.docker.ts

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

ts/npmci.build.ts

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

ts/npmci.clean.ts

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

ts/npmci.command.ts

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

ts/npmci.config.ts

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

ts/npmci.env.ts

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

ts/npmci.install.ts

@@ -1,29 +1,54 @@
-import "typings-global";
-import * as plugins from "./npmci.plugins";
-import { bash } from "./npmci.bash";
-import { nvmAvailable } from "./npmci.bash"
+import * as plugins from './npmci.plugins'
+import * as configModule from './npmci.config'
+import {
+  bash,
+  bashNoError,
+  nvmAvailable,
+  yarnAvailable } from './npmci.bash'
 
-export let install = (versionArg) => {
-    let done = plugins.q.defer();
-    plugins.beautylog.log(`now installing node version ${versionArg}`);
-    let version: string;
-    if (versionArg == "stable") {
-        version = "6.3.0";
-    } else if (versionArg == "lts") {
-        version = "6.3.0";
-    } else if (versionArg == "legacy") {
-        version = "6.3.0"
-    } else {
-        version = versionArg;
-    };
-    if (nvmAvailable) {
-        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");
-    bash("npm -v");
-    done.resolve();
-    return done.promise;
-}
+/**
+ * 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') {
+    version = 'stable'
+  } else if (versionArg === 'lts') {
+    version = '6'
+  } else if (versionArg === 'legacy') {
+    version = '6'
+  } else {
+    version = versionArg
+  };
+  if (await nvmAvailable.promise) {
+    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!')
+  };
+  await bash('node -v')
+  await bash('npm -v')
+  // lets look for further config
+  await configModule.getConfig()
+    .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: 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`)
+          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!')
+    })
+}

ts/npmci.paths.ts

@@ -1,9 +1,8 @@
-import "typings-global";
-import * as plugins from "./npmci.plugins";
+import * as plugins from './npmci.plugins'
 
-export let cwd = process.cwd();
+export let cwd = process.cwd()
 
-export let NpmciPackageRoot = plugins.path.join(__dirname,"../");
-export let NpmciPackageConfig = plugins.path.join(NpmciPackageRoot,"./config.json");
-export let NpmciProjectDir = cwd;
-export let NpmciTestDir = plugins.path.join(cwd,"./test");
+export let NpmciPackageRoot = plugins.path.join(__dirname,'../')
+export let NpmciPackageConfig = plugins.path.join(NpmciPackageRoot,'./config.json')
+export let NpmciProjectDir = cwd
+export let NpmciTestDir = plugins.path.join(cwd,'./test')

ts/npmci.plugins.ts

@@ -1,17 +1,20 @@
-import "typings-global";
-export import beautylog = require("beautylog");
-export let gulp = require("gulp");
-export let gulpFunction = require("gulp-function");
-export let lodash = require("lodash");
-export import path = require("path");
-export import projectinfo = require("projectinfo");
-export import q = require("q");
-export let request = require("request");
-export import shelljs = require("shelljs");
-export import smartcli = require("smartcli");
-export import smartfile = require("smartfile");
-export import smartparam = require("smartparam");
-export import smartsocket = require("smartsocket");
-export import smartssh = require("smartssh");
-export import smartstring = require("smartstring");
-export let through2 = require("through2");
+export import beautylog = require('beautylog')
+export let gulp = require('gulp')
+export import gulpFunction = require('gulp-function')
+export import lodash = require('lodash')
+export import npmextra = require('npmextra')
+export import path = require('path')
+export import projectinfo = require('projectinfo')
+export import q = require('smartq')
+export let request = require('request')
+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')
+export import through2 = require('through2')

ts/npmci.prepare.ts

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

ts/npmci.publish.ts

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

ts/npmci.servezone.ts

@@ -1,32 +1,32 @@
-import * as plugins from "./npmci.plugins";
+import * as plugins from './npmci.plugins'
 
 /**
  * servezoneRegex is the regex that parses the servezone connection data
  * parses strings in the form of "servezone.example.com|3000|somepassword"
  */
-let servezoneRegex = /^(.*)\|(.*)\|(.*)/;
+let servezoneRegex = /^(.*)\|(.*)\|(.*)/
 
 /**
  * holds the results of the parsed servezone env string
  */
-let servezoneRegexResultArray = servezoneRegex.exec(process.env.NPMCI_SERVEZONE);
+let servezoneRegexResultArray = servezoneRegex.exec(process.env.NPMCI_SERVEZONE)
 
 /**
  * the data object that is used for the smartsocket client object
  */
 let smartsocketClientConstructorOptions = {
-    alias: "npmci",
+    alias: 'npmci',
     password: servezoneRegexResultArray[3],
     port: parseInt(servezoneRegexResultArray[2]),
-    role: "ci",
+    role: 'ci',
     url: servezoneRegexResultArray[1]
-};
+}
 
 /**
  * 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

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

ts/npmci.test.ts

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

ts/npmci.trigger.ts

@@ -1,32 +1,27 @@
-import "typings-global";
-import * as plugins from "./npmci.plugins";
-import {prepare} from "./npmci.prepare";
-import {bash} from "./npmci.bash";
+import * as plugins from './npmci.plugins'
+import { prepare } from './npmci.prepare'
+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\.\-\/]*)/
 
-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 () {
-    let done = plugins.q.defer();
-    plugins.beautylog.info("now running triggers");
-    plugins.smartparam.forEachMinimatch(process.env, "NPMCI_TRIGGER_*", evaluateTrigger);
-    done.resolve();
-    return done.promise;
+export let trigger = async () => {
+  plugins.beautylog.info('now running triggers')
+  plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger)
 }
 
-let evaluateTrigger = (triggerEnvVarArg) => {
-    let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg);
-    let regexDomain = triggerRegexResultArray[1];
-    let regexProjectId = triggerRegexResultArray[2];
-    let regexProjectTriggerToken = triggerRegexResultArray[3];
-    let regexRefName = triggerRegexResultArray[4];
-    let regexTriggerName;
-    if (triggerRegexResultArray.length == 6) {
-        regexTriggerName = triggerRegexResultArray[5];
-    } else {
-        regexTriggerName = "Unnamed Trigger";
-    }
-    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 } });
-}
+let evaluateTrigger = async (triggerEnvVarArg) => {
+  let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg)
+  let regexDomain = triggerRegexResultArray[1]
+  let regexProjectId = triggerRegexResultArray[2]
+  let regexProjectTriggerToken = triggerRegexResultArray[3]
+  let regexRefName = triggerRegexResultArray[4]
+  let regexTriggerName
+  if (triggerRegexResultArray.length === 6) {
+    regexTriggerName = triggerRegexResultArray[5]
+  } else {
+    regexTriggerName = 'Unnamed Trigger'
+  }
+  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 } })
+}

tslint.json

@@ -0,0 +1,3 @@
+{
+    "extends": "tslint-config-standard"
+}