2.3.52

Go fully async with shelljs to reduce processor strain

Closes #2

See merge request !2

.gitignore

@@ -3,3 +3,4 @@ coverage/
 pages/
 public/
 config.json
+.yarn/

.gitlab-ci.yml

@@ -8,13 +8,13 @@ stages:
 
 
 before_script:
-  - npm install npmci --loglevel=silent -g
+  - 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
@@ -23,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
@@ -32,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

README.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)

dist/cli.js

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

dist/index.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const paths = require("./npmci.paths");
 let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot);
@@ -21,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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMkNBQTBDO0FBQzFDLHVDQUFzQztBQUN0QyxJQUFJLFNBQVMsR0FBRyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQzlFLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLGlCQUFpQixHQUFHLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtBQUU1RCwrQ0FBbUM7QUFDbkMsK0NBQW1DO0FBQ25DLG1EQUF1QztBQUN2QyxtREFBdUM7QUFDdkMsbURBQXVDO0FBQ3ZDLG1EQUF1QztBQUN2Qyw2Q0FBaUM7QUFDakMsbURBQXVDO0FBQ3ZDLHdDQUF1QztBQUV2Qyw2Q0FBbUM7QUFBM0IsOEJBQUEsS0FBSyxDQUFBO0FBQ2IsaURBQXdDO0FBQWhDLGtDQUFBLE9BQU8sQ0FBQTtBQUNmLGlEQUF3QztBQUFoQyxrQ0FBQSxPQUFPLENBQUE7QUFFZixJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUE7QUFDOUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUE7QUFFdEMsUUFBUTtBQUNSLFFBQVEsQ0FBQyxVQUFVLENBQUM7SUFDaEIsV0FBVyxFQUFFLE9BQU87Q0FDdkIsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCxtQkFBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDWCxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQ25DLENBQUMsQ0FBQyxDQUFBO0FBRUYsUUFBUTtBQUNSLFFBQVEsQ0FBQyxVQUFVLENBQUM7SUFDaEIsV0FBVyxFQUFFLE9BQU87Q0FDdkIsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCxtQkFBSyxFQUFFO1NBQ0YsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUNuQyxDQUFDLENBQUMsQ0FBQTtBQUVGLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxTQUFTO0NBQ3pCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sRUFBRTtTQUNKLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUFDLENBQUE7QUFFRixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUUsU0FBUztDQUN6QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNiLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUFDLENBQUE7QUFFRixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUUsU0FBUztDQUN6QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNiLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUFDLENBQUE7QUFFRixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUUsU0FBUztDQUN6QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNiLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUFDLENBQUE7QUFFRixPQUFPO0FBQ1AsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUUsTUFBTTtDQUN0QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULGlCQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNWLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUFDLENBQUE7QUFFRixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUUsU0FBUztDQUN6QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLEVBQUUsQ0FBQTtBQUNiLENBQUMsQ0FBQyxDQUFBO0FBRUYsUUFBUSxDQUFDLFVBQVUsRUFBRSxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFDdEMsSUFBSSxTQUFTLEdBQUcsSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtBQUM5RSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUE7QUFFNUQsK0NBQXFDO0FBQ3JDLCtDQUFxQztBQUNyQyxtREFBeUM7QUFDekMsbURBQXlDO0FBQ3pDLG1EQUF5QztBQUN6QyxtREFBeUM7QUFDekMsNkNBQW1DO0FBQ25DLG1EQUF5QztBQUN6Qyx3Q0FBdUM7QUFFdkMsNkNBQXFDO0FBQTVCLDhCQUFBLEtBQUssQ0FBQTtBQUNkLGlEQUEwQztBQUFqQyxrQ0FBQSxPQUFPLENBQUE7QUFDaEIsaURBQTBDO0FBQWpDLGtDQUFBLE9BQU8sQ0FBQTtBQUVoQixJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUE7QUFDOUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUE7QUFFdEMsUUFBUTtBQUNSLFFBQVEsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDO0tBQ3pCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCxtQkFBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFFLENBQUM7U0FDZixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQy9CLENBQUMsQ0FBQyxDQUFBO0FBRUosUUFBUTtBQUNSLFFBQVEsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDO0tBQ3pCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCxtQkFBSyxFQUFFO1NBQ0osSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUMsQ0FBQTtBQUVKLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztLQUMzQixJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sRUFBRTtTQUNOLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7S0FDM0IsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBRSxDQUFDLENBQUUsQ0FBQztTQUNqQixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQy9CLENBQUMsQ0FBQyxDQUFBO0FBRUosVUFBVTtBQUNWLFFBQVEsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO0tBQzNCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCx1QkFBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFFLENBQUM7U0FDakIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUMsQ0FBQTtBQUVKLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztLQUMzQixJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFFLENBQUMsQ0FBRSxDQUFDO1NBQ2pCLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixPQUFPO0FBQ1AsUUFBUSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUM7S0FDeEIsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULGlCQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBRSxDQUFDLENBQUUsQ0FBQztTQUNkLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7S0FDM0IsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLEVBQUUsQ0FBQTtBQUNYLENBQUMsQ0FBQyxDQUFBO0FBRUosUUFBUSxDQUFDLFVBQVUsRUFBRSxDQUFBIn0=

dist/npmci.bash.d.ts

@@ -1,3 +1,20 @@
-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, bareArg?: boolean) => Promise<string>;
+/**
+ * bashBare allows usage of bash without sourcing any files like nvm
+ */
+export declare let bashBare: (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,51 +1,110 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
-let 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;
+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 ((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 (plugins.shelljs.exec(`bash -c "source ~/.nvm/nvm.sh"`, { silent: true }).code === 0) {
-        nvmSourceString = `source ~/.nvm/nvm.sh && `;
-        exports.nvmAvailable = 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);
     }
     ;
-};
-checkNvm();
-exports.bash = (commandArg, retryArg = 2, bareArg = false) => {
-    let exitCode;
-    let stdOut;
+    // check for yarn
+    yield plugins.smartshell.which('yarn').then(() => {
+        plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`);
+        exports.yarnAvailable.resolve(true);
+    }, () => { exports.yarnAvailable.resolve(false); });
+});
+checkToolsAvailable();
+/**
+ * bash() allows using bash with nvm in path
+ * @param commandArg - The command to execute
+ * @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
+ */
+exports.bash = (commandArg, retryArg = 2, bareArg = false) => __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}"`);
+                execResult = yield npmciSmartshell.exec(commandArg);
             }
             else {
-                execResult = plugins.shelljs.exec(commandArg);
+                execResult = yield plugins.smartshell.exec(commandArg);
             }
-            exitCode = execResult.code;
-            stdOut = execResult.stdout;
-            if (exitCode !== 0 && i === retryArg) {
-                process.exit(1);
+            // 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 (exitCode === 0) {
-                i = retryArg + 1; // if everything works out ok retrials are not wanted
+            else if (execResult.exitCode === 0) {
+                i = retryArg + 1; // retry +1 breaks for loop, if everything works out ok retrials are not wanted
             }
             else {
-                plugins.beautylog.warn('Something went wrong! Exit Code: ' + exitCode.toString());
+                plugins.beautylog.warn('Something went wrong! Exit Code: ' + execResult.exitCode.toString());
                 plugins.beautylog.info('Retry ' + (i + 1).toString() + ' of ' + retryArg.toString());
             }
         }
     }
     else {
         plugins.beautylog.log('ShellExec would be: ' + commandArg);
+        yield plugins.smartdelay.delayFor(100);
+        execResult = {
+            exitCode: 0,
+            stdout: 'testOutput'
+        };
     }
-    return stdOut;
-};
-exports.bashBare = (commandArg, retryArg = 2) => {
-    return exports.bash(commandArg, retryArg, true);
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUUxQyxJQUFJLGVBQWUsR0FBVyxFQUFFLENBQUE7QUFDckIsUUFBQSxZQUFZLEdBQVksS0FBSyxDQUFBO0FBQ3hDLElBQUksUUFBUSxHQUFHO0lBQ1gsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsd0NBQXdDLEVBQUMsRUFBQyxNQUFNLEVBQUUsSUFBSSxFQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMzRixlQUFlLEdBQUcsa0NBQWtDLENBQUE7UUFDcEQsb0JBQVksR0FBRyxJQUFJLENBQUE7SUFDdkIsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxnQ0FBZ0MsRUFBQyxFQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzFGLGVBQWUsR0FBRywwQkFBMEIsQ0FBQTtRQUM1QyxvQkFBWSxHQUFHLElBQUksQ0FBQTtJQUN2QixDQUFDO0lBQUEsQ0FBQztBQUNOLENBQUMsQ0FBQTtBQUNELFFBQVEsRUFBRSxDQUFBO0FBRUMsUUFBQSxJQUFJLEdBQUcsQ0FBQyxVQUFrQixFQUFFLFFBQVEsR0FBRyxDQUFDLEVBQUUsT0FBTyxHQUFHLEtBQUs7SUFDaEUsSUFBSSxRQUFnQixDQUFBO0lBQ3BCLElBQUksTUFBYyxDQUFBO0lBQ2xCLElBQUksVUFBVSxDQUFBO0lBQ2QsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7UUFDMUIsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsSUFBSSxRQUFRLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNqQyxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUM3QixZQUFZLGVBQWUsSUFBSSxVQUFVLEdBQUcsQ0FDL0MsQ0FBQTtZQUNMLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7WUFDakQsQ0FBQztZQUNELFFBQVEsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFBO1lBQzFCLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFBO1lBQzFCLEVBQUUsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7Z0JBQ25DLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDbkIsQ0FBQztZQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDeEIsQ0FBQyxHQUFHLFFBQVEsR0FBRyxDQUFDLENBQUEsQ0FBQyxxREFBcUQ7WUFDMUUsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLG1DQUFtQyxHQUFHLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFBO2dCQUNqRixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLEdBQUcsTUFBTSxHQUFHLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFBO1lBQ3hGLENBQUM7UUFDTCxDQUFDO0lBQ0wsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsc0JBQXNCLEdBQUcsVUFBVSxDQUFDLENBQUE7SUFDOUQsQ0FBQztJQUNELE1BQU0sQ0FBQyxNQUFNLENBQUE7QUFDakIsQ0FBQyxDQUFBO0FBRVUsUUFBQSxRQUFRLEdBQUcsQ0FBQyxVQUFVLEVBQUUsUUFBUSxHQUFHLENBQUM7SUFDM0MsTUFBTSxDQUFDLFlBQUksQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFBO0FBQzNDLENBQUMsQ0FBQSJ9
+    return execResult.stdout;
+});
+/**
+ * bashBare allows usage of bash without sourcing any files like nvm
+ */
+exports.bashBare = (commandArg, retryArg = 2) => __awaiter(this, void 0, void 0, function* () {
+    return yield exports.bash(commandArg, retryArg, true);
+});
+/**
+ * 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFFdEMsaUNBQWdDO0FBRWhDOztHQUVHO0FBQ1EsUUFBQSxZQUFZLEdBQUcsTUFBTSxDQUFDLEtBQUssRUFBVyxDQUFBO0FBQ3RDLFFBQUEsYUFBYSxHQUFHLE1BQU0sQ0FBQyxLQUFLLEVBQVcsQ0FBQTtBQUNsRDs7R0FFRztBQUNILElBQUksZUFBZSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7SUFDdEQsUUFBUSxFQUFFLE1BQU07SUFDaEIsZUFBZSxFQUFFLEVBQUU7Q0FDcEIsQ0FBQyxDQUFBO0FBRUY7O0dBRUc7QUFDSCxJQUFJLG1CQUFtQixHQUFHO0lBQ3hCLGdCQUFnQjtJQUNoQixFQUFFLENBQUMsQ0FDRCxDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsd0NBQXdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUMvRixDQUFDLENBQUMsQ0FBQztRQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLENBQUE7UUFDekQsb0JBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDNUIsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FDUixDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsZ0NBQWdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUN2RixDQUFDLENBQUMsQ0FBQztRQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFBO1FBQ2pELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNO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

dist/npmci.build.d.ts

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

dist/npmci.build.docker.d.ts

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

dist/npmci.build.js

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

dist/npmci.clean.d.ts

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

dist/npmci.clean.js

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

dist/npmci.command.d.ts

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

dist/npmci.command.js

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

dist/npmci.config.d.ts

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

dist/npmci.config.js

@@ -1,16 +1,21 @@
 "use strict";
-const q = require("q");
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const paths = require("./npmci.paths");
-exports.getConfig = () => {
-    console.log('getting config');
-    let done = q.defer();
+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);
-    done.resolve(npmciConfig);
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx1QkFBc0I7QUFFdEIsMkNBQTBDO0FBQzFDLHVDQUFzQztBQU0zQixRQUFBLFNBQVMsR0FBRztJQUNuQixPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUE7SUFDN0IsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBaUIsQ0FBQTtJQUNuQyxJQUFJLGFBQWEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUM1RCxJQUFJLGFBQWEsR0FBa0I7UUFDL0IsY0FBYyxFQUFFLEVBQUU7S0FDckIsQ0FBQTtJQUNELElBQUksV0FBVyxHQUFHLGFBQWEsQ0FBQyxPQUFPLENBQWdCLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQTtJQUM5RSxJQUFJLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQ3pCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQSJ9
+    return npmciConfig;
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFFQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBTTNCLFFBQUEsU0FBUyxHQUFHO0lBQ3JCLElBQUksYUFBYSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzVELElBQUksYUFBYSxHQUFrQjtRQUNqQyxjQUFjLEVBQUUsRUFBRTtLQUNuQixDQUFBO0lBQ0QsSUFBSSxXQUFXLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBZ0IsT0FBTyxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQzlFLE1BQU0sQ0FBQyxXQUFXLENBQUE7QUFDcEIsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.env.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const paths = require("./npmci.paths");
 const smartstring_1 = require("smartstring");
@@ -45,4 +46,4 @@ let configLoad = () => {
     exports.config.dockerFilesBuilt ? exports.dockerFilesBuilt = exports.config.dockerFilesBuilt : void (0);
 };
 configLoad();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBQ3RDLDZDQUFtQztBQUluQyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQztJQUFDLFlBQUksR0FBRyxJQUFJLHFCQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQTtBQUVqRSxRQUFBLFVBQVUsR0FBVyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQTtBQUkvQyxRQUFBLGlCQUFpQixHQUFHLENBQUMsaUJBQXlCO0lBQ3JELHNCQUFjLEdBQUcsaUJBQWlCLENBQUE7QUFDdEMsQ0FBQyxDQUFBO0FBQ1UsUUFBQSxnQkFBZ0IsR0FBaUIsRUFBRSxDQUFBO0FBQ25DLFFBQUEsV0FBVyxHQUFpQixFQUFFLENBQUE7QUFDOUIsUUFBQSxNQUFNLEdBQUc7SUFDaEIsY0FBYyxFQUFFLFNBQVM7SUFDekIsZ0JBQWdCLEVBQUUsd0JBQWdCO0lBQ2xDLFdBQVcsRUFBRSxtQkFBVztJQUN4QixPQUFPLEVBQUUsU0FBUztDQUNyQixDQUFBO0FBRVUsUUFBQSxXQUFXLEdBQUc7SUFDckIsY0FBTSxDQUFDLGNBQWMsR0FBRyxzQkFBYyxDQUFBO0lBQ3RDLE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FDN0IsSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFNLENBQUMsRUFDdEIsS0FBSyxDQUFDLGtCQUFrQixDQUMzQixDQUFBO0FBQ0wsQ0FBQyxDQUFBO0FBRUQsSUFBSSxVQUFVLEdBQUc7SUFDYix1RUFBdUU7SUFDdkUsSUFBSSxDQUFDO1FBQ0QsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsY0FBTSxFQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQTtJQUNwRyxDQUNBO0lBQUEsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNULG1CQUFXLEVBQUUsQ0FBQTtRQUNiLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLENBQUE7SUFDaEQsQ0FBQztJQUVELGlCQUFpQjtJQUNqQixJQUFJLENBQUM7UUFDRCxFQUFFLENBQUMsQ0FBQyxDQUFDLGNBQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ2xCLGNBQU0sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxlQUFlLEVBQUMsWUFBWSxDQUFDLENBQUE7WUFDdEYsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtRQUNqRCxDQUFDO1FBQUEsQ0FBQztJQUNOLENBQ0E7SUFBQSxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ1QsY0FBTSxDQUFDLE9BQU8sR0FBRyxFQUFFLENBQUE7UUFDbkIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZ0VBQWdFLENBQUMsQ0FBQTtJQUMzRixDQUFDO0lBRUQsY0FBTSxDQUFDLGNBQWMsR0FBRyxzQkFBYyxHQUFHLGNBQU0sQ0FBQyxjQUFjLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3hFLGNBQU0sQ0FBQyxnQkFBZ0IsR0FBRyx3QkFBZ0IsR0FBRyxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ2xGLENBQUMsQ0FBQTtBQUNELFVBQVUsRUFBRSxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMkNBQTBDO0FBQzFDLHVDQUFzQztBQUN0Qyw2Q0FBcUM7QUFJckMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUM7SUFBQyxZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUE7QUFFakUsUUFBQSxVQUFVLEdBQVcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUE7QUFJL0MsUUFBQSxpQkFBaUIsR0FBRyxDQUFDLGlCQUF5QjtJQUN2RCxzQkFBYyxHQUFHLGlCQUFpQixDQUFBO0FBQ3BDLENBQUMsQ0FBQTtBQUNVLFFBQUEsZ0JBQWdCLEdBQWlCLEVBQUUsQ0FBQTtBQUNuQyxRQUFBLFdBQVcsR0FBaUIsRUFBRSxDQUFBO0FBQzlCLFFBQUEsTUFBTSxHQUFHO0lBQ2xCLGNBQWMsRUFBRSxTQUFTO0lBQ3pCLGdCQUFnQixFQUFFLHdCQUFnQjtJQUNsQyxXQUFXLEVBQUUsbUJBQVc7SUFDeEIsT0FBTyxFQUFFLFNBQVM7Q0FDbkIsQ0FBQTtBQUVVLFFBQUEsV0FBVyxHQUFHO0lBQ3ZCLGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsQ0FBQTtJQUN0QyxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQy9CLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBTSxDQUFDLEVBQ3RCLEtBQUssQ0FBQyxrQkFBa0IsQ0FDekIsQ0FBQTtBQUNILENBQUMsQ0FBQTtBQUVELElBQUksVUFBVSxHQUFHO0lBQ2YsdUVBQXVFO0lBQ3ZFLElBQUksQ0FBQztRQUNILE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLGNBQU0sRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUE7SUFDcEcsQ0FBQztJQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDYixtQkFBVyxFQUFFLENBQUE7UUFDYixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0lBQzlDLENBQUM7SUFFRCxpQkFBaUI7SUFDakIsSUFBSSxDQUFDO1FBQ0gsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztZQUNwQixjQUFNLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsZUFBZSxFQUFFLFlBQVksQ0FBQyxDQUFBO1lBQ3ZGLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLHVCQUF1QixDQUFDLENBQUE7UUFDL0MsQ0FBQztRQUFBLENBQUM7SUFDSixDQUFDO0lBQ0QsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNYLGNBQU0sQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFBO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLGdFQUFnRSxDQUFDLENBQUE7SUFDekYsQ0FBQztJQUVELGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsR0FBRyxjQUFNLENBQUMsY0FBYyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6RSxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsd0JBQWdCLEdBQUcsY0FBTSxDQUFDLGdCQUFnQixHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqRixDQUFDLENBQUE7QUFDRCxVQUFVLEVBQUUsQ0FBQSJ9

dist/npmci.install.d.ts

@@ -1,3 +1,5 @@
-/// <reference types="q" />
-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,10 +1,21 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const configModule = require("./npmci.config");
 const npmci_bash_1 = require("./npmci.bash");
-const npmci_bash_2 = require("./npmci.bash");
-exports.install = (versionArg) => {
-    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') {
@@ -20,25 +31,38 @@ exports.install = (versionArg) => {
         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!');
     }
     ;
-    npmci_bash_1.bash('node -v');
-    npmci_bash_1.bash('npm -v');
+    yield npmci_bash_1.bash('node -v');
+    yield npmci_bash_1.bash('npm -v');
     // lets look for further config
-    configModule.getConfig()
-        .then(config => {
-        for (let npmTool of config.globalNpmTools) {
-            plugins.beautylog.info(`globally installing ${npmTool} from npm`);
-            npmci_bash_1.bash(`npm install --loglevel=silent  -g ${npmTool}`);
+    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`);
+                }
+            }
         }
-        done.resolve();
-    });
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUMxQywrQ0FBOEM7QUFDOUMsNkNBQW1DO0FBQ25DLDZDQUEyQztBQUNoQyxRQUFBLE9BQU8sR0FBRyxDQUFDLFVBQVU7SUFDNUIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsVUFBVSxFQUFFLENBQUMsQ0FBQTtJQUNsRSxJQUFJLE9BQWUsQ0FBQTtJQUNuQixFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUMxQixPQUFPLEdBQUcsUUFBUSxDQUFBO0lBQ3RCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDOUIsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNqQixDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLE9BQU8sR0FBRyxHQUFHLENBQUE7SUFDakIsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxHQUFHLFVBQVUsQ0FBQTtJQUN4QixDQUFDO0lBQUEsQ0FBQztJQUNGLEVBQUUsQ0FBQyxDQUFDLHlCQUFZLENBQUMsQ0FBQyxDQUFDO1FBQ2YsaUJBQUksQ0FBQyxlQUFlLE9BQU8seUJBQXlCLE9BQU8sRUFBRSxDQUFDLENBQUE7UUFDOUQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLE9BQU8sMEJBQTBCLENBQUMsQ0FBQTtJQUNoRixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyx1REFBdUQsQ0FBQyxDQUFBO0lBQ25GLENBQUM7SUFBQSxDQUFDO0lBQ0YsaUJBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUNmLGlCQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFFZCwrQkFBK0I7SUFDL0IsWUFBWSxDQUFDLFNBQVMsRUFBRTtTQUNuQixJQUFJLENBQUMsTUFBTTtRQUNSLEdBQUcsQ0FBQyxDQUFDLElBQUksT0FBTyxJQUFJLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDO1lBQ3hDLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHVCQUF1QixPQUFPLFdBQVcsQ0FBQyxDQUFBO1lBQ2pFLGlCQUFJLENBQUMscUNBQXFDLE9BQU8sRUFBRSxDQUFDLENBQUE7UUFDeEQsQ0FBQztRQUNELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNsQixDQUFDLENBQUMsQ0FBQTtJQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQSJ9
+        plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!');
+    }));
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQywrQ0FBOEM7QUFDOUMsNkNBSXFDO0FBRXJDOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLENBQU8sVUFBVTtJQUNwQyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsVUFBVSxFQUFFLENBQUMsQ0FBQTtJQUNsRSxJQUFJLE9BQWUsQ0FBQTtJQUNuQixFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUM1QixPQUFPLEdBQUcsUUFBUSxDQUFBO0lBQ3BCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDaEMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDbkMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE9BQU8sR0FBRyxVQUFVLENBQUE7SUFDdEIsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyxNQUFNLHlCQUFZLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUMvQixNQUFNLGlCQUFJLENBQUMsZUFBZSxPQUFPLHlCQUF5QixPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBQ3BFLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLGdCQUFnQixPQUFPLDBCQUEwQixDQUFDLENBQUE7SUFDOUUsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdURBQXVELENBQUMsQ0FBQTtJQUNqRixDQUFDO0lBQUEsQ0FBQztJQUNGLE1BQU0saUJBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUNyQixNQUFNLGlCQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDcEIsK0JBQStCO0lBQy9CLE1BQU0sWUFBWSxDQUFDLFNBQVMsRUFBRTtTQUMzQixJQUFJLENBQUMsQ0FBTSxTQUFTO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLDZDQUE2QyxDQUFDLENBQUE7UUFDcEUsR0FBRyxDQUFDLENBQUMsSUFBSSxPQUFPLElBQUksU0FBUyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUM7WUFDN0MsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsd0JBQXdCLE9BQU8sR0FBRyxDQUFDLENBQUE7WUFDMUQsSUFBSSxXQUFXLEdBQVcsTUFBTSx3QkFBVyxDQUFDLFNBQVMsT0FBTyxFQUFFLENBQUMsQ0FBQTtZQUMvRCxJQUFJLGFBQWEsR0FBWSxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksV0FBVyxLQUFLLEVBQUUsQ0FBQyxDQUFBO1lBQ3RGLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7Z0JBQ2xCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLFFBQVEsT0FBTyxlQUFlLENBQUMsQ0FBQTtZQUN2RCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLE9BQU8sV0FBVyxDQUFDLENBQUE7Z0JBQ2pFLEVBQUUsQ0FBQyxDQUFDLE1BQU0sMEJBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO29CQUNoQyxNQUFNLGlCQUFJLENBQUMsbUJBQW1CLE9BQU8sRUFBRSxDQUFDLENBQUE7Z0JBQzFDLENBQUM7Z0JBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ04sTUFBTSxpQkFBSSxDQUFDLGVBQWUsT0FBTyxRQUFRLENBQUMsQ0FBQTtnQkFDNUMsQ0FBQztZQUNILENBQUM7UUFDSCxDQUFDO1FBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsb0VBQW9FLENBQUMsQ0FBQTtJQUNqRyxDQUFDLENBQUEsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.paths.js

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

dist/npmci.plugins.d.ts

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

dist/npmci.plugins.js

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

dist/npmci.prepare.d.ts

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

dist/npmci.prepare.js

@@ -1,12 +1,21 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
+const npmci_bash_1 = require("./npmci.bash");
 const env = require("./npmci.env");
 const sshModule = require("./npmci.ssh");
 /**
  * authenticates npm with token from env var
  */
-let npm = function () {
-    let done = plugins.q.defer();
+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;
@@ -18,14 +27,12 @@ let npm = function () {
         process.exit(1);
     }
     plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc');
-    done.resolve();
-    return done.promise;
-};
+    return;
+});
 /**
  * logs in docker
  */
-let docker = function () {
-    let done = plugins.q.defer();
+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) {
@@ -36,45 +43,39 @@ let docker = function () {
     let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER);
     let username = dockerRegexResultArray[1];
     let password = dockerRegexResultArray[2];
-    plugins.shelljs.exec('docker login -u ' + username + ' -p ' + password);
-    done.resolve();
-    return done.promise;
-};
+    yield npmci_bash_1.bash('docker login -u ' + username + ' -p ' + password);
+    return;
+});
 /**
  * prepare docker for gitlab registry
  */
-let dockerGitlab = function () {
-    let done = plugins.q.defer();
+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');
-    done.resolve();
-    return done.promise;
-};
+    return;
+});
 /**
  * prepare ssh
  */
-let ssh = function () {
-    let done = plugins.q.defer();
-    sshModule.ssh()
-        .then(done.resolve);
-    return done.promise;
-};
+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 = function (serviceArg) {
+exports.prepare = (serviceArg) => __awaiter(this, void 0, void 0, function* () {
     switch (serviceArg) {
         case 'npm':
-            return npm();
+            return yield npm();
         case 'docker':
-            return docker();
+            return yield docker();
         case 'docker-gitlab':
-            return dockerGitlab();
+            return yield dockerGitlab();
         case 'ssh':
-            return ssh();
+            return yield ssh();
         default:
             break;
     }
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHJlcGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnByZXBhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUUxQyxtQ0FBa0M7QUFDbEMseUNBQXdDO0FBVXhDOztHQUVHO0FBQ0gsSUFBSSxHQUFHLEdBQUc7SUFDTixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBRTVCLElBQUksV0FBVyxHQUFXLG1DQUFtQyxDQUFBO0lBQzdELElBQUksUUFBUSxHQUFXLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFBO0lBQ2xELElBQUksZUFBZSxHQUFHLFdBQVcsR0FBRyxRQUFRLENBQUE7SUFFNUMsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNYLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLENBQUE7SUFDaEQsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQTtRQUMxRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ25CLENBQUM7SUFDRCxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsZUFBZSxFQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQ2pFLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxNQUFNLEdBQUc7SUFDVCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsQ0FBQTtJQUNsQyxJQUFJLFdBQVcsR0FBRyxxQ0FBcUMsQ0FBQTtJQUN2RCxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO1FBQ2xDLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLHVEQUF1RCxDQUFDLENBQUE7UUFDaEYsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNuQixDQUFDO0lBQ0QsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMscUNBQXFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEdBQUcsR0FBRyxHQUFHLHFCQUFxQixDQUFDLENBQUEsQ0FBQyx1Q0FBdUM7SUFDOUosSUFBSSxzQkFBc0IsR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsQ0FBQTtJQUM3RSxJQUFJLFFBQVEsR0FBRyxzQkFBc0IsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4QyxJQUFJLFFBQVEsR0FBRyxzQkFBc0IsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4QyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxRQUFRLEdBQUcsTUFBTSxHQUFHLFFBQVEsQ0FBQyxDQUFBO0lBQ3ZFLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxZQUFZLEdBQUc7SUFDZixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0lBQzVDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxHQUFHLEdBQUcsR0FBRyxxQkFBcUIsQ0FBQyxDQUFBO0lBQ3RILElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxHQUFHLEdBQUc7SUFDTixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLFNBQVMsQ0FBQyxHQUFHLEVBQUU7U0FDVixJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLFVBQVMsVUFBd0I7SUFDbEQsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUNqQixLQUFLLEtBQUs7WUFDTixNQUFNLENBQUMsR0FBRyxFQUFFLENBQUE7UUFDaEIsS0FBSyxRQUFRO1lBQ1QsTUFBTSxDQUFDLE1BQU0sRUFBRSxDQUFBO1FBQ25CLEtBQUssZUFBZTtZQUNoQixNQUFNLENBQUMsWUFBWSxFQUFFLENBQUE7UUFDekIsS0FBSyxLQUFLO1lBQ04sTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFBO1FBQ2hCO1lBQ0ksS0FBSyxDQUFBO0lBQ2IsQ0FBQztBQUNMLENBQUMsQ0FBQSJ9
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHJlcGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnByZXBhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyw2Q0FBbUM7QUFDbkMsbUNBQWtDO0FBQ2xDLHlDQUF3QztBQVV4Qzs7R0FFRztBQUNILElBQUksR0FBRyxHQUFHO0lBQ1IsSUFBSSxXQUFXLEdBQVcsbUNBQW1DLENBQUE7SUFDN0QsSUFBSSxRQUFRLEdBQVcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUE7SUFDbEQsSUFBSSxlQUFlLEdBQVcsV0FBVyxHQUFHLFFBQVEsQ0FBQTtJQUNwRCxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtJQUM5QyxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFBO1FBQzFELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDakIsQ0FBQztJQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxlQUFlLEVBQUUsY0FBYyxDQUFDLENBQUE7SUFDbEUsTUFBTSxDQUFBO0FBQ1IsQ0FBQyxDQUFBLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksTUFBTSxHQUFHO0lBQ1gsR0FBRyxDQUFDLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQ2xDLElBQUksV0FBVyxHQUFHLHFDQUFxQyxDQUFBO0lBQ3ZELEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7UUFDcEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsdURBQXVELENBQUMsQ0FBQTtRQUNoRixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2pCLENBQUM7SUFDRCxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRyxHQUFHLEdBQUcscUJBQXFCLENBQUMsQ0FBQSxDQUFDLHVDQUF1QztJQUM5SixJQUFJLHNCQUFzQixHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFBO0lBQzdFLElBQUksUUFBUSxHQUFHLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3hDLElBQUksUUFBUSxHQUFHLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3hDLE1BQU0saUJBQUksQ0FBQyxrQkFBa0IsR0FBRyxRQUFRLEdBQUcsTUFBTSxHQUFHLFFBQVEsQ0FBQyxDQUFBO0lBQzdELE1BQU0sQ0FBQTtBQUNSLENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLFlBQVksR0FBRztJQUNqQixHQUFHLENBQUMsaUJBQWlCLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM1QyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRyxHQUFHLEdBQUcscUJBQXFCLENBQUMsQ0FBQTtJQUN0SCxNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxHQUFHLEdBQUc7SUFDUixNQUFNLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQTtBQUN2QixDQUFDLENBQUEsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLENBQU8sVUFBd0I7SUFDbEQsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUNuQixLQUFLLEtBQUs7WUFDUixNQUFNLENBQUMsTUFBTSxHQUFHLEVBQUUsQ0FBQTtRQUNwQixLQUFLLFFBQVE7WUFDWCxNQUFNLENBQUMsTUFBTSxNQUFNLEVBQUUsQ0FBQTtRQUN2QixLQUFLLGVBQWU7WUFDbEIsTUFBTSxDQUFDLE1BQU0sWUFBWSxFQUFFLENBQUE7UUFDN0IsS0FBSyxLQUFLO1lBQ1IsTUFBTSxDQUFDLE1BQU0sR0FBRyxFQUFFLENBQUE7UUFDcEI7WUFDRSxLQUFLLENBQUE7SUFDVCxDQUFDO0FBQ0gsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.publish.d.ts

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

dist/npmci.publish.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const npmci_prepare_1 = require("./npmci.prepare");
 const npmci_bash_1 = require("./npmci.bash");
@@ -7,36 +16,35 @@ const NpmciBuildDocker = require("./npmci.build.docker");
  * the main exported publish function.
  * @param pubServiceArg references targeted service to publish to
  */
-exports.publish = (pubServiceArg = 'npm') => {
+exports.publish = (pubServiceArg = 'npm') => __awaiter(this, void 0, void 0, function* () {
     switch (pubServiceArg) {
         case 'npm':
-            return publishNpm();
+            return yield publishNpm();
         case 'docker':
-            return publishDocker();
+            return yield publishDocker();
     }
-};
+});
 /**
  * tries to publish current cwd to NPM registry
  */
-let publishNpm = function () {
-    let 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHVibGlzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDJDQUEwQztBQUMxQyxtREFBdUM7QUFDdkMsNkNBQWlDO0FBRWpDLHlEQUF3RDtBQU94RDs7O0dBR0c7QUFDUSxRQUFBLE9BQU8sR0FBRyxDQUFDLGdCQUE2QixLQUFLO0lBQ3BELE1BQU0sQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFDcEIsS0FBSyxLQUFLO1lBQ04sTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFBO1FBQ3ZCLEtBQUssUUFBUTtZQUNULE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQTtJQUM5QixDQUFDO0FBQ0wsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLFVBQVUsR0FBSTtJQUNkLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDNUIsdUJBQU8sQ0FBQyxLQUFLLENBQUM7U0FDVCxJQUFJLENBQUM7UUFDRixpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzdCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNsQixDQUFDLENBQUMsQ0FBQTtJQUNQLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3RCLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxhQUFhLEdBQUc7SUFDaEIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUN4QixnQkFBZ0IsQ0FBQyxlQUFlLEVBQUU7U0FDakMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLG9CQUFvQixDQUFDO1NBQzNDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxlQUFlLENBQUM7U0FDdEMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUN2QixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUEifQ==
+        .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
@@ -22,7 +31,7 @@ let smartsocketClientConstructorOptions = {
 /**
  * the main run function to submit a service to a servezone
  */
-exports.run = (configArg) => {
+exports.run = (configArg) => __awaiter(this, void 0, void 0, function* () {
     new plugins.smartsocket.SmartsocketClient(smartsocketClientConstructorOptions);
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc2VydmV6b25lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc2VydmV6b25lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwyQ0FBMEM7QUFFMUM7OztHQUdHO0FBQ0gsSUFBSSxjQUFjLEdBQUcsbUJBQW1CLENBQUE7QUFFeEM7O0dBRUc7QUFDSCxJQUFJLHlCQUF5QixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUVoRjs7R0FFRztBQUNILElBQUksbUNBQW1DLEdBQUc7SUFDdEMsS0FBSyxFQUFFLE9BQU87SUFDZCxRQUFRLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0lBQ3RDLElBQUksRUFBRSxRQUFRLENBQUMseUJBQXlCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUMsSUFBSSxFQUFFLElBQUk7SUFDVixHQUFHLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0NBQ3BDLENBQUE7QUFFRDs7R0FFRztBQUNRLFFBQUEsR0FBRyxHQUFHLENBQUMsU0FBUztJQUN2QixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQ3JDLG1DQUFtQyxDQUN0QyxDQUFBO0FBQ0wsQ0FBQyxDQUFBIn0=
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc2VydmV6b25lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc2VydmV6b25lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFFMUM7OztHQUdHO0FBQ0gsSUFBSSxjQUFjLEdBQUcsbUJBQW1CLENBQUE7QUFFeEM7O0dBRUc7QUFDSCxJQUFJLHlCQUF5QixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUVoRjs7R0FFRztBQUNILElBQUksbUNBQW1DLEdBQUc7SUFDdEMsS0FBSyxFQUFFLE9BQU87SUFDZCxRQUFRLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0lBQ3RDLElBQUksRUFBRSxRQUFRLENBQUMseUJBQXlCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUMsSUFBSSxFQUFFLElBQUk7SUFDVixHQUFHLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0NBQ3BDLENBQUE7QUFFRDs7R0FFRztBQUNRLFFBQUEsR0FBRyxHQUFHLENBQU8sU0FBUztJQUM3QixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQ3JDLG1DQUFtQyxDQUN0QyxDQUFBO0FBQ0wsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.ssh.d.ts

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

dist/npmci.ssh.js

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

dist/npmci.test.d.ts

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

dist/npmci.trigger.d.ts

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

dist/npmci.trigger.js

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

npmextra.json

@@ -1,9 +1,16 @@
 {
     "npmts":{
         "mode":"default",
-        "coverageTreshold": "70"
+        "coverageTreshold": "70",
+        "cli": true
+    },
+    "npmci": {
+        "globalNpmTools": [
+            "npmts"
+        ]
     },
     "npmdocker":{
-        "baseImage":"hosttoday/ht-docker-node:npmts"
+        "baseImage":"hosttoday/ht-docker-node:npmts",
+        "command": "npmci test stable"
     }
 }

package.json

@@ -1,55 +1,56 @@
 {
   "name": "npmci",
-  "version": "2.3.24",
+  "version": "2.3.52",
   "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": "(cd test/assets/ && 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": {
     "@types/should": "^8.1.30",
-    "npmts-g": "^5.2.8",
-    "should": "^11.1.1",
+    "npmts-g": "^6.0.0",
+    "should": "^11.2.1",
     "typings-test": "^1.0.3"
   },
   "dependencies": {
-    "@types/lodash": "^4.14.40",
-    "@types/node": "^6.0.51",
-    "@types/q": "0.x.x",
+    "@types/lodash": "^4.14.55",
+    "@types/node": "^7.0.8",
     "@types/request": "0.x.x",
-    "@types/shelljs": "^0.3.33",
+    "@types/shelljs": "^0.7.0",
     "@types/through2": "^2.0.32",
-    "beautylog": "^6.0.0",
+    "beautylog": "^6.1.5",
     "gulp": "^3.9.1",
-    "gulp-function": "^2.2.0",
-    "lodash": "^4.17.2",
+    "gulp-function": "^2.2.3",
+    "lodash": "^4.17.4",
     "npmextra": "^2.0.3",
-    "projectinfo": "^1.0.4",
-    "q": "^1.4.1",
-    "request": "^2.79.0",
-    "shelljs": "^0.7.5",
-    "smartcli": "^1.0.15",
-    "smartfile": "^4.1.0",
+    "projectinfo": "^3.0.2",
+    "request": "^2.81.0",
+    "shelljs": "^0.7.7",
+    "smartcli": "^2.0.1",
+    "smartdelay": "^1.0.1",
+    "smartfile": "^4.1.7",
     "smartparam": "^0.1.1",
+    "smartq": "^1.1.1",
+    "smartshell": "^1.0.6",
     "smartsocket": "^1.1.7",
     "smartssh": "^1.2.1",
-    "smartstring": "^2.0.22",
-    "through2": "^2.0.1",
+    "smartstring": "^2.0.24",
+    "through2": "^2.0.3",
     "typings-global": "^1.0.14"
   }
 }

test/test.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-test");
 const should = require("should");
 const path = require("path");
@@ -85,4 +86,4 @@ describe('NPMCI', function () {
         });
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFDaEMsNkJBQTRCO0FBRTVCLHFCQUFxQjtBQUNyQixPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsR0FBRyx1REFBdUQsQ0FBQTtBQUNuRixPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRywyQkFBMkIsQ0FBQTtBQUN4RCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUE7QUFDL0IsT0FBTyxDQUFDLEdBQUcsR0FBRztJQUNWLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxTQUFTLENBQUMsQ0FBQTtBQUN6QyxDQUFDLENBQUE7QUFJRCwrREFBK0Q7QUFDL0Qsc0RBQXNEO0FBQ3RELGdEQUFnRDtBQUNoRCw4Q0FBOEM7QUFHOUMsSUFBSSxXQUF3QyxDQUFBO0FBQzVDLElBQUksV0FBd0MsQ0FBQTtBQUM1QyxJQUFJLGFBQTRDLENBQUE7QUFFaEQsUUFBUSxDQUFDLE9BQU8sRUFBQztJQUNiLFFBQVEsQ0FBQyxjQUFjLEVBQUM7UUFDcEIsRUFBRSxDQUFDLGlDQUFpQyxFQUFDO1lBQ2pDLFdBQVcsR0FBRyxJQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFDLFFBQVEsRUFBRSxjQUFjLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBQyxDQUFDLENBQUE7WUFDckYsV0FBVyxHQUFHLElBQUksZ0JBQWdCLENBQUMsVUFBVSxDQUFDLEVBQUMsUUFBUSxFQUFFLHVCQUF1QixFQUFFLElBQUksRUFBRSxJQUFJLEVBQUMsQ0FBQyxDQUFBO1lBQzlGLE1BQU0sQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1lBQzNDLE1BQU0sQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLFVB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3QkFBcUI7QUFDckIsaUNBQWdDO0FBQ2hDLDZCQUE0QjtBQUU1QixxQkFBcUI7QUFDckIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEdBQUcsdURBQXVELENBQUE7QUFDbkYsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEdBQUcsMkJBQTJCLENBQUE7QUFDeEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEdBQUcsTUFBTSxDQUFBO0FBQy9CLE9BQU8sQ0FBQyxHQUFHLEdBQUc7SUFDVixNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsU0FBUyxDQUFDLENBQUE7QUFDekMsQ0FBQyxDQUFBO0FBSUQsK0RBQStEO0FBQy9ELHNEQUFzRDtBQUN0RCxnREFBZ0Q7QUFDaEQsOENBQThDO0FBRzlDLElBQUksV0FBd0MsQ0FBQTtBQUM1QyxJQUFJLFdBQXdDLENBQUE7QUFDNUMsSUFBSSxhQUE0QyxDQUFBO0FBRWhELFFBQVEsQ0FBQyxPQUFPLEVBQUM7SUFDYixRQUFRLENBQUMsY0FBYyxFQUFDO1FBQ3BCLEVBQUUsQ0FBQyxpQ0FBaUMsRUFBQztZQUNqQyxXQUFXLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsRUFBQyxRQUFRLEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUMsQ0FBQyxDQUFBO1lBQ3JGLFdBQVcsR0FBRyxJQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFDLFFBQVEsRUFBRSx1QkFBdUIsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFDLENBQUMsQ0FBQTtZQUM5RixNQUFNLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtZQUMzQyxNQUFNLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxV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

ts/index.ts

@@ -3,84 +3,76 @@ 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 { 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)
 
 // 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) => {
+smartcli.addCommand('trigger')
+  .then((argv) => {
     trigger()
-})
+  })
 
 smartcli.startParse()

ts/npmci.bash.ts

@@ -1,48 +1,111 @@
 import * as plugins from './npmci.plugins'
+import * as paths from './npmci.paths'
 
-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
-    };
+import * as smartq from 'smartq'
+
+/**
+ * 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: []
+})
+
+/**
+ * check for tools.
+ */
+let checkToolsAvailable = async () => {
+  // check for nvm
+  if (
+    (await plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0
+  ) {
+    npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh`])
+    nvmAvailable.resolve(true)
+  } else if (
+    (await plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0
+  ) {
+    npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh`])
+    nvmAvailable.resolve(true)
+  } else {
+    nvmAvailable.resolve(false)
+  };
+
+  // check for yarn
+  await plugins.smartshell.which('yarn').then(
+    () => {
+      plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd,'.yarn')}`)
+      yarnAvailable.resolve(true)
+    },
+    () => { yarnAvailable.resolve(false) }
+  )
 }
-checkNvm()
+checkToolsAvailable()
 
-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())
-            }
+
+
+/**
+ * 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, bareArg: boolean = false): 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 (!bareArg) {
+        execResult = await npmciSmartshell.exec(commandArg)
+      } else {
+        execResult = await plugins.smartshell.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 {
-        plugins.beautylog.log('ShellExec would be: ' + commandArg)
+      } 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())
+      }
     }
-    return stdOut
+  } 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)
+/**
+ * bashBare allows usage of bash without sourcing any files like nvm
+ */
+export let bashBare = async (commandArg: string, retryArg: number = 2): Promise<string> => {
+  return await 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,43 +1,38 @@
 import * as plugins from './npmci.plugins'
 import * as paths from './npmci.paths'
 import * as NpmciEnv from './npmci.env'
-import {bashBare} from './npmci.bash'
+import { bashBare } from './npmci.bash'
 
 /**
  * builds a cwd of Dockerfiles by triggering a promisechain
  */
-export let build = function(){
-    let done = plugins.q.defer()
-    readDockerfiles()
-        .then(sortDockerfiles)
-        .then(mapDockerfiles)
-        .then(buildDockerfiles)
-        .then(pushDockerfiles)
-        .then(() => {
-            done.resolve()
-        })
-    return done.promise
+export let build = async () => {
+  await readDockerfiles()
+    .then(sortDockerfiles)
+    .then(mapDockerfiles)
+    .then(buildDockerfiles)
+    .then(pushDockerfiles)
 }
 
 /**
  * creates instance of class Dockerfile for all Dockerfiles in cwd
  * @returns Promise<Dockerfile[]>
  */
-export let readDockerfiles = function(): plugins.q.Promise<Dockerfile[]>{
-    let done = plugins.q.defer<Dockerfile[]>()
-    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
+export let readDockerfiles = async (): Promise<Dockerfile[]> => {
+  let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, './Dockerfile*')
+
+  // create the Dockerfile array
+  let readDockerfilesArray: Dockerfile[] = []
+  for (let dockerfilePath of fileTree) {
+    let myDockerfile = new Dockerfile({
+      filePath: dockerfilePath,
+      read: true
+    })
+    readDockerfilesArray.push(myDockerfile)
+  }
+
+  return readDockerfilesArray
+
 }
 
 /**
@@ -45,249 +40,236 @@ export let readDockerfiles = function(): plugins.q.Promise<Dockerfile[]>{
  * @param sortableArrayArg an array of instances of class Dockerfile
  * @returns Promise<Dockerfile[]>
  */
-export let sortDockerfiles = function(sortableArrayArg: Dockerfile[]): plugins.q.Promise<Dockerfile[]>{
-    let done = plugins.q.defer<Dockerfile[]>()
-    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 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) => {
+      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
 }
 
 /**
  * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
  */
-export let mapDockerfiles = function(sortedArray: Dockerfile[]): plugins.q.Promise<Dockerfile[]>{
-    let done = plugins.q.defer<Dockerfile[]>()
-    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 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 = (sortedArrayArg: Dockerfile[]) => {
-    let done = plugins.q.defer()
-    sortedArrayArg.forEach(function(dockerfileArg){
-        dockerfileArg.build()
-    })
-    done.resolve(sortedArrayArg)
-    return done.promise
+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 = function(sortedArrayArg: Dockerfile[]){
-    let done = plugins.q.defer()
-    sortedArrayArg.forEach(function(dockerfileArg){
-        dockerfileArg.push(NpmciEnv.buildStage)
-    })
-    done.resolve(sortedArrayArg)
-    return done.promise
+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 = (sortableArrayArg: Dockerfile[],registryArg = 'registry.gitlab.com') => {
-    let done = plugins.q.defer()
-    sortableArrayArg.forEach((dockerfileArg) => {
-        dockerfileArg.pull(registryArg)
-    })
-    done.resolve(sortableArrayArg)
-    return done.promise
+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 = (sortedArrayArg: Dockerfile[]) => {
-    let done = plugins.q.defer()
-    sortedArrayArg.forEach(function(dockerfileArg){
-        dockerfileArg.test()
-    })
-    done.resolve(sortedArrayArg)
-    return done.promise
+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
+  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
+  };
 
-    /**
-     * builds the Dockerfile
-     */
-    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
-    };
+  /**
+   * builds the Dockerfile
+   */
+  async build() {
+    plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
+    await bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .')
+    NpmciEnv.dockerFilesBuilt.push(this)
+    return
+  };
 
-    /**
-     * pushes the Dockerfile to a registry
-     */
-    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
-    };
-
-    /**
-     * pulls the Dockerfile from a registry
-     */
-    pull(registryArg: string) {
-        let pullTag = this.testTag
-        bashBare('docker pull ' + pullTag)
-        bashBare('docker tag ' + pullTag + ' ' + this.buildTag)
-    };
-
-    /**
-     * tests the Dockerfile;
-     */
-    test() {
-        let testFile: string = plugins.path.join(paths.NpmciTestDir,'test_' + this.version + '.sh')
-        let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile)
-        if (testFileExists) {
-            bashBare('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
-            bashBare('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
-            bashBare('docker commit npmci_test_container npmci_test_image')
-            bashBare('docker run npmci_test_image sh /npmci_test/test.sh')
-            bashBare('docker rm npmci_test_container')
-            bashBare('docker rmi --force npmci_test_image')
-        } else {
-            plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
-        }
-    };
-
-    /**
-     * gets the id of a Dockerfile
-     */
-    getId() {
-        let containerId = bashBare('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
-        return containerId
-    };
-}
-
-/**
- * 
- */
-export let dockerFileVersion = function(dockerfileNameArg: string): string{
-    let versionString: string
-    let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/
-    let regexResultArray = versionRegex.exec(dockerfileNameArg)
-    if (regexResultArray && regexResultArray.length === 2) {
-        versionString = regexResultArray[1]
-    } else {
-        versionString = 'latest'
+  /**
+   * pushes the Dockerfile to a registry
+   */
+  async push(stageArg) {
+    let pushTag
+    switch (stageArg) {
+      case 'release':
+        pushTag = this.releaseTag
+        break
+      case 'test':
+      default:
+        pushTag = this.testTag
+        break
     }
-    return versionString
+    await bashBare('docker tag ' + this.buildTag + ' ' + pushTag)
+    await bashBare('docker push ' + pushTag)
+  };
+
+  /**
+   * pulls the Dockerfile from a registry
+   */
+  async pull(registryArg: string) {
+    let pullTag = this.testTag
+    await bashBare('docker pull ' + pullTag)
+    await bashBare('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 bashBare('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
+      await bashBare('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
+      await bashBare('docker commit npmci_test_container npmci_test_image')
+      await bashBare('docker run npmci_test_image sh /npmci_test/test.sh')
+      await bashBare('docker rm npmci_test_container')
+      await bashBare('docker rmi --force npmci_test_image')
+    } else {
+      plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
+    }
+  };
+
+  /**
+   * gets the id of a Dockerfile
+   */
+  async getId() {
+    let containerId = await bashBare('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
+    return containerId
+  };
+}
+
+/**
+ * returns a version for a docker file
+ * @execution SYNC
+ */
+export let dockerFileVersion = (dockerfileNameArg: string): string => {
+  let versionString: string
+  let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/
+  let regexResultArray = versionRegex.exec(dockerfileNameArg)
+  if (regexResultArray && regexResultArray.length === 2) {
+    versionString = regexResultArray[1]
+  } else {
+    versionString = 'latest'
+  }
+  return versionString
 }
 
 /**
  * 
  */
-export let dockerBaseImage = function(dockerfileContentArg: string){
-    let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
-    let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
-    return regexResultArray[1]
+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 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 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
+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,22 +1,23 @@
 import * as plugins from './npmci.plugins'
-import {bash} from './npmci.bash'
+import { bash } from './npmci.bash'
 import * as env from './npmci.env'
 import * as buildDocker from './npmci.build.docker'
 
 /**
  * defines possible build services
  */
-export type TBuildService = 'docker';
+export type TBuildService = 'docker'
 
 /**
  * builds for a specific service
  */
-export let build = function(commandArg): plugins.q.Promise<any> {
-    switch (commandArg) {
-        case 'docker':
-            return buildDocker.build()
-        default:
-            plugins.beautylog.log('build target ' + commandArg + ' not recognised!')
-    };
-    return
+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

@@ -4,9 +4,7 @@ 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,15 +1,13 @@
 import * as plugins from './npmci.plugins'
-import {bash} from './npmci.bash'
+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

@@ -4,17 +4,14 @@ import * as plugins from './npmci.plugins'
 import * as paths from './npmci.paths'
 
 export interface INpmciOptions {
-    globalNpmTools: string[]
+  globalNpmTools: string[]
 }
 
-export let getConfig = () => {
-    console.log('getting config')
-    let done = q.defer<INpmciOptions>()
-    let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd)
-    let defaultConfig: INpmciOptions = {
-        globalNpmTools: []
-    }
-    let npmciConfig = npmciNpmextra.dataFor<INpmciOptions>('npmci', defaultConfig)
-    done.resolve(npmciConfig)
-    return done.promise
+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,7 +1,7 @@
 import * as plugins from './npmci.plugins'
 import * as paths from './npmci.paths'
-import {GitRepo} from 'smartstring'
-import {Dockerfile} from './npmci.build.docker'
+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)
@@ -11,48 +11,47 @@ export let buildStage: string = process.env.CI_BUILD_STAGE
 // handling config between commands
 export let dockerRegistry: string // will be set by npmci.prepare
 export let setDockerRegistry = (dockerRegistryArg: string) => {
-    dockerRegistry = dockerRegistryArg
+  dockerRegistry = dockerRegistryArg
 }
 export let dockerFilesBuilt: Dockerfile[] = []
 export let dockerFiles: Dockerfile[] = []
 export let config = {
-    dockerRegistry: undefined, // this will be set later on store
-    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!')
-    }
+  // 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)
+  config.dockerRegistry ? dockerRegistry = config.dockerRegistry : void (0)
+  config.dockerFilesBuilt ? dockerFilesBuilt = config.dockerFilesBuilt : void (0)
 }
 configLoad()

ts/npmci.install.ts

@@ -1,37 +1,54 @@
 import * as plugins from './npmci.plugins'
 import * as configModule from './npmci.config'
-import { bash } from './npmci.bash'
-import { nvmAvailable } 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 = 'stable'
-    } else if (versionArg === 'lts') {
-        version = '6'
-    } else if (versionArg === 'legacy') {
-        version = '6'
-    } 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')
+import {
+  bash,
+  bashNoError,
+  nvmAvailable,
+  yarnAvailable } from './npmci.bash'
 
-    // lets look for further config
-    configModule.getConfig()
-        .then(config => {
-            for (let npmTool of config.globalNpmTools) {
-                plugins.beautylog.info(`globally installing ${npmTool} from npm`)
-                bash(`npm install --loglevel=silent  -g ${npmTool}`)
-            }
-            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.plugins.ts

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

ts/npmci.prepare.ts

@@ -1,5 +1,5 @@
 import * as plugins from './npmci.plugins'
-import {bash} from './npmci.bash'
+import { bash } from './npmci.bash'
 import * as env from './npmci.env'
 import * as sshModule from './npmci.ssh'
 
@@ -9,85 +9,74 @@ import * as sshModule from './npmci.ssh'
 /**
  * defines possible prepare services
  */
-export type TPrepService = 'npm' | 'docker' | 'docker-gitlab' | 'ssh';
+export type TPrepService = 'npm' | 'docker' | 'docker-gitlab' | 'ssh'
 
 /**
  * authenticates npm with token from env var
  */
-let npm = function(){
-    let 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 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
 }
 
 /**
  * logs in docker
  */
-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
+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
 }
 
 /**
  * prepare docker for gitlab registry
  */
-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 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
 }
 
 /**
  * prepare ssh
  */
-let ssh = function(){
-    let done = plugins.q.defer()
-    sshModule.ssh()
-        .then(done.resolve)
-    return done.promise
+let ssh = async () => {
+  await sshModule.ssh()
 }
 
 /**
  * the main exported prepare function
  * @param servieArg describes the service to prepare
  */
-export let prepare = function(serviceArg: TPrepService){
-    switch (serviceArg) {
-        case 'npm':
-            return npm()
-        case 'docker':
-            return docker()
-        case 'docker-gitlab':
-            return dockerGitlab()
-        case 'ssh':
-            return ssh()
-        default:
-            break
-    }
+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,49 +1,46 @@
 import * as plugins from './npmci.plugins'
-import {prepare} from './npmci.prepare'
-import {bash} from './npmci.bash'
+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 TPubService = 'npm' | 'docker';
+export type TPubService = 'npm' | 'docker'
 
 /**
  * the main exported publish function.
  * @param pubServiceArg references targeted service to publish to 
  */
-export let publish = (pubServiceArg: TPubService = 'npm') => {
-    switch (pubServiceArg) {
-        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 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

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

ts/npmci.ssh.ts

@@ -6,45 +6,43 @@ let sshInstance: plugins.smartssh.SshInstance
 /**
  * checks for ENV vars in form of NPMCI_SSHKEY_* and deploys any found ones
  */
-export let ssh = () => {
-    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]
-    };
+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)
+  sshInstance.addKey(sshKey)
+  return
 }
 
 /**
  * checks if not undefined
  */
 let notUndefined = (stringArg: string) => {
-    return (stringArg && stringArg !== 'undefined' && stringArg !== '##')
+  return (stringArg && stringArg !== 'undefined' && stringArg !== '##')
 }

ts/npmci.test.ts

@@ -1,49 +1,36 @@
 import * as plugins from './npmci.plugins'
-import {bash} from './npmci.bash'
-import {install} from './npmci.install'
+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

@@ -4,27 +4,24 @@ import { bash } from './npmci.bash'
 
 let triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/
 
-export let trigger = function () {
-    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 } })
 }