3.1.72

.gitignore

@@ -1,6 +1,22 @@
-dist/
+.nogit/
-node_modules/
+
+# artifacts
 coverage/
 public/
-config.json
+pages/
+
+# installs
+node_modules/
+
+# caches
 .yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,95 +1,119 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .yarn/
+  - .npmci_cache/
   key: "$CI_BUILD_STAGE"
 
 stages:
 - security
 - test
 - release
-- trigger
+- metadata
-- pages
 
+# ====================
+# security stage
+# ====================
 mirror:
   stage: security
   script:
   - npmci git mirror
   tags:
   - docker
+  - notpriv
 
 snyk:
   stage: security
   script:
-    - npmci command yarn global add snyk
+    - npmci npm prepare
-    - npmci command yarn install --ignore-scripts
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
   - docker
+  - notpriv
 
-testLEGACY:
+# ====================
-  stage: test
+# test stage
-  script:
+# ====================
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  allow_failure: true
 
-testLTS:
+testStable:
-  stage: test
-  script:
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-    
-testSTABLE:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install stable
   - npmci npm install
   - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
+  - notpriv
 
 release:
   stage: release
   script:
-  - npmci npm prepare
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
   tags:
   - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  allow_failure: true
+  script:
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
+  tags:
+  - docker
+  - priv
 
 trigger:
-  stage: trigger
+  stage: metadata
   script:
   - npmci trigger
   only:
   - tags
   tags:
   - docker
+  - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
-  stage: pages
+  services:
+   - docker:stable-dind
+  stage: metadata
   script:
-    - npmci command yarn global add npmpage
+    - npmci command npm install -g @gitzone/tsdoc
-    - npmci command npmpage
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command tsdoc
   tags:
     - docker
+    - notpriv
   only:
     - tags
   artifacts:
     expire_in: 1 week
     paths:
     - public
+  allow_failure: true

.npmignore

@@ -1,5 +0,0 @@
-pages/
-coverage/
-test/
-node_modules/
-config.json

.snyk

@@ -1,15 +1,4 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.10.2
+version: v1.13.1
-# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore: {}
-ignore:
-  'npm:shelljs:20140723':
-    - shelljs:
-        reason: None given
-        expires: '2018-05-04T20:41:54.426Z'
-    - smartshell > shelljs:
-        reason: None given
-        expires: '2018-05-04T20:41:54.426Z'
-    - smartssh > shelljs:
-        reason: None given
-        expires: '2018-05-04T20:41:54.426Z'
 patch: {}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "workbench.colorCustomizations": {}
+}

cli.js

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

cli.ts.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+require('@gitzone/tsrun');
+require('./ts/index');

docs/index.md

@@ -1,100 +0,0 @@
-# npmci
-
-node and docker in gitlab ci on steroids
-
-## 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)

docs/ssh.md

@@ -1,22 +0,0 @@
-# SSH
-
-npmci allows easy usage of ssh:
-
-## Add the SSH KEY to the environment
-
-To make npmci aware of any SSH KEY add it to the environment in the following format
-
-```
-# Key
-NPMCI_SSHKEY_[A_NAME_FROM_YOU]
-# Value:
-[targeted host]|[privatekey as base64]|***
-```
-
-## Use npmci cli tool in your ci script
-
-```
-npmci prepare ssh
-npmci command git remote add heroku ssh://git@heroku.com/[you project name].git
-npmci command git push heroku master
-```

npmextra.json

@@ -1,20 +1,21 @@
 {
-    "npmts":{
+  "npmci": {
-        "mode":"default",
+    "npmGlobalTools": [],
-        "coverageTreshold": "70",
+    "npmAccessLevel": "public",
-        "cli": true
+    "npmRegistryUrl": "registry.npmjs.org"
-    },
+  },
-    "npmci": {
+  "npmdocker": {
-        "globalNpmTools": [
+    "baseImage": "hosttoday/ht-docker-node:npmci",
-            "npmts"
+    "command": "npmci test stable"
-        ],
+  },
-        "npmGlobalTools": [
+  "gitzone": {
-            "npmts"
+    "module": {
-        ],
+      "githost": "gitlab.com",
-        "npmAccessLevel": "public"
+      "gitscope": "shipzone",
-    },
+      "gitrepo": "npmci",
-    "npmdocker":{
+      "shortDescription": "node and docker in gitlab ci on steroids",
-        "baseImage":"hosttoday/ht-docker-node:npmci",
+      "npmPackagename": "@shipzone/npmci",
-        "command": "npmci test stable"
+      "license": "MIT"
     }
+  }
 }

package.json

@@ -1,16 +1,17 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.0.32",
+  "version": "3.1.72",
+  "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "bin": {
-    "npmci": "dist/cli.js"
+    "npmci": "cli.js"
   },
   "scripts": {
-    "test": "(rm -f config.json) && (npmts) && (npm run testVersion)",
+    "test": "tstest test/",
-    "build": "(rm -f config.json) && (npmts) && (npm run testVersion)",
+    "build": "tsbuild && (npm run testVersion)",
-    "testVersion": "(cd test/assets/ && node ../../dist/cli.js -v)"
+    "testVersion": "(cd test/assets/ && node ../../cli.js -v)"
   },
   "repository": {
     "type": "git",
@@ -23,31 +24,46 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "tapbundle": "^2.0.0"
+    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsrun": "^1.2.6",
+    "@gitzone/tstest": "^1.0.28",
+    "@pushrocks/tapbundle": "^3.2.0",
+    "@types/node": "^12.12.12",
+    "tslint": "^5.20.1",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@types/lodash": "^4.14.74",
+    "@apiglobal/typedrequest": "^1.0.24",
-    "@types/shelljs": "^0.7.4",
+    "@pushrocks/lik": "^3.0.11",
-    "@types/through2": "^2.0.33",
+    "@pushrocks/npmextra": "^3.0.7",
-    "beautylog": "^6.1.10",
+    "@pushrocks/projectinfo": "^4.0.2",
-    "cflare": "^1.0.5",
+    "@pushrocks/qenv": "^4.0.6",
-    "lik": "^2.0.5",
+    "@pushrocks/smartanalytics": "^2.0.15",
-    "lodash": "^4.17.4",
+    "@pushrocks/smartcli": "^3.0.7",
-    "npmextra": "^2.0.9",
+    "@pushrocks/smartdelay": "^2.0.6",
-    "projectinfo": "^3.0.2",
+    "@pushrocks/smartfile": "^7.0.6",
-    "request": "^2.81.0",
+    "@pushrocks/smartlog": "^2.0.21",
-    "shelljs": "^0.8.1",
+    "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "smartanalytics": "^2.0.9",
+    "@pushrocks/smartparam": "^1.0.4",
-    "smartcli": "^2.0.7",
+    "@pushrocks/smartpromise": "^3.0.6",
-    "smartdelay": "^1.0.3",
+    "@pushrocks/smartrequest": "^1.1.43",
-    "smartfile": "^4.2.20",
+    "@pushrocks/smartshell": "^2.0.25",
-    "smartparam": "^1.0.2",
+    "@pushrocks/smartsocket": "^1.1.58",
-    "smartq": "^1.1.6",
+    "@pushrocks/smartssh": "^1.2.3",
-    "smartshell": "^1.0.18",
+    "@pushrocks/smartstring": "^3.0.17",
-    "smartsocket": "^1.1.10",
+    "@servezone/servezone-interfaces": "^2.0.51",
-    "smartssh": "^1.2.2",
+    "@types/through2": "^2.0.34",
-    "smartstring": "^2.0.24",
+    "through2": "^3.0.1"
-    "smartsystem": "^2.0.2",
+  },
-    "through2": "^2.0.3"
+  "files": [
-  }
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -1,33 +1,101 @@
-# npmci
+# @shipzone/npmci
-
 node and docker in gitlab ci on steroids
 
-## Availabililty
+## Availabililty and Links
-
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@shipzone/npmci)
-[![npm](https://shipzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/@shipzone/npmci)
+* [gitlab.com (source)](https://gitlab.com/shipzone/npmci)
-[![git](https://shipzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/shipzone/npmci)
+* [github.com (source mirror)](https://github.com/shipzone/npmci)
-[![git](https://shipzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/shipzone/npmci)
+* [docs (typedoc)](https://shipzone.gitlab.io/npmci/)
-[![docs](https://shipzone.gitlab.io/assets/repo-button-docs.svg)](https://shipzone.gitlab.io/npmci/)
 
 ## Status for master
-
+[![build status](https://gitlab.com/shipzone/npmci/badges/master/build.svg)](https://gitlab.com/shipzone/npmci/commits/master)
-[![build status](https://GitLab.com/shipzone/npmci/badges/master/build.svg)](https://GitLab.com/shipzone/npmci/commits/master)
+[![coverage report](https://gitlab.com/shipzone/npmci/badges/master/coverage.svg)](https://gitlab.com/shipzone/npmci/commits/master)
-[![coverage report](https://GitLab.com/shipzone/npmci/badges/master/coverage.svg)](https://GitLab.com/shipzone/npmci/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@shipzone/npmci.svg)](https://www.npmjs.com/package/@shipzone/npmci)
-[![npm downloads per month](https://img.shields.io/npm/dm/npmci.svg)](https://www.npmjs.com/package/@shipzone/npmci)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@shipzone/npmci/badge.svg)](https://snyk.io/test/npm/@shipzone/npmci)
-[![Dependency Status](https://david-dm.org/shipzone/npmci.svg)](https://david-dm.org/shipzone/npmci)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![bitHound Dependencies](https://www.bithound.io/github/shipzone/npmci/badges/dependencies.svg)](https://www.bithound.io/github/shipzone/npmci/master/dependencies/npm)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![bitHound Code](https://www.bithound.io/github/shipzone/npmci/badges/code.svg)](https://www.bithound.io/github/shipzone/npmci)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
-[![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 and handle a lot of tasks durug ci:
+
+```shell
+# Handle node versions
+npmci node install stable # will install latest stable node version and update PATH for node and npm
+npmci node install lts # will install latest LTS node version and update PATH for node and npm versions
+npmci node install legacy # will install latest legacy node version and update PATH for node and npm
+npmci node install x.x.x #  will install any specific node version.
+
+# Handle npm and yarn tasks
+npmcu npm login # logs in npm using the auth key provided at env var "NPMCI_TOKEN_NPM"
+npmci npm install  # installs dependencies using npm or yarn dependending on availablity
+npmci npm test # tests the package
+npmci npm publish # builds a package and publishes it
+
+# handle docker tasks
+npmci docker prepare
+## 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 docker build # 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)
+Use TypeScript for best in class instellisense.
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
-[![repo-footer](https://shipzone.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+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)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -1,7 +1,6 @@
-import { tap, expect } from 'tapbundle';
+import { tap, expect } from '@pushrocks/tapbundle';
 import * as path from 'path';
 
-// Setup test
 process.env.NPMTS_TEST = 'true';
 
 // set up environment
@@ -18,66 +17,72 @@ process.cwd = () => {
   return path.join(__dirname, 'assets/');
 };
 
-// require NPMCI files
+import * as npmci from '../ts';
-import '../ts/index';
-import npmciModDocker = require('../ts/mod_docker/index');
-import npmciModNpm = require('../ts/mod_npm/index');
-import npmciModNode = require('../ts/mod_node/index');
-import npmciModSsh = require('../ts/mod_ssh/index');
-import npmciEnv = require('../ts/npmci.env');
 
 // ======
 // Docker
 // ======
 
-let dockerfile1: npmciModDocker.Dockerfile;
+let dockerfile1: npmci.Dockerfile;
-let dockerfile2: npmciModDocker.Dockerfile;
+let dockerfile2: npmci.Dockerfile;
-let sortableArray: npmciModDocker.Dockerfile[];
+let sortableArray: npmci.Dockerfile[];
 
 tap.test('should return valid Dockerfiles', async () => {
-  dockerfile1 = new npmciModDocker.Dockerfile({ filePath: './Dockerfile', read: true });
+  const npmciInstance = new npmci.Npmci();
-  dockerfile2 = new npmciModDocker.Dockerfile({ filePath: './Dockerfile_sometag1', read: true });
+  dockerfile1 = new npmci.Dockerfile(npmciInstance.dockerManager, {
+    filePath: './Dockerfile',
+    read: true
+  });
+  dockerfile2 = new npmci.Dockerfile(npmciInstance.dockerManager, {
+    filePath: './Dockerfile_sometag1',
+    read: true
+  });
   expect(dockerfile1.version).to.equal('latest');
   return expect(dockerfile2.version).to.equal('sometag1');
 });
 
 tap.test('should read a directory of Dockerfiles', async () => {
-  return npmciModDocker.helpers
+  const npmciInstance = new npmci.Npmci();
-    .readDockerfiles()
+  return npmci.Dockerfile.readDockerfiles(npmciInstance.dockerManager).then(
-    .then(async (readDockerfilesArrayArg: npmciModDocker.Dockerfile[]) => {
+    async (readDockerfilesArrayArg: npmci.Dockerfile[]) => {
       sortableArray = readDockerfilesArrayArg;
       return expect(readDockerfilesArrayArg[1].version).to.equal('sometag1');
-    });
+    }
+  );
 });
 
 tap.test('should sort an array of Dockerfiles', async () => {
-  return npmciModDocker.helpers
+  return npmci.Dockerfile.sortDockerfiles(sortableArray).then(
-    .sortDockerfiles(sortableArray)
+    async (sortedArrayArg: npmci.Dockerfile[]) => {
-    .then(async (sortedArrayArg: npmciModDocker.Dockerfile[]) => {
       console.log(sortedArrayArg);
-    });
+    }
+  );
 });
 
 tap.test('should build all Dockerfiles', async () => {
-  return npmciModDocker.handleCli({
+  const npmciInstance = new npmci.Npmci();
+  return npmciInstance.dockerManager.handleCli({
     _: ['docker', 'build']
   });
 });
 
 tap.test('should test all Dockerfiles', async () => {
-  return await npmciModDocker.handleCli({
+  const npmciInstance = new npmci.Npmci();
+  return npmciInstance.dockerManager.handleCli({
     _: ['docker', 'test']
   });
 });
 
 tap.test('should test dockerfiles', async () => {
-  return await npmciModDocker.handleCli({
+  const npmciInstance = new npmci.Npmci();
+  return npmciInstance.dockerManager.handleCli({
     _: ['docker', 'test']
   });
 });
 
 tap.test('should login docker daemon', async () => {
-  return await npmciModDocker.handleCli({
+  const npmciInstance = new npmci.Npmci();
+  return npmciInstance.dockerManager.handleCli({
     _: ['docker', 'login']
   });
 });
@@ -86,6 +91,7 @@ tap.test('should login docker daemon', async () => {
 // SSH
 // ===
 tap.test('should prepare SSH keys', async () => {
+  const npmciModSsh = await import('../ts/mod_ssh');
   return await npmciModSsh.handleCli({
     _: ['ssh', 'prepare']
   });
@@ -95,13 +101,14 @@ tap.test('should prepare SSH keys', async () => {
 // node
 // ====
 tap.test('should install a certain version of node', async () => {
-  await npmciModNode.handleCli({
+  const npmciInstance = new npmci.Npmci();
+  await npmciInstance.nodejsManager.handleCli({
     _: ['node', 'install', 'stable']
   });
-  await npmciModNode.handleCli({
+  await npmciInstance.nodejsManager.handleCli({
     _: ['node', 'install', 'lts']
   });
-  await npmciModNode.handleCli({
+  await npmciInstance.nodejsManager.handleCli({
     _: ['node', 'install', 'legacy']
   });
 });

ts/connector.cloudly/cloudlyconnector.ts

@@ -0,0 +1,32 @@
+import * as plugins from '../npmci.plugins';
+
+import { Npmci } from '../npmci.classes.npmci';
+import { logger } from '../npmci.logging';
+
+/**
+ * connects to cloudly
+ */
+export class CloudlyConnector {
+  public npmciRef: Npmci;
+
+  constructor(npmciRefArg: Npmci) {
+    this.npmciRef = npmciRefArg;
+  }
+
+  public async announceDockerContainer(optionsArg: plugins.servezoneInterfaces.version.IVersionData) {
+    const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly;
+    if (!cloudlyUrl) {
+      logger.log(
+        'warn',
+        'no cloudly url provided. Thus we cannot announce the newly built Dockerimage!'
+      );
+      return;
+    }
+
+    const typedrequest = new plugins.typedrequest.TypedRequest<
+      plugins.servezoneInterfaces.request.version.IRequest_Any_Cloudly_VersionManager_Update
+    >(`https://${cloudlyUrl}/versionmanager`, 'update');
+
+    const response = await typedrequest.fire(optionsArg);
+  }
+}

ts/index.ts

@@ -1 +1,10 @@
-import './npmci.cli';
+import { Npmci } from './npmci.classes.npmci';
+import { Dockerfile } from './manager.docker/mod.classes.dockerfile';
+
+export const npmciInstance = new Npmci();
+
+export { Dockerfile, Npmci };
+
+if (process.env.CLI_CALL) {
+  npmciInstance.start();
+}

ts/manager.docker/index.ts

@@ -0,0 +1,177 @@
+import { logger } from '../npmci.logging';
+import * as plugins from './mod.plugins';
+import * as paths from '../npmci.paths';
+import { bash } from '../npmci.bash';
+
+// classes
+import { Npmci } from '../npmci.classes.npmci';
+import { Dockerfile } from './mod.classes.dockerfile';
+import { DockerRegistry } from './mod.classes.dockerregistry';
+import { RegistryStorage } from './mod.classes.registrystorage';
+
+export class NpmciDockerManager {
+  public npmciRef: Npmci;
+  public npmciRegistryStorage = new RegistryStorage();
+
+  constructor(npmciArg: Npmci) {
+    this.npmciRef = npmciArg;
+  }
+
+  /**
+   * handle cli input
+   * @param argvArg
+   */
+  public handleCli = async argvArg => {
+    if (argvArg._.length >= 2) {
+      const action: string = argvArg._[1];
+      switch (action) {
+        case 'build':
+          await this.build();
+          break;
+        case 'login':
+        case 'prepare':
+          await this.login();
+          break;
+        case 'test':
+          await this.test();
+          break;
+        case 'push':
+          await this.push(argvArg);
+          break;
+        case 'pull':
+          await this.pull(argvArg);
+          break;
+        default:
+          logger.log('error', `>>npmci docker ...<< action >>${action}<< not supported`);
+      }
+    } else {
+      logger.log(
+        'info',
+        `>>npmci docker ...<< cli arguments invalid... Please read the documentation.`
+      );
+    }
+  };
+
+  /**
+   * builds a cwd of Dockerfiles by triggering a promisechain
+   */
+  public build = async () => {
+    await this.prepare();
+    logger.log('info', 'now building Dockerfiles...');
+    await Dockerfile.readDockerfiles(this)
+      .then(Dockerfile.sortDockerfiles)
+      .then(Dockerfile.mapDockerfiles)
+      .then(Dockerfile.buildDockerfiles);
+  };
+
+  /**
+   * login to the DockerRegistries
+   */
+  public login = async () => {
+    await this.prepare();
+    await this.npmciRegistryStorage.loginAll();
+  };
+
+  /**
+   * logs in docker
+   */
+  public prepare = async () => {
+    // Always login to GitLab Registry
+    if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') {
+      logger.log('error', 'No registry token specified by gitlab!');
+      process.exit(1);
+    }
+    this.npmciRegistryStorage.addRegistry(
+      new DockerRegistry({
+        registryUrl: 'registry.gitlab.com',
+        username: 'gitlab-ci-token',
+        password: process.env.CI_BUILD_TOKEN
+      })
+    );
+
+    // handle registries
+    await plugins.smartparam.forEachMinimatch(
+      process.env,
+      'NPMCI_LOGIN_DOCKER*',
+      async envString => {
+        this.npmciRegistryStorage.addRegistry(DockerRegistry.fromEnvString(envString));
+      }
+    );
+    return;
+  };
+
+  /**
+   * pushes an image towards a registry
+   * @param argvArg
+   */
+  public push = async argvArg => {
+    await this.prepare();
+    let dockerRegistryUrls: string[] = [];
+
+    // lets parse the input of cli and npmextra
+    if (argvArg._.length >= 3 && argvArg._[2] !== 'npmextra') {
+      dockerRegistryUrls.push(argvArg._[2]);
+    } else {
+      if (this.npmciRef.npmciConfig.getConfig().dockerRegistries.length === 0) {
+        logger.log(
+          'warn',
+          `There are no docker registries listed in npmextra.json! This is strange!`
+        );
+      }
+      dockerRegistryUrls = dockerRegistryUrls.concat(
+        this.npmciRef.npmciConfig.getConfig().dockerRegistries
+      );
+    }
+
+    // lets determine the suffix
+    let suffix = null;
+    if (argvArg._.length >= 4) {
+      suffix = argvArg._[3];
+    }
+
+    // lets push to the registries
+    for (const dockerRegistryUrl of dockerRegistryUrls) {
+      const dockerfileArray = await Dockerfile.readDockerfiles(this)
+        .then(Dockerfile.sortDockerfiles)
+        .then(Dockerfile.mapDockerfiles);
+      const dockerRegistryToPushTo = this.npmciRegistryStorage.getRegistryByUrl(dockerRegistryUrl);
+      if (!dockerRegistryToPushTo) {
+        logger.log(
+          'error',
+          `Cannot push to registry ${dockerRegistryUrl}, because it was not found in the authenticated registry list.`
+        );
+        process.exit(1);
+      }
+      for (const dockerfile of dockerfileArray) {
+        await dockerfile.push(dockerRegistryToPushTo, suffix);
+      }
+    }
+  };
+
+  /**
+   * pulls an image
+   */
+  public pull = async argvArg => {
+    await this.prepare();
+    const registryUrlArg = argvArg._[2];
+    let suffix = null;
+    if (argvArg._.length >= 4) {
+      suffix = argvArg._[3];
+    }
+    const localDockerRegistry = this.npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
+    const dockerfileArray = await Dockerfile.readDockerfiles(this)
+      .then(Dockerfile.sortDockerfiles)
+      .then(Dockerfile.mapDockerfiles);
+    for (const dockerfile of dockerfileArray) {
+      await dockerfile.pull(localDockerRegistry, suffix);
+    }
+  };
+
+  /**
+   * tests docker files
+   */
+  public test = async () => {
+    await this.prepare();
+    return await Dockerfile.readDockerfiles(this).then(Dockerfile.testDockerfiles);
+  };
+}

ts/manager.docker/mod.classes.dockerfile.ts

@@ -0,0 +1,328 @@
+import * as plugins from './mod.plugins';
+import * as paths from '../npmci.paths';
+
+import { logger } from '../npmci.logging';
+import { bash } from '../npmci.bash';
+
+import { DockerRegistry } from './mod.classes.dockerregistry';
+import * as helpers from './mod.helpers';
+import { NpmciDockerManager } from '.';
+import { Npmci } from '../npmci.classes.npmci';
+
+/**
+ * class Dockerfile represents a Dockerfile on disk in npmci
+ */
+export class Dockerfile {
+  // STATIC
+
+  /**
+   * creates instance of class Dockerfile for all Dockerfiles in cwd
+   * @returns Promise<Dockerfile[]>
+   */
+  public static async readDockerfiles(
+    npmciDockerManagerRefArg: NpmciDockerManager
+  ): Promise<Dockerfile[]> {
+    const fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*');
+
+    // create the Dockerfile array
+    const readDockerfilesArray: Dockerfile[] = [];
+    logger.log('info', `found ${fileTree.length} Dockerfiles:`);
+    console.log(fileTree);
+    for (const dockerfilePath of fileTree) {
+      const myDockerfile = new Dockerfile(npmciDockerManagerRefArg, {
+        filePath: dockerfilePath,
+        read: true
+      });
+      readDockerfilesArray.push(myDockerfile);
+    }
+
+    return readDockerfilesArray;
+  }
+
+  /**
+   * sorts Dockerfiles into a dependency chain
+   * @param sortableArrayArg an array of instances of class Dockerfile
+   * @returns Promise<Dockerfile[]>
+   */
+  public static async sortDockerfiles(sortableArrayArg: Dockerfile[]): Promise<Dockerfile[]> {
+    const done = plugins.smartpromise.defer<Dockerfile[]>();
+    logger.log('info', 'sorting Dockerfiles:');
+    const sortedArray: Dockerfile[] = [];
+    const cleanTagsOriginal = Dockerfile.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
+    let sorterFunctionCounter: number = 0;
+    const sorterFunction = () => {
+      sortableArrayArg.forEach(dockerfileArg => {
+        const cleanTags = Dockerfile.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) {
+        let counter = 1;
+        for (const dockerfile of sortedArray) {
+          logger.log('info', `tag ${counter}: -> ${dockerfile.cleanTag}`);
+          counter++;
+        }
+        done.resolve(sortedArray);
+      } else if (sorterFunctionCounter < 10) {
+        sorterFunctionCounter++;
+        sorterFunction();
+      }
+    };
+    sorterFunction();
+    return done.promise;
+  }
+
+  /**
+   * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
+   */
+  public static async mapDockerfiles(sortedDockerfileArray: Dockerfile[]): Promise<Dockerfile[]> {
+    sortedDockerfileArray.forEach(dockerfileArg => {
+      if (dockerfileArg.localBaseImageDependent) {
+        sortedDockerfileArray.forEach((dockfile2: Dockerfile) => {
+          if (dockfile2.cleanTag === dockerfileArg.baseImage) {
+            dockerfileArg.localBaseDockerfile = dockfile2;
+          }
+        });
+      }
+    });
+    return sortedDockerfileArray;
+  }
+
+  /**
+   * builds the correspoding real docker image for each Dockerfile class instance
+   */
+  public static async buildDockerfiles(sortedArrayArg: Dockerfile[]) {
+    for (const dockerfileArg of sortedArrayArg) {
+      await dockerfileArg.build();
+    }
+    return sortedArrayArg;
+  }
+
+  /**
+   * tests all Dockerfiles in by calling class Dockerfile.test();
+   * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
+   */
+  public static async testDockerfiles(sortedArrayArg: Dockerfile[]) {
+    for (const dockerfileArg of sortedArrayArg) {
+      await dockerfileArg.test();
+    }
+    return sortedArrayArg;
+  }
+
+  /**
+   * returns a version for a docker file
+   * @execution SYNC
+   */
+  public static dockerFileVersion(dockerfileNameArg: string): string {
+    let versionString: string;
+    const versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
+    const regexResultArray = versionRegex.exec(dockerfileNameArg);
+    if (regexResultArray && regexResultArray.length === 2) {
+      versionString = regexResultArray[1];
+    } else {
+      versionString = 'latest';
+    }
+    return versionString;
+  }
+
+  /**
+   * returns the docker base image for a Dockerfile
+   */
+  public static dockerBaseImage(dockerfileContentArg: string): string {
+    const baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/;
+    const regexResultArray = baseImageRegex.exec(dockerfileContentArg);
+    return regexResultArray[1];
+  }
+
+  /**
+   * returns the docker tag
+   */
+  public static getDockerTagString(
+    npmciDockerManagerRef: NpmciDockerManager,
+    registryArg: string,
+    repoArg: string,
+    versionArg: string,
+    suffixArg?: string
+  ): string {
+    // determine wether the repo should be mapped accordingly to the registry
+    const mappedRepo = npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerRegistryRepoMap[
+      registryArg
+    ];
+    const repo = (() => {
+      if (mappedRepo) {
+        return mappedRepo;
+      } else {
+        return repoArg;
+      }
+    })();
+
+    // determine wether the version contais a suffix
+    let version = versionArg;
+    if (suffixArg) {
+      version = versionArg + '_' + suffixArg;
+    }
+
+    const tagString = `${registryArg}/${repo}:${version}`;
+    return tagString;
+  }
+
+  public static async getDockerBuildArgs(
+    npmciDockerManagerRef: NpmciDockerManager
+  ): Promise<string> {
+    logger.log('info', 'checking for env vars to be supplied to the docker build');
+    let buildArgsString: string = '';
+    for (const key of Object.keys(
+      npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap
+    )) {
+      const targetValue =
+        process.env[
+          npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap[key]
+        ];
+      buildArgsString = `${buildArgsString} --build-arg ${key}="${targetValue}"`;
+    }
+    return buildArgsString;
+  }
+
+  /**
+   *
+   */
+  public static cleanTagsArrayFunction(
+    dockerfileArrayArg: Dockerfile[],
+    trackingArrayArg: Dockerfile[]
+  ): string[] {
+    const cleanTagsArray: string[] = [];
+    dockerfileArrayArg.forEach(dockerfileArg => {
+      if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
+        cleanTagsArray.push(dockerfileArg.cleanTag);
+      }
+    });
+    return cleanTagsArray;
+  }
+
+  // INSTANCE
+  public npmciDockerManagerRef: NpmciDockerManager;
+
+  public filePath: string;
+  public repo: string;
+  public version: string;
+  public cleanTag: string;
+  public buildTag: string;
+  public pushTag: string;
+  public containerName: string;
+  public content: string;
+  public baseImage: string;
+  public localBaseImageDependent: boolean;
+  public localBaseDockerfile: Dockerfile;
+
+  constructor(
+    dockerManagerRefArg: NpmciDockerManager,
+    options: { filePath?: string; fileContents?: string | Buffer; read?: boolean }
+  ) {
+    this.npmciDockerManagerRef = dockerManagerRefArg;
+    this.filePath = options.filePath;
+    this.repo =
+      this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.user +
+      '/' +
+      this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.repo;
+    this.version = Dockerfile.dockerFileVersion(plugins.path.parse(options.filePath).base);
+    this.cleanTag = this.repo + ':' + this.version;
+    this.buildTag = this.cleanTag;
+
+    this.containerName = 'dockerfile-' + this.version;
+    if (options.filePath && options.read) {
+      this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath));
+    }
+    this.baseImage = Dockerfile.dockerBaseImage(this.content);
+    this.localBaseImageDependent = false;
+  }
+
+  /**
+   * builds the Dockerfile
+   */
+  public async build() {
+    logger.log('info', 'now building Dockerfile for ' + this.cleanTag);
+    const buildArgsString = await Dockerfile.getDockerBuildArgs(this.npmciDockerManagerRef);
+    const buildCommand = `docker build --label="version=${
+      this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version
+    }" -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
+    await bash(buildCommand);
+    return;
+  }
+
+  /**
+   * pushes the Dockerfile to a registry
+   */
+  public async push(dockerRegistryArg: DockerRegistry, versionSuffix: string = null) {
+    this.pushTag = Dockerfile.getDockerTagString(
+      this.npmciDockerManagerRef,
+      dockerRegistryArg.registryUrl,
+      this.repo,
+      this.version,
+      versionSuffix
+    );
+    await bash(`docker tag ${this.buildTag} ${this.pushTag}`);
+    await bash(`docker push ${this.pushTag}`);
+    const imageDigest = (await bash(
+      `docker inspect --format="{{index .RepoDigests 0}}" ${this.pushTag}`
+    )).split('@')[1];
+    console.log(`The image ${this.pushTag} has digest ${imageDigest}`);
+    await this.npmciDockerManagerRef.npmciRef.cloudlyConnector.announceDockerContainer({
+      dockerImageUrl: this.pushTag,
+      dockerImageVersion: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo
+        .npm.version
+    });
+  }
+
+  /**
+   * pulls the Dockerfile from a registry
+   */
+  public async pull(registryArg: DockerRegistry, versionSuffixArg: string = null) {
+    const pullTag = Dockerfile.getDockerTagString(
+      this.npmciDockerManagerRef,
+      registryArg.registryUrl,
+      this.repo,
+      this.version,
+      versionSuffixArg
+    );
+    await bash(`docker pull ${pullTag}`);
+    await bash(`docker tag ${pullTag} ${this.buildTag}`);
+  }
+
+  /**
+   * tests the Dockerfile;
+   */
+  public async test() {
+    const testFile: string = plugins.path.join(paths.NpmciTestDir, 'test_' + this.version + '.sh');
+    const testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile);
+    if (testFileExists) {
+      // run tests
+      await bash(
+        `docker run --name npmci_test_container --entrypoint="bash" ${this.buildTag} -c "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 --entrypoint="bash" npmci_test_image -x /npmci_test/test.sh`);
+      await bash(`docker rm npmci_test_container`);
+      await bash(`docker rmi --force npmci_test_image`);
+    } else {
+      logger.log('warn', 'skipping tests for ' + this.cleanTag + ' because no testfile was found!');
+    }
+  }
+
+  /**
+   * gets the id of a Dockerfile
+   */
+  public async getId() {
+    const containerId = await bash(
+      'docker inspect --type=image --format="{{.Id}}" ' + this.buildTag
+    );
+    return containerId;
+  }
+}

ts/manager.docker/mod.classes.dockerregistry.ts

@@ -1,3 +1,4 @@
+import { logger } from '../npmci.logging';
 import * as plugins from './mod.plugins';
 import { bash } from '../npmci.bash';
 
@@ -8,26 +9,26 @@ export interface IDockerRegistryConstructorOptions {
 }
 
 export class DockerRegistry {
-  registryUrl: string;
+  public registryUrl: string;
-  username: string;
+  public username: string;
-  password: string;
+  public password: string;
   constructor(optionsArg: IDockerRegistryConstructorOptions) {
     this.registryUrl = optionsArg.registryUrl;
     this.username = optionsArg.username;
     this.password = optionsArg.password;
-    plugins.beautylog.info(`created DockerRegistry for ${this.registryUrl}`);
+    logger.log('info', `created DockerRegistry for ${this.registryUrl}`);
   }
 
-  static fromEnvString(envString: string): DockerRegistry {
+  public static fromEnvString(envString: string): DockerRegistry {
-    let dockerRegexResultArray = envString.split('|');
+    const dockerRegexResultArray = envString.split('|');
     if (dockerRegexResultArray.length !== 3) {
-      plugins.beautylog.error('malformed docker env var...');
+      logger.log('error', 'malformed docker env var...');
       process.exit(1);
       return;
     }
-    let registryUrl = dockerRegexResultArray[0];
+    const registryUrl = dockerRegexResultArray[0];
-    let username = dockerRegexResultArray[1];
+    const username = dockerRegexResultArray[1];
-    let password = dockerRegexResultArray[2];
+    const password = dockerRegexResultArray[2];
     return new DockerRegistry({
       registryUrl: registryUrl,
       username: username,
@@ -35,13 +36,13 @@ export class DockerRegistry {
     });
   }
 
-  async login() {
+  public async login() {
     if (this.registryUrl === 'docker.io') {
       await bash(`docker login -u ${this.username} -p ${this.password}`);
-      plugins.beautylog.info('Logged in to standard docker hub');
+      logger.log('info', 'Logged in to standard docker hub');
     } else {
       await bash(`docker login -u ${this.username} -p ${this.password} ${this.registryUrl}`);
     }
-    plugins.beautylog.ok(`docker authenticated for ${this.registryUrl}!`);
+    logger.log('ok', `docker authenticated for ${this.registryUrl}!`);
   }
 }

ts/manager.docker/mod.classes.registrystorage.ts

@@ -1,5 +1,6 @@
+import { logger } from '../npmci.logging';
 import * as plugins from './mod.plugins';
-import { Objectmap } from 'lik';
+import { Objectmap } from '@pushrocks/lik';
 
 import { DockerRegistry } from './mod.classes.dockerregistry';
 
@@ -23,6 +24,6 @@ export class RegistryStorage {
     await this.objectMap.forEach(async registryArg => {
       await registryArg.login();
     });
-    plugins.beautylog.success('logged in successfully into all available DockerRegistries!');
+    logger.log('success', 'logged in successfully into all available DockerRegistries!');
   }
 }

ts/manager.docker/mod.helpers.ts

@@ -0,0 +1,5 @@
+import { logger } from '../npmci.logging';
+import * as plugins from './mod.plugins';
+import * as paths from '../npmci.paths';
+
+import { Dockerfile } from './mod.classes.dockerfile';

ts/manager.git/index.ts

@@ -0,0 +1,71 @@
+import { logger } from '../npmci.logging';
+import * as plugins from './mod.plugins';
+import { bash, bashNoError } from '../npmci.bash';
+import { Npmci } from '../npmci.classes.npmci';
+
+export class NpmciGitManager {
+  public npmciRef: Npmci;
+
+  constructor(npmciRefArg: Npmci) {
+    this.npmciRef = npmciRefArg;
+  }
+
+  /**
+   * handle cli input
+   * @param argvArg
+   */
+  public handleCli = async argvArg => {
+    if (argvArg._.length >= 2) {
+      const action: string = argvArg._[1];
+      switch (action) {
+        case 'mirror':
+          await this.mirror();
+          break;
+        default:
+          logger.log('error', `npmci git -> action >>${action}<< not supported!`);
+      }
+    } else {
+      logger.log('info', `npmci git -> cli arguments invalid! Please read the documentation.`);
+    }
+  };
+
+  public mirror = async () => {
+    const githubToken = process.env.NPMCI_GIT_GITHUBTOKEN;
+    const githubUser = process.env.NPMCI_GIT_GITHUBGROUP || this.npmciRef.npmciEnv.repo.user;
+    const githubRepo = process.env.NPMCI_GIT_GITHUB || this.npmciRef.npmciEnv.repo.repo;
+    if (
+      this.npmciRef.npmciConfig.getConfig().projectInfo.npm.packageJson.private === true ||
+      this.npmciRef.npmciConfig.getConfig().npmAccessLevel === 'private'
+    ) {
+      logger.log(
+        'warn',
+        `refusing to mirror due to private property use a private mirror location instead`
+      );
+      return;
+    }
+    if (githubToken) {
+      logger.log('info', 'found github token.');
+      logger.log('info', 'attempting the mirror the repository to GitHub');
+
+      // remove old mirrors
+      await bashNoError('git remote rm mirror');
+
+      await bash(`git fetch`);
+      // add the mirror
+      await bashNoError(
+        `git remote add mirror https://${githubToken}@github.com/${githubUser}/${githubRepo}.git`
+      );
+      await bashNoError(`git push mirror --all`);
+      await bashNoError(`git checkout origin/master`);
+      await bashNoError(`git push mirror master`);
+      logger.log('ok', 'pushed all branches to mirror!');
+      await bashNoError(`git push mirror --tags`);
+      logger.log('ok', 'pushed all tags to mirror!');
+      // remove old mirrors
+      await bashNoError('git remote rm mirror');
+    } else {
+      logger.log('error', `cannot find NPMCI_GIT_GITHUBTOKEN env var!`);
+      process.exit(1);
+    }
+  };
+}

ts/manager.nodejs/index.ts

@@ -0,0 +1,83 @@
+import * as plugins from '../npmci.plugins';
+import * as paths from '../npmci.paths';
+
+import { logger } from '../npmci.logging';
+import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
+import { Npmci } from '../npmci.classes.npmci';
+
+export class NpmciNodeJsManager {
+  public npmciRef: Npmci;
+
+  constructor(npmciRefArg: Npmci) {
+    this.npmciRef = npmciRefArg;
+  }
+
+  /**
+   * handle cli input
+   * @param argvArg
+   */
+  public async handleCli(argvArg) {
+    if (argvArg._.length >= 3) {
+      const action: string = argvArg._[1];
+      switch (action) {
+        case 'install':
+          await this.install(argvArg._[2]);
+          break;
+        default:
+          logger.log('error', `>>npmci node ...<< action >>${action}<< not supported`);
+          process.exit(1);
+      }
+    } else {
+      logger.log(
+        'error',
+        `>>npmci node ...<< cli arguments invalid... Please read the documentation.`
+      );
+      process.exit(1);
+    }
+  }
+
+  /**
+   * Install a specific version of node
+   * @param versionArg
+   */
+  public async install(versionArg) {
+    logger.log('info', `now installing node version ${versionArg}`);
+    let version: string;
+    if (versionArg === 'stable') {
+      version = '12';
+    } else if (versionArg === 'lts') {
+      version = '10';
+    } else if (versionArg === 'legacy') {
+      version = '8';
+    } else {
+      version = versionArg;
+    }
+    if (await nvmAvailable.promise) {
+      await bash(`nvm install ${version} && nvm alias default ${version}`);
+      logger.log('success', `Node version ${version} successfully installed!`);
+    } else {
+      logger.log('warn', 'Nvm not in path so staying at installed node version!');
+    }
+    logger.log('info', 'now installing latest npm version');
+    await bash('npm install -g npm');
+    await bash('node -v');
+    await bash('npm -v');
+    await bash(`npm config set cache ${paths.NpmciCacheDir}  --global `);
+
+    // lets look for further config
+    const config = await this.npmciRef.npmciConfig.getConfig();
+    logger.log('info', 'Now checking for needed global npm tools...');
+    for (const npmTool of config.npmGlobalTools) {
+      logger.log('info', `Checking for global "${npmTool}"`);
+      const whichOutput: string = await bashNoError(`which ${npmTool}`);
+      const toolAvailable: boolean = !(/not\sfound/.test(whichOutput) || whichOutput === '');
+      if (toolAvailable) {
+        logger.log('info', `Tool ${npmTool} is available`);
+      } else {
+        logger.log('info', `globally installing ${npmTool} from npm`);
+        await bash(`npm install ${npmTool} -q -g`);
+      }
+    }
+    logger.log('success', 'all global npm tools specified in npmextra.json are now available!');
+  }
+}

ts/manager.npm/index.ts

@@ -0,0 +1,170 @@
+import * as plugins from './mod.plugins';
+
+import { logger } from '../npmci.logging';
+import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
+import { Npmci } from '../npmci.classes.npmci';
+
+export class NpmciNpmManager {
+  public npmciRef: Npmci;
+
+  constructor(npmciRefArg) {
+    this.npmciRef = npmciRefArg;
+  }
+
+  /**
+   * handle cli input
+   * @param argvArg
+   */
+  public async handleCli(argvArg) {
+    if (argvArg._.length >= 2) {
+      const action: string = argvArg._[1];
+      switch (action) {
+        case 'install':
+          await this.install();
+          break;
+        case 'build':
+            await this.build();
+            break;
+        case 'prepare':
+          await this.prepare();
+          break;
+        case 'test':
+          await this.test();
+          break;
+        case 'publish':
+          await this.publish();
+          break;
+        default:
+          logger.log('error', `>>npmci npm ...<< action >>${action}<< not supported`);
+          process.exit(1);
+      }
+    } else {
+      logger.log(
+        'info',
+        `>>npmci npm ...<< cli arguments invalid... Please read the documentation.`
+      );
+      process.exit(1);
+    }
+  }
+
+  /**
+   * authenticates npm with token from env var
+   */
+  public async prepare() {
+    const config = this.npmciRef.npmciConfig.getConfig();
+    let npmrcFileString: string = '';
+    await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => {
+      const npmRegistryUrl = npmEnvArg.split('|')[0];
+      const npmToken = npmEnvArg.split('|')[1];
+      npmrcFileString += `//${npmRegistryUrl}/:_authToken="${plugins.smartstring.base64.decode(
+        npmToken
+      )}"\n`;
+    });
+    logger.log('info', `setting default npm registry to ${config.npmRegistryUrl}`);
+    npmrcFileString += `registry=https://${config.npmRegistryUrl}\n`;
+
+    // final check
+    if (npmrcFileString.length > 0) {
+      logger.log('info', 'found one or more access tokens');
+    } else {
+      logger.log('error', 'no access token found! Exiting!');
+      process.exit(1);
+    }
+
+    // lets save it to disk
+    plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc');
+    return;
+  }
+
+  /**
+   * publish a package to npm
+   */
+  public async publish() {
+    const buildPublishCommand = async () => {
+      let npmAccessCliString = ``;
+      let npmRegistryCliString = ``;
+      let publishVerdaccioAsWell = false;
+      const config = this.npmciRef.npmciConfig.getConfig();
+      const availableRegistries: string[] = [];
+      await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => {
+        availableRegistries.push(npmEnvArg.split('|')[0]);
+      });
+
+      // -> configure package access level
+      if (config.npmAccessLevel) {
+        npmAccessCliString = `--access=${config.npmAccessLevel}`;
+        if (config.npmAccessLevel === 'public') {
+          publishVerdaccioAsWell = true;
+        }
+      } else {
+        throw new Error('You need to set a npmAccessLevel!!!');
+      }
+      // -> configure registry url
+      if (config.npmRegistryUrl) {
+        npmRegistryCliString = `--registry=https://${config.npmRegistryUrl}`;
+      } else {
+        logger.log('error', `no registry url specified. Can't publish!`);
+        process.exit(1);
+      }
+
+      let publishCommand = `npm publish ${npmAccessCliString} ${npmRegistryCliString} `;
+
+      // publishEverywhere
+      if (publishVerdaccioAsWell) {
+        const verdaccioRegistry = availableRegistries.find(registryString =>
+          registryString.startsWith('verdaccio')
+        );
+        if (verdaccioRegistry) {
+          logger.log(
+            'info',
+            `package is public and verdaccio registry is specified. Also publishing to Verdaccio!`
+          );
+          publishCommand = `${publishCommand} && npm publish ${npmAccessCliString} --registry=https://${verdaccioRegistry}`;
+        } else {
+          logger.log(
+            'error',
+            `This package should also be published to Verdaccio, however there is no Verdaccio registry data available!`
+          );
+        }
+      }
+      return publishCommand;
+    };
+
+    // -> preparing
+    logger.log('info', `now preparing environment:`);
+    this.prepare();
+    await bash(`npm -v`);
+
+    // -> build it
+    await this.install();
+    await this.build();
+
+    logger.log('success', `Nice!!! The build for the publication was successfull!`);
+    logger.log('info', `Lets clean up so we don't publish any packages that don't belong to us:`);
+    // -> clean up before we publish stuff
+    await bashNoError(`rm -r ./.npmci_cache`);
+    await bash(`rm -r ./node_modules`);
+
+    logger.log('success', `Cleaned up!:`);
+
+    // -> publish it
+    logger.log('info', `now invoking npm to publish the package!`);
+    await bash(await buildPublishCommand());
+    logger.log('success', `Package was successfully published!`);
+  }
+
+  public async install(): Promise<void> {
+    logger.log('info', 'now installing dependencies:');
+    await bash('npm ci');
+  }
+
+  public async build(): Promise<void> {
+    logger.log('info', 'now building the project:');
+    await bash('npm run build');
+  }
+
+  public async test(): Promise<void> {
+    logger.log('info', 'now starting tests:');
+    await bash('npm test');
+  }
+}

ts/mod_cloudflare/index.ts

@@ -1,31 +0,0 @@
-import * as plugins from './mod.plugins';
-
-let npmciCflare = new plugins.cflare.CflareAccount();
-
-/**
- * handle cli input
- * @param argvArg
- */
-export let handleCli = async argvArg => {
-  if (argvArg._.length >= 2) {
-    let action: string = argvArg._[1];
-    switch (action) {
-      default:
-        plugins.beautylog.error(`>>npmci cloudflare ...<< action >>${action}<< not supported`);
-        process.exit(1);
-    }
-  } else {
-    plugins.beautylog.log(
-      `>>npmci cloudflare ...<< cli arguments invalid... Please read the documentation.`
-    );
-    process.exit(1);
-  }
-};
-
-export let purge = async argvArg => {
-  npmciCflare.auth({
-    email: '',
-    key: ''
-  });
-  npmciCflare.purgeZone(argvArg._[1]);
-};

ts/mod_cloudflare/mod.plugins.ts

@@ -1,5 +0,0 @@
-export * from '../npmci.plugins';
-
-import * as cflare from 'cflare';
-
-export { cflare };

ts/mod_docker/index.ts

@@ -1,142 +0,0 @@
-import * as plugins from './mod.plugins';
-import * as paths from '../npmci.paths';
-import { bash } from '../npmci.bash';
-
-import * as helpers from './mod.helpers';
-
-// classes
-import { Dockerfile } from './mod.classes.dockerfile';
-import { DockerRegistry } from './mod.classes.dockerregistry';
-import { RegistryStorage } from './mod.classes.registrystorage';
-
-// instances
-let npmciRegistryStorage = new RegistryStorage();
-
-export { Dockerfile, helpers };
-
-export let modArgvArg; // will be set through the build command
-
-/**
- * handle cli input
- * @param argvArg
- */
-export let handleCli = async argvArg => {
-  modArgvArg = argvArg;
-  if (argvArg._.length >= 2) {
-    let action: string = argvArg._[1];
-    switch (action) {
-      case 'build':
-        await build();
-        break;
-      case 'login':
-      case 'prepare':
-        await login();
-        break;
-      case 'test':
-        await test();
-        break;
-      case 'push':
-        await push(argvArg);
-        break;
-      case 'pull':
-        await pull(argvArg);
-        break;
-      default:
-        plugins.beautylog.error(`>>npmci docker ...<< action >>${action}<< not supported`);
-    }
-  } else {
-    plugins.beautylog.log(
-      `>>npmci docker ...<< cli arguments invalid... Please read the documentation.`
-    );
-  }
-};
-
-/**
- * builds a cwd of Dockerfiles by triggering a promisechain
- */
-export let build = async () => {
-  await prepare();
-  plugins.beautylog.log('now building Dockerfiles...');
-  await helpers
-    .readDockerfiles()
-    .then(helpers.sortDockerfiles)
-    .then(helpers.mapDockerfiles)
-    .then(helpers.buildDockerfiles);
-};
-
-/**
- * login to the DockerRegistries
- */
-export let login = async () => {
-  await prepare();
-  await npmciRegistryStorage.loginAll();
-};
-
-/**
- * logs in docker
- */
-export let prepare = async () => {
-  // Always login to GitLab Registry
-  if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') {
-    plugins.beautylog.error('No registry token specified by gitlab!');
-    process.exit(1);
-  }
-  npmciRegistryStorage.addRegistry(
-    new DockerRegistry({
-      registryUrl: 'registry.gitlab.com',
-      username: 'gitlab-ci-token',
-      password: process.env.CI_BUILD_TOKEN
-    })
-  );
-
-  // handle registries
-  await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_LOGIN_DOCKER*', async envString => {
-    npmciRegistryStorage.addRegistry(DockerRegistry.fromEnvString(envString));
-  });
-  return;
-};
-
-export let push = async argvArg => {
-  await prepare();
-  let registryUrlArg = argvArg._[2];
-  let suffix = null;
-  if (argvArg._.length >= 4) {
-    suffix = argvArg._[3];
-  }
-  let dockerfileArray = await helpers
-    .readDockerfiles()
-    .then(helpers.sortDockerfiles)
-    .then(helpers.mapDockerfiles);
-  let localDockerRegistry = npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
-  if (!localDockerRegistry) {
-    plugins.beautylog.error(
-      `Cannot push to registry ${registryUrlArg}, because it was not found in the authenticated registry list.`
-    );
-    process.exit(1);
-  }
-  for (let dockerfile of dockerfileArray) {
-    await dockerfile.push(localDockerRegistry, suffix);
-  }
-};
-
-export let pull = async argvArg => {
-  await prepare();
-  let registryUrlArg = argvArg._[2];
-  let suffix = null;
-  if (argvArg._.length >= 4) {
-    suffix = argvArg._[3];
-  }
-  let localDockerRegistry = npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
-  let dockerfileArray = await helpers
-    .readDockerfiles()
-    .then(helpers.sortDockerfiles)
-    .then(helpers.mapDockerfiles);
-  for (let dockerfile of dockerfileArray) {
-    await dockerfile.pull(localDockerRegistry, suffix);
-  }
-};
-
-export let test = async () => {
-  await prepare();
-  return await helpers.readDockerfiles().then(helpers.testDockerfiles);
-};

ts/mod_docker/mod.classes.dockerfile.ts

@@ -1,109 +0,0 @@
-import * as plugins from './mod.plugins';
-import * as NpmciEnv from '../npmci.env';
-import { bash } from '../npmci.bash';
-import * as paths from '../npmci.paths';
-
-import { DockerRegistry } from './mod.classes.dockerregistry';
-import * as helpers from './mod.helpers';
-
-/**
- * class Dockerfile represents a Dockerfile on disk in npmci
- */
-export class Dockerfile {
-  filePath: string;
-  repo: string;
-  version: string;
-  cleanTag: string;
-  buildTag: string;
-  containerName: string;
-  content: string;
-  baseImage: string;
-  localBaseImageDependent: boolean;
-  localBaseDockerfile: Dockerfile;
-  constructor(options: { filePath?: string; fileContents?: string | Buffer; read?: boolean }) {
-    this.filePath = options.filePath;
-    this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo;
-    this.version = helpers.dockerFileVersion(plugins.path.parse(options.filePath).base);
-    this.cleanTag = this.repo + ':' + this.version;
-    this.buildTag = this.cleanTag;
-
-    this.containerName = 'dockerfile-' + this.version;
-    if (options.filePath && options.read) {
-      this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath));
-    }
-    this.baseImage = helpers.dockerBaseImage(this.content);
-    this.localBaseImageDependent = false;
-  }
-
-  /**
-   * builds the Dockerfile
-   */
-  async build() {
-    plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag);
-    let buildArgsString = await helpers.getDockerBuildArgs();
-    let buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
-    await bash(buildCommand);
-    return;
-  }
-
-  /**
-   * pushes the Dockerfile to a registry
-   */
-  async push(dockerRegistryArg: DockerRegistry, versionSuffix: string = null) {
-    let pushTag = helpers.getDockerTagString(
-      dockerRegistryArg.registryUrl,
-      this.repo,
-      this.version,
-      versionSuffix
-    );
-    await bash(`docker tag ${this.buildTag} ${pushTag}`);
-    await bash(`docker push ${pushTag}`);
-  }
-
-  /**
-   * pulls the Dockerfile from a registry
-   */
-  async pull(registryArg: DockerRegistry, versionSuffixArg: string = null) {
-    let pullTag = helpers.getDockerTagString(
-      registryArg.registryUrl,
-      this.repo,
-      this.version,
-      versionSuffixArg
-    );
-    await bash(`docker pull ${pullTag}`);
-    await bash(`docker tag ${pullTag} ${this.buildTag}`);
-  }
-
-  /**
-   * tests the Dockerfile;
-   */
-  async test() {
-    let testFile: string = plugins.path.join(paths.NpmciTestDir, 'test_' + this.version + '.sh');
-    let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile);
-    if (testFileExists) {
-      // run tests
-      await bash(
-        `docker run --name npmci_test_container --entrypoint="bash" ${
-          this.buildTag
-        } -c "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 --entrypoint="bash" npmci_test_image -x /npmci_test/test.sh`);
-      await bash(`docker rm npmci_test_container`);
-      await bash(`docker rmi --force npmci_test_image`);
-    } else {
-      plugins.beautylog.warn(
-        'skipping tests for ' + this.cleanTag + ' because no testfile was found!'
-      );
-    }
-  }
-
-  /**
-   * gets the id of a Dockerfile
-   */
-  async getId() {
-    let containerId = await bash('docker inspect --type=image --format="{{.Id}}" ' + this.buildTag);
-    return containerId;
-  }
-}

ts/mod_docker/mod.helpers.ts

@@ -1,186 +0,0 @@
-import * as plugins from './mod.plugins';
-import * as paths from '../npmci.paths';
-import * as NpmciEnv from '../npmci.env';
-import * as NpmciConfig from '../npmci.config';
-import { bash } from '../npmci.bash';
-
-import { Dockerfile } from './mod.classes.dockerfile';
-
-/**
- * creates instance of class Dockerfile for all Dockerfiles in cwd
- * @returns Promise<Dockerfile[]>
- */
-export let readDockerfiles = async (): Promise<Dockerfile[]> => {
-  let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*');
-
-  // create the Dockerfile array
-  let readDockerfilesArray: Dockerfile[] = [];
-  plugins.beautylog.info(`found ${fileTree.length} Dockerfiles:`);
-  console.log(fileTree);
-  for (let dockerfilePath of fileTree) {
-    let myDockerfile = new Dockerfile({
-      filePath: dockerfilePath,
-      read: true
-    });
-    readDockerfilesArray.push(myDockerfile);
-  }
-
-  return readDockerfilesArray;
-};
-
-/**
- * sorts Dockerfiles into a dependency chain
- * @param sortableArrayArg an array of instances of class Dockerfile
- * @returns Promise<Dockerfile[]>
- */
-export let sortDockerfiles = (sortableArrayArg: Dockerfile[]): Promise<Dockerfile[]> => {
-  let done = plugins.q.defer<Dockerfile[]>();
-  plugins.beautylog.info('sorting Dockerfiles:');
-  let sortedArray: Dockerfile[] = [];
-  let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg, sortedArray);
-  let sorterFunctionCounter: number = 0;
-  let sorterFunction = function() {
-    sortableArrayArg.forEach(dockerfileArg => {
-      let cleanTags = cleanTagsArrayFunction(sortableArrayArg, sortedArray);
-      if (
-        cleanTags.indexOf(dockerfileArg.baseImage) === -1 &&
-        sortedArray.indexOf(dockerfileArg) === -1
-      ) {
-        sortedArray.push(dockerfileArg);
-      }
-      if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) {
-        dockerfileArg.localBaseImageDependent = true;
-      }
-    });
-    if (sortableArrayArg.length === sortedArray.length) {
-      let counter = 1;
-      for (let dockerfile of sortedArray) {
-        plugins.beautylog.log(`tag ${counter}: -> ${dockerfile.cleanTag}`);
-        counter++;
-      }
-      done.resolve(sortedArray);
-    } else if (sorterFunctionCounter < 10) {
-      sorterFunctionCounter++;
-      sorterFunction();
-    }
-  };
-  sorterFunction();
-  return done.promise;
-};
-
-/**
- * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
- */
-export let mapDockerfiles = async (sortedArray: Dockerfile[]): Promise<Dockerfile[]> => {
-  sortedArray.forEach(dockerfileArg => {
-    if (dockerfileArg.localBaseImageDependent) {
-      sortedArray.forEach((dockfile2: Dockerfile) => {
-        if (dockfile2.cleanTag === dockerfileArg.baseImage) {
-          dockerfileArg.localBaseDockerfile = dockfile2;
-        }
-      });
-    }
-  });
-  return sortedArray;
-};
-
-/**
- * builds the correspoding real docker image for each Dockerfile class instance
- */
-export let buildDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
-  for (let dockerfileArg of sortedArrayArg) {
-    await dockerfileArg.build();
-  }
-  return sortedArrayArg;
-};
-
-/**
- * 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;
-};
-
-/**
- * returns a version for a docker file
- * @execution SYNC
- */
-export let dockerFileVersion = (dockerfileNameArg: string): string => {
-  let versionString: string;
-  let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
-  let regexResultArray = versionRegex.exec(dockerfileNameArg);
-  if (regexResultArray && regexResultArray.length === 2) {
-    versionString = regexResultArray[1];
-  } else {
-    versionString = 'latest';
-  }
-  return versionString;
-};
-
-/**
- * returns the docker base image for a Dockerfile
- */
-export let dockerBaseImage = function(dockerfileContentArg: string) {
-  let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/;
-  let regexResultArray = baseImageRegex.exec(dockerfileContentArg);
-  return regexResultArray[1];
-};
-
-/**
- * returns the docker tag
- */
-export let getDockerTagString = (
-  registryArg: string,
-  repoArg: string,
-  versionArg: string,
-  suffixArg?: string
-): string => {
-  // determine wether the repo should be mapped accordingly to the registry
-  let mappedRepo = NpmciConfig.configObject.dockerRegistryRepoMap[registryArg];
-  let repo = (() => {
-    if (mappedRepo) {
-      return mappedRepo;
-    } else {
-      return repoArg;
-    }
-  })();
-
-  // determine wether the version contais a suffix
-  let version = versionArg;
-  if (suffixArg) {
-    version = versionArg + '_' + suffixArg;
-  }
-
-  let tagString = `${registryArg}/${repo}:${version}`;
-  return tagString;
-};
-
-export let getDockerBuildArgs = async (): Promise<string> => {
-  plugins.beautylog.info('checking for env vars to be supplied to the docker build');
-  let buildArgsString: string = '';
-  for (let key in NpmciConfig.configObject.dockerBuildargEnvMap) {
-    let targetValue = process.env[NpmciConfig.configObject.dockerBuildargEnvMap[key]];
-    buildArgsString = `${buildArgsString} --build-arg ${key}=${targetValue}`;
-  }
-  return buildArgsString;
-};
-
-/**
- *
- */
-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/mod_git/index.ts

@@ -1,45 +0,0 @@
-import * as plugins from './mod.plugins';
-import { bash } from '../npmci.bash';
-import { repo } from '../npmci.env';
-
-/**
- * handle cli input
- * @param argvArg
- */
-export let handleCli = async argvArg => {
-  if (argvArg._.length >= 2) {
-    let action: string = argvArg._[1];
-    switch (action) {
-      case 'mirror':
-        await mirror();
-        break;
-      default:
-        plugins.beautylog.error(`>>npmci git ...<< action >>${action}<< not supported`);
-    }
-  } else {
-    plugins.beautylog.log(
-      `>>npmci git ...<< cli arguments invalid... Please read the documentation.`
-    );
-  }
-};
-
-export let mirror = async () => {
-  let githubToken = process.env.NPMCI_GIT_GITHUBTOKEN;
-  let githubUser = process.env.NPMCI_GIT_GITHUBGROUP || repo.user;
-  let githubRepo = process.env.NPMCI_GIT_GITHUB || repo.repo;
-  if (githubToken) {
-    plugins.beautylog.info('found github token.');
-    plugins.beautylog.log('attempting the mirror the repository to GitHub');
-    // add the mirror
-    await bash(
-      `git remote add mirror https://${githubToken}@github.com/${githubUser}/${githubRepo}.git`
-    );
-    await bash(`git push mirror --all`);
-    plugins.beautylog.ok('pushed all branches to mirror!');
-    await bash(`git push mirror --tags`);
-    plugins.beautylog.ok('pushed all tags to mirror!');
-  } else {
-    plugins.beautylog.error(`cannot find NPMCI_GIT_GITHUBTOKEN env var!`);
-    process.exit(1);
-  }
-};

ts/mod_node/index.ts

@@ -1,72 +0,0 @@
-import * as plugins from '../npmci.plugins';
-import * as npmciConfig from '../npmci.config';
-import { bash, bashNoError, nvmAvailable, yarnAvailable } from '../npmci.bash';
-
-/**
- * handle cli input
- * @param argvArg
- */
-export let handleCli = async argvArg => {
-  if (argvArg._.length >= 3) {
-    let action: string = argvArg._[1];
-    switch (action) {
-      case 'install':
-        await install(argvArg._[2]);
-        break;
-      default:
-        plugins.beautylog.error(`>>npmci node ...<< action >>${action}<< not supported`);
-        process.exit(1);
-    }
-  } else {
-    plugins.beautylog.error(
-      `>>npmci node ...<< cli arguments invalid... Please read the documentation.`
-    );
-    process.exit(1);
-  }
-};
-
-/**
- * Install a specific version of node
- * @param versionArg
- */
-export let install = async versionArg => {
-  plugins.beautylog.log(`now installing node version ${versionArg}`);
-  let version: string;
-  if (versionArg === 'stable') {
-    version = '9';
-  } else if (versionArg === 'lts') {
-    version = '8';
-  } else if (versionArg === 'legacy') {
-    version = '8';
-  } else {
-    version = versionArg;
-  }
-  if (await nvmAvailable.promise) {
-    await bash(`nvm install ${version} && nvm alias default ${version}`);
-    plugins.beautylog.success(`Node version ${version} successfully installed!`);
-  } else {
-    plugins.beautylog.warn('Nvm not in path so staying at installed node version!');
-  }
-  await bash('node -v');
-  await bash('npm -v');
-  // lets look for further config
-  await npmciConfig.getConfig().then(async configArg => {
-    plugins.beautylog.log('Now checking for needed global npm tools...');
-    for (let npmTool of configArg.npmGlobalTools) {
-      plugins.beautylog.info(`Checking for global "${npmTool}"`);
-      let whichOutput: string = await bashNoError(`which ${npmTool}`);
-      let toolAvailable: boolean = !(/not\sfound/.test(whichOutput) || whichOutput === '');
-      if (toolAvailable) {
-        plugins.beautylog.log(`Tool ${npmTool} is available`);
-      } else {
-        plugins.beautylog.info(`globally installing ${npmTool} from npm`);
-        if (await yarnAvailable.promise) {
-          await bash(`yarn global add ${npmTool}`);
-        } else {
-          await bash(`npm install ${npmTool} -q -g`);
-        }
-      }
-    }
-    plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!');
-  });
-};

ts/mod_npm/index.ts

@@ -1,92 +0,0 @@
-import * as plugins from './mod.plugins';
-import * as configModule from '../npmci.config';
-import { bash, bashNoError, nvmAvailable, yarnAvailable } from '../npmci.bash';
-
-/**
- * handle cli input
- * @param argvArg
- */
-export let handleCli = async argvArg => {
-  if (argvArg._.length >= 2) {
-    let action: string = argvArg._[1];
-    switch (action) {
-      case 'install':
-        await install();
-        break;
-      case 'prepare':
-        await prepare();
-        break;
-      case 'test':
-        await test();
-        break;
-      case 'publish':
-        await publish();
-        break;
-      default:
-        plugins.beautylog.error(`>>npmci npm ...<< action >>${action}<< not supported`);
-        process.exit(1);
-    }
-  } else {
-    plugins.beautylog.log(
-      `>>npmci npm ...<< cli arguments invalid... Please read the documentation.`
-    );
-    process.exit(1);
-  }
-};
-
-/**
- * authenticates npm with token from env var
- */
-let prepare = async () => {
-  let npmrcPrefix: string = '//registry.npmjs.org/:_authToken=';
-  let npmToken: string = process.env.NPMCI_TOKEN_NPM;
-  let npmrcFileString: string = npmrcPrefix + npmToken;
-  if (npmToken) {
-    plugins.beautylog.info('found access token');
-  } else {
-    plugins.beautylog.error('no access token found! Exiting!');
-    process.exit(1);
-  }
-  plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc');
-  return;
-};
-
-/**
- * publish a package to npm
- */
-let publish = async () => {
-  let npmAccessCliString = ``;
-  const config = await configModule.getConfig();
-
-  // -> configure package access level
-  if (
-    config.npmAccessLevel &&
-    (config.npmAccessLevel === 'public' || config.npmAccessLevel === 'private')
-  ) {
-    npmAccessCliString = `--access=${config.npmAccessLevel}`;
-  }
-
-  // -> build it
-  await bash(`yarn install`);
-  await bash(`yarn run build`);
-
-  // -> make sure npm is authenticated
-  prepare();
-
-  // -> publish it
-  await bash(`npm publish ${npmAccessCliString}`);
-};
-
-let install = async (): Promise<void> => {
-  plugins.beautylog.info('now installing dependencies:');
-  if (await yarnAvailable.promise) {
-    await bash('yarn install');
-  } else {
-    await bash('npm install');
-  }
-};
-
-export let test = async (): Promise<void> => {
-  plugins.beautylog.info('now starting tests:');
-  await bash('yarn test');
-};

ts/mod_ssh/index.ts

@@ -1,19 +1,20 @@
+import { logger } from '../npmci.logging';
 import * as plugins from './mod.plugins';
 let sshInstance: plugins.smartssh.SshInstance;
 
 export let handleCli = async argvArg => {
   if (argvArg._.length >= 2) {
-    let action: string = argvArg._[1];
+    const action: string = argvArg._[1];
     switch (action) {
       case 'prepare':
         await prepare();
         break;
       default:
-        plugins.beautylog.error(`action >>${action}<< not supported`);
+        logger.log('error', `action >>${action}<< not supported`);
         process.exit(1);
     }
   } else {
-    plugins.beautylog.error(`>>npmci ssh ...<< please specify an action!`);
+    logger.log('error', `>>npmci ssh ...<< please specify an action!`);
     process.exit(1);
   }
 };
@@ -21,7 +22,7 @@ export let handleCli = async argvArg => {
 /**
  * checks if not undefined
  */
-let notUndefined = (stringArg: string) => {
+const notUndefined = (stringArg: string) => {
   return stringArg && stringArg !== 'undefined' && stringArg !== '##';
 };
 
@@ -34,27 +35,27 @@ export let prepare = async () => {
   if (!process.env.NPMTS_TEST) {
     sshInstance.writeToDisk();
   } else {
-    plugins.beautylog.log('In test mode, so not storing SSH keys to disk!');
+    logger.log('info', '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: string) => {
+const evaluateSshEnv = async (sshkeyEnvVarArg: string) => {
-  let sshEnvArray = sshkeyEnvVarArg.split('|');
+  const sshEnvArray = sshkeyEnvVarArg.split('|');
-  let sshKey = new plugins.smartssh.SshKey();
+  const sshKey = new plugins.smartssh.SshKey();
-  plugins.beautylog.info('Found SSH identity for ' + sshEnvArray[1]);
+  logger.log('info', 'Found SSH identity for ' + sshEnvArray[1]);
   if (notUndefined(sshEnvArray[0])) {
-    plugins.beautylog.log('---> host defined!');
+    logger.log('info', '---> host defined!');
     sshKey.host = sshEnvArray[0];
   }
   if (notUndefined(sshEnvArray[1])) {
-    plugins.beautylog.log('---> privKey defined!');
+    logger.log('info', '---> privKey defined!');
     sshKey.privKeyBase64 = sshEnvArray[1];
   }
   if (notUndefined(sshEnvArray[2])) {
-    plugins.beautylog.log('---> pubKey defined!');
+    logger.log('info', '---> pubKey defined!');
     sshKey.pubKeyBase64 = sshEnvArray[2];
   }
 

ts/mod_trigger/index.ts

@@ -1,28 +1,42 @@
 import * as plugins from './mod.plugins';
 import { bash } from '../npmci.bash';
+import { logger } from '../npmci.logging';
 
-let triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/;
+const triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/;
 
 export let trigger = async () => {
-  plugins.beautylog.info('now running triggers');
+  logger.log('info', 'now running triggers');
-  plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
+  await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
 };
 
-let evaluateTrigger = async triggerEnvVarArg => {
+const evaluateTrigger = async triggerEnvVarArg => {
-  let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg);
+  const triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg);
-  let regexDomain = triggerRegexResultArray[1];
+  const regexDomain = triggerRegexResultArray[1];
-  let regexProjectId = triggerRegexResultArray[2];
+  const regexProjectId = triggerRegexResultArray[2];
-  let regexProjectTriggerToken = triggerRegexResultArray[3];
+  const regexProjectTriggerToken = triggerRegexResultArray[3];
-  let regexRefName = triggerRegexResultArray[4];
+  const regexRefName = triggerRegexResultArray[4];
   let regexTriggerName;
   if (triggerRegexResultArray.length === 6) {
     regexTriggerName = triggerRegexResultArray[5];
   } else {
     regexTriggerName = 'Unnamed Trigger';
   }
-  plugins.beautylog.info('Found Trigger!');
+  logger.log('info', 'Found Trigger!');
-  plugins.beautylog.log('triggering build for ref ' + regexRefName + ' of ' + regexTriggerName);
+  logger.log('info', 'triggering build for ref ' + regexRefName + ' of ' + regexTriggerName);
-  plugins.request.post('https://gitlab.com/api/v3/projects/' + regexProjectId + '/trigger/builds', {
+  plugins.smartrequest.postFormData(
-    form: { token: regexProjectTriggerToken, ref: regexRefName }
+    'https://gitlab.com/api/v3/projects/' + regexProjectId + '/trigger/builds',
-  });
+    {},
+    [
+      {
+        name: 'token',
+        payload: regexProjectTriggerToken,
+        type: 'string'
+      },
+      {
+        name: 'ref',
+        payload: regexRefName,
+        type: 'string'
+      }
+    ]
+  );
 };

ts/npmci.bash.ts

@@ -1,17 +1,17 @@
+import { logger } from './npmci.logging';
 import * as plugins from './npmci.plugins';
 import * as paths from './npmci.paths';
 
-import * as smartq from 'smartq';
+import * as smartpromise from '@pushrocks/smartpromise';
 
 /**
  * wether nvm is available or not
  */
-export let nvmAvailable = smartq.defer<boolean>();
+export let nvmAvailable = smartpromise.defer<boolean>();
-export let yarnAvailable = smartq.defer<boolean>();
 /**
  * the smartshell instance for npmci
  */
-let npmciSmartshell = new plugins.smartshell.Smartshell({
+const npmciSmartshell = new plugins.smartshell.Smartshell({
   executor: 'bash',
   sourceFilePaths: []
 });
@@ -19,38 +19,24 @@ let npmciSmartshell = new plugins.smartshell.Smartshell({
 /**
  * check for tools.
  */
-let checkToolsAvailable = async () => {
+const checkToolsAvailable = async () => {
   // check for nvm
   if (!process.env.NPMTS_TEST) {
     if (
-      (await plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0
+      (await npmciSmartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0
     ) {
-      npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh`]);
+      npmciSmartshell.shellEnv.addSourceFiles([`/usr/local/nvm/nvm.sh`]);
       nvmAvailable.resolve(true);
     } else if (
-      (await plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0
+      (await npmciSmartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0
     ) {
-      npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh`]);
+      npmciSmartshell.shellEnv.addSourceFiles([`~/.nvm/nvm.sh`]);
       nvmAvailable.resolve(true);
     } else {
       nvmAvailable.resolve(false);
     }
-
-    // check for yarn
-    await plugins.smartshell.which('yarn').then(
-      async () => {
-        await plugins.smartshell.exec(
-          `yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`
-        );
-        yarnAvailable.resolve(true);
-      },
-      () => {
-        yarnAvailable.resolve(false);
-      }
-    );
   } else {
     nvmAvailable.resolve(true);
-    yarnAvailable.resolve(true);
   }
 };
 checkToolsAvailable();
@@ -83,21 +69,19 @@ export let bash = async (commandArg: string, retryArg: number = 2): Promise<stri
       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');
+          logger.log('error', 'something went wrong and retries are exhausted');
           process.exit(1);
         }
       } else if (execResult.exitCode === 0) {
         // everything went fine, or no error wanted
         i = retryArg + 1; // retry +1 breaks for loop, if everything works out ok retrials are not wanted
       } else {
-        plugins.beautylog.warn(
+        logger.log('warn', 'Something went wrong! Exit Code: ' + execResult.exitCode.toString());
-          'Something went wrong! Exit Code: ' + execResult.exitCode.toString()
+        logger.log('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);
+    logger.log('info', 'ShellExec would be: ' + commandArg);
     execResult = {
       exitCode: 0,
       stdout: 'testOutput'

ts/npmci.classes.npmci.ts

@@ -0,0 +1,55 @@
+import * as plugins from './npmci.plugins';
+
+import { CloudlyConnector } from './connector.cloudly/cloudlyconnector';
+
+import { NpmciInfo } from './npmci.classes.npmciinfo';
+import { NpmciCli } from './npmci.classes.npmcicli';
+import { NpmciConfig } from './npmci.classes.npmciconfig';
+
+// mods
+import { NpmciDockerManager } from './manager.docker';
+import { NpmciGitManager } from './manager.git';
+import { NpmciNodeJsManager } from './manager.nodejs';
+import { NpmciNpmManager } from './manager.npm';
+import { NpmciEnv } from './npmci.classes.npmcienv';
+
+export class Npmci {
+  public analytics: plugins.smartanalytics.Analytics;
+  public cloudlyConnector: CloudlyConnector;
+
+  public npmciEnv: NpmciEnv;
+  public npmciInfo: NpmciInfo;
+  public npmciConfig: NpmciConfig;
+  public npmciCli: NpmciCli;
+
+  // managers
+  public dockerManager: NpmciDockerManager;
+  public gitManager: NpmciGitManager;
+  public nodejsManager: NpmciNodeJsManager;
+  public npmManager: NpmciNpmManager;
+
+  constructor() {
+    this.analytics = new plugins.smartanalytics.Analytics({
+      apiEndPoint: 'https://pubapi.lossless.one/analytics',
+      projectId: 'gitzone',
+      appName: 'npmci'
+    });
+    this.cloudlyConnector = new CloudlyConnector(this);
+    this.npmciEnv = new NpmciEnv(this);
+    this.npmciInfo = new NpmciInfo(this);
+    this.npmciCli = new NpmciCli(this);
+    this.npmciConfig = new NpmciConfig(this);
+
+    // managers
+    this.dockerManager = new NpmciDockerManager(this);
+    this.gitManager = new NpmciGitManager(this);
+    this.nodejsManager = new NpmciNodeJsManager(this);
+    this.npmManager = new NpmciNpmManager(this);
+  }
+
+  public async start() {
+    await this.npmciInfo.printToConsole();
+    await this.npmciConfig.init();
+    this.npmciCli.startParse();
+  }
+}

ts/npmci.classes.npmcicli.ts

@@ -0,0 +1,110 @@
+import { logger } from './npmci.logging';
+import * as plugins from './npmci.plugins';
+import * as paths from './npmci.paths';
+import { Npmci } from './npmci.classes.npmci';
+
+export class NpmciCli {
+  public npmciRef: Npmci;
+  public smartcli: plugins.smartcli.Smartcli;
+
+  constructor(npmciArg: Npmci) {
+    this.npmciRef = npmciArg;
+    this.smartcli = new plugins.smartcli.Smartcli();
+    this.smartcli.addVersion(this.npmciRef.npmciInfo.projectInfo.version);
+
+    // clean
+    this.smartcli.addCommand('clean').subscribe(
+      async argv => {
+        const modClean = await import('./mod_clean/index');
+        await modClean.clean();
+      },
+      err => {
+        console.log(err);
+        process.exit(1);
+      }
+    );
+
+    // command
+    this.smartcli.addCommand('command').subscribe(
+      async argv => {
+        const modCommand = await import('./mod_command/index');
+        await modCommand.command();
+      },
+      err => {
+        console.log(err);
+        process.exit(1);
+      }
+    );
+
+    // command
+    this.smartcli.addCommand('git').subscribe(
+      async argvArg => {
+        await this.npmciRef.gitManager.handleCli(argvArg);
+      },
+      err => {
+        console.log(err);
+        process.exit(1);
+      }
+    );
+
+    // build
+    this.smartcli.addCommand('docker').subscribe(
+      async argvArg => {
+        await this.npmciRef.dockerManager.handleCli(argvArg);
+      },
+      err => {
+        console.log(err);
+        process.exit(1);
+      }
+    );
+
+    // node
+    this.smartcli.addCommand('node').subscribe(
+      async argvArg => {
+        await this.npmciRef.nodejsManager.handleCli(argvArg);
+      },
+      err => {
+        console.log(err);
+        process.exit(1);
+      }
+    );
+
+    // npm
+    this.smartcli.addCommand('npm').subscribe(
+      async argvArg => {
+        await this.npmciRef.npmManager.handleCli(argvArg);
+      },
+      err => {
+        console.log(err);
+      }
+    );
+
+    // trigger
+    this.smartcli.addCommand('ssh').subscribe(
+      async argvArg => {
+        const modSsh = await import('./mod_ssh/index');
+        await modSsh.handleCli(argvArg);
+      },
+      err => {
+        console.log(err);
+        process.exit(1);
+      }
+    );
+
+    // trigger
+    this.smartcli.addCommand('trigger').subscribe(
+      async argv => {
+        const modTrigger = await import('./mod_trigger/index');
+        await modTrigger.trigger();
+      },
+      err => {
+        console.log(err);
+        process.exit(1);
+      }
+    );
+  }
+
+  public startParse = () => {
+    this.smartcli.startParse();
+  };
+}

ts/npmci.classes.npmciconfig.ts

@@ -0,0 +1,73 @@
+import * as plugins from './npmci.plugins';
+import * as paths from './npmci.paths';
+
+import { logger } from './npmci.logging';
+import { Npmci } from './npmci.classes.npmci';
+
+/**
+ * the main config interface for npmci
+ */
+export interface INpmciOptions {
+  projectInfo: plugins.projectinfo.ProjectInfo;
+
+  // npm
+  npmGlobalTools: string[];
+  npmAccessLevel?: 'private' | 'public';
+  npmRegistryUrl: string;
+
+  // docker
+  dockerRegistries: string[];
+  dockerRegistryRepoMap: { [key: string]: string };
+  dockerBuildargEnvMap: { [key: string]: string };
+
+  // urls
+  urlCloudly: string;
+}
+
+/**
+ * a config class for Npmci
+ */
+export class NpmciConfig {
+  public npmciRef: Npmci;
+
+  public npmciNpmextra: plugins.npmextra.Npmextra;
+  public kvStorage: plugins.npmextra.KeyValueStore;
+  public npmciQenv: plugins.qenv.Qenv;
+
+  private configObject: INpmciOptions;
+
+  constructor(npmciRefArg: Npmci) {
+    this.npmciRef = npmciRefArg;
+
+    this.npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
+    this.kvStorage = new plugins.npmextra.KeyValueStore(
+      'custom',
+      `${this.npmciRef.npmciEnv.repo.user}_${this.npmciRef.npmciEnv.repo.repo}`
+    );
+    this.npmciQenv = new plugins.qenv.Qenv(
+      paths.NpmciProjectDir,
+      paths.NpmciProjectNogitDir,
+      false,
+      logger
+    );
+
+    this.configObject = {
+      projectInfo: new plugins.projectinfo.ProjectInfo(paths.cwd),
+      npmGlobalTools: [],
+      dockerRegistries: [],
+      dockerRegistryRepoMap: {},
+      npmAccessLevel: 'private',
+      npmRegistryUrl: 'registry.npmjs.org',
+      dockerBuildargEnvMap: {},
+      urlCloudly: this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY')
+    };
+  }
+
+  public async init() {
+    this.configObject = this.npmciNpmextra.dataFor<INpmciOptions>('npmci', this.configObject);
+  }
+
+  public getConfig(): INpmciOptions {
+    return this.configObject;
+  }
+}

ts/npmci.classes.npmcienv.ts

@@ -0,0 +1,18 @@
+import * as plugins from './npmci.plugins';
+import { Npmci } from './npmci.classes.npmci';
+
+export class NpmciEnv {
+  public npmciRef: Npmci;
+
+  public repoString: string;
+  public repo: plugins.smartstring.GitRepo;
+
+  constructor(npmciRefArg: Npmci) {
+    this.npmciRef = npmciRefArg;
+    this.repoString = process.env.CI_REPOSITORY_URL;
+    if (!this.repoString) {
+      this.repoString = 'https://undefined:undefined@github.com/undefined/undefined.git';
+    }
+    this.repo = new plugins.smartstring.GitRepo(this.repoString);
+  }
+}

ts/npmci.classes.npmciinfo.ts

@@ -0,0 +1,17 @@
+import * as plugins from './npmci.plugins';
+import * as paths from './npmci.paths';
+import { logger } from './npmci.logging';
+import { Npmci } from './npmci.classes.npmci';
+
+export class NpmciInfo {
+  public npmciRef: Npmci;
+  public projectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot);
+
+  constructor(npmciArg: Npmci) {
+    this.npmciRef = npmciArg;
+  }
+
+  public printToConsole() {
+    logger.log('info', `npmci version: ${this.projectInfo.version}`);
+  }
+}

ts/npmci.cli.ts

@@ -1,122 +0,0 @@
-import * as plugins from './npmci.plugins';
-import * as paths from './npmci.paths';
-import * as npmciMonitor from './npmci.monitor';
-npmciMonitor.run();
-
-// Get Info about npmci itself
-let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot);
-plugins.beautylog.log('npmci version: ' + npmciInfo.version);
-
-import * as NpmciEnv from './npmci.env';
-
-import * as npmciMods from './npmci.mods';
-
-let smartcli = new plugins.smartcli.Smartcli();
-smartcli.addVersion(npmciInfo.version);
-
-// clean
-smartcli
-  .addCommand('clean')
-  .then(async argv => {
-    let modClean = await npmciMods.modClean.load();
-    await modClean.clean();
-  })
-  .catch(err => {
-    console.log(err);
-    process.exit(1);
-  });
-
-// cloudflare
-smartcli
-  .addCommand('cloudflare')
-  .then(async argvArg => {
-    let modPurge = await npmciMods.modCloudflare.load();
-    await modPurge.handleCli(argvArg);
-  })
-  .catch(err => {
-    console.log(err);
-  });
-
-// command
-smartcli
-  .addCommand('command')
-  .then(async argv => {
-    let modCommand = await npmciMods.modCommand.load();
-    await modCommand.command();
-  })
-  .catch(err => {
-    console.log(err);
-    process.exit(1);
-  });
-
-// command
-smartcli
-  .addCommand('git')
-  .then(async argvArg => {
-    let modGit = await npmciMods.modGit.load();
-    await modGit.handleCli(argvArg);
-  })
-  .catch(err => {
-    console.log(err);
-    process.exit(1);
-  });
-
-// build
-smartcli
-  .addCommand('docker')
-  .then(async argvArg => {
-    let modDocker = await npmciMods.modDocker.load();
-    await modDocker.handleCli(argvArg);
-  })
-  .catch(err => {
-    console.log(err);
-    process.exit(1);
-  });
-
-// node
-smartcli
-  .addCommand('node')
-  .then(async argvArg => {
-    let modNode = await npmciMods.modNode.load();
-    await modNode.handleCli(argvArg);
-  })
-  .catch(err => {
-    console.log(err);
-  });
-
-// npm
-smartcli
-  .addCommand('npm')
-  .then(async argvArg => {
-    let modNpm = await npmciMods.modNpm.load();
-    await modNpm.handleCli(argvArg);
-  })
-  .catch(err => {
-    console.log(err);
-  });
-
-// trigger
-smartcli
-  .addCommand('ssh')
-  .then(async argvArg => {
-    let modSsh = await npmciMods.modSsh.load();
-    await modSsh.handleCli(argvArg);
-  })
-  .catch(err => {
-    console.log(err);
-    process.exit(1);
-  });
-
-// trigger
-smartcli
-  .addCommand('trigger')
-  .then(async argv => {
-    let modTrigger = await npmciMods.modTrigger.load();
-    await modTrigger.trigger();
-  })
-  .catch(err => {
-    console.log(err);
-    process.exit(1);
-  });
-
-smartcli.startParse();

ts/npmci.config.ts

@@ -1,34 +0,0 @@
-import * as q from 'q';
-
-import * as plugins from './npmci.plugins';
-import * as paths from './npmci.paths';
-
-import { repo } from './npmci.env';
-
-import { KeyValueStore } from 'npmextra';
-
-export interface INpmciOptions {
-  npmGlobalTools: string[];
-  npmAccessLevel?: 'private' | 'public';
-  dockerRegistryRepoMap: any;
-  dockerBuildargEnvMap: any;
-}
-
-// instantiate a kvStorage for the current directory
-export let kvStorage = new KeyValueStore('custom', `${repo.user}_${repo.repo}`);
-
-// handle config retrival
-let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
-let defaultConfig: INpmciOptions = {
-  npmGlobalTools: [],
-  dockerRegistryRepoMap: {},
-  dockerBuildargEnvMap: {}
-};
-export let configObject = npmciNpmextra.dataFor<INpmciOptions>('npmci', defaultConfig);
-
-/**
- * gets the npmci portion of the npmextra.json file
- */
-export let getConfig = async (): Promise<INpmciOptions> => {
-  return configObject;
-};

ts/npmci.env.ts

@@ -1,13 +0,0 @@
-import * as plugins from './npmci.plugins';
-import * as paths from './npmci.paths';
-import { GitRepo } from 'smartstring';
-import { Dockerfile } from './mod_docker/index';
-
-/**
- * a info instance about the git respoitory at cwd :)
- */
-let repoString: string = process.env.CI_REPOSITORY_URL;
-if (!repoString) {
-  repoString = 'https://undefined:undefined@github.com/undefined/undefined.git';
-}
-export let repo = new GitRepo(repoString);

ts/npmci.logging.ts

@@ -0,0 +1,14 @@
+import * as plugins from './npmci.plugins';
+
+export const logger = new plugins.smartlog.Smartlog({
+  logContext: {
+    company: 'Some Company',
+    companyunit: 'Some Unit',
+    containerName: 'Some ContainerName',
+    environment: 'test',
+    runtime: 'node',
+    zone: 'Some Zone'
+  }
+});
+
+logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());

ts/npmci.mods.ts

@@ -1,24 +0,0 @@
-import * as _modClean from './mod_clean/index';
-import * as _modCloudflare from './mod_cloudflare/index';
-import * as _modCommand from './mod_command/index';
-import * as _modDocker from './mod_docker/index';
-import * as _modGit from './mod_git/index';
-import * as _modNpm from './mod_npm/index';
-import * as _modNode from './mod_node/index';
-import * as _modSsh from './mod_ssh/index';
-import * as _modTrigger from './mod_trigger/index';
-
-import { LazyModule } from 'smartsystem';
-
-export let modClean = new LazyModule<typeof _modClean>('./mod_clean/index', __dirname);
-export let modCloudflare = new LazyModule<typeof _modCloudflare>(
-  './mod_cloudflare/index',
-  __dirname
-);
-export let modCommand = new LazyModule<typeof _modCommand>('./mod_command/index', __dirname);
-export let modGit = new LazyModule<typeof _modGit>('./mod_git/index', __dirname);
-export let modDocker = new LazyModule<typeof _modDocker>('./mod_docker/index', __dirname);
-export let modNode = new LazyModule<typeof _modNode>('./mod_node/index', __dirname);
-export let modNpm = new LazyModule<typeof _modNpm>('./mod_npm/index', __dirname);
-export let modSsh = new LazyModule<typeof _modSsh>('./mod_ssh/index', __dirname);
-export let modTrigger = new LazyModule<typeof _modTrigger>('./mod_trigger/index', __dirname);

ts/npmci.monitor.ts

@@ -1,22 +0,0 @@
-import * as plugins from './npmci.plugins';
-import * as env from './npmci.env';
-
-import { Analytics } from 'smartanalytics';
-
-export let npmciAnalytics = new Analytics({
-  apiEndPoint: 'https://pubapi.lossless.one/analytics',
-  projectId: 'gitzone',
-  appName: 'npmci'
-});
-
-export let run = async () => {
-  npmciAnalytics
-    .recordEvent('npmToolExecution', {
-      host: env.repo.host,
-      user: env.repo.user,
-      repo: env.repo.repo
-    })
-    .catch(err => {
-      plugins.beautylog.warn('Lossless Analytics API not available...');
-    });
-};

ts/npmci.paths.ts

@@ -1,8 +1,13 @@
 import * as plugins from './npmci.plugins';
 
-export let cwd = process.cwd();
+export const cwd = process.cwd();
 
-export let NpmciPackageRoot = plugins.path.join(__dirname, '../');
+// package paths
-export let NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json');
+export const NpmciPackageRoot = plugins.path.join(__dirname, '../');
-export let NpmciProjectDir = cwd;
+export const NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json');
-export let NpmciTestDir = plugins.path.join(cwd, './test');
+
+// project paths
+export const NpmciProjectDir = cwd;
+export const NpmciProjectNogitDir = plugins.path.join(NpmciProjectDir, './.nogit');
+export const NpmciTestDir = plugins.path.join(cwd, './test');
+export const NpmciCacheDir = plugins.path.join(cwd, './.npmci_cache');

ts/npmci.plugins.ts

@@ -1,19 +1,55 @@
-export import beautylog = require('beautylog');
+// node native
-export import lodash = require('lodash');
+import * as path from 'path';
-export import npmextra = require('npmextra');
+
-export import path = require('path');
+export { path };
-export import projectinfo = require('projectinfo');
+
-export import q = require('smartq');
+// @apiglobal
-export let request = require('request');
+import * as typedrequest from '@apiglobal/typedrequest';
-export import smartcli = require('smartcli');
+
-export import smartdelay = require('smartdelay');
+export { typedrequest };
-export import smartfile = require('smartfile');
+
-export import shelljs = require('shelljs');
+// @servezone
-export import smartparam = require('smartparam');
+import * as servezoneInterfaces from '@servezone/servezone-interfaces';
-export import smartq = require('smartq');
+
-export import smartshell = require('smartshell');
+export { servezoneInterfaces };
-export import smartsocket = require('smartsocket');
+
-export import smartsystem = require('smartsystem');
+// @pushrocks
-export import smartssh = require('smartssh');
+import * as npmextra from '@pushrocks/npmextra';
-export import smartstring = require('smartstring');
+import * as projectinfo from '@pushrocks/projectinfo';
-export import through2 = require('through2');
+import * as qenv from '@pushrocks/qenv';
+import * as smartanalytics from '@pushrocks/smartanalytics';
+import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartfile from '@pushrocks/smartfile';
+import * as smartcli from '@pushrocks/smartcli';
+import * as smartlog from '@pushrocks/smartlog';
+import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
+import * as smartparam from '@pushrocks/smartparam';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartrequest from '@pushrocks/smartrequest';
+import * as smartshell from '@pushrocks/smartshell';
+import * as smartsocket from '@pushrocks/smartsocket';
+import * as smartssh from '@pushrocks/smartssh';
+import * as smartstring from '@pushrocks/smartstring';
+
+export {
+  npmextra,
+  projectinfo,
+  qenv,
+  smartanalytics,
+  smartdelay,
+  smartfile,
+  smartcli,
+  smartlog,
+  smartlogDestinationLocal,
+  smartparam,
+  smartpromise,
+  smartrequest,
+  smartshell,
+  smartsocket,
+  smartssh,
+  smartstring
+};
+
+import * as through2 from 'through2';
+
+export { through2 };

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }