3.0.59

.gitignore

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

.gitlab-ci.yml

@@ -3,16 +3,18 @@ image: 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:
@@ -24,15 +26,70 @@ mirror:
 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
 
+# ====================
+# test stage
+# ====================
+testLEGACY:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install legacy
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
+  - notpriv
+  allow_failure: true
+
+testLTS:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
+  - notpriv
+    
+testSTABLE:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
+  - notpriv
+
+release:
+  stage: release
+  script:
+  - npmci node install stable
+  - npmci npm publish
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
 codequality:
-  stage: security
+  stage: metadata
   image: docker:stable
   allow_failure: true
   services:
@@ -50,54 +107,8 @@ codequality:
   - docker
   - priv
 
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
-
-testLTS:
-  stage: test
-  script:
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
-  stage: test
-  script:
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-
-release:
-  stage: release
-  script:
-  - npmci node install lts
-  - npmci npm prepare
-  - npmci npm publish
-  only:
-  - tags
-  tags:
-  - docker
-  - notpriv
-
 trigger:
-  stage: trigger
+  stage: metadata
   script:
   - npmci trigger
   only:
@@ -108,10 +119,12 @@ trigger:
 
 pages:
   image: hosttoday/ht-docker-node:npmci
-  stage: pages
+  stage: metadata
   script:
-    - npmci command yarn global add npmpage
+    - npmci command npm install -g typedoc typescript
-    - npmci command npmpage
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
   tags:
     - docker
     - notpriv
@@ -121,3 +134,14 @@ pages:
     expire_in: 1 week
     paths:
     - public
+  allow_failure: true
+
+windowsCompatibility:
+  image: stefanscherer/node-windows:10-build-tools
+  stage: metadata
+  script:
+  - npm install & npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - windows
+  allow_failure: true

.snyk

@@ -1,15 +1,28 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.10.2
+version: v1.12.0
 # ignores vulnerabilities until expiry date; change duration by modifying expiry date
 ignore:
   'npm:shelljs:20140723':
     - shelljs:
         reason: None given
-        expires: '2018-05-04T20:41:54.426Z'
+        expires: '2018-06-02T22:48:10.660Z'
     - smartshell > shelljs:
         reason: None given
-        expires: '2018-05-04T20:41:54.426Z'
+        expires: '2018-06-02T22:48:10.660Z'
     - smartssh > shelljs:
         reason: None given
-        expires: '2018-05-04T20:41:54.426Z'
+        expires: '2018-06-02T22:48:10.660Z'
+    - smartshell > shelljs:
+        reason: None given
+        expires: '2018-08-14T21:49:25.248Z'
+    - smartssh > shelljs:
+        reason: None given
+        expires: '2018-08-14T21:49:25.248Z'
+    - shelljs:
+        reason: None given
+        expires: '2018-08-14T21:49:25.248Z'
+  'npm:stringstream:20180511':
+    - request > stringstream:
+        reason: None given
+        expires: '2018-08-14T21:49:25.248Z'
 patch: {}

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
-```

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.0.40",
+  "version": "3.0.59",
   "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": "(rm -f config.json) && tstest test/",
-    "build": "(rm -f config.json) && (npmts) && (npm run testVersion)",
+    "build": "(rm -f config.json) && 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 +23,34 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "tapbundle": "^2.0.0"
+    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsrun": "^1.1.12",
+    "@gitzone/tstest": "^1.0.15",
+    "@pushrocks/tapbundle": "^3.0.7",
+    "@types/node": "^10.10.3"
   },
   "dependencies": {
-    "@types/lodash": "^4.14.74",
+    "@pushrocks/lik": "^3.0.1",
-    "@types/shelljs": "^0.7.4",
+    "@pushrocks/npmextra": "^3.0.1",
-    "@types/through2": "^2.0.33",
+    "@pushrocks/projectinfo": "^4.0.2",
+    "@pushrocks/smartcli": "^3.0.4",
+    "@pushrocks/smartdelay": "^2.0.2",
+    "@pushrocks/smartfile": "^6.0.8",
+    "@pushrocks/smartparam": "^1.0.4",
+    "@pushrocks/smartpromise": "^2.0.5",
+    "@pushrocks/smartrequest": "^1.1.14",
+    "@pushrocks/smartshell": "^2.0.6",
+    "@pushrocks/smartssh": "^1.2.3",
+    "@pushrocks/smartstring": "^3.0.4",
+    "@types/lodash": "^4.14.116",
+    "@types/shelljs": "^0.8.0",
+    "@types/through2": "^2.0.34",
     "beautylog": "^6.1.10",
     "cflare": "^1.0.5",
-    "lik": "^2.0.5",
+    "lodash": "^4.17.11",
-    "lodash": "^4.17.4",
-    "npmextra": "^2.0.9",
-    "projectinfo": "^3.0.2",
-    "request": "^2.81.0",
-    "shelljs": "^0.8.1",
     "smartanalytics": "^2.0.9",
-    "smartcli": "^2.0.7",
+    "smartsocket": "^1.1.19",
-    "smartdelay": "^1.0.3",
-    "smartfile": "^4.2.20",
-    "smartparam": "^1.0.2",
-    "smartq": "^1.1.6",
-    "smartshell": "^1.0.18",
-    "smartsocket": "^1.1.10",
-    "smartssh": "^1.2.2",
-    "smartstring": "^2.0.24",
-    "smartsystem": "^2.0.2",
     "through2": "^2.0.3"
-  }
+  },
+  "private": false
 }

readme.md

@@ -25,6 +25,79 @@ node and docker in gitlab ci on steroids
 
 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.
+
+Use TypeScript for best in class instellisense.
+
 For further information read the linked docs at the top of this README.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from 'tapbundle';
+import { tap, expect } from '@pushrocks/tapbundle';
 import * as path from 'path';
 
 // Setup 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/mod.helpers.ts

@@ -34,7 +34,7 @@ export let readDockerfiles = async (): Promise<Dockerfile[]> => {
  * @returns Promise<Dockerfile[]>
  */
 export let sortDockerfiles = (sortableArrayArg: Dockerfile[]): Promise<Dockerfile[]> => {
-  let done = plugins.q.defer<Dockerfile[]>();
+  let done = plugins.smartpromise.defer<Dockerfile[]>();
   plugins.beautylog.info('sorting Dockerfiles:');
   let sortedArray: Dockerfile[] = [];
   let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg, sortedArray);

ts/mod_node/index.ts

@@ -1,6 +1,7 @@
 import * as plugins from '../npmci.plugins';
+import * as paths from '../npmci.paths';
 import * as npmciConfig from '../npmci.config';
-import { bash, bashNoError, nvmAvailable, yarnAvailable } from '../npmci.bash';
+import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
 
 /**
  * handle cli input
@@ -33,11 +34,11 @@ export let install = async versionArg => {
   plugins.beautylog.log(`now installing node version ${versionArg}`);
   let version: string;
   if (versionArg === 'stable') {
-    version = '9';
+    version = '10';
   } else if (versionArg === 'lts') {
     version = '8';
   } else if (versionArg === 'legacy') {
-    version = '8';
+    version = '9';
   } else {
     version = versionArg;
   }
@@ -49,6 +50,7 @@ export let install = async versionArg => {
   }
   await bash('node -v');
   await bash('npm -v');
+  await bash(`npm config set cache ${paths.NpmciCacheDir}  --global `);
   // lets look for further config
   await npmciConfig.getConfig().then(async configArg => {
     plugins.beautylog.log('Now checking for needed global npm tools...');
@@ -60,11 +62,7 @@ export let install = async versionArg => {
         plugins.beautylog.log(`Tool ${npmTool} is available`);
       } else {
         plugins.beautylog.info(`globally installing ${npmTool} from npm`);
-        if (await yarnAvailable.promise) {
+        await bash(`npm install ${npmTool} -q -g`);
-          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,6 +1,6 @@
 import * as plugins from './mod.plugins';
 import * as configModule from '../npmci.config';
-import { bash, bashNoError, nvmAvailable, yarnAvailable } from '../npmci.bash';
+import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
 
 /**
  * handle cli input
@@ -72,14 +72,14 @@ let publish = async () => {
   await bash(`npm -v`);
 
   // -> build it
-  await bash(`yarn install`);
+  await bash(`npm install`);
-  await bash(`yarn run build`);
+  await bash(`npm run build`);
 
   plugins.beautylog.success(`Nice!!! The build for the publication was successfull!`);
-  plugins.beautylog.log(`Lets clean up so we don't publish any packages that don't belong to us:`)
+  plugins.beautylog.log(`Lets clean up so we don't publish any packages that don't belong to us:`);
   // -> clean up before we publish stuff
-  await bash(`rm -r .yarn`);
+  await bashNoError(`rm -r ./.npmci_cache`);
-  await bash(`rm -r node_modules`);
+  await bash(`rm -r ./node_modules`);
 
   plugins.beautylog.success(`Cleaned up!:`);
 
@@ -91,14 +91,10 @@ let publish = async () => {
 
 let install = async (): Promise<void> => {
   plugins.beautylog.info('now installing dependencies:');
-  if (await yarnAvailable.promise) {
+  await bash('npm install');
-    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');
+  await bash('npm test');
 };

ts/mod_trigger/index.ts

@@ -22,7 +22,20 @@ let evaluateTrigger = async triggerEnvVarArg => {
   }
   plugins.beautylog.info('Found Trigger!');
   plugins.beautylog.log('triggering build for ref ' + regexRefName + ' of ' + regexTriggerName);
-  plugins.request.post('https://gitlab.com/api/v3/projects/' + regexProjectId + '/trigger/builds', {
+  plugins.request.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,13 +1,12 @@
 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
  */
@@ -23,34 +22,20 @@ let checkToolsAvailable = async () => {
   // check for nvm
   if (!process.env.NPMTS_TEST) {
     if (
-      (await plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0
+      (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();

ts/npmci.cli.ts

@@ -9,114 +9,102 @@ plugins.beautylog.log('npmci version: ' + npmciInfo.version);
 
 import * as NpmciEnv from './npmci.env';
 
-import * as npmciMods from './npmci.mods';
+const npmciSmartcli = new plugins.smartcli.Smartcli();
-
+npmciSmartcli.addVersion(npmciInfo.version);
-let smartcli = new plugins.smartcli.Smartcli();
-smartcli.addVersion(npmciInfo.version);
 
 // clean
-smartcli
+npmciSmartcli.addCommand('clean').subscribe(
-  .addCommand('clean')
+  async argv => {
-  .then(async argv => {
+    let modClean = await import('./mod_clean/index');
-    let modClean = await npmciMods.modClean.load();
     await modClean.clean();
-  })
+  },
-  .catch(err => {
+  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
+npmciSmartcli.addCommand('command').subscribe(
-  .addCommand('command')
+  async argv => {
-  .then(async argv => {
+    let modCommand = await import('./mod_command/index');
-    let modCommand = await npmciMods.modCommand.load();
     await modCommand.command();
-  })
+  },
-  .catch(err => {
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 // command
-smartcli
+npmciSmartcli.addCommand('git').subscribe(
-  .addCommand('git')
+  async argvArg => {
-  .then(async argvArg => {
+    let modGit = await import('./mod_git/index');
-    let modGit = await npmciMods.modGit.load();
     await modGit.handleCli(argvArg);
-  })
+  },
-  .catch(err => {
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 // build
-smartcli
+npmciSmartcli.addCommand('docker').subscribe(
-  .addCommand('docker')
+  async argvArg => {
-  .then(async argvArg => {
+    let modDocker = await import('./mod_docker/index');
-    let modDocker = await npmciMods.modDocker.load();
     await modDocker.handleCli(argvArg);
-  })
+  },
-  .catch(err => {
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 // node
-smartcli
+npmciSmartcli.addCommand('node').subscribe(
-  .addCommand('node')
+  async argvArg => {
-  .then(async argvArg => {
+    let modNode = await import('./mod_node/index');
-    let modNode = await npmciMods.modNode.load();
     await modNode.handleCli(argvArg);
-  })
+  },
-  .catch(err => {
+  err => {
     console.log(err);
-  });
+    process.exit(1);
+  }
+);
 
 // npm
-smartcli
+npmciSmartcli.addCommand('npm').subscribe(
-  .addCommand('npm')
+  async argvArg => {
-  .then(async argvArg => {
+    let modNpm = await import('./mod_npm/index');
-    let modNpm = await npmciMods.modNpm.load();
     await modNpm.handleCli(argvArg);
-  })
+  },
-  .catch(err => {
+  err => {
     console.log(err);
-  });
+  }
+);
 
 // trigger
-smartcli
+npmciSmartcli.addCommand('ssh').subscribe(
-  .addCommand('ssh')
+  async argvArg => {
-  .then(async argvArg => {
+    let modSsh = await import('./mod_ssh/index');
-    let modSsh = await npmciMods.modSsh.load();
     await modSsh.handleCli(argvArg);
-  })
+  },
-  .catch(err => {
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 // trigger
-smartcli
+npmciSmartcli.addCommand('trigger').subscribe(
-  .addCommand('trigger')
+  async argv => {
-  .then(async argv => {
+    let modTrigger = await import('./mod_trigger/index');
-    let modTrigger = await npmciMods.modTrigger.load();
     await modTrigger.trigger();
-  })
+  },
-  .catch(err => {
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
-smartcli.startParse();
+npmciSmartcli.startParse();

ts/npmci.config.ts

@@ -5,7 +5,7 @@ import * as paths from './npmci.paths';
 
 import { repo } from './npmci.env';
 
-import { KeyValueStore } from 'npmextra';
+import { KeyValueStore } from '@pushrocks/npmextra';
 
 export interface INpmciOptions {
   npmGlobalTools: string[];

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.paths.ts

@@ -6,3 +6,4 @@ export let NpmciPackageRoot = plugins.path.join(__dirname, '../');
 export let NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json');
 export let NpmciProjectDir = cwd;
 export let NpmciTestDir = plugins.path.join(cwd, './test');
+export let NpmciCacheDir = plugins.path.join(cwd, './.npmci_cache');

ts/npmci.plugins.ts

@@ -1,19 +1,21 @@
-export import beautylog = require('beautylog');
+// node native
-export import lodash = require('lodash');
-export import npmextra = require('npmextra');
 export import path = require('path');
-export import projectinfo = require('projectinfo');
+
-export import q = require('smartq');
+// @pushrocks
-export let request = require('request');
+export import beautylog = require('beautylog');
-export import smartcli = require('smartcli');
+export import projectinfo = require('@pushrocks/projectinfo');
-export import smartdelay = require('smartdelay');
+export import npmextra = require('@pushrocks/npmextra');
-export import smartfile = require('smartfile');
+export import smartdelay = require('@pushrocks/smartdelay');
-export import shelljs = require('shelljs');
+export import smartfile = require('@pushrocks/smartfile');
+export import smartcli = require('@pushrocks/smartcli');
 export import smartparam = require('smartparam');
-export import smartq = require('smartq');
+export import smartpromise = require('@pushrocks/smartpromise');
-export import smartshell = require('smartshell');
+export import smartshell = require('@pushrocks/smartshell');
 export import smartsocket = require('smartsocket');
-export import smartsystem = require('smartsystem');
+export import smartssh = require('@pushrocks/smartssh');
-export import smartssh = require('smartssh');
+export import smartstring = require('@pushrocks/smartstring');
-export import smartstring = require('smartstring');
+
+// third party
+export import lodash = require('lodash');
 export import through2 = require('through2');
+export import request = require('@pushrocks/smartrequest');