2.3.63

.gitignore

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

.gitlab-ci.yml

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

dist/cli.js

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

dist/npmci.bash.d.ts

@@ -10,10 +10,6 @@ export declare let yarnAvailable: plugins.q.Deferred<boolean>;
  * @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
  */

dist/npmci.bash.js

@@ -28,23 +28,29 @@ let npmciSmartshell = new plugins.smartshell.Smartshell({
  */
 let checkToolsAvailable = () => __awaiter(this, void 0, void 0, function* () {
     // check for nvm
-    if ((yield plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0) {
-        npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh`]);
-        exports.nvmAvailable.resolve(true);
-    }
-    else if ((yield plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0) {
-        npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh`]);
-        exports.nvmAvailable.resolve(true);
+    if (!process.env.NPMTS_TEST) {
+        if ((yield plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0) {
+            npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh`]);
+            exports.nvmAvailable.resolve(true);
+        }
+        else if ((yield plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0) {
+            npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh`]);
+            exports.nvmAvailable.resolve(true);
+        }
+        else {
+            exports.nvmAvailable.resolve(false);
+        }
+        ;
+        // check for yarn
+        yield plugins.smartshell.which('yarn').then(() => __awaiter(this, void 0, void 0, function* () {
+            yield plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`);
+            exports.yarnAvailable.resolve(true);
+        }), () => { exports.yarnAvailable.resolve(false); });
     }
     else {
-        exports.nvmAvailable.resolve(false);
-    }
-    ;
-    // check for yarn
-    yield plugins.smartshell.which('yarn').then(() => {
-        plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`);
+        exports.nvmAvailable.resolve(true);
         exports.yarnAvailable.resolve(true);
-    }, () => { exports.yarnAvailable.resolve(false); });
+    }
 });
 checkToolsAvailable();
 /**
@@ -67,7 +73,7 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => __awaiter(this, vo
                 execResult = yield npmciSmartshell.exec(commandArg);
             }
             else {
-                execResult = yield plugins.smartshell.exec(commandArg);
+                execResult = yield npmciSmartshell.exec(commandArg);
             }
             // determine how bash reacts to error and success
             if (execResult.exitCode !== 0 && i === retryArg) {
@@ -95,16 +101,10 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => __awaiter(this, vo
     }
     return execResult.stdout;
 });
-/**
- * bashBare allows usage of bash without sourcing any files like nvm
- */
-exports.bashBare = (commandArg, retryArg = 2) => __awaiter(this, void 0, void 0, function* () {
-    return yield exports.bash(commandArg, retryArg, true);
-});
 /**
  * bashNoError allows executing stuff without throwing an error
  */
 exports.bashNoError = (commandArg) => __awaiter(this, void 0, void 0, function* () {
     return yield exports.bash(commandArg, -1);
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFFdEMsaUNBQWdDO0FBRWhDOztHQUVHO0FBQ1EsUUFBQSxZQUFZLEdBQUcsTUFBTSxDQUFDLEtBQUssRUFBVyxDQUFBO0FBQ3RDLFFBQUEsYUFBYSxHQUFHLE1BQU0sQ0FBQyxLQUFLLEVBQVcsQ0FBQTtBQUNsRDs7R0FFRztBQUNILElBQUksZUFBZSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7SUFDdEQsUUFBUSxFQUFFLE1BQU07SUFDaEIsZUFBZSxFQUFFLEVBQUU7Q0FDcEIsQ0FBQyxDQUFBO0FBRUY7O0dBRUc7QUFDSCxJQUFJLG1CQUFtQixHQUFHO0lBQ3hCLGdCQUFnQjtJQUNoQixFQUFFLENBQUMsQ0FDRCxDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsd0NBQXdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUMvRixDQUFDLENBQUMsQ0FBQztRQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLENBQUE7UUFDekQsb0JBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDNUIsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FDUixDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsZ0NBQWdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUN2RixDQUFDLENBQUMsQ0FBQztRQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFBO1FBQ2pELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNO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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFFdEMsaUNBQWdDO0FBRWhDOztHQUVHO0FBQ1EsUUFBQSxZQUFZLEdBQUcsTUFBTSxDQUFDLEtBQUssRUFBVyxDQUFBO0FBQ3RDLFFBQUEsYUFBYSxHQUFHLE1BQU0sQ0FBQyxLQUFLLEVBQVcsQ0FBQTtBQUNsRDs7R0FFRztBQUNILElBQUksZUFBZSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7SUFDdEQsUUFBUSxFQUFFLE1BQU07SUFDaEIsZUFBZSxFQUFFLEVBQUU7Q0FDcEIsQ0FBQyxDQUFBO0FBRUY7O0dBRUc7QUFDSCxJQUFJLG1CQUFtQixHQUFHO0lBQ3hCLGdCQUFnQjtJQUNoQixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1QixFQUFFLENBQUMsQ0FDRCxDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsd0NBQXdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUMvRixDQUFDLENBQUMsQ0FBQztZQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBRSx1QkFBdUIsQ0FBRSxDQUFDLENBQUE7WUFDM0Qsb0JBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDNUIsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FDUixDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsZ0NBQWdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUN2RixDQUFDLENBQUMsQ0FBQztZQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBRSxlQUFlLENBQUUsQ0FBQyxDQUFBO1lBQ25ELG9CQUFZ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

dist/npmci.build.docker.d.ts

@@ -45,7 +45,8 @@ export declare class Dockerfile {
     version: string;
     cleanTag: string;
     buildTag: string;
-    testTag: string;
+    gitlabTestTag: string;
+    gitlabReleaseTag: string;
     releaseTag: string;
     containerName: string;
     content: string;

npmextra.json

@@ -10,7 +10,7 @@
         ]
     },
     "npmdocker":{
-        "baseImage":"hosttoday/ht-docker-node:npmts",
+        "baseImage":"hosttoday/ht-docker-node:npmci",
         "command": "npmci test stable"
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmci",
-  "version": "2.3.52",
+  "version": "2.3.63",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -22,28 +22,26 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "@types/should": "^8.1.30",
-    "npmts-g": "^6.0.0",
-    "should": "^11.2.1",
+    "tapbundle": "^1.0.12",
     "typings-test": "^1.0.3"
   },
   "dependencies": {
-    "@types/lodash": "^4.14.55",
-    "@types/node": "^7.0.8",
+    "@types/lodash": "^4.14.64",
+    "@types/node": "^7.0.18",
     "@types/request": "0.x.x",
-    "@types/shelljs": "^0.7.0",
+    "@types/shelljs": "^0.7.1",
     "@types/through2": "^2.0.32",
-    "beautylog": "^6.1.5",
+    "beautylog": "^6.1.10",
     "gulp": "^3.9.1",
-    "gulp-function": "^2.2.3",
+    "gulp-function": "^2.2.9",
     "lodash": "^4.17.4",
-    "npmextra": "^2.0.3",
+    "npmextra": "^2.0.5",
     "projectinfo": "^3.0.2",
     "request": "^2.81.0",
     "shelljs": "^0.7.7",
-    "smartcli": "^2.0.1",
+    "smartcli": "^2.0.7",
     "smartdelay": "^1.0.1",
-    "smartfile": "^4.1.7",
+    "smartfile": "^4.2.11",
     "smartparam": "^0.1.1",
     "smartq": "^1.1.1",
     "smartshell": "^1.0.6",
@@ -51,6 +49,6 @@
     "smartssh": "^1.2.1",
     "smartstring": "^2.0.24",
     "through2": "^2.0.3",
-    "typings-global": "^1.0.14"
+    "typings-global": "^1.0.16"
   }
 }

readme.md

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

test/test.d.ts

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

test/test.js

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

test/test.ts

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

ts/npmci.bash.ts

@@ -21,33 +21,36 @@ let npmciSmartshell = new plugins.smartshell.Smartshell({
  */
 let checkToolsAvailable = async () => {
   // check for nvm
-  if (
-    (await plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0
-  ) {
-    npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh`])
-    nvmAvailable.resolve(true)
-  } else if (
-    (await plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0
-  ) {
-    npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh`])
-    nvmAvailable.resolve(true)
-  } else {
-    nvmAvailable.resolve(false)
-  };
+  if (!process.env.NPMTS_TEST) {
+    if (
+      (await plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0
+    ) {
+      npmciSmartshell.addSourceFiles([ `/usr/local/nvm/nvm.sh` ])
+      nvmAvailable.resolve(true)
+    } else if (
+      (await plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0
+    ) {
+      npmciSmartshell.addSourceFiles([ `~/.nvm/nvm.sh` ])
+      nvmAvailable.resolve(true)
+    } else {
+      nvmAvailable.resolve(false)
+    };
 
-  // check for yarn
-  await plugins.smartshell.which('yarn').then(
-    () => {
-      plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd,'.yarn')}`)
-      yarnAvailable.resolve(true)
-    },
-    () => { yarnAvailable.resolve(false) }
-  )
+    // check for yarn
+    await plugins.smartshell.which('yarn').then(
+      async () => {
+        await plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`)
+        yarnAvailable.resolve(true)
+      },
+      () => { yarnAvailable.resolve(false) }
+    )
+  } else {
+    nvmAvailable.resolve(true)
+    yarnAvailable.resolve(true)
+  }
 }
 checkToolsAvailable()
 
-
-
 /**
  * bash() allows using bash with nvm in path
  * @param commandArg - The command to execute
@@ -69,7 +72,7 @@ export let bash = async (commandArg: string, retryArg: number = 2, bareArg: bool
       if (!bareArg) {
         execResult = await npmciSmartshell.exec(commandArg)
       } else {
-        execResult = await plugins.smartshell.exec(commandArg)
+        execResult = await npmciSmartshell.exec(commandArg)
       }
 
       // determine how bash reacts to error and success
@@ -96,13 +99,6 @@ export let bash = async (commandArg: string, retryArg: number = 2, bareArg: bool
   return execResult.stdout
 }
 
-/**
- * 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
  */

ts/npmci.build.docker.ts

@@ -1,12 +1,13 @@
 import * as plugins from './npmci.plugins'
 import * as paths from './npmci.paths'
 import * as NpmciEnv from './npmci.env'
-import { bashBare } from './npmci.bash'
+import { bash } from './npmci.bash'
 
 /**
  * builds a cwd of Dockerfiles by triggering a promisechain
  */
 export let build = async () => {
+  plugins.beautylog.log('now building Dockerfiles...')
   await readDockerfiles()
     .then(sortDockerfiles)
     .then(mapDockerfiles)
@@ -19,13 +20,15 @@ export let build = async () => {
  * @returns Promise<Dockerfile[]>
  */
 export let readDockerfiles = async (): Promise<Dockerfile[]> => {
-  let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, './Dockerfile*')
+  let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*')
 
   // create the Dockerfile array
   let readDockerfilesArray: Dockerfile[] = []
+  plugins.beautylog.info(`found ${fileTree.length} Dockerfiles:`)
+  console.log(fileTree)
   for (let dockerfilePath of fileTree) {
     let myDockerfile = new Dockerfile({
-      filePath: dockerfilePath,
+      filePath: plugins.path.join(paths.cwd, dockerfilePath),
       read: true
     })
     readDockerfilesArray.push(myDockerfile)
@@ -133,20 +136,22 @@ export class Dockerfile {
   version: string
   cleanTag: string
   buildTag: string
-  testTag: string
+  gitlabTestTag: string
+  gitlabReleaseTag: string
   releaseTag: string
   containerName: string
   content: string
   baseImage: string
   localBaseImageDependent: boolean
   localBaseDockerfile: Dockerfile
-  constructor(options: { filePath?: string, fileContents?: string | Buffer, read?: boolean }) {
+  constructor (options: { filePath?: string, fileContents?: string | Buffer, read?: boolean }) {
     this.filePath = options.filePath
     this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo
     this.version = dockerFileVersion(plugins.path.parse(options.filePath).base)
     this.cleanTag = this.repo + ':' + this.version
     this.buildTag = this.cleanTag
-    this.testTag = dockerTag('registry.gitlab.com', this.repo, this.version, 'test')
+    this.gitlabTestTag = dockerTag('registry.gitlab.com', this.repo, this.version, 'test')
+    this.gitlabReleaseTag = dockerTag('registry.gitlab.com', this.repo, this.version)
     this.releaseTag = dockerTag(NpmciEnv.dockerRegistry, this.repo, this.version)
     this.containerName = 'dockerfile-' + this.version
     if (options.filePath && options.read) {
@@ -159,9 +164,10 @@ export class Dockerfile {
   /**
    * builds the Dockerfile
    */
-  async build() {
+  async build () {
     plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
-    await bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .')
+    let buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} .`
+    await bash(buildCommand)
     NpmciEnv.dockerFilesBuilt.push(this)
     return
   };
@@ -170,27 +176,32 @@ export class Dockerfile {
    * pushes the Dockerfile to a registry
    */
   async push(stageArg) {
-    let pushTag
     switch (stageArg) {
       case 'release':
-        pushTag = this.releaseTag
+        await bash(`docker tag ${this.buildTag} ${this.releaseTag}`)
+        await bash(`docker push ${this.releaseTag}`)
+
+        // if release registry is different from gitlab
+        if (NpmciEnv.dockerRegistry !== 'registry.gitlab.com') {
+          await bash(`docker tag ${this.buildTag} ${this.gitlabReleaseTag}`)
+          await bash(`docker push ${this.gitlabReleaseTag}`)
+        }
         break
       case 'test':
       default:
-        pushTag = this.testTag
+        await bash(`docker tag ${this.buildTag} ${this.gitlabTestTag}`)
+        await bash(`docker push ${this.gitlabTestTag}`)
         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)
+    let pullTag = this.gitlabTestTag
+    await bash('docker pull ' + pullTag)
+    await bash('docker tag ' + pullTag + ' ' + this.buildTag)
   };
 
   /**
@@ -201,12 +212,12 @@ export class Dockerfile {
     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')
+      await bash('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
+      await bash('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
+      await bash('docker commit npmci_test_container npmci_test_image')
+      await bash('docker run npmci_test_image sh /npmci_test/test.sh')
+      await bash('docker rm npmci_test_container')
+      await bash('docker rmi --force npmci_test_image')
     } else {
       plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
     }
@@ -216,7 +227,7 @@ export class Dockerfile {
    * gets the id of a Dockerfile
    */
   async getId() {
-    let containerId = await bashBare('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
+    let containerId = await bash('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
     return containerId
   };
 }
@@ -230,7 +241,7 @@ export let dockerFileVersion = (dockerfileNameArg: string): string => {
   let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/
   let regexResultArray = versionRegex.exec(dockerfileNameArg)
   if (regexResultArray && regexResultArray.length === 2) {
-    versionString = regexResultArray[1]
+    versionString = regexResultArray[ 1 ]
   } else {
     versionString = 'latest'
   }
@@ -243,7 +254,7 @@ export let dockerFileVersion = (dockerfileNameArg: string): string => {
 export let dockerBaseImage = function (dockerfileContentArg: string) {
   let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
   let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
-  return regexResultArray[1]
+  return regexResultArray[ 1 ]
 }
 
 /**