2.3.47

Go fully async with shelljs to reduce processor strain

Closes #2

See merge request !2

.gitignore

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

.gitlab-ci.yml

@@ -1,17 +1,20 @@
-image: hosttoday/ht-docker-node:lts
+image: node:latest
 
 stages:
 - test
 - release
 - trigger
+- page
 
 
 before_script:
-  - npm install -g npmci
+  - npm install npmci -q -g
 
 testLTS:
   stage: test
   script:
+    - npmci install lts
+    - npmci command npm install -g -q npmts
     - npmci test lts
   tags:
     - docker
@@ -19,6 +22,8 @@ testLTS:
 testSTABLE:
   stage: test
   script:
+    - npmci install stable
+    - npmci command npm install -g -q npmts
     - npmci test stable
   tags:
     - docker
@@ -26,6 +31,8 @@ testSTABLE:
 testLEGACY:
   stage: test
   script:
+    - npmci install legacy
+    - npmci command npm install -g -q npmts
     - npmci test legacy
   tags:
     - docker
@@ -47,4 +54,17 @@ trigger:
   only:
     - tags
   tags:
-    - docker
+    - docker
+
+pages:
+  stage: page
+  script:
+    - npmci test stable
+    - npmci command npm install -g -q npmpage
+    - npmci command npmpage --host gitlab
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public

.npmignore

@@ -1,4 +1,4 @@
-docs/
+pages/
 coverage/
 test/
 node_modules/

README.md

@@ -1,20 +1,30 @@
 # NPMCI
 npmci is your friend when it comes to handling npm packages during CI builds. It is optimized for GitLab CI
 
-## Status
+## Availabililty
-[![build status](https://gitlab.com/pushrocks/npmci/badges/master/build.svg)](https://gitlab.com/pushrocks/npmci/commits/master)
+[![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/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/)
 
 ## Usage
 npmci is designed to work in docker CI environments. The following docker images come with npmci presinstalled:
 
 Docker Hub:
 
-* [hosttoday/ht-docker-node](https://hub.docker.com/r/hosttoday/ht-docker-node/)  
+* [hosttoday/ht-docker-node:npmci](https://hub.docker.com/r/hosttoday/ht-docker-node/)  
-has LTS node version preinstalled. Change it with npmci
+has LTS node version and npmci preinstalled.
-* [hosttoday/ht-docker-node-python-3](https://hub.docker.com/r/hosttoday/ht-docker-node-python3/)  
-like ht-docker-node, but with python3 instead of python2.7
 * [hosttoday/ht-docker-dbase](https://hub.docker.com/r/hosttoday/ht-docker-dbase/)  
-based on docker:git, can be used to build docker images in conjuction with docker:dind
+based on docker:git, can be used to build docker images in conjunction with docker:dind
 
 npmci can be called from commandline:
 ```shell
@@ -30,6 +40,8 @@ npmci test stable # will install latest stable node version and run "npm install
 npmci test legacy # will install latest legacy node version and run "npm install" and "npm test".
 npmci test x.x.x # will install any specific node version and run "npm install" and "npm test".
 npmci test docker # will test any build image with tests defined in ./npmci/dockertest_1.sh to ./npmci/dockertest_100.sh
+## npmci test docker will look at all Dockerfiles and look for according tags on GitLab container registry
+
 
 # prepare tools
 npmci prepare npm # will look for $NPMCI_TOKEN_NPM env var and create .npmrc, so npm is authenticated
@@ -37,7 +49,11 @@ npmci prepare docker # will look for $NPMCI_LOGIN_DOCKER in form username|passwo
 npmci prepare docker-gitlab # will authenticate docker for gitlab container registry
 
 # build containers
-npmci build docker # will build container and tag it
+npmci build docker # will build containers
+## all Dockerfiles named Dockerfile* are picked up.
+## specify tags like this Dockerfile_[tag]
+## uploads all built images as [username]/[reponame]:[tag]_test to GitLab
+## then test in next step with "npmci test docker"
 
 # publish npm module
 npmci publish npm # will look vor $NPMCI_TOKEN_NPM env var and push any module in cwd to npm
@@ -47,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)

appveyor.yml

@@ -1,10 +0,0 @@
-environment:
-  nodejs_version: "4"
-install:
-  - ps: Install-Product node $env:nodejs_version
-  - npm install
-test_script:
-  - node --version
-  - npm --version
-  - npm test
-build: off

dist/cli.js

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

dist/index.d.ts

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

dist/index.js

@@ -1,49 +1,72 @@
-#!/usr/bin/env node
 "use strict";
-require("typings-global");
+Object.defineProperty(exports, "__esModule", { value: true });
-var plugins = require("./npmci.plugins");
+const plugins = require("./npmci.plugins");
-var packJson = require("../package.json");
+const paths = require("./npmci.paths");
-plugins.beautylog.info("npmci version: " + packJson.version);
+let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot);
-var npmci_build_1 = require("./npmci.build");
+plugins.beautylog.log('npmci version: ' + npmciInfo.version);
-var npmci_install_1 = require("./npmci.install");
+const npmci_build_1 = require("./npmci.build");
-var npmci_publish_1 = require("./npmci.publish");
+const npmci_clean_1 = require("./npmci.clean");
-var npmci_prepare_1 = require("./npmci.prepare");
+const npmci_command_1 = require("./npmci.command");
-var npmci_test_1 = require("./npmci.test");
+const npmci_install_1 = require("./npmci.install");
-var npmci_trigger_1 = require("./npmci.trigger");
+const npmci_publish_1 = require("./npmci.publish");
-var command;
+const npmci_prepare_1 = require("./npmci.prepare");
-var commandOption;
+const npmci_test_1 = require("./npmci.test");
-plugins.commander
+const npmci_trigger_1 = require("./npmci.trigger");
-    .arguments('<commandarg> [commandoptionarg]')
+const NpmciEnv = require("./npmci.env");
-    .action(function (commandarg, commandoptionarg) {
+var npmci_build_2 = require("./npmci.build");
-    command = commandarg;
+exports.build = npmci_build_2.build;
-    commandOption = commandoptionarg;
+var npmci_install_2 = require("./npmci.install");
+exports.install = npmci_install_2.install;
+var npmci_publish_2 = require("./npmci.publish");
+exports.publish = npmci_publish_2.publish;
+let smartcli = new plugins.smartcli.Smartcli();
+smartcli.addVersion(npmciInfo.version);
+// build
+smartcli.addCommand('build')
+    .then((argv) => {
+    npmci_build_1.build(argv._[1])
+        .then(NpmciEnv.configStore);
 });
-plugins.commander.parse(process.argv);
+// clean
-if (typeof command === 'undefined') {
+smartcli.addCommand('clean')
-    console.error('no command given!');
+    .then((argv) => {
-    process.exit(1);
+    npmci_clean_1.clean()
-}
+        .then(NpmciEnv.configStore);
-switch (command) {
+});
-    case "build":
+// command
-        npmci_build_1.build(commandOption);
+smartcli.addCommand('command')
-        break;
+    .then((argv) => {
-    case "install":
+    npmci_command_1.command()
-        npmci_install_1.install(commandOption);
+        .then(NpmciEnv.configStore);
-        break;
+});
-    case "prepare":
+// install
-        npmci_prepare_1.prepare(commandOption);
+smartcli.addCommand('install')
-        break;
+    .then((argv) => {
-    case "publish":
+    npmci_install_1.install(argv._[1])
-        npmci_publish_1.publish(commandOption);
+        .then(NpmciEnv.configStore);
-        break;
+});
-    case "test":
+// prepare
-        npmci_test_1.test(commandOption);
+smartcli.addCommand('prepare')
-        break;
+    .then((argv) => {
-    case "trigger":
+    npmci_prepare_1.prepare(argv._[1])
-        npmci_trigger_1.trigger();
+        .then(NpmciEnv.configStore);
-        break;
+});
-    default:
+// publish
-        break;
+smartcli.addCommand('publish')
-}
+    .then((argv) => {
-
+    npmci_publish_1.publish(argv._[1])
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFFM0MsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUM7QUFFMUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRTdELDRCQUFvQixlQUNwQixDQUFDLENBRGtDO0FBQ25DLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBRXhDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUd4QyxJQUFJLE9BQU8sQ0FBQztBQUNaLElBQUksYUFBYSxDQUFDO0FBRWxCLE9BQU8sQ0FBQyxTQUFTO0tBQ1osU0FBUyxDQUFDLGlDQUFpQyxDQUFDO0tBQzVDLE1BQU0sQ0FBQyxVQUFVLFVBQVUsRUFBRSxnQkFBZ0I7SUFDMUMsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUNyQixhQUFhLEdBQUcsZ0JBQWdCLENBQUM7QUFDckMsQ0FBQyxDQUFDLENBQUM7QUFFUCxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFdEMsRUFBRSxDQUFDLENBQUMsT0FBTyxPQUFPLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztJQUNqQyxPQUFPLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDbkMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNwQixDQUFDO0FBRUQsTUFBTSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUEsQ0FBQztJQUNiLEtBQUssT0FBTztRQUNSLG1CQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDckIsS0FBSyxDQUFDO0lBQ1YsS0FBSyxTQUFTO1FBQ1YsdUJBQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUN2QixLQUFLLENBQUM7SUFDVixLQUFLLFNBQVM7UUFDVix1QkFBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3ZCLEtBQUssQ0FBQztJQUNWLEtBQUssU0FBUztRQUNWLHVCQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDdkIsS0FBSyxDQUFDO0lBQ1YsS0FBSyxNQUFNO1FBQ1AsaUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQixLQUFLLENBQUM7SUFDVixLQUFLLFNBQVM7UUFDVix1QkFBTyxFQUFFLENBQUM7UUFDVixLQUFLLENBQUM7SUFDVjtRQUNJLEtBQUssQ0FBQztBQUNkLENBQUMiLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyIjIS91c3IvYmluL2VudiBub2RlXHJcbmltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xyXG5cclxubGV0IHBhY2tKc29uID0gcmVxdWlyZShcIi4uL3BhY2thZ2UuanNvblwiKTtcclxuXHJcbnBsdWdpbnMuYmVhdXR5bG9nLmluZm8oXCJucG1jaSB2ZXJzaW9uOiBcIiArIHBhY2tKc29uLnZlcnNpb24pO1xyXG5cclxuaW1wb3J0IHtidWlsZH0gZnJvbSBcIi4vbnBtY2kuYnVpbGRcIlxyXG5pbXBvcnQge2luc3RhbGx9IGZyb20gXCIuL25wbWNpLmluc3RhbGxcIjtcclxuaW1wb3J0IHtwdWJsaXNofSBmcm9tIFwiLi9ucG1jaS5wdWJsaXNoXCI7XHJcbmltcG9ydCB7cHJlcGFyZX0gZnJvbSBcIi4vbnBtY2kucHJlcGFyZVwiO1xyXG5pbXBvcnQge3RhZywgcmV0YWd9IGZyb20gXCIuL25wbWNpLnRhZ1wiO1xyXG5pbXBvcnQge3Rlc3R9IGZyb20gXCIuL25wbWNpLnRlc3RcIjtcclxuaW1wb3J0IHt0cmlnZ2VyfSBmcm9tIFwiLi9ucG1jaS50cmlnZ2VyXCI7XHJcblxyXG5cclxubGV0IGNvbW1hbmQ7XHJcbmxldCBjb21tYW5kT3B0aW9uO1xyXG5cclxucGx1Z2lucy5jb21tYW5kZXJcclxuICAgIC5hcmd1bWVudHMoJzxjb21tYW5kYXJnPiBbY29tbWFuZG9wdGlvbmFyZ10nKVxyXG4gICAgLmFjdGlvbihmdW5jdGlvbiAoY29tbWFuZGFyZywgY29tbWFuZG9wdGlvbmFyZykge1xyXG4gICAgICAgIGNvbW1hbmQgPSBjb21tYW5kYXJnO1xyXG4gICAgICAgIGNvbW1hbmRPcHRpb24gPSBjb21tYW5kb3B0aW9uYXJnO1xyXG4gICAgfSk7XHJcbiBcclxucGx1Z2lucy5jb21tYW5kZXIucGFyc2UocHJvY2Vzcy5hcmd2KTtcclxuIFxyXG5pZiAodHlwZW9mIGNvbW1hbmQgPT09ICd1bmRlZmluZWQnKSB7XHJcbiAgICBjb25zb2xlLmVycm9yKCdubyBjb21tYW5kIGdpdmVuIScpO1xyXG4gICAgcHJvY2Vzcy5leGl0KDEpO1xyXG59XHJcblxyXG5zd2l0Y2ggKGNvbW1hbmQpe1xyXG4gICAgY2FzZSBcImJ1aWxkXCI6XHJcbiAgICAgICAgYnVpbGQoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwiaW5zdGFsbFwiOlxyXG4gICAgICAgIGluc3RhbGwoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwicHJlcGFyZVwiOlxyXG4gICAgICAgIHByZXBhcmUoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwicHVibGlzaFwiOlxyXG4gICAgICAgIHB1Ymxpc2goY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwidGVzdFwiOlxyXG4gICAgICAgIHRlc3QoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwidHJpZ2dlclwiOlxyXG4gICAgICAgIHRyaWdnZXIoKTtcclxuICAgICAgICBicmVhaztcclxuICAgIGRlZmF1bHQ6XHJcbiAgICAgICAgYnJlYWs7XHJcbn1cclxuXHJcbiJdfQ==
+        .then(NpmciEnv.configStore);
+});
+// test
+smartcli.addCommand('test')
+    .then((argv) => {
+    npmci_test_1.test(argv._[1])
+        .then(NpmciEnv.configStore);
+});
+// trigger
+smartcli.addCommand('trigger')
+    .then((argv) => {
+    npmci_trigger_1.trigger();
+});
+smartcli.startParse();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFDdEMsSUFBSSxTQUFTLEdBQUcsSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtBQUM5RSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUE7QUFFNUQsK0NBQXFDO0FBQ3JDLCtDQUFxQztBQUNyQyxtREFBeUM7QUFDekMsbURBQXlDO0FBQ3pDLG1EQUF5QztBQUN6QyxtREFBeUM7QUFDekMsNkNBQW1DO0FBQ25DLG1EQUF5QztBQUN6Qyx3Q0FBdUM7QUFFdkMsNkNBQXFDO0FBQTVCLDhCQUFBLEtBQUssQ0FBQTtBQUNkLGlEQUEwQztBQUFqQyxrQ0FBQSxPQUFPLENBQUE7QUFDaEIsaURBQTBDO0FBQWpDLGtDQUFBLE9BQU8sQ0FBQTtBQUVoQixJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUE7QUFDOUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUE7QUFFdEMsUUFBUTtBQUNSLFFBQVEsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDO0tBQ3pCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCxtQkFBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFFLENBQUM7U0FDZixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQy9CLENBQUMsQ0FBQyxDQUFBO0FBRUosUUFBUTtBQUNSLFFBQVEsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDO0tBQ3pCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCxtQkFBSyxFQUFFO1NBQ0osSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUMsQ0FBQTtBQUVKLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztLQUMzQixJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sRUFBRTtTQUNOLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7S0FDM0IsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBRSxDQUFDLENBQUUsQ0FBQztTQUNqQixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQy9CLENBQUMsQ0FBQyxDQUFBO0FBRUosVUFBVTtBQUNWLFFBQVEsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO0tBQzNCLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCx1QkFBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFFLENBQUM7U0FDakIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUMsQ0FBQTtBQUVKLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztLQUMzQixJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFFLENBQUMsQ0FBRSxDQUFDO1NBQ2pCLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixPQUFPO0FBQ1AsUUFBUSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUM7S0FDeEIsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULGlCQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBRSxDQUFDLENBQUUsQ0FBQztTQUNkLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFDLENBQUE7QUFFSixVQUFVO0FBQ1YsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7S0FDM0IsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULHVCQUFPLEVBQUUsQ0FBQTtBQUNYLENBQUMsQ0FBQyxDQUFBO0FBRUosUUFBUSxDQUFDLFVBQVUsRUFBRSxDQUFBIn0=

dist/npmci.bash.d.ts

@@ -1,3 +1,19 @@
-import "typings-global";
+import * as plugins from './npmci.plugins';
-export declare let bash: (commandArg: string, retryArg?: number, bareArg?: boolean) => string;
+/**
-export declare let bashBare: (commandArg: any, retryArg?: number) => string;
+ * wether nvm is available or not
+ */
+export declare let nvmAvailable: 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,44 +1,99 @@
 "use strict";
-require("typings-global");
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-var plugins = require("./npmci.plugins");
+    return new (P || (P = Promise))(function (resolve, reject) {
-exports.bash = function (commandArg, retryArg, bareArg) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-    if (retryArg === void 0) { retryArg = 2; }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-    if (bareArg === void 0) { bareArg = false; }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-    var exitCode;
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    var stdOut;
+    });
-    var execResult;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./npmci.plugins");
+const smartq = require("smartq");
+/**
+ * wether nvm is available or not
+ */
+exports.nvmAvailable = smartq.defer();
+/**
+ * the smartshell instance for npmci
+ */
+let npmciSmartshell = new plugins.smartshell.Smartshell({
+    executor: 'bash',
+    sourceFilePaths: []
+});
+let checkNvm = () => __awaiter(this, void 0, void 0, function* () {
+    if ((yield plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0) {
+        npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh && `]);
+        exports.nvmAvailable.resolve(true);
+    }
+    else if ((yield plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0) {
+        npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh && `]);
+        exports.nvmAvailable.resolve(true);
+    }
+    else {
+        exports.nvmAvailable.resolve(false);
+    }
+    ;
+});
+checkNvm();
+/**
+ * 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 (var i = 0; i <= retryArg; i++) {
+        for (let i = 0; i <= retryArg; i++) {
             if (!bareArg) {
-                execResult = plugins.shelljs.exec("bash -c \"source /usr/local/nvm/nvm.sh &&" +
+                execResult = yield npmciSmartshell.exec(commandArg);
-                    commandArg +
-                    "\"");
             }
             else {
-                execResult = plugins.shelljs.exec(commandArg);
+                execResult = yield plugins.smartshell.exec(commandArg);
             }
-            exitCode = execResult.code;
+            // determine how bash reacts to error and success
-            stdOut = execResult.stdout;
+            if (execResult.exitCode !== 0 && i === retryArg) {
-            if (exitCode !== 0 && i == retryArg) {
+                if (failOnError) {
-                process.exit(1);
+                    plugins.beautylog.error('something went wrong and retries are exhausted');
+                    process.exit(1);
+                }
             }
-            else if (exitCode == 0) {
+            else if (execResult.exitCode === 0) {
-                i = retryArg + 1; // if everything works out ok retrials are not wanted
+                i = retryArg + 1; // retry +1 breaks for loop, if everything works out ok retrials are not wanted
             }
             else {
-                plugins.beautylog.warn("Something went wrong! Exit Code: " + exitCode.toString());
+                plugins.beautylog.warn('Something went wrong! Exit Code: ' + execResult.exitCode.toString());
-                plugins.beautylog.info("Retry " + (i + 1).toString() + " of " + retryArg.toString());
+                plugins.beautylog.info('Retry ' + (i + 1).toString() + ' of ' + retryArg.toString());
             }
         }
     }
     else {
-        plugins.beautylog.log("ShellExec would be: " + commandArg.blue);
+        plugins.beautylog.log('ShellExec would be: ' + commandArg);
+        yield plugins.smartdelay.delayFor(100);
+        execResult = {
+            exitCode: 0,
+            stdout: 'testOutput'
+        };
     }
-    return stdOut;
+    return execResult.stdout;
-};
+});
-exports.bashBare = function (commandArg, retryArg) {
+/**
-    if (retryArg === void 0) { retryArg = 2; }
+ * bashBare allows usage of bash without sourcing any files like nvm
-    return exports.bash(commandArg, retryArg, true);
+ */
-};
+exports.bashBare = (commandArg, retryArg = 2) => __awaiter(this, void 0, void 0, function* () {
-
+    return yield exports.bash(commandArg, retryArg, true);
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBRWhDLFlBQUksR0FBRyxVQUFDLFVBQWlCLEVBQUMsUUFBWSxFQUFDLE9BQWU7SUFBNUIsd0JBQVksR0FBWixZQUFZO0lBQUMsdUJBQWUsR0FBZixlQUFlO0lBQzdELElBQUksUUFBZSxDQUFDO0lBQ3BCLElBQUksTUFBYSxDQUFDO0lBQ2xCLElBQUksVUFBVSxDQUFDO0lBQ2YsRUFBRSxDQUFBLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFBLENBQUM7UUFDeEIsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsSUFBSSxRQUFRLEVBQUUsQ0FBQyxFQUFFLEVBQUMsQ0FBQztZQUNoQyxFQUFFLENBQUEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFBLENBQUM7Z0JBQ1QsVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUM3QiwyQ0FBMkM7b0JBQzNDLFVBQVU7b0JBQ1YsSUFBSSxDQUNQLENBQUM7WUFDTixDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ2xELENBQUM7WUFDRCxRQUFRLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztZQUMzQixNQUFNLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQztZQUMzQixFQUFFLENBQUEsQ0FBQyxRQUFRLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxRQUFRLENBQUMsQ0FBQSxDQUFDO2dCQUNoQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3BCLENBQUM7WUFBQyxJQUFJLENBQUMsRUFBRSxDQUFBLENBQUMsUUFBUSxJQUFJLENBQUMsQ0FBQyxDQUFBLENBQUM7Z0JBQ3JCLENBQUMsR0FBRyxRQUFRLEdBQUcsQ0FBQyxDQUFDLENBQUMscURBQXFEO1lBQzNFLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsR0FBRyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztnQkFDbEYsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxHQUFHLE1BQU0sR0FBSSxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztZQUMxRixDQUFDO1FBQ0wsQ0FBQztJQUNMLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHNCQUFzQixHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNuRSxDQUFDO0lBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQztBQUNsQixDQUFDLENBQUE7QUFFVSxnQkFBUSxHQUFHLFVBQUMsVUFBVSxFQUFDLFFBQVk7SUFBWix3QkFBWSxHQUFaLFlBQVk7SUFDMUMsTUFBTSxDQUFDLFlBQUksQ0FBQyxVQUFVLEVBQUMsUUFBUSxFQUFDLElBQUksQ0FBQyxDQUFDO0FBQzFDLENBQUMsQ0FBQSIsImZpbGUiOiJucG1jaS5iYXNoLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XHJcblxyXG5leHBvcnQgbGV0IGJhc2ggPSAoY29tbWFuZEFyZzpzdHJpbmcscmV0cnlBcmcgPSAyLGJhcmVBcmcgPSBmYWxzZSkgPT4ge1xyXG4gICAgbGV0IGV4aXRDb2RlOm51bWJlcjtcclxuICAgIGxldCBzdGRPdXQ6c3RyaW5nO1xyXG4gICAgbGV0IGV4ZWNSZXN1bHQ7XHJcbiAgICBpZighcHJvY2Vzcy5lbnYuTlBNVFNfVEVTVCl7XHJcbiAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPD0gcmV0cnlBcmc7IGkrKyl7XHJcbiAgICAgICAgICAgIGlmKCFiYXJlQXJnKXtcclxuICAgICAgICAgICAgICAgIGV4ZWNSZXN1bHQgPSBwbHVnaW5zLnNoZWxsanMuZXhlYyhcclxuICAgICAgICAgICAgICAgICAgICBcImJhc2ggLWMgXFxcInNvdXJjZSAvdXNyL2xvY2FsL252bS9udm0uc2ggJiZcIiArXHJcbiAgICAgICAgICAgICAgICAgICAgY29tbWFuZEFyZyArXHJcbiAgICAgICAgICAgICAgICAgICAgXCJcXFwiXCJcclxuICAgICAgICAgICAgICAgICk7XHJcbiAgICAgICAgICAgIH0gZWxzZSB7XHJcbiAgICAgICAgICAgICAgICBleGVjUmVzdWx0ID0gcGx1Z2lucy5zaGVsbGpzLmV4ZWMoY29tbWFuZEFyZyk7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgZXhpdENvZGUgPSBleGVjUmVzdWx0LmNvZGU7XHJcbiAgICAgICAgICAgIHN0ZE91dCA9IGV4ZWNSZXN1bHQuc3Rkb3V0O1xyXG4gICAgICAgICAgICBpZihleGl0Q29kZSAhPT0gMCAmJiBpID09IHJldHJ5QXJnKXtcclxuICAgICAgICAgICAgICAgIHByb2Nlc3MuZXhpdCgxKTtcclxuICAgICAgICAgICAgfSBlbHNlIGlmKGV4aXRDb2RlID09IDApe1xyXG4gICAgICAgICAgICAgICAgaSA9IHJldHJ5QXJnICsgMTsgLy8gaWYgZXZlcnl0aGluZyB3b3JrcyBvdXQgb2sgcmV0cmlhbHMgYXJlIG5vdCB3YW50ZWRcclxuICAgICAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLndhcm4oXCJTb21ldGhpbmcgd2VudCB3cm9uZyEgRXhpdCBDb2RlOiBcIiArIGV4aXRDb2RlLnRvU3RyaW5nKCkpO1xyXG4gICAgICAgICAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cuaW5mbyhcIlJldHJ5IFwiICsgKGkgKyAxKS50b1N0cmluZygpICsgXCIgb2YgXCIgKyAgcmV0cnlBcmcudG9TdHJpbmcoKSk7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICB9XHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmxvZyhcIlNoZWxsRXhlYyB3b3VsZCBiZTogXCIgKyBjb21tYW5kQXJnLmJsdWUpXHJcbiAgICB9XHJcbiAgICByZXR1cm4gc3RkT3V0O1xyXG59XHJcblxyXG5leHBvcnQgbGV0IGJhc2hCYXJlID0gKGNvbW1hbmRBcmcscmV0cnlBcmcgPSAyKSA9PiB7XHJcbiAgICByZXR1cm4gYmFzaChjb21tYW5kQXJnLHJldHJ5QXJnLHRydWUpO1xyXG59Il19
+});
+/**
+ * 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyxpQ0FBZ0M7QUFFaEM7O0dBRUc7QUFDUSxRQUFBLFlBQVksR0FBRyxNQUFNLENBQUMsS0FBSyxFQUFXLENBQUE7QUFFakQ7O0dBRUc7QUFDSCxJQUFJLGVBQWUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO0lBQ3RELFFBQVEsRUFBRSxNQUFNO0lBQ2hCLGVBQWUsRUFBRSxFQUFFO0NBQ3BCLENBQUMsQ0FBQTtBQUVGLElBQUksUUFBUSxHQUFHO0lBQ2IsRUFBRSxDQUFDLENBQ0QsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLHdDQUF3QyxDQUFDLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FDL0YsQ0FBQyxDQUFDLENBQUM7UUFDRCxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUMsMkJBQTJCLENBQUMsQ0FBQyxDQUFBO1FBQzdELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQ1IsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLGdDQUFnQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FDdkYsQ0FBQyxDQUFDLENBQUM7UUFDRCxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFBO1FBQ3JELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLG9CQUFZLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzdCLENBQUM7SUFBQSxDQUFDO0FBQ0osQ0FBQyxDQUFBLENBQUE7QUFDRCxRQUFRLEVBQUUsQ0FBQTtBQUlWOzs7O0dBSUc7QUFDUSxRQUFBLElBQUksR0FBRyxDQUFPLFVBQWtCLEVBQUUsV0FBbUIsQ0FBQyxFQUFFLFVBQW1CLEtBQUs7SUFDekYsTUFBTSxvQkFBWSxDQUFDLE9BQU8sQ0FBQSxDQUFDLDhCQUE4QjtJQUN6RCxJQUFJLFVBQTBDLENBQUE7SUFFOUMsdUJBQXVCO0lBQ3ZCLElBQUksV0FBVyxHQUFZLElBQUksQ0FBQTtJQUMvQixFQUFFLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3BCLFdBQVcsR0FBRyxLQUFLLENBQUE7UUFDbkIsUUFBUSxHQUFHLENBQUMsQ0FBQTtJQUNkLENBQUM7SUFFRCxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1QixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLFFBQVEsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ25DLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztnQkFDYixVQUFVLEdBQUcsTUFBTSxlQUFlLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFBO1lBQ3JELENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDTixVQUFVLEdBQUcsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtZQUN4RCxDQUFDO1lBRUQsaURBQWlEO1lBQ2pELEVBQUUsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxRQUFRLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUNoRCxFQUFFLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO29CQUNoQixPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxnREFBZ0QsQ0FBQyxDQUFBO29CQUN6RSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO2dCQUNqQixDQUFDO1lBQ0gsQ0FBQztZQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxVQUFVLENBQUMsUUFBUSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3JDLENBQUMsR0FBRyxRQUFRLEdBQUcsQ0FBQyxDQUFBLENBQUMsK0VBQStFO1lBQ2xHLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDTixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUE7Z0JBQzVGLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsR0FBRyxNQUFNLEdBQUcsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUE7WUFDdEYsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsR0FBRyxVQUFVLENBQUMsQ0FBQTtRQUMxRCxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3RDLFVBQVUsR0FBRztZQUNYLFFBQVEsRUFBRSxDQUFDO1lBQ1gsTUFBTSxFQUFFLFlBQVk7U0FDckIsQ0FBQTtJQUNILENBQUM7SUFDRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQTtBQUMxQixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ1EsUUFBQSxRQUFRLEdBQUcsQ0FBTyxVQUFrQixFQUFFLFdBQW1CLENBQUM7SUFDbkUsTUFBTSxDQUFDLE1BQU0sWUFBSSxDQUFDLFVBQVUsRUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUE7QUFDL0MsQ0FBQyxDQUFBLENBQUE7QUFFRDs7R0FFRztBQUNRLFFBQUEsV0FBVyxHQUFHLENBQU8sVUFBa0I7SUFDaEQsTUFBTSxDQUFDLE1BQU0sWUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ25DLENBQUMsQ0FBQSxDQUFBIn0=

dist/npmci.build.d.ts

@@ -1,2 +1,8 @@
-import "typings-global";
+/**
-export declare let build: (commandArg: any) => any;
+ * defines possible build services
+ */
+export declare type TBuildService = 'docker';
+/**
+ * builds for a specific service
+ */
+export declare let build: (commandArg: any) => Promise<void>;

dist/npmci.build.docker.d.ts

@@ -1,22 +1,54 @@
-export declare let build: () => any;
+/// <reference types="node" />
-export declare let readDockerfiles: () => any;
+/**
-export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => any;
+ * builds a cwd of Dockerfiles by triggering a promisechain
-export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => any;
+ */
-export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => any;
+export declare let build: () => Promise<void>;
-export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[]) => any;
+/**
-export declare let pullDockerfileImages: (sortableArrayArg: Dockerfile[]) => any;
+ * creates instance of class Dockerfile for all Dockerfiles in cwd
-export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => any;
+ * @returns Promise<Dockerfile[]>
-export declare let releaseDockerfiles: (sortedArrayArg: Dockerfile[]) => any;
+ */
+export declare let readDockerfiles: () => Promise<Dockerfile[]>;
+/**
+ * sorts Dockerfiles into a dependency chain
+ * @param sortableArrayArg an array of instances of class Dockerfile
+ * @returns Promise<Dockerfile[]>
+ */
+export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => Promise<Dockerfile[]>;
+/**
+ * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
+ */
+export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => Promise<Dockerfile[]>;
+/**
+ * builds the correspoding real docker image for each Dockerfile class instance
+ */
+export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise<Dockerfile[]>;
+/**
+ * pushes the real Dockerfile images to a Docker registry
+ */
+export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise<Dockerfile[]>;
+/**
+ * pulls corresponding real Docker images for instances of Dockerfile from a registry.
+ * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages.
+ */
+export declare let pullDockerfileImages: (sortableArrayArg: Dockerfile[], registryArg?: string) => Promise<Dockerfile[]>;
+/**
+ * tests all Dockerfiles in by calling class Dockerfile.test();
+ * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
+ */
+export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise<Dockerfile[]>;
+/**
+ * class Dockerfile represents a Dockerfile on disk in npmci
+ */
 export declare class Dockerfile {
     filePath: string;
     repo: string;
     version: string;
     cleanTag: string;
     buildTag: string;
+    testTag: string;
     releaseTag: string;
     containerName: string;
     content: string;
-    patchedContent: string;
     baseImage: string;
     localBaseImageDependent: boolean;
     localBaseDockerfile: Dockerfile;
@@ -25,16 +57,41 @@ export declare class Dockerfile {
         fileContents?: string | Buffer;
         read?: boolean;
     });
-    build(): any;
+    /**
-    push(): any;
+     * builds the Dockerfile
-    pull(): void;
+     */
-    test(): void;
+    build(): Promise<void>;
-    release(): void;
+    /**
-    getId(): string;
+     * pushes the Dockerfile to a registry
-    patchContents(): any;
+     */
-    restoreContents(): any;
+    push(stageArg: any): Promise<void>;
+    /**
+     * pulls the Dockerfile from a registry
+     */
+    pull(registryArg: string): Promise<void>;
+    /**
+     * tests the Dockerfile;
+     */
+    test(): Promise<void>;
+    /**
+     * gets the id of a Dockerfile
+     */
+    getId(): Promise<string>;
 }
+/**
+ * returns a version for a docker file
+ * @execution SYNC
+ */
 export declare let dockerFileVersion: (dockerfileNameArg: string) => string;
+/**
+ *
+ */
 export declare let dockerBaseImage: (dockerfileContentArg: string) => string;
-export declare let dockerTag: (repoArg: string, versionArg: string, stageArg: string) => string;
+/**
+ *
+ */
+export declare let dockerTag: (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string) => string;
+/**
+ *
+ */
 export declare let cleanTagsArrayFunction: (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]) => string[];

dist/npmci.build.js

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

dist/npmci.clean.d.ts

@@ -0,0 +1,4 @@
+/**
+ * cleans npmci config files
+ */
+export declare let clean: () => Promise<void>;

dist/npmci.clean.js

@@ -0,0 +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 = () => __awaiter(this, void 0, void 0, function* () {
+    plugins.smartfile.fs.removeSync(paths.NpmciPackageConfig);
+    return;
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY2xlYW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5jbGVhbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsMkNBQTBDO0FBQzFDLHVDQUFzQztBQUV0Qzs7R0FFRztBQUNRLFFBQUEsS0FBSyxHQUFHO0lBQ2pCLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsa0JBQWtCLENBQUMsQ0FBQTtJQUN6RCxNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQSJ9

dist/npmci.command.d.ts

@@ -0,0 +1 @@
+export declare let command: () => Promise<void>;

dist/npmci.command.js

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

dist/npmci.config.d.ts

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

dist/npmci.config.js

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

dist/npmci.env.d.ts

@@ -1,11 +1,15 @@
-import "typings-global";
+import { GitRepo } from 'smartstring';
-import { GitRepo } from "smartstring";
+import { Dockerfile } from './npmci.build.docker';
-import { Dockerfile } from "./npmci.build.docker";
 export declare let repo: GitRepo;
 export declare let buildStage: string;
-export declare let dockerRegistry: any;
+export declare let dockerRegistry: string;
+export declare let setDockerRegistry: (dockerRegistryArg: string) => void;
 export declare let dockerFilesBuilt: Dockerfile[];
 export declare let dockerFiles: Dockerfile[];
-export declare let config: any;
+export declare let config: {
+    dockerRegistry: any;
+    dockerFilesBuilt: Dockerfile[];
+    dockerFiles: Dockerfile[];
+    project: any;
+};
 export declare let configStore: () => void;
-export declare let configLoad: () => void;

dist/npmci.env.js

@@ -1,30 +1,49 @@
 "use strict";
-require("typings-global");
+Object.defineProperty(exports, "__esModule", { value: true });
-var plugins = require("./npmci.plugins");
+const plugins = require("./npmci.plugins");
-var paths = require("./npmci.paths");
+const paths = require("./npmci.paths");
-var smartstring_1 = require("smartstring");
+const smartstring_1 = require("smartstring");
-exports.repo = new smartstring_1.GitRepo(process.env.CI_BUILD_REPO);
+if (process.env.CI_BUILD_REPO)
+    exports.repo = new smartstring_1.GitRepo(process.env.CI_BUILD_REPO);
 exports.buildStage = process.env.CI_BUILD_STAGE;
+exports.setDockerRegistry = (dockerRegistryArg) => {
+    exports.dockerRegistry = dockerRegistryArg;
+};
 exports.dockerFilesBuilt = [];
 exports.dockerFiles = [];
-exports.configStore = function () {
+exports.config = {
-    plugins.smartfile.memory.toFsSync(JSON.stringify(exports.config), {
+    dockerRegistry: undefined,
-        fileName: "config.json",
+    dockerFilesBuilt: exports.dockerFilesBuilt,
-        filePath: paths.NpmciPackageRoot
+    dockerFiles: exports.dockerFiles,
-    });
+    project: undefined
 };
-exports.configLoad = function () {
+exports.configStore = () => {
+    exports.config.dockerRegistry = exports.dockerRegistry;
+    plugins.smartfile.memory.toFsSync(JSON.stringify(exports.config), paths.NpmciPackageConfig);
+};
+let configLoad = () => {
+    // internal config to transfer information in between npmci shell calls
     try {
-        exports.config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig, "json");
+        plugins.lodash.assign(exports.config, plugins.smartfile.fs.toObjectSync(paths.NpmciPackageConfig, 'json'));
     }
     catch (err) {
-        exports.config = {};
         exports.configStore();
-        plugins.beautylog.log("config inititialized!");
+        plugins.beautylog.log('config initialized!');
+    }
+    // project config
+    try {
+        if (!exports.config.project) {
+            exports.config.project = plugins.smartfile.fs.toObjectSync(paths.NpmciProjectDir, 'npmci.json');
+            plugins.beautylog.ok('project config found!');
+        }
+        ;
+    }
+    catch (err) {
+        exports.config.project = {};
+        plugins.beautylog.log('no project config found, so proceeding with default behaviour!');
     }
     exports.config.dockerRegistry ? exports.dockerRegistry = exports.config.dockerRegistry : void (0);
     exports.config.dockerFilesBuilt ? exports.dockerFilesBuilt = exports.config.dockerFilesBuilt : void (0);
 };
-exports.configLoad();
+configLoad();
-
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMkNBQTBDO0FBQzFDLHVDQUFzQztBQUN0Qyw2Q0FBcUM7QUFJckMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUM7SUFBQyxZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUE7QUFFakUsUUFBQSxVQUFVLEdBQVcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUE7QUFJL0MsUUFBQSxpQkFBaUIsR0FBRyxDQUFDLGlCQUF5QjtJQUN2RCxzQkFBYyxHQUFHLGlCQUFpQixDQUFBO0FBQ3BDLENBQUMsQ0FBQTtBQUNVLFFBQUEsZ0JBQWdCLEdBQWlCLEVBQUUsQ0FBQTtBQUNuQyxRQUFBLFdBQVcsR0FBaUIsRUFBRSxDQUFBO0FBQzlCLFFBQUEsTUFBTSxHQUFHO0lBQ2xCLGNBQWMsRUFBRSxTQUFTO0lBQ3pCLGdCQUFnQixFQUFFLHdCQUFnQjtJQUNsQyxXQUFXLEVBQUUsbUJBQVc7SUFDeEIsT0FBTyxFQUFFLFNBQVM7Q0FDbkIsQ0FBQTtBQUVVLFFBQUEsV0FBVyxHQUFHO0lBQ3ZCLGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsQ0FBQTtJQUN0QyxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQy9CLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBTSxDQUFDLEVBQ3RCLEtBQUssQ0FBQyxrQkFBa0IsQ0FDekIsQ0FBQTtBQUNILENBQUMsQ0FBQTtBQUVELElBQUksVUFBVSxHQUFHO0lBQ2YsdUVBQXVFO0lBQ3ZFLElBQUksQ0FBQztRQUNILE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLGNBQU0sRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUE7SUFDcEcsQ0FBQztJQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDYixtQkFBVyxFQUFFLENBQUE7UUFDYixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0lBQzlDLENBQUM7SUFFRCxpQkFBaUI7SUFDakIsSUFBSSxDQUFDO1FBQ0gsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztZQUNwQixjQUFNLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsZUFBZSxFQUFFLFlBQVksQ0FBQyxDQUFBO1lBQ3ZGLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLHVCQUF1QixDQUFDLENBQUE7UUFDL0MsQ0FBQztRQUFBLENBQUM7SUFDSixDQUFDO0lBQ0QsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNYLGNBQU0sQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFBO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLGdFQUFnRSxDQUFDLENBQUE7SUFDekYsQ0FBQztJQUVELGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsR0FBRyxjQUFNLENBQUMsY0FBYyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6RSxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsd0JBQWdCLEdBQUcsY0FBTSxDQUFDLGdCQUFnQixHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqRixDQUFDLENBQUE7QUFDRCxVQUFVLEVBQUUsQ0FBQSJ9
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFDM0MsSUFBWSxLQUFLLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFDdkMsNEJBQXNCLGFBQWEsQ0FBQyxDQUFBO0FBR3pCLFlBQUksR0FBVyxJQUFJLHFCQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztBQUV0RCxrQkFBVSxHQUFVLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDO0FBSS9DLHdCQUFnQixHQUFnQixFQUFFLENBQUM7QUFDbkMsbUJBQVcsR0FBZ0IsRUFBRSxDQUFDO0FBSTlCLG1CQUFXLEdBQUc7SUFDckIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUM3QixJQUFJLENBQUMsU0FBUyxDQUFDLGNBQU0sQ0FBQyxFQUN0QjtRQUNJLFFBQVEsRUFBQyxhQUFhO1FBQ3RCLFFBQVEsRUFBQyxLQUFLLENBQUMsZ0JBQWdCO0tBQ2xDLENBQ0osQ0FBQztBQUNOLENBQUMsQ0FBQTtBQUVVLGtCQUFVLEdBQUc7SUFDcEIsSUFBSSxDQUFDO1FBQ0QsY0FBTSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUMsTUFBTSxDQUFDLENBQUM7SUFDbkYsQ0FDQTtJQUFBLEtBQUssQ0FBQSxDQUFDLEdBQUcsQ0FBQyxDQUFBLENBQUM7UUFDUCxjQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ1osbUJBQVcsRUFBRSxDQUFDO1FBQ2QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsY0FBTSxDQUFDLGNBQWMsR0FBRyxzQkFBYyxHQUFHLGNBQU0sQ0FBQyxjQUFjLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3pFLGNBQU0sQ0FBQyxnQkFBZ0IsR0FBRyx3QkFBZ0IsR0FBRyxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ25GLENBQUMsQ0FBQTtBQUNELGtCQUFVLEVBQUUsQ0FBQyIsImZpbGUiOiJucG1jaS5lbnYuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuaW1wb3J0ICogYXMgcGF0aHMgZnJvbSBcIi4vbnBtY2kucGF0aHNcIjtcclxuaW1wb3J0IHtHaXRSZXBvfSBmcm9tIFwic21hcnRzdHJpbmdcIjtcclxuaW1wb3J0IHtEb2NrZXJmaWxlfSBmcm9tIFwiLi9ucG1jaS5idWlsZC5kb2NrZXJcIlxyXG5cclxuZXhwb3J0IGxldCByZXBvOkdpdFJlcG8gPSBuZXcgR2l0UmVwbyhwcm9jZXNzLmVudi5DSV9CVUlMRF9SRVBPKTtcclxuXHJcbmV4cG9ydCBsZXQgYnVpbGRTdGFnZTpzdHJpbmcgPSBwcm9jZXNzLmVudi5DSV9CVUlMRF9TVEFHRTtcclxuXHJcbi8vIGhhbmRsaW5nIGNvbmZpZyBiZXR3ZWVuIGNvbW1hbmRzXHJcbmV4cG9ydCBsZXQgZG9ja2VyUmVnaXN0cnk7IC8vIHdpbGwgYmUgc2V0IGJ5IG5wbWNpLnByZXBhcmVcclxuZXhwb3J0IGxldCBkb2NrZXJGaWxlc0J1aWx0OkRvY2tlcmZpbGVbXSA9IFtdO1xyXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzOkRvY2tlcmZpbGVbXSA9IFtdO1xyXG5cclxuZXhwb3J0IGxldCBjb25maWc7XHJcblxyXG5leHBvcnQgbGV0IGNvbmZpZ1N0b3JlID0gKCkgPT4ge1xyXG4gICAgcGx1Z2lucy5zbWFydGZpbGUubWVtb3J5LnRvRnNTeW5jKFxyXG4gICAgICAgIEpTT04uc3RyaW5naWZ5KGNvbmZpZyksXHJcbiAgICAgICAge1xyXG4gICAgICAgICAgICBmaWxlTmFtZTpcImNvbmZpZy5qc29uXCIsXHJcbiAgICAgICAgICAgIGZpbGVQYXRoOnBhdGhzLk5wbWNpUGFja2FnZVJvb3RcclxuICAgICAgICB9XHJcbiAgICApO1xyXG59XHJcblxyXG5leHBvcnQgbGV0IGNvbmZpZ0xvYWQgPSAoKSA9PiB7XHJcbiAgICB0cnkge1xyXG4gICAgICAgIGNvbmZpZyA9IHBsdWdpbnMuc21hcnRmaWxlLmxvY2FsLnRvT2JqZWN0U3luYyhwYXRocy5OcG1jaVBhY2thZ2VDb25maWcsXCJqc29uXCIpO1xyXG4gICAgfVxyXG4gICAgY2F0Y2goZXJyKXtcclxuICAgICAgICBjb25maWcgPSB7fTtcclxuICAgICAgICBjb25maWdTdG9yZSgpO1xyXG4gICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmxvZyhcImNvbmZpZyBpbml0aXRpYWxpemVkIVwiKTtcclxuICAgIH1cclxuICAgIFxyXG4gICAgY29uZmlnLmRvY2tlclJlZ2lzdHJ5ID8gZG9ja2VyUmVnaXN0cnkgPSBjb25maWcuZG9ja2VyUmVnaXN0cnkgOiB2b2lkKDApO1xyXG4gICAgY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgPyBkb2NrZXJGaWxlc0J1aWx0ID0gY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgOiB2b2lkKDApO1xyXG59XHJcbmNvbmZpZ0xvYWQoKTsiXX0=

dist/npmci.install.d.ts

@@ -1,2 +1,5 @@
-import "typings-global";
+/**
-export declare let install: (versionArg: any) => any;
+ * Install a specific version of node
+ * @param versionArg
+ */
+export declare let install: (versionArg: any) => Promise<void>;

dist/npmci.install.js

@@ -1,28 +1,64 @@
 "use strict";
-require("typings-global");
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-var plugins = require("./npmci.plugins");
+    return new (P || (P = Promise))(function (resolve, reject) {
-var npmci_bash_1 = require("./npmci.bash");
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-exports.install = function (versionArg) {
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-    var done = plugins.q.defer();
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-    plugins.beautylog.log("now installing " + "node ".green + ("version " + versionArg).yellow);
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    var version;
+    });
-    if (versionArg == "lts") {
+};
-        version = "4";
+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");
+/**
+ * Install a specific version of node
+ * @param versionArg
+ */
+exports.install = (versionArg) => __awaiter(this, void 0, void 0, function* () {
+    plugins.beautylog.log(`now installing node version ${versionArg}`);
+    let version;
+    if (versionArg === 'stable') {
+        version = 'stable';
     }
-    else if (versionArg == "legacy") {
+    else if (versionArg === 'lts') {
-        version = "4.0.0";
+        version = '6';
+    }
+    else if (versionArg === 'legacy') {
+        version = '6';
     }
     else {
         version = versionArg;
     }
     ;
-    npmci_bash_1.bash("nvm install " + version +
+    if (yield npmci_bash_2.nvmAvailable.promise) {
-        " && nvm alias default " + version);
+        yield npmci_bash_1.bash(`nvm install ${version} && nvm alias default ${version}`);
-    plugins.beautylog.success("Node version " + version + " successfully installed!");
+        plugins.beautylog.success(`Node version ${version} successfully installed!`);
-    npmci_bash_1.bash("node -v");
+    }
-    npmci_bash_1.bash("npm -v");
+    else {
-    done.resolve();
+        plugins.beautylog.warn('Nvm not in path so staying at installed node version!');
-    return done.promise;
+    }
-};
+    ;
-
+    yield npmci_bash_1.bash('node -v');
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUV2QixlQUFPLEdBQUcsVUFBQyxVQUFVO0lBQzVCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLEtBQUssR0FBRyxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUM1RixJQUFJLE9BQWMsQ0FBQztJQUNuQixFQUFFLENBQUEsQ0FBQyxVQUFVLElBQUksS0FBSyxDQUFDLENBQUEsQ0FBQztRQUNwQixPQUFPLEdBQUcsR0FBRyxDQUFDO0lBQ2xCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFBLENBQUMsVUFBVSxJQUFJLFFBQVEsQ0FBQyxDQUFBLENBQUM7UUFDOUIsT0FBTyxHQUFHLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLEdBQUcsVUFBVSxDQUFDO0lBQ3pCLENBQUM7SUFBQSxDQUFDO0lBQ0YsaUJBQUksQ0FDQSxjQUFjLEdBQUcsT0FBTztRQUN4Qix3QkFBd0IsR0FBRyxPQUFPLENBQ3JDLENBQUM7SUFDRixPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxlQUFlLEdBQUcsT0FBTyxHQUFHLDBCQUEwQixDQUFDLENBQUM7SUFDbEYsaUJBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNoQixpQkFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBIiwiZmlsZSI6Im5wbWNpLmluc3RhbGwuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuaW1wb3J0IHtiYXNofSBmcm9tIFwiLi9ucG1jaS5iYXNoXCI7XHJcblxyXG5leHBvcnQgbGV0IGluc3RhbGwgPSAodmVyc2lvbkFyZykgPT4ge1xyXG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcclxuICAgIHBsdWdpbnMuYmVhdXR5bG9nLmxvZyhcIm5vdyBpbnN0YWxsaW5nIFwiICsgXCJub2RlIFwiLmdyZWVuICsgKFwidmVyc2lvbiBcIiArIHZlcnNpb25BcmcpLnllbGxvdyk7XHJcbiAgICBsZXQgdmVyc2lvbjpzdHJpbmc7XHJcbiAgICBpZih2ZXJzaW9uQXJnID09IFwibHRzXCIpe1xyXG4gICAgICAgIHZlcnNpb24gPSBcIjRcIjtcclxuICAgIH0gZWxzZSBpZih2ZXJzaW9uQXJnID09IFwibGVnYWN5XCIpe1xyXG4gICAgICAgIHZlcnNpb24gPSBcIjQuMC4wXCJcclxuICAgIH0gZWxzZSB7XHJcbiAgICAgICAgdmVyc2lvbiA9IHZlcnNpb25Bcmc7XHJcbiAgICB9O1xyXG4gICAgYmFzaChcclxuICAgICAgICBcIm52bSBpbnN0YWxsIFwiICsgdmVyc2lvbiArXHJcbiAgICAgICAgXCIgJiYgbnZtIGFsaWFzIGRlZmF1bHQgXCIgKyB2ZXJzaW9uXHJcbiAgICApO1xyXG4gICAgcGx1Z2lucy5iZWF1dHlsb2cuc3VjY2VzcyhcIk5vZGUgdmVyc2lvbiBcIiArIHZlcnNpb24gKyBcIiBzdWNjZXNzZnVsbHkgaW5zdGFsbGVkIVwiKTtcclxuICAgIGJhc2goXCJub2RlIC12XCIpO1xyXG4gICAgYmFzaChcIm5wbSAtdlwiKTtcclxuICAgIGRvbmUucmVzb2x2ZSgpO1xyXG4gICAgcmV0dXJuIGRvbmUucHJvbWlzZTtcclxufSJdfQ==
+    yield npmci_bash_1.bash('npm -v');
+    // lets look for further config
+    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`);
+                yield npmci_bash_1.bash(`npm install ${npmTool} -q -g`);
+            }
+        }
+        plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!');
+    }));
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQywrQ0FBOEM7QUFDOUMsNkNBQWdEO0FBQ2hELDZDQUEyQztBQUUzQzs7O0dBR0c7QUFDUSxRQUFBLE9BQU8sR0FBRyxDQUFPLFVBQVU7SUFDcEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsK0JBQStCLFVBQVUsRUFBRSxDQUFDLENBQUE7SUFDbEUsSUFBSSxPQUFlLENBQUE7SUFDbkIsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDNUIsT0FBTyxHQUFHLFFBQVEsQ0FBQTtJQUNwQixDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQ2hDLE9BQU8sR0FBRyxHQUFHLENBQUE7SUFDZixDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ25DLE9BQU8sR0FBRyxHQUFHLENBQUE7SUFDZixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixPQUFPLEdBQUcsVUFBVSxDQUFBO0lBQ3RCLENBQUM7SUFBQSxDQUFDO0lBQ0YsRUFBRSxDQUFDLENBQUMsTUFBTSx5QkFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDL0IsTUFBTSxpQkFBSSxDQUFDLGVBQWUsT0FBTyx5QkFBeUIsT0FBTyxFQUFFLENBQUMsQ0FBQTtRQUNwRSxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsT0FBTywwQkFBMEIsQ0FBQyxDQUFBO0lBQzlFLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHVEQUF1RCxDQUFDLENBQUE7SUFDakYsQ0FBQztJQUFBLENBQUM7SUFDRixNQUFNLGlCQUFJLENBQUMsU0FBUyxDQUFDLENBQUE7SUFDckIsTUFBTSxpQkFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ3BCLCtCQUErQjtJQUMvQixZQUFZLENBQUMsU0FBUyxFQUFFO1NBQ3JCLElBQUksQ0FBQyxDQUFNLFNBQVM7UUFDbkIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsNkNBQTZDLENBQUMsQ0FBQTtRQUNwRSxHQUFHLENBQUMsQ0FBQyxJQUFJLE9BQU8sSUFBSSxTQUFTLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUM3QyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyx3QkFBd0IsT0FBTyxHQUFHLENBQUMsQ0FBQTtZQUMxRCxJQUFJLFdBQVcsR0FBVyxNQUFNLHdCQUFXLENBQUMsU0FBUyxPQUFPLEVBQUUsQ0FBQyxDQUFBO1lBQy9ELElBQUksYUFBYSxHQUFZLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsSUFBSSxXQUFXLEtBQUssRUFBRSxDQUFDLENBQUE7WUFDdEYsRUFBRSxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztnQkFDbEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsUUFBUSxPQUFPLGVBQWUsQ0FBQyxDQUFBO1lBQ3ZELENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDTixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyx1QkFBdUIsT0FBTyxXQUFXLENBQUMsQ0FBQTtnQkFDakUsTUFBTSxpQkFBSSxDQUFDLGVBQWUsT0FBTyxRQUFRLENBQUMsQ0FBQTtZQUM1QyxDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLG9FQUFvRSxDQUFDLENBQUE7SUFDakcsQ0FBQyxDQUFBLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQSxDQUFBIn0=

dist/npmci.paths.d.ts

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

dist/npmci.paths.js

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

dist/npmci.plugins.d.ts

@@ -1,13 +1,20 @@
-import "typings-global";
+export import beautylog = require('beautylog');
-export import beautylog = require("beautylog");
-export declare let commander: any;
 export declare let gulp: any;
-export declare let gulpFunction: any;
+export import gulpFunction = require('gulp-function');
-export import path = require("path");
+export declare let lodash: any;
-export declare let q: any;
+export import npmextra = require('npmextra');
+export import path = require('path');
+export import projectinfo = require('projectinfo');
+export import q = require('smartq');
 export declare let request: any;
-export declare let shelljs: any;
+export import smartcli = require('smartcli');
-export import smartssh = require("smartssh");
+export import smartdelay = require('smartdelay');
-export import smartstring = require("smartstring");
+export import smartfile = require('smartfile');
-export import smartfile = require("smartfile");
+export import shelljs = require('shelljs');
-export declare let through2: any;
+export import smartparam = require('smartparam');
+export import smartq = require('smartq');
+export import smartshell = require('smartshell');
+export import smartsocket = require('smartsocket');
+export import smartssh = require('smartssh');
+export import smartstring = require('smartstring');
+export import through2 = require('through2');

dist/npmci.plugins.js

@@ -1,16 +1,23 @@
 "use strict";
-require("typings-global");
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.beautylog = require("beautylog");
-exports.commander = require("commander");
+exports.gulp = require('gulp');
-exports.gulp = require("gulp");
 exports.gulpFunction = require("gulp-function");
+exports.lodash = require('lodash');
+exports.npmextra = require("npmextra");
 exports.path = require("path");
-exports.q = require("q");
+exports.projectinfo = require("projectinfo");
-exports.request = require("request");
+exports.q = require("smartq");
+exports.request = require('request');
+exports.smartcli = require("smartcli");
+exports.smartdelay = require("smartdelay");
+exports.smartfile = require("smartfile");
 exports.shelljs = require("shelljs");
+exports.smartparam = require("smartparam");
+exports.smartq = require("smartq");
+exports.smartshell = require("smartshell");
+exports.smartsocket = require("smartsocket");
 exports.smartssh = require("smartssh");
 exports.smartstring = require("smartstring");
-exports.smartfile = require("smartfile");
 exports.through2 = require("through2");
-
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBOEM7QUFDbkMsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ2pDLGdEQUFxRDtBQUMxQyxRQUFBLE1BQU0sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7QUFDckMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyw2Q0FBa0Q7QUFDbEQsOEJBQW1DO0FBQ3hCLFFBQUEsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUN2Qyx1Q0FBNEM7QUFDNUMsMkNBQWdEO0FBQ2hELHlDQUE4QztBQUM5QyxxQ0FBMEM7QUFDMUMsMkNBQWdEO0FBQ2hELG1DQUF3QztBQUN4QywyQ0FBZ0Q7QUFDaEQsNkNBQWtEO0FBQ2xELHVDQUE0QztBQUM1Qyw2Q0FBa0Q7QUFDbEQsdUNBQTRDIn0=
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsaUJBQVMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDakMsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN2QixvQkFBWSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUNyQyxZQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDMUIsU0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDMUIsZ0JBQVEsV0FBVyxVQUFVLENBQUMsQ0FBQztBQUMvQixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDO0FBQ3JDLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsZ0JBQVEsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUMiLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmV4cG9ydCBpbXBvcnQgYmVhdXR5bG9nID0gcmVxdWlyZShcImJlYXV0eWxvZ1wiKTtcclxuZXhwb3J0IGxldCBjb21tYW5kZXIgPSByZXF1aXJlKFwiY29tbWFuZGVyXCIpO1xyXG5leHBvcnQgbGV0IGd1bHAgPSByZXF1aXJlKFwiZ3VscFwiKTtcclxuZXhwb3J0IGxldCBndWxwRnVuY3Rpb24gPSByZXF1aXJlKFwiZ3VscC1mdW5jdGlvblwiKTtcclxuZXhwb3J0IGltcG9ydCBwYXRoID0gcmVxdWlyZShcInBhdGhcIik7XHJcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpO1xyXG5leHBvcnQgbGV0IHJlcXVlc3QgPSByZXF1aXJlKFwicmVxdWVzdFwiKTtcclxuZXhwb3J0IGxldCBzaGVsbGpzID0gcmVxdWlyZShcInNoZWxsanNcIik7XHJcbmV4cG9ydCBpbXBvcnQgc21hcnRzc2ggPSByZXF1aXJlKFwic21hcnRzc2hcIik7XHJcbmV4cG9ydCBpbXBvcnQgc21hcnRzdHJpbmcgPSByZXF1aXJlKFwic21hcnRzdHJpbmdcIik7XHJcbmV4cG9ydCBpbXBvcnQgc21hcnRmaWxlID0gcmVxdWlyZShcInNtYXJ0ZmlsZVwiKTtcclxuZXhwb3J0IGxldCB0aHJvdWdoMiA9IHJlcXVpcmUoXCJ0aHJvdWdoMlwiKTsiXX0=

dist/npmci.prepare.d.ts

@@ -1,2 +1,9 @@
-import "typings-global";
+/**
-export declare let prepare: (serviceArg: string) => any;
+ * defines possible prepare services
+ */
+export declare type TPrepService = 'npm' | 'docker' | 'docker-gitlab' | 'ssh';
+/**
+ * the main exported prepare function
+ * @param servieArg describes the service to prepare
+ */
+export declare let prepare: (serviceArg: TPrepService) => Promise<void>;

dist/npmci.publish.d.ts

@@ -1,2 +1,10 @@
-import "typings-global";
+import * as NpmciBuildDocker from './npmci.build.docker';
-export declare let publish: (serviceArg?: string) => any;
+/**
+ * type of supported services
+ */
+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) => Promise<void | NpmciBuildDocker.Dockerfile[]>;

dist/npmci.publish.js

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

dist/npmci.servezone.d.ts

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

dist/npmci.servezone.js

@@ -0,0 +1,37 @@
+"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
+ * parses strings in the form of "servezone.example.com|3000|somepassword"
+ */
+let servezoneRegex = /^(.*)\|(.*)\|(.*)/;
+/**
+ * holds the results of the parsed servezone env string
+ */
+let servezoneRegexResultArray = servezoneRegex.exec(process.env.NPMCI_SERVEZONE);
+/**
+ * the data object that is used for the smartsocket client object
+ */
+let smartsocketClientConstructorOptions = {
+    alias: 'npmci',
+    password: servezoneRegexResultArray[3],
+    port: parseInt(servezoneRegexResultArray[2]),
+    role: 'ci',
+    url: servezoneRegexResultArray[1]
+};
+/**
+ * the main run function to submit a service to a servezone
+ */
+exports.run = (configArg) => __awaiter(this, void 0, void 0, function* () {
+    new plugins.smartsocket.SmartsocketClient(smartsocketClientConstructorOptions);
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc2VydmV6b25lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc2VydmV6b25lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFFMUM7OztHQUdHO0FBQ0gsSUFBSSxjQUFjLEdBQUcsbUJBQW1CLENBQUE7QUFFeEM7O0dBRUc7QUFDSCxJQUFJLHlCQUF5QixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUVoRjs7R0FFRztBQUNILElBQUksbUNBQW1DLEdBQUc7SUFDdEMsS0FBSyxFQUFFLE9BQU87SUFDZCxRQUFRLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0lBQ3RDLElBQUksRUFBRSxRQUFRLENBQUMseUJBQXlCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUMsSUFBSSxFQUFFLElBQUk7SUFDVixHQUFHLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0NBQ3BDLENBQUE7QUFFRDs7R0FFRztBQUNRLFFBQUEsR0FBRyxHQUFHLENBQU8sU0FBUztJQUM3QixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQ3JDLG1DQUFtQyxDQUN0QyxDQUFBO0FBQ0wsQ0FBQyxDQUFBLENBQUEifQ==

dist/npmci.ssh.d.ts

@@ -0,0 +1,4 @@
+/**
+ * checks for ENV vars in form of NPMCI_SSHKEY_* and deploys any found ones
+ */
+export declare let ssh: () => Promise<void>;

dist/npmci.ssh.js

@@ -0,0 +1,58 @@
+"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 = () => __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) {
+        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) => __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]);
+    if (notUndefined(resultArray[1])) {
+        plugins.beautylog.log('---> host defined!');
+        sshKey.host = resultArray[1];
+    }
+    if (notUndefined(resultArray[2])) {
+        plugins.beautylog.log('---> privKey defined!');
+        sshKey.privKeyBase64 = resultArray[2];
+    }
+    ;
+    if (notUndefined(resultArray[3])) {
+        '---> pubKey defined!';
+        sshKey.pubKeyBase64 = resultArray[3];
+    }
+    ;
+    sshInstance.addKey(sshKey);
+    return;
+});
+/**
+ * checks if not undefined
+ */
+let notUndefined = (stringArg) => {
+    return (stringArg && stringArg !== 'undefined' && stringArg !== '##');
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc3NoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc3NoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFFMUMsSUFBSSxRQUFRLEdBQUcsbUJBQW1CLENBQUE7QUFDbEMsSUFBSSxXQUF5QyxDQUFBO0FBRTdDOztHQUVHO0FBQ1EsUUFBQSxHQUFHLEdBQUc7SUFDZixXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFBLENBQUMsb0JBQW9CO0lBQ3JFLE9BQU8sQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxnQkFBZ0IsRUFBRSxjQUFjLENBQUMsQ0FBQTtJQUNsRixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1QixXQUFXLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDM0IsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZ0RBQWdELENBQUMsQ0FBQTtJQUN6RSxDQUFDO0lBQUEsQ0FBQztBQUNKLENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLGNBQWMsR0FBRyxDQUFPLGVBQWU7SUFDekMsSUFBSSxXQUFXLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUNoRCxJQUFJLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUE7SUFDMUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMseUJBQXlCLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDbEUsRUFBRSxDQUFDLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNqQyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO1FBQzNDLE1BQU0sQ0FBQyxJQUFJLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzlCLENBQUM7SUFDRCxFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLENBQUE7UUFDOUMsTUFBTSxDQUFDLGFBQWEsR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDdkMsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLHNCQUFzQixDQUFBO1FBQ3RCLE1BQU0sQ0FBQyxZQUFZLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3RDLENBQUM7SUFBQSxDQUFDO0lBRUYsV0FBVyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUMxQixNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxZQUFZLEdBQUcsQ0FBQyxTQUFpQjtJQUNuQyxNQUFNLENBQUMsQ0FBQyxTQUFTLElBQUksU0FBUyxLQUFLLFdBQVcsSUFBSSxTQUFTLEtBQUssSUFBSSxDQUFDLENBQUE7QUFDdkUsQ0FBQyxDQUFBIn0=

dist/npmci.tag.d.ts

@@ -1,3 +0,0 @@
-import "typings-global";
-export declare let tag: (commandOptionArg: any) => void;
-export declare let retag: () => void;

dist/npmci.tag.js

@@ -1,8 +0,0 @@
-"use strict";
-require("typings-global");
-exports.tag = function (commandOptionArg) {
-};
-exports.retag = function () {
-};
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnRhZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBTWIsV0FBRyxHQUFHLFVBQVMsZ0JBQWdCO0FBRTFDLENBQUMsQ0FBQTtBQUVVLGFBQUssR0FBRztBQUVuQixDQUFDLENBQUMiLCJmaWxlIjoibnBtY2kudGFnLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XHJcbmltcG9ydCB7cHJlcGFyZX0gZnJvbSBcIi4vbnBtY2kucHJlcGFyZVwiO1xyXG5pbXBvcnQge2Jhc2h9IGZyb20gXCIuL25wbWNpLmJhc2hcIjtcclxuaW1wb3J0ICogYXMgZW52IGZyb20gXCIuL25wbWNpLmVudlwiO1xyXG5cclxuZXhwb3J0IGxldCB0YWcgPSBmdW5jdGlvbihjb21tYW5kT3B0aW9uQXJnKXtcclxuICAgIFxyXG59XHJcblxyXG5leHBvcnQgbGV0IHJldGFnID0gZnVuY3Rpb24oKXtcclxuICAgIFxyXG59O1xyXG4iXX0=

dist/npmci.test.d.ts

@@ -1,2 +1 @@
-import "typings-global";
+export declare let test: (versionArg: any) => Promise<void>;
-export declare let test: (versionArg: any) => any;

dist/npmci.test.docker.d.ts

@@ -1 +0,0 @@
-export declare let testDocker: () => void;

dist/npmci.test.docker.js

@@ -1,5 +0,0 @@
-"use strict";
-exports.testDocker = function () {
-};
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnRlc3QuZG9ja2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFLVyxrQkFBVSxHQUFHO0FBRXhCLENBQUMsQ0FBQyIsImZpbGUiOiJucG1jaS50ZXN0LmRvY2tlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiXHJcbmltcG9ydCAqIGFzIE5wbWNpRW52IGZyb20gXCIuL25wbWNpLmVudlwiO1xyXG5pbXBvcnQge2Jhc2hCYXJlfSBmcm9tIFwiLi9ucG1jaS5iYXNoXCI7XHJcbmltcG9ydCAqIGFzIE5wbWNpQnVpbGREb2NrZXIgZnJvbSBcIi4vbnBtY2kuYnVpbGQuZG9ja2VyXCI7XHJcblxyXG5leHBvcnQgbGV0IHRlc3REb2NrZXIgPSAoKSA9PiB7XHJcblxyXG59OyJdfQ==

dist/npmci.test.js

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

dist/npmci.trigger.d.ts

@@ -1,2 +1 @@
-import "typings-global";
+export declare let trigger: () => Promise<void>;
-export declare let trigger: () => any;

dist/npmci.trigger.js

@@ -1,35 +1,34 @@
 "use strict";
-require("typings-global");
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-var plugins = require("./npmci.plugins");
+    return new (P || (P = Promise))(function (resolve, reject) {
-//Variables
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-var triggerEnvPrefix = "NPMCI_TRIGGER_";
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-exports.trigger = function () {
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-    var done = plugins.q.defer();
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    plugins.beautylog.info("now running triggers");
+    });
-    var triggerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/;
-    for (var i = 0; i < 100; i++) {
-        var iteratorString = i.toString();
-        var triggerName = triggerEnvPrefix + iteratorString;
-        if (process.env[triggerName]) {
-            var triggerRegexResultArray = triggerRegex.exec(process.env[triggerName]);
-            var regexDomain = triggerRegexResultArray[1];
-            var regexProjectId = triggerRegexResultArray[2];
-            var regexProjectTriggerToken = triggerRegexResultArray[3];
-            var regexRefName = triggerRegexResultArray[4];
-            var regexTriggerName = void 0;
-            if (triggerRegexResultArray.length == 6) {
-                regexTriggerName = triggerRegexResultArray[5];
-            }
-            else {
-                regexTriggerName = "Unnamed Trigger";
-            }
-            plugins.beautylog.info("Found " + triggerName);
-            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 } });
-        }
-    }
-    done.resolve();
-    return done.promise;
 };
-
+Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnRyaWdnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBSTNDLFdBQVc7QUFDWCxJQUFJLGdCQUFnQixHQUFHLGdCQUFnQixDQUFDO0FBRTdCLGVBQU8sR0FBRztJQUNqQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUM7SUFDL0MsSUFBSSxZQUFZLEdBQUcsZ0dBQWdHLENBQUM7SUFDcEgsR0FBRyxDQUFBLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxHQUFHLEVBQUUsQ0FBQyxFQUFFLEVBQUMsQ0FBQztRQUN6QixJQUFJLGNBQWMsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDbEMsSUFBSSxXQUFXLEdBQUcsZ0JBQWdCLEdBQUcsY0FBYyxDQUFBO1FBQ25ELEVBQUUsQ0FBQSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQSxDQUFDO1lBQ3pCLElBQUksdUJBQXVCLEdBQUcsWUFBWSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDMUUsSUFBSSxXQUFXLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDN0MsSUFBSSxjQUFjLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDaEQsSUFBSSx3QkFBd0IsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMxRCxJQUFJLFlBQVksR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM5QyxJQUFJLGdCQUFnQixTQUFBLENBQUM7WUFDckIsRUFBRSxDQUFBLENBQUMsdUJBQXVCLENBQUMsTUFBTSxJQUFJLENBQUMsQ0FBQyxDQUFBLENBQUM7Z0JBQ3BDLGdCQUFnQixHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2xELENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixnQkFBZ0IsR0FBRyxpQkFBaUIsQ0FBQztZQUN6QyxDQUFDO1lBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxHQUFHLFdBQVcsQ0FBQyxDQUFDO1lBQy9DLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLDJCQUEyQixHQUFHLFlBQVksR0FBRyxNQUFNLEdBQUcsZ0JBQWdCLENBQUMsQ0FBQztZQUM5RixPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxjQUFjLEdBQUcsaUJBQWlCLEVBQUUsRUFBQyxJQUFJLEVBQUMsRUFBQyxLQUFLLEVBQUMsd0JBQXdCLEVBQUMsR0FBRyxFQUFDLFlBQVksRUFBQyxFQUFDLENBQUMsQ0FBQztRQUMvSixDQUFDO0lBQ0wsQ0FBQztJQUNELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQSIsImZpbGUiOiJucG1jaS50cmlnZ2VyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XHJcbmltcG9ydCB7cHJlcGFyZX0gZnJvbSBcIi4vbnBtY2kucHJlcGFyZVwiO1xyXG5pbXBvcnQge2Jhc2h9IGZyb20gXCIuL25wbWNpLmJhc2hcIjtcclxuXHJcbi8vVmFyaWFibGVzXHJcbmxldCB0cmlnZ2VyRW52UHJlZml4ID0gXCJOUE1DSV9UUklHR0VSX1wiO1xyXG5cclxuZXhwb3J0IGxldCB0cmlnZ2VyID0gZnVuY3Rpb24oKXtcclxuICAgIGxldCBkb25lID0gcGx1Z2lucy5xLmRlZmVyKCk7XHJcbiAgICBwbHVnaW5zLmJlYXV0eWxvZy5pbmZvKFwibm93IHJ1bm5pbmcgdHJpZ2dlcnNcIik7XHJcbiAgICBsZXQgdHJpZ2dlclJlZ2V4ID0gL14oW2EtekEtWjAtOVxcLl0qKVxcfChbYS16QS1aMC05XFwuXSopXFx8KFthLXpBLVowLTlcXC5dKilcXHwoW2EtekEtWjAtOVxcLl0qKVxcfD8oW2EtekEtWjAtOVxcLlxcLVxcL10qKS87XHJcbiAgICBmb3IobGV0IGkgPSAwOyBpIDwgMTAwOyBpKyspe1xyXG4gICAgICAgIGxldCBpdGVyYXRvclN0cmluZyA9IGkudG9TdHJpbmcoKTtcclxuICAgICAgICBsZXQgdHJpZ2dlck5hbWUgPSB0cmlnZ2VyRW52UHJlZml4ICsgaXRlcmF0b3JTdHJpbmdcclxuICAgICAgICBpZihwcm9jZXNzLmVudlt0cmlnZ2VyTmFtZV0pe1xyXG4gICAgICAgICAgICBsZXQgdHJpZ2dlclJlZ2V4UmVzdWx0QXJyYXkgPSB0cmlnZ2VyUmVnZXguZXhlYyhwcm9jZXNzLmVudlt0cmlnZ2VyTmFtZV0pO1xyXG4gICAgICAgICAgICBsZXQgcmVnZXhEb21haW4gPSB0cmlnZ2VyUmVnZXhSZXN1bHRBcnJheVsxXTtcclxuICAgICAgICAgICAgbGV0IHJlZ2V4UHJvamVjdElkID0gdHJpZ2dlclJlZ2V4UmVzdWx0QXJyYXlbMl07XHJcbiAgICAgICAgICAgIGxldCByZWdleFByb2plY3RUcmlnZ2VyVG9rZW4gPSB0cmlnZ2VyUmVnZXhSZXN1bHRBcnJheVszXTtcclxuICAgICAgICAgICAgbGV0IHJlZ2V4UmVmTmFtZSA9IHRyaWdnZXJSZWdleFJlc3VsdEFycmF5WzRdO1xyXG4gICAgICAgICAgICBsZXQgcmVnZXhUcmlnZ2VyTmFtZTtcclxuICAgICAgICAgICAgaWYodHJpZ2dlclJlZ2V4UmVzdWx0QXJyYXkubGVuZ3RoID09IDYpe1xyXG4gICAgICAgICAgICAgICAgcmVnZXhUcmlnZ2VyTmFtZSA9IHRyaWdnZXJSZWdleFJlc3VsdEFycmF5WzVdO1xyXG4gICAgICAgICAgICB9IGVsc2Uge1xyXG4gICAgICAgICAgICAgICAgcmVnZXhUcmlnZ2VyTmFtZSA9IFwiVW5uYW1lZCBUcmlnZ2VyXCI7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cuaW5mbyhcIkZvdW5kIFwiICsgdHJpZ2dlck5hbWUpO1xyXG4gICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5sb2coXCJ0cmlnZ2VyaW5nIGJ1aWxkIGZvciByZWYgXCIgKyByZWdleFJlZk5hbWUgKyBcIiBvZiBcIiArIHJlZ2V4VHJpZ2dlck5hbWUpO1xyXG4gICAgICAgICAgICBwbHVnaW5zLnJlcXVlc3QucG9zdChcImh0dHBzOi8vZ2l0bGFiLmNvbS9hcGkvdjMvcHJvamVjdHMvXCIgKyByZWdleFByb2plY3RJZCArIFwiL3RyaWdnZXIvYnVpbGRzXCIsIHtmb3JtOnt0b2tlbjpyZWdleFByb2plY3RUcmlnZ2VyVG9rZW4scmVmOnJlZ2V4UmVmTmFtZX19KTtcclxuICAgICAgICB9XHJcbiAgICB9XHJcbiAgICBkb25lLnJlc29sdmUoKTtcclxuICAgIHJldHVybiBkb25lLnByb21pc2U7XHJcbn0iXX0=
+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 = () => __awaiter(this, void 0, void 0, function* () {
+    plugins.beautylog.info('now running triggers');
+    plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
+});
+let evaluateTrigger = (triggerEnvVarArg) => __awaiter(this, void 0, void 0, function* () {
+    let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg);
+    let regexDomain = triggerRegexResultArray[1];
+    let regexProjectId = triggerRegexResultArray[2];
+    let regexProjectTriggerToken = triggerRegexResultArray[3];
+    let regexRefName = triggerRegexResultArray[4];
+    let regexTriggerName;
+    if (triggerRegexResultArray.length === 6) {
+        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 } });
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudHJpZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRyaWdnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUkxQyxJQUFJLGlCQUFpQixHQUFHLGdHQUFnRyxDQUFBO0FBRTdHLFFBQUEsT0FBTyxHQUFHO0lBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUE7SUFDOUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLGlCQUFpQixFQUFFLGVBQWUsQ0FBQyxDQUFBO0FBQ3RGLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxlQUFlLEdBQUcsQ0FBTyxnQkFBZ0I7SUFDM0MsSUFBSSx1QkFBdUIsR0FBRyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtJQUN0RSxJQUFJLFdBQVcsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUM1QyxJQUFJLGNBQWMsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMvQyxJQUFJLHdCQUF3QixHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3pELElBQUksWUFBWSxHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzdDLElBQUksZ0JBQWdCLENBQUE7SUFDcEIsRUFBRSxDQUFDLENBQUMsdUJBQXVCLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDekMsZ0JBQWdCLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDL0MsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUE7SUFDdEMsQ0FBQztJQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUE7SUFDeEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsMkJBQTJCLEdBQUcsWUFBWSxHQUFHLE1BQU0sR0FBRyxnQkFBZ0IsQ0FBQyxDQUFBO0lBQzdGLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLGNBQWMsR0FBRyxpQkFBaUIsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxHQUFHLEVBQUUsWUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFBO0FBQ3BLLENBQUMsQ0FBQSxDQUFBIn0=

npmextra.json

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

package.json

@@ -1,41 +1,56 @@
 {
   "name": "npmci",
-  "version": "2.1.41",
+  "version": "2.3.47",
   "description": "",
   "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "bin": {
-    "npmci": "dist/index.js"
+    "npmci": "dist/cli.js"
   },
   "scripts": {
-    "test": "(npmts)"
+    "test": "(npmts) && (npm run testVersion)",
+    "testVersion": "(cd test/assets/ && node ../../dist/cli.js -v)"
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/pushrocks/npmci.git"
+    "url": "git+ssh://git@gitlab.com/gitzone/npmci.git"
   },
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://gitlab.com/pushrocks/npmci/issues"
+    "url": "https://gitlab.com/gitzone/npmci/issues"
   },
-  "homepage": "https://gitlab.com/pushrocks/npmci#README",
+  "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "npmts": "^5.2.5",
+    "@types/should": "^8.1.30",
-    "should": "^9.0.0",
+    "npmts-g": "^6.0.0",
-    "typings-test": "^1.0.1"
+    "should": "^11.2.1",
+    "typings-test": "^1.0.3"
   },
   "dependencies": {
-    "beautylog": "^5.0.8",
+    "@types/lodash": "^4.14.55",
-    "commander": "^2.9.0",
+    "@types/node": "^7.0.8",
+    "@types/request": "0.x.x",
+    "@types/shelljs": "^0.7.0",
+    "@types/through2": "^2.0.32",
+    "beautylog": "^6.1.3",
     "gulp": "^3.9.1",
-    "gulp-function": "^1.3.5",
+    "gulp-function": "^2.2.3",
-    "q": "^1.4.1",
+    "lodash": "^4.17.4",
-    "request": "^2.72.0",
+    "npmextra": "^2.0.3",
-    "shelljs": "^0.7.0",
+    "projectinfo": "^3.0.2",
-    "smartfile": "^3.0.10",
+    "request": "^2.81.0",
-    "smartssh": "^1.0.5",
+    "shelljs": "^0.7.7",
-    "smartstring": "^2.0.6",
+    "smartcli": "^2.0.1",
-    "through2": "^2.0.1",
+    "smartdelay": "^1.0.1",
-    "typings-global": "^1.0.3"
+    "smartfile": "^4.1.7",
+    "smartparam": "^0.1.1",
+    "smartq": "^1.1.1",
+    "smartshell": "^1.0.5",
+    "smartsocket": "^1.1.7",
+    "smartssh": "^1.2.1",
+    "smartstring": "^2.0.24",
+    "through2": "^2.0.3",
+    "typings-global": "^1.0.14"
   }
 }

test/assets/test/test_latest.sh

@@ -1,3 +1,2 @@
-#!/bin/sh
 npm -v
 node -v

test/test.d.ts

@@ -1,2 +1 @@
-import "typings-test";
+import 'typings-test';
-import "should";

test/test.ts

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

ts/index.ts

@@ -1,57 +1,78 @@
-#!/usr/bin/env node
+import * as plugins from './npmci.plugins'
-import "typings-global";
+import * as paths from './npmci.paths'
-import * as plugins from "./npmci.plugins";
+let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot)
+plugins.beautylog.log('npmci version: ' + npmciInfo.version)
 
-let packJson = require("../package.json");
+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'
 
-plugins.beautylog.info("npmci version: " + packJson.version);
+export { build } from './npmci.build'
+export { install } from './npmci.install';
+export { publish } from './npmci.publish';
 
-import {build} from "./npmci.build"
+let smartcli = new plugins.smartcli.Smartcli()
-import {install} from "./npmci.install";
+smartcli.addVersion(npmciInfo.version)
-import {publish} from "./npmci.publish";
-import {prepare} from "./npmci.prepare";
-import {tag, retag} from "./npmci.tag";
-import {test} from "./npmci.test";
-import {trigger} from "./npmci.trigger";
 
+// build
+smartcli.addCommand('build')
+  .then((argv) => {
+    build(argv._[ 1 ])
+      .then(NpmciEnv.configStore)
+  })
 
-let command;
+// clean
-let commandOption;
+smartcli.addCommand('clean')
+  .then((argv) => {
+    clean()
+      .then(NpmciEnv.configStore)
+  })
 
-plugins.commander
+// command
-    .arguments('<commandarg> [commandoptionarg]')
+smartcli.addCommand('command')
-    .action(function (commandarg, commandoptionarg) {
+  .then((argv) => {
-        command = commandarg;
+    command()
-        commandOption = commandoptionarg;
+      .then(NpmciEnv.configStore)
-    });
+  })
- 
-plugins.commander.parse(process.argv);
- 
-if (typeof command === 'undefined') {
-    console.error('no command given!');
-    process.exit(1);
-}
 
-switch (command){
+// install
-    case "build":
+smartcli.addCommand('install')
-        build(commandOption);
+  .then((argv) => {
-        break;
+    install(argv._[ 1 ])
-    case "install":
+      .then(NpmciEnv.configStore)
-        install(commandOption);
+  })
-        break;
-    case "prepare":
-        prepare(commandOption);
-        break;
-    case "publish":
-        publish(commandOption);
-        break;
-    case "test":
-        test(commandOption);
-        break;
-    case "trigger":
-        trigger();
-        break;
-    default:
-        break;
-}
 
+// prepare
+smartcli.addCommand('prepare')
+  .then((argv) => {
+    prepare(argv._[ 1 ])
+      .then(NpmciEnv.configStore)
+  })
+
+// publish
+smartcli.addCommand('publish')
+  .then((argv) => {
+    publish(argv._[ 1 ])
+      .then(NpmciEnv.configStore)
+  })
+
+// test
+smartcli.addCommand('test')
+  .then((argv) => {
+    test(argv._[ 1 ])
+      .then(NpmciEnv.configStore)
+  })
+
+// trigger
+smartcli.addCommand('trigger')
+  .then((argv) => {
+    trigger()
+  })
+
+smartcli.startParse()

ts/npmci.bash.ts

@@ -1,38 +1,96 @@
-import "typings-global";
+import * as plugins from './npmci.plugins'
-import * as plugins from "./npmci.plugins";
+import * as smartq from 'smartq'
 
-export let bash = (commandArg:string,retryArg = 2,bareArg = false) => {
+/**
-    let exitCode:number;
+ * wether nvm is available or not
-    let stdOut:string;
+ */
-    let execResult;
+export let nvmAvailable = smartq.defer<boolean>()
-    if(!process.env.NPMTS_TEST){
+
-        for (let i = 0; i <= retryArg; i++){
+/**
-            if(!bareArg){
+ * the smartshell instance for npmci
-                execResult = plugins.shelljs.exec(
+ */
-                    "bash -c \"source /usr/local/nvm/nvm.sh &&" +
+let npmciSmartshell = new plugins.smartshell.Smartshell({
-                    commandArg +
+  executor: 'bash',
-                    "\""
+  sourceFilePaths: []
-                );
+})
-            } else {
+
-                execResult = plugins.shelljs.exec(commandArg);
+let checkNvm = async () => {
-            }
+  if (
-            exitCode = execResult.code;
+    (await plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0
-            stdOut = execResult.stdout;
+  ) {
-            if(exitCode !== 0 && i == retryArg){
+    npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh && `])
-                process.exit(1);
+    nvmAvailable.resolve(true)
-            } else if(exitCode == 0){
+  } else if (
-                i = retryArg + 1; // if everything works out ok retrials are not wanted
+    (await plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0
-            } else {
+  ) {
-                plugins.beautylog.warn("Something went wrong! Exit Code: " + exitCode.toString());
+    npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh && `])
-                plugins.beautylog.info("Retry " + (i + 1).toString() + " of " +  retryArg.toString());
+    nvmAvailable.resolve(true)
-            }
+  } else {
+    nvmAvailable.resolve(false)
+  };
+}
+checkNvm()
+
+
+
+/**
+ * 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 {
+      } else if (execResult.exitCode === 0) { // everything went fine, or no error wanted
-        plugins.beautylog.log("ShellExec would be: " + commandArg.blue)
+        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,264 +1,275 @@
-import * as plugins from "./npmci.plugins";
+import * as plugins from './npmci.plugins'
-import * as paths from "./npmci.paths";
+import * as paths from './npmci.paths'
-import * as NpmciEnv from "./npmci.env";
+import * as NpmciEnv from './npmci.env'
-import {bashBare} from "./npmci.bash";
+import { bashBare } from './npmci.bash'
 
-export let build = function(){
+/**
-    let done = plugins.q.defer();
+ * builds a cwd of Dockerfiles by triggering a promisechain
-    readDockerfiles()
+ */
-        .then(sortDockerfiles)
+export let build = async () => {
-        .then(mapDockerfiles)
+  await readDockerfiles()
-        .then(buildDockerfiles)
+    .then(sortDockerfiles)
-        .then(pushDockerfiles)
+    .then(mapDockerfiles)
-        .then(() => {
+    .then(buildDockerfiles)
-            done.resolve();
+    .then(pushDockerfiles)
-        });
-    return done.promise;
 }
 
-export let readDockerfiles = function(){
+/**
-    let done = plugins.q.defer();
+ * creates instance of class Dockerfile for all Dockerfiles in cwd
-    let readDockerfilesArray:Dockerfile[] = []
+ * @returns Promise<Dockerfile[]>
-    plugins.gulp.src("./Dockerfile*")
+ */
-        .pipe(plugins.through2.obj(function(file,enc,cb){
+export let readDockerfiles = async (): Promise<Dockerfile[]> => {
-            let myDockerfile = new Dockerfile({
+  let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, './Dockerfile*')
-                filePath:file.path,
-                read:true
-            });
-            readDockerfilesArray.push(myDockerfile);
-            cb(null,file);
-         },function(){
-             done.resolve(readDockerfilesArray);
-         }));
-    return done.promise;
-}
 
-export let sortDockerfiles = function(sortableArrayArg:Dockerfile[]){
+  // create the Dockerfile array
-    let done = plugins.q.defer();
+  let readDockerfilesArray: Dockerfile[] = []
-    let sortedArray:Dockerfile[] = [];
+  for (let dockerfilePath of fileTree) {
-    let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg,sortedArray);
+    let myDockerfile = new Dockerfile({
-    let sorterFunctionCounter:number = 0;
+      filePath: dockerfilePath,
-    let sorterFunction = function(){
+      read: true
-        sortableArrayArg.forEach((dockerfileArg)=>{
-            let cleanTags = cleanTagsArrayFunction(sortableArrayArg,sortedArray);
-            if(cleanTags.indexOf(dockerfileArg.baseImage) == -1 && sortedArray.indexOf(dockerfileArg) == -1){
-                sortedArray.push(dockerfileArg);
-            };
-            if(cleanTagsOriginal.indexOf(dockerfileArg.baseImage) != -1){
-                dockerfileArg.localBaseImageDependent = true;
-            };
-        });
-        if(sortableArrayArg.length == sortedArray.length){
-            done.resolve(sortedArray);
-        } else if (sorterFunctionCounter < 10) {
-            sorterFunctionCounter++;
-            sorterFunction();
-        };
-    }
-    sorterFunction();
-    return done.promise;
-};
-
-export let mapDockerfiles = function(sortedArray:Dockerfile[]){
-    let done = plugins.q.defer();
-    sortedArray.forEach((dockerfileArg) => {
-        if(dockerfileArg.localBaseImageDependent){
-            sortedArray.forEach((dockfile2:Dockerfile) => {
-                if(dockfile2.cleanTag == dockerfileArg.baseImage){
-                    dockerfileArg.localBaseDockerfile = dockfile2;
-                }
-            })
-        };
-    });
-    done.resolve(sortedArray);
-    return done.promise;
-}
-
-export let buildDockerfiles = (sortedArrayArg:Dockerfile[]) => {
-    let done = plugins.q.defer();
-    sortedArrayArg.forEach(function(dockerfileArg){
-        dockerfileArg.build();
     })
-    done.resolve(sortedArrayArg);
+    readDockerfilesArray.push(myDockerfile)
-    return done.promise;
+  }
+
+  return readDockerfilesArray
+
 }
 
-export let pushDockerfiles = function(sortedArrayArg:Dockerfile[]){
+/**
-    let done = plugins.q.defer();
+ * sorts Dockerfiles into a dependency chain
-    sortedArrayArg.forEach(function(dockerfileArg){
+ * @param sortableArrayArg an array of instances of class Dockerfile
-        dockerfileArg.push();
+ * @returns Promise<Dockerfile[]>
-    });
+ */
-    done.resolve(sortedArrayArg);
+export let sortDockerfiles = (sortableArrayArg: Dockerfile[]): Promise<Dockerfile[]> => {
-    return done.promise;
+  let done = plugins.q.defer<Dockerfile[]>()
-}
+  let sortedArray: Dockerfile[] = []
-
+  let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg, sortedArray)
-export let pullDockerfileImages = (sortableArrayArg:Dockerfile[]) => {
+  let sorterFunctionCounter: number = 0
-    let done = plugins.q.defer();
+  let sorterFunction = function () {
     sortableArrayArg.forEach((dockerfileArg) => {
-        dockerfileArg.pull();
+      let cleanTags = cleanTagsArrayFunction(sortableArrayArg, sortedArray)
-    });
+      if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) {
-    done.resolve(sortableArrayArg);
+        sortedArray.push(dockerfileArg)
-    return done.promise;
+      };
+      if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) {
+        dockerfileArg.localBaseImageDependent = true
+      };
+    })
+    if (sortableArrayArg.length === sortedArray.length) {
+      done.resolve(sortedArray)
+    } else if (sorterFunctionCounter < 10) {
+      sorterFunctionCounter++
+      sorterFunction()
+    };
+  }
+  sorterFunction()
+  return done.promise
 }
 
-export let testDockerfiles = (sortedArrayArg:Dockerfile[]) => {
+/**
-    let done = plugins.q.defer();
+ * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
-    sortedArrayArg.forEach(function(dockerfileArg){
+ */
-        dockerfileArg.test();
+export let mapDockerfiles = async (sortedArray: Dockerfile[]): Promise<Dockerfile[]> => {
-    });
+  sortedArray.forEach((dockerfileArg) => {
-    done.resolve(sortedArrayArg);
+    if (dockerfileArg.localBaseImageDependent) {
-    return done.promise;
+      sortedArray.forEach((dockfile2: Dockerfile) => {
-};
+        if (dockfile2.cleanTag === dockerfileArg.baseImage) {
-
+          dockerfileArg.localBaseDockerfile = dockfile2
-export let releaseDockerfiles = (sortedArrayArg:Dockerfile[]) => {
+        }
-     let done = plugins.q.defer();
+      })
-    sortedArrayArg.forEach(function(dockerfileArg){
+    };
-        dockerfileArg.release();
+  })
-    });
+  return sortedArray
-    done.resolve(sortedArrayArg);
-    return done.promise;
 }
 
+/**
+ * builds the correspoding real docker image for each Dockerfile class instance
+ */
+export let buildDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
+  for (let dockerfileArg of sortedArrayArg) {
+    await dockerfileArg.build()
+  }
+  return sortedArrayArg
+}
+
+/**
+ * pushes the real Dockerfile images to a Docker registry
+ */
+export let pushDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
+  for (let dockerfileArg of sortedArrayArg) {
+    await dockerfileArg.push(NpmciEnv.buildStage)
+  }
+  return sortedArrayArg
+}
+
+/**
+ * pulls corresponding real Docker images for instances of Dockerfile from a registry.
+ * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages.
+ */
+export let pullDockerfileImages = async (sortableArrayArg: Dockerfile[], registryArg = 'registry.gitlab.com') => {
+  for (let dockerfileArg of sortableArrayArg) {
+    await dockerfileArg.pull(registryArg)
+  }
+  return sortableArrayArg
+}
+
+/**
+ * tests all Dockerfiles in by calling class Dockerfile.test();
+ * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
+ */
+export let testDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
+  for (let dockerfileArg of sortedArrayArg) {
+    await dockerfileArg.test()
+  }
+  return sortedArrayArg
+}
+
+/**
+ * class Dockerfile represents a Dockerfile on disk in npmci
+ */
 export class Dockerfile {
-    filePath:string;
+  filePath: string
-    repo:string;
+  repo: string
-    version:string;
+  version: string
-    cleanTag:string;
+  cleanTag: string
-    buildTag:string;
+  buildTag: string
-    releaseTag:string;
+  testTag: string
-    containerName:string
+  releaseTag: string
-    content:string;
+  containerName: string
-    patchedContent:string;
+  content: string
-    baseImage:string;
+  baseImage: string
-    localBaseImageDependent:boolean;
+  localBaseImageDependent: boolean
-    localBaseDockerfile:Dockerfile;
+  localBaseDockerfile: Dockerfile
-    constructor(options:{filePath?:string,fileContents?:string|Buffer,read?:boolean}){
+  constructor(options: { filePath?: string, fileContents?: string | Buffer, read?: boolean }) {
-        this.filePath = options.filePath;
+    this.filePath = options.filePath
-        this.repo = NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo;
+    this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo
-        this.version = dockerFileVersion(plugins.path.parse(options.filePath).base);
+    this.version = dockerFileVersion(plugins.path.parse(options.filePath).base)
-        this.cleanTag = this.repo + ":" + this.version;
+    this.cleanTag = this.repo + ':' + this.version
-        this.buildTag = dockerTag(this.repo,this.version,"build");
+    this.buildTag = this.cleanTag
-        this.releaseTag = dockerTag(this.repo,this.version,"release");
+    this.testTag = dockerTag('registry.gitlab.com', this.repo, this.version, 'test')
-        this.containerName = "dockerfile-" + this.version;
+    this.releaseTag = dockerTag(NpmciEnv.dockerRegistry, this.repo, this.version)
-        if(options.filePath && options.read){
+    this.containerName = 'dockerfile-' + this.version
-            this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath));
+    if (options.filePath && options.read) {
-        };
+      this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath))
-        this.baseImage = dockerBaseImage(this.content);
-        this.localBaseImageDependent = false;
     };
-    build(){
+    this.baseImage = dockerBaseImage(this.content)
-        plugins.beautylog.info("now building Dockerfile for " + this.cleanTag);
+    this.localBaseImageDependent = false
-        let done = plugins.q.defer();
+  };
-        this.patchContents();
-        bashBare("docker build -t " + this.buildTag + " -f " + this.filePath + " .");
-        NpmciEnv.dockerFilesBuilt.push(this);
-        this.restoreContents();
-        done.resolve();
-        return done.promise;
-    };
-    push(){
-        let done = plugins.q.defer();
-        if(this.buildTag){
-            bashBare("docker push " + this.buildTag);
-        } else {
-            plugins.beautylog.error("Dockerfile hasn't been built yet!");
-        }
-        done.resolve();
-        return done.promise;
-    }
-    pull(){
-        bashBare("docker pull " + this.buildTag);
-    };
-    test(){
-        let testFile = plugins.path.join(paths.NpmciTestDir,"test_" + this.version + ".sh");
-        let testExists = plugins.smartfile.checks.fileExistsSync(testFile);
-        if(testExists){
-            bashBare("docker run -v " + 
-                paths.NpmciTestDir + ":/test " +
-                "--name " + this.containerName + " " + this.buildTag + " /test/" + "test_" + this.version  + ".sh");
-        } else {
-            plugins.beautylog.warn("skipping tests for " + this.cleanTag + " because no testfile was found!");
-        }
-    };
-    release(){
-        bashBare("docker tag " + this.getId() + " " + this.releaseTag);
-        bashBare("docker push " + this.releaseTag);
-    }
-    getId(){
-        let containerId = bashBare("docker inspect --type=image --format=\"{{.Id}}\" " + this.buildTag);
-        return containerId;
-    };
-    patchContents(){
-        let done = plugins.q.defer();
-        if(this.localBaseImageDependent == true){
-            plugins.beautylog.info("patching Dockerfile due to local build dependency!");
-            this.patchedContent = this.content.replace(/FROM\s[a-zA-Z0-9\/\-\:]*/, 'FROM ' + this.localBaseDockerfile.buildTag);
-            plugins.smartfile.memory.toFsSync(
-                this.patchedContent,
-                {
-                    fileName:plugins.path.parse(this.filePath).name,
-                    filePath:plugins.path.parse(this.filePath).dir
-                }
-            );
-        }
-        done.resolve();
-        return done.promise;
-    };
-    restoreContents(){
-        let done = plugins.q.defer();
-        if(this.localBaseImageDependent == true){
-            plugins.smartfile.memory.toFsSync(
-                this.content,
-                {
-                    fileName:plugins.path.parse(this.filePath).name,
-                    filePath:plugins.path.parse(this.filePath).dir
-                }
-            );
-        }
-        done.resolve();
-        return done.promise;
-    };
-}
 
-export let dockerFileVersion = function(dockerfileNameArg:string):string{
+  /**
-    let versionString:string;
+   * builds the Dockerfile
-    let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
+   */
-    let regexResultArray = versionRegex.exec(dockerfileNameArg);
+  async build() {
-    if(regexResultArray && regexResultArray.length == 2){
+    plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
-        versionString = regexResultArray[1];        
+    await bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .')
+    NpmciEnv.dockerFilesBuilt.push(this)
+    return
+  };
+
+  /**
+   * 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
+    }
+    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 {
-        versionString = "latest";
+      plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
     }
-    return versionString;
+  };
+
+  /**
+   * gets the id of a Dockerfile
+   */
+  async getId() {
+    let containerId = await bashBare('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
+    return containerId
+  };
 }
 
-export let dockerBaseImage = function(dockerfileContentArg:string){
+/**
-    let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
+ * returns a version for a docker file
-    let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
+ * @execution SYNC
-    return regexResultArray[1];
+ */
+export let dockerFileVersion = (dockerfileNameArg: string): string => {
+  let versionString: string
+  let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/
+  let regexResultArray = versionRegex.exec(dockerfileNameArg)
+  if (regexResultArray && regexResultArray.length === 2) {
+    versionString = regexResultArray[1]
+  } else {
+    versionString = 'latest'
+  }
+  return versionString
 }
 
-export let dockerTag = function(repoArg:string,versionArg:string,stageArg:string):string{
+/**
-    let tagString:string;
+ * 
-    let registry = NpmciEnv.dockerRegistry;
+ */
-    if(stageArg == "build"  || stageArg == "test"){
+export let dockerBaseImage = function (dockerfileContentArg: string) {
-        registry = "registry.gitlab.com";
+  let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
-    } 
+  let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
-    let repo = repoArg;
+  return regexResultArray[1]
-    let version = versionArg;
+}
-    if(NpmciEnv.buildStage == "build" || NpmciEnv.buildStage == "test"){
-        version = version + "_test";
-    }
-    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){
+export let dockerTag = function (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string): string {
-            cleanTagsArray.push(dockerfileArg.cleanTag);
+  let tagString: string
-        }
+  let registry = registryArg
-    });
+  let repo = repoArg
-    return cleanTagsArray;
+  let version = versionArg
-}
+  if (suffixArg) {
+    version = versionArg + '_' + suffixArg
+  };
+  tagString = registry + '/' + repo + ':' + version
+  return tagString
+}
+
+/**
+ * 
+ */
+export let cleanTagsArrayFunction = function (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]): string[] {
+  let cleanTagsArray: string[] = []
+  dockerfileArrayArg.forEach(function (dockerfileArg) {
+    if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
+      cleanTagsArray.push(dockerfileArg.cleanTag)
+    }
+  })
+  return cleanTagsArray
+}

ts/npmci.build.ts

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

ts/npmci.clean.ts

@@ -0,0 +1,10 @@
+import * as plugins from './npmci.plugins'
+import * as paths from './npmci.paths'
+
+/**
+ * cleans npmci config files
+ */
+export let clean = async (): Promise<void> => {
+  plugins.smartfile.fs.removeSync(paths.NpmciPackageConfig)
+  return
+}

ts/npmci.command.ts

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

ts/npmci.config.ts

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

ts/npmci.env.ts

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

ts/npmci.install.ts

@@ -1,25 +1,47 @@
-import "typings-global";
+import * as plugins from './npmci.plugins'
-import * as plugins from "./npmci.plugins";
+import * as configModule from './npmci.config'
-import {bash} from "./npmci.bash";
+import { bash, bashNoError } from './npmci.bash'
+import { nvmAvailable } from './npmci.bash'
 
-export let install = (versionArg) => {
+/**
-    let done = plugins.q.defer();
+ * Install a specific version of node
-    plugins.beautylog.log("now installing " + "node ".green + ("version " + versionArg).yellow);
+ * @param versionArg
-    let version:string;
+ */
-    if(versionArg == "lts"){
+export let install = async (versionArg) => {
-        version = "4";
+  plugins.beautylog.log(`now installing node version ${versionArg}`)
-    } else if(versionArg == "legacy"){
+  let version: string
-        version = "4.0.0"
+  if (versionArg === 'stable') {
-    } else {
+    version = 'stable'
-        version = versionArg;
+  } else if (versionArg === 'lts') {
-    };
+    version = '6'
-    bash(
+  } else if (versionArg === 'legacy') {
-        "nvm install " + version +
+    version = '6'
-        " && nvm alias default " + version
+  } else {
-    );
+    version = versionArg
-    plugins.beautylog.success("Node version " + version + " successfully installed!");
+  };
-    bash("node -v");
+  if (await nvmAvailable.promise) {
-    bash("npm -v");
+    await bash(`nvm install ${version} && nvm alias default ${version}`)
-    done.resolve();
+    plugins.beautylog.success(`Node version ${version} successfully installed!`)
-    return done.promise;
+  } 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
+  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`)
+          await bash(`npm install ${npmTool} -q -g`)
+        }
+      }
+      plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!')
+    })
+}

ts/npmci.paths.ts

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

ts/npmci.plugins.ts

@@ -1,13 +1,20 @@
-import "typings-global";
+export import beautylog = require('beautylog')
-export import beautylog = require("beautylog");
+export let gulp = require('gulp')
-export let commander = require("commander");
+export import gulpFunction = require('gulp-function')
-export let gulp = require("gulp");
+export let lodash = require('lodash')
-export let gulpFunction = require("gulp-function");
+export import npmextra = require('npmextra')
-export import path = require("path");
+export import path = require('path')
-export let q = require("q");
+export import projectinfo = require('projectinfo')
-export let request = require("request");
+export import q = require('smartq')
-export let shelljs = require("shelljs");
+export let request = require('request')
-export import smartssh = require("smartssh");
+export import smartcli = require('smartcli')
-export import smartstring = require("smartstring");
+export import smartdelay = require('smartdelay')
-export import smartfile = require("smartfile");
+export import smartfile = require('smartfile')
-export let through2 = require("through2");
+export import shelljs = require('shelljs')
+export import smartparam = require('smartparam')
+export import smartq = require('smartq')
+export import smartshell = require('smartshell')
+export import smartsocket = require('smartsocket')
+export import smartssh = require('smartssh')
+export import smartstring = require('smartstring')
+export import through2 = require('through2')

ts/npmci.prepare.ts

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

ts/npmci.publish.ts

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

ts/npmci.servezone.ts

@@ -0,0 +1,32 @@
+import * as plugins from './npmci.plugins'
+
+/**
+ * servezoneRegex is the regex that parses the servezone connection data
+ * parses strings in the form of "servezone.example.com|3000|somepassword"
+ */
+let servezoneRegex = /^(.*)\|(.*)\|(.*)/
+
+/**
+ * holds the results of the parsed servezone env string
+ */
+let servezoneRegexResultArray = servezoneRegex.exec(process.env.NPMCI_SERVEZONE)
+
+/**
+ * the data object that is used for the smartsocket client object
+ */
+let smartsocketClientConstructorOptions = {
+    alias: 'npmci',
+    password: servezoneRegexResultArray[3],
+    port: parseInt(servezoneRegexResultArray[2]),
+    role: 'ci',
+    url: servezoneRegexResultArray[1]
+}
+
+/**
+ * the main run function to submit a service to a servezone
+ */
+export let run = async (configArg) => {
+    new plugins.smartsocket.SmartsocketClient(
+        smartsocketClientConstructorOptions
+    )
+}

ts/npmci.ssh.ts

@@ -0,0 +1,48 @@
+import * as plugins from './npmci.plugins'
+
+let sshRegex = /^(.*)\|(.*)\|(.*)/
+let sshInstance: plugins.smartssh.SshInstance
+
+/**
+ * checks for ENV vars in form of NPMCI_SSHKEY_* and deploys any found ones
+ */
+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 = async (sshkeyEnvVarArg) => {
+  let resultArray = sshRegex.exec(sshkeyEnvVarArg)
+  let sshKey = new plugins.smartssh.SshKey()
+  plugins.beautylog.info('Found SSH identity for ' + resultArray[1])
+  if (notUndefined(resultArray[1])) {
+    plugins.beautylog.log('---> host defined!')
+    sshKey.host = resultArray[1]
+  }
+  if (notUndefined(resultArray[2])) {
+    plugins.beautylog.log('---> privKey defined!')
+    sshKey.privKeyBase64 = resultArray[2]
+  };
+  if (notUndefined(resultArray[3])) {
+    '---> pubKey defined!'
+    sshKey.pubKeyBase64 = resultArray[3]
+  };
+
+  sshInstance.addKey(sshKey)
+  return
+}
+
+/**
+ * checks if not undefined
+ */
+let notUndefined = (stringArg: string) => {
+  return (stringArg && stringArg !== 'undefined' && stringArg !== '##')
+}

ts/npmci.tag.ts

@@ -1,13 +0,0 @@
-import "typings-global";
-import * as plugins from "./npmci.plugins";
-import {prepare} from "./npmci.prepare";
-import {bash} from "./npmci.bash";
-import * as env from "./npmci.env";
-
-export let tag = function(commandOptionArg){
-    
-}
-
-export let retag = function(){
-    
-};

ts/npmci.test.docker.ts

@@ -1,8 +0,0 @@
-import * as plugins from "./npmci.plugins"
-import * as NpmciEnv from "./npmci.env";
-import {bashBare} from "./npmci.bash";
-import * as NpmciBuildDocker from "./npmci.build.docker";
-
-export let testDocker = () => {
-
-};

ts/npmci.test.ts

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

ts/npmci.trigger.ts

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

tslint.json

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