1.2.24

.gitlab-ci.yml

@@ -1,28 +1,40 @@
-image: hosttoday/ht-docker-dbase:npmts
+image: hosttoday/ht-docker-dbase:npmci
 services:
   - docker:dind
 
 stages:
+- mirror
 - test
 - release
 - trigger
+- pages
+
+mirror:
+  image: hosttoday/ht-docker-node:npmci
+  stage: mirror
+  script:
+    - npmci git mirror
+  tags:
+    - docker
+
 
 test:
   stage: test
   script:
-    - npm install
+    - npmci node install stable
-    - npm test
+    - npmci npm install
+    - npmci npm test
   tags:
     - docker
     - lossless
     - priv
 
 release:
-  image: hosttoday/ht-docker-node:npmts
   stage: release
   environment: npmjs-com_registry
   script:
-    - npmci publish
+    - npmci npm prepare
+    - npmci npm publish
   only:
     - tags
   tags:
@@ -31,7 +43,6 @@ release:
     - priv
 
 trigger:
-  image: hosttoday/ht-docker-node:npmts
   stage: trigger
   script:
     - npmci trigger
@@ -41,3 +52,18 @@ trigger:
     - docker
     - lossless
     - priv
+
+pages:
+  image: hosttoday/ht-docker-node:npmci
+  stage: pages
+  script:
+    - npmci command yarn global add npmpage
+    - npmci command npmpage
+  only:
+    - tags
+  tags:
+    - docker
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public

Dockerfile

@@ -0,0 +1,4 @@
+FROM hosttoday/ht-docker-node:stable
+LABEL author="Lossless GmbH <office@lossless.com>"
+
+RUN yarn global add npmci npmdocker npmts ts-node

README.md

@@ -1,13 +1,16 @@
 # npmdocker
+
 develop npm modules cross platform with docker
 
 ## Availabililty
+
 [![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmdocker)
 [![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmdocker)
 [![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmdocker)
 [![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmdocker/)
 
 ## Status for master
+
 [![build status](https://GitLab.com/gitzone/npmdocker/badges/master/build.svg)](https://GitLab.com/gitzone/npmdocker/commits/master)
 [![coverage report](https://GitLab.com/gitzone/npmdocker/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmdocker/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/npmdocker.svg)](https://www.npmjs.com/package/npmdocker)
@@ -19,21 +22,25 @@ develop npm modules cross platform with docker
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
+
 Use TypeScript for best in class instellisense.
 
 ### Why does this package exist?
+
 Sometimes you want a clean and fresh linux environment everytime you test your package.
 Usually this is the default i CI, but locally behaviour tends to defer.
 
 ### Where does it work
+
 The npmdocker package works in everywhere where the docker cli is available. e.g.:
 
-  * docker toolbox
+* docker toolbox
-  * native docker application
+* native docker application
-  * docker in docker
+* docker in docker
-  * mounted docker.sock
+* mounted docker.sock
 
 ### How do I use it?
+
 create a npmextra.json in the project's root directory
 
 ```json
@@ -46,14 +53,15 @@ create a npmextra.json in the project's root directory
 }
 ```
 
-option | description
+| option      | description                                                                           |
---- | ---
+| ----------- | ------------------------------------------------------------------------------------- |
-baseImage | the base image that is the context for your project
+| baseImage   | the base image that is the context for your project                                   |
-command | the cli command to run within the the project's directory inside the docker container
+| command     | the cli command to run within the the project's directory inside the docker container |
-dockersSock | wether or not the testcontainer will have access to the docker.sock of the host
+| dockersSock | wether or not the testcontainer will have access to the docker.sock of the host       |
 
 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)
 
-[![npm](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)
+[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)

assets/Dockerfile

@@ -1,5 +1,6 @@
-FROM hosttoday/ht-docker-node:npmts
+FROM hosttoday/ht-docker-node:npmci
-COPY ./buildContextDir /workspace
+RUN yarn global add npmdocker
+COPY ./ /workspace
 WORKDIR /workspace
 ENV CI=true
-CMD ["npmci","test","stable"];
+CMD ["npmdocker","runinside"];

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');

dist/cli.js

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

dist/index.js

@@ -1,14 +0,0 @@
-"use strict";
-const plugins = require("./npmdocker.plugins");
-const promisechain = require("./npmdocker.promisechain");
-promisechain.run()
-    .then((configArg) => {
-    if (configArg.exitCode == 0) {
-        plugins.beautylog.success("container ended all right!");
-    }
-    else {
-        plugins.beautylog.error("container ended with error!");
-        process.exit(1);
-    }
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsK0NBQStDO0FBQy9DLHlEQUF5RDtBQUl6RCxZQUFZLENBQUMsR0FBRyxFQUFFO0tBQ2IsSUFBSSxDQUFDLENBQUMsU0FBOEI7SUFDakMsRUFBRSxDQUFBLENBQUMsU0FBUyxDQUFDLFFBQVEsSUFBSSxDQUFDLENBQUMsQ0FBQSxDQUFDO1FBQ3hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsNkJBQTZCLENBQUMsQ0FBQztRQUN2RCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3BCLENBQUM7QUFDTCxDQUFDLENBQUMsQ0FBQyJ9

dist/npmdocker.config.d.ts

@@ -1,9 +0,0 @@
-import { IKeyValueObject } from 'qenv';
-export interface IConfig {
-    baseImage: string;
-    command: string;
-    dockerSock: boolean;
-    exitCode?: number;
-    keyValueObjectArray: IKeyValueObject[];
-}
-export declare let run: () => Promise<{}>;

dist/npmdocker.config.js

@@ -1,37 +0,0 @@
-"use strict";
-const plugins = require("./npmdocker.plugins");
-const paths = require("./npmdocker.paths");
-;
-let getQenvKeyValueObject = () => {
-    let done = plugins.q.defer();
-    let qenvKeyValueObjectArray;
-    if (plugins.smartfile.fs.fileExistsSync(plugins.path.join(paths.cwd, 'qenv.yml'))) {
-        qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObjectArray;
-    }
-    else {
-        qenvKeyValueObjectArray = [];
-    }
-    ;
-    done.resolve(qenvKeyValueObjectArray);
-    return done.promise;
-};
-let buildConfig = (qenvKeyValueObjectArrayArg) => {
-    let done = plugins.q.defer();
-    let npmextra = new plugins.npmextra.Npmextra(paths.cwd);
-    let config = npmextra.dataFor('npmdocker', {
-        baseImage: 'hosttoday/ht-docker-node:npmts',
-        command: 'npm test',
-        dockerSock: false,
-        keyValueObjectArray: qenvKeyValueObjectArrayArg
-    });
-    done.resolve(config);
-    return done.promise;
-};
-exports.run = () => {
-    let done = plugins.q.defer();
-    getQenvKeyValueObject()
-        .then(buildConfig)
-        .then(done.resolve);
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLCtDQUE4QztBQUM5QywyQ0FBMEM7QUFXekMsQ0FBQztBQUVGLElBQUkscUJBQXFCLEdBQUc7SUFDMUIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixJQUFJLHVCQUEwQyxDQUFBO0lBQzlDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2xGLHVCQUF1QixHQUFHLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQTtJQUMzRixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTix1QkFBdUIsR0FBRyxFQUFFLENBQUE7SUFDOUIsQ0FBQztJQUFBLENBQUM7SUFDRixJQUFJLENBQUMsT0FBTyxDQUFDLHVCQUF1QixDQUFDLENBQUE7SUFDckMsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDckIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxXQUFXLEdBQUcsQ0FBQywwQkFBMkM7SUFDNUQsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUN2RCxJQUFJLE1BQU0sR0FBRyxRQUFRLENBQUMsT0FBTyxDQUMzQixXQUFXLEVBQ1g7UUFDRSxTQUFTLEVBQUUsZ0NBQWdDO1FBQzNDLE9BQU8sRUFBRSxVQUFVO1FBQ25CLFVBQVUsRUFBRSxLQUFLO1FBQ2pCLG1CQUFtQixFQUFFLDBCQUEwQjtLQUNoRCxDQUNGLENBQUE7SUFDRCxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ3BCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3JCLENBQUMsQ0FBQTtBQUVVLFFBQUEsR0FBRyxHQUFHO0lBQ2YsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixxQkFBcUIsRUFBRTtTQUNwQixJQUFJLENBQUMsV0FBVyxDQUFDO1NBQ2pCLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDckIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDckIsQ0FBQyxDQUFBIn0=

dist/npmdocker.docker.d.ts

@@ -1 +0,0 @@
-export declare let run: (configArg: any) => Promise<{}>;

dist/npmdocker.paths.d.ts

@@ -1,5 +0,0 @@
-export declare let cwd: string;
-export declare let packageBase: string;
-export declare let assets: string;
-export declare let buildContextDir: string;
-export declare let dockerfile: string;

dist/npmdocker.paths.js

@@ -1,12 +0,0 @@
-"use strict";
-const plugins = require("./npmdocker.plugins");
-// directories
-exports.cwd = process.cwd();
-exports.packageBase = plugins.path.join(__dirname, "../");
-exports.assets = plugins.path.join(exports.packageBase, "assets/");
-plugins.smartfile.fs.ensureDirSync(exports.assets);
-exports.buildContextDir = plugins.path.join(exports.assets, "buildContextDir");
-plugins.smartfile.fs.ensureDirSync(exports.buildContextDir);
-// files
-exports.dockerfile = plugins.path.join(exports.assets, "Dockerfile");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwrQ0FBK0M7QUFFL0MsY0FBYztBQUNILFFBQUEsR0FBRyxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztBQUNwQixRQUFBLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUM7QUFDbEQsUUFBQSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsbUJBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQztBQUM5RCxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsY0FBTSxDQUFDLENBQUM7QUFFaEMsUUFBQSxlQUFlLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBTSxFQUFDLGlCQUFpQixDQUFDLENBQUM7QUFDekUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsYUFBYSxDQUFDLHVCQUFlLENBQUMsQ0FBQztBQUVwRCxRQUFRO0FBQ0csUUFBQSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBTSxFQUFFLFlBQVksQ0FBQyxDQUFDIn0=

dist/npmdocker.plugins.d.ts

@@ -1,10 +0,0 @@
-import "typings-global";
-export import beautylog = require("beautylog");
-export import npmextra = require("npmextra");
-export import path = require("path");
-export import projectinfo = require("projectinfo");
-export import q = require("smartq");
-export import qenv = require("qenv");
-export import shelljs = require("shelljs");
-export import smartfile = require("smartfile");
-export import smartstring = require("smartstring");

dist/npmdocker.plugins.js

@@ -1,12 +0,0 @@
-"use strict";
-require("typings-global");
-exports.beautylog = require("beautylog");
-exports.npmextra = require("npmextra");
-exports.path = require("path");
-exports.projectinfo = require("projectinfo");
-exports.q = require("smartq");
-exports.qenv = require("qenv");
-exports.shelljs = require("shelljs");
-exports.smartfile = require("smartfile");
-exports.smartstring = require("smartstring");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1kb2NrZXIucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXdCO0FBQ3hCLHlDQUErQztBQUMvQyx1Q0FBNkM7QUFDN0MsK0JBQXFDO0FBQ3JDLDZDQUFtRDtBQUNuRCw4QkFBb0M7QUFDcEMsK0JBQXFDO0FBQ3JDLHFDQUEyQztBQUMzQyx5Q0FBK0M7QUFDL0MsNkNBQW1EIn0=

dist/npmdocker.promisechain.d.ts

@@ -1 +0,0 @@
-export declare let run: () => Promise<{}>;

dist/npmdocker.promisechain.js

@@ -1,16 +0,0 @@
-"use strict";
-const plugins = require("./npmdocker.plugins");
-//modules
-const ConfigModule = require("./npmdocker.config");
-const DockerModule = require("./npmdocker.docker");
-plugins.beautylog.ora.start();
-exports.run = () => {
-    let done = plugins.q.defer();
-    ConfigModule.run()
-        .then(DockerModule.run)
-        .then((configArg) => {
-        done.resolve(configArg);
-    });
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnByb21pc2VjaGFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5wcm9taXNlY2hhaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLCtDQUErQztBQUcvQyxTQUFTO0FBQ1QsbURBQW1EO0FBQ25ELG1EQUFtRDtBQUVuRCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNuQixRQUFBLEdBQUcsR0FBRztJQUNiLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsWUFBWSxDQUFDLEdBQUcsRUFBRTtTQUNiLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDO1NBQ3RCLElBQUksQ0FBQyxDQUFDLFNBQVM7UUFDWixJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzVCLENBQUMsQ0FBQyxDQUFBO0lBQ04sTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBIn0=

dist/npmdocker.snippets.d.ts

@@ -1,5 +0,0 @@
-export interface IDockerfileSnippet {
-    baseImage: string;
-    command: string;
-}
-export declare let dockerfileSnippet: (optionsArg: IDockerfileSnippet) => string;

dist/npmdocker.snippets.js

@@ -1,21 +0,0 @@
-"use strict";
-const plugins = require("./npmdocker.plugins");
-exports.dockerfileSnippet = (optionsArg) => {
-    let commandArray = optionsArg.command.split(/\s/);
-    let commandString = "";
-    for (let stringItem of commandArray) {
-        if (!(commandString == "")) {
-            commandString = commandString + ",";
-        }
-        commandString = commandString + '"' + stringItem + '"';
-    }
-    ;
-    return plugins.smartstring.indent.normalize(`
-        FROM ${optionsArg.baseImage}
-        COPY ./buildContextDir /workspace
-        WORKDIR /workspace
-        ENV CI=true
-        CMD [${commandString}];
-    `);
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnNuaXBwZXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnNuaXBwZXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwrQ0FBK0M7QUFPcEMsUUFBQSxpQkFBaUIsR0FBRyxDQUFDLFVBQTZCO0lBQ3pELElBQUksWUFBWSxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2xELElBQUksYUFBYSxHQUFVLEVBQUUsQ0FBQztJQUM5QixHQUFHLENBQUEsQ0FBQyxJQUFJLFVBQVUsSUFBSSxZQUFZLENBQUMsQ0FBQSxDQUFDO1FBQ2hDLEVBQUUsQ0FBQSxDQUFDLENBQUMsQ0FBQyxhQUFhLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQSxDQUFDO1lBQ3ZCLGFBQWEsR0FBRyxhQUFhLEdBQUcsR0FBRyxDQUFDO1FBQ3hDLENBQUM7UUFDRCxhQUFhLEdBQUcsYUFBYSxHQUFHLEdBQUcsR0FBRyxVQUFVLEdBQUcsR0FBRyxDQUFDO0lBQzNELENBQUM7SUFBQSxDQUFDO0lBQ0YsTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQztlQUNqQyxVQUFVLENBQUMsU0FBUzs7OztlQUlwQixhQUFhO0tBQ3ZCLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQSJ9

docs/index.md

@@ -0,0 +1 @@
+Docs for npmpage coming soon.

npmextra.json

@@ -1,7 +1,13 @@
 {
-    "npmts":{
+  "npmts": {
-        "mode":"default",
+    "mode": "default",
-        "cli":true,
+    "cli": true
-        "dockerSock":true
+  },
+  "npmci": {
+    "npmGlobalTools": [
+      "@gitzone/npmts",
+      "ts-node"
+    ],
+    "npmAccessLevel": "public"
   }
 }

package.json

@@ -1,22 +1,22 @@
 {
-  "name": "npmdocker",
+  "name": "@gitzone/npmdocker",
-  "version": "1.2.2",
+  "version": "1.2.24",
+  "private": false,
   "description": "develop npm modules cross platform with docker",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "bin": {
-    "npmdocker": "dist/cli.js"
+    "npmdocker": "cli.js"
-  },
-  "directories": {
-    "test": "test"
   },
   "scripts": {
-    "test": "(npm run clean && npm run compile && npm run setupCheck && npm run check)",
+    "test": "(npm run clean && npm run setupCheck && npm run testStandard && npm run testSpeed)",
-    "testDev": "(npm run compile && npm run check)",
+    "build": "tsbuild",
+    "testStandard": "(cd test/ && node ../cli.ts.js)",
+    "testSpeed": "(cd test/ && node ../cli.ts.js speedtest)",
+    "testClean": "(cd test/ && node ../cli.ts.js clean --all)",
     "clean": "(rm -rf test/)",
     "compile": "(npmts --notest)",
-    "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
+    "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)"
-    "check": "(cd test/ && node ../dist/index.js)"
   },
   "repository": {
     "type": "git",
@@ -32,18 +32,23 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmdocker#README",
   "devDependencies": {
-    "npmts-g": "^6.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.9.4"
   },
   "dependencies": {
-    "@types/shelljs": "0.x.x",
+    "@pushrocks/npmextra": "^3.0.1",
-    "beautylog": "^6.1.1",
+    "@pushrocks/projectinfo": "^4.0.2",
-    "npmextra": "^2.0.3",
+    "@pushrocks/qenv": "^2.0.2",
-    "projectinfo": "^3.0.1",
+    "@pushrocks/smartcli": "^3.0.4",
-    "qenv": "^1.1.3",
+    "@pushrocks/smartfile": "^6.0.8",
-    "shelljs": "^0.7.6",
+    "@pushrocks/smartpromise": "^2.0.5",
-    "smartfile": "^4.1.5",
+    "@pushrocks/smartshell": "^2.0.6",
-    "smartq": "^1.1.0",
+    "@pushrocks/smartstring": "^3.0.4",
-    "smartstring": "^2.0.22",
+    "@types/shelljs": "^0.8.0",
-    "typings-global": "^1.0.14"
+    "beautylog": "^6.1.10",
+    "smartanalytics": "^2.0.9"
   }
 }

ts/analytics.ts

@@ -0,0 +1,20 @@
+/**
+ * smartanalytics:
+ * We count executions of this tool to keep track which of our tools are really used.
+ * This insight is used to plan spending our limited resources for improving them.
+ * Any submitted analytics data is fully anonymized (no Ips or any other personal information is tracked).
+ * Feel free to dig into the smartanalytics package, if you are interested in how it works.
+ * Our privacy policy can be found here: https://lossless.gmbh/privacy.html
+ * The privacy policy is also linked in the readme, so we hope this behaviour does not come as a surprise to you.
+ * Have a nice day and regards
+ * Your Open Source team at Lossless GmbH :)
+ */
+import * as smartanalytics from 'smartanalytics';
+let npmdockerAnalytics = new smartanalytics.Analytics({
+  apiEndPoint: 'https://pubapi.lossless.one',
+  appName: 'npmdocker',
+  projectId: 'gitzone'
+});
+npmdockerAnalytics.recordEvent('npmtoolexecution', {
+  somedata: 'somedata'
+});

ts/index.ts

@@ -1,15 +1,5 @@
-import * as plugins from "./npmdocker.plugins";
+import './analytics';
-import * as promisechain from "./npmdocker.promisechain";
+import * as plugins from './npmdocker.plugins';
-import * as ConfigModule from "./npmdocker.config";
+import * as cli from './npmdocker.cli';
-
-
-promisechain.run()
-    .then((configArg:ConfigModule.IConfig) => {
-        if(configArg.exitCode == 0){
-            plugins.beautylog.success("container ended all right!");
-        } else {
-            plugins.beautylog.error("container ended with error!");
-            process.exit(1);
-        }
-    });
 
+cli.run();

ts/npmdocker.cli.ts

@@ -0,0 +1,76 @@
+import * as plugins from './npmdocker.plugins';
+import * as paths from './npmdocker.paths';
+
+// modules
+import * as ConfigModule from './npmdocker.config';
+import * as DockerModule from './npmdocker.docker';
+
+let npmdockerCli = new plugins.smartcli.Smartcli();
+
+export let run = () => {
+  npmdockerCli.standardTask().subscribe(async argvArg => {
+    plugins.beautylog.figletSync('npmdocker');
+    let configArg = await ConfigModule.run().then(DockerModule.run);
+    if (configArg.exitCode === 0) {
+      plugins.beautylog.success('container ended all right!');
+    } else {
+      plugins.beautylog.error(`container ended with error! Exit Code is ${configArg.exitCode}`);
+      process.exit(1);
+    }
+  });
+
+  /**
+   * this command is executed inside docker and meant for use from outside docker
+   */
+  npmdockerCli.addCommand('runinside').subscribe(async argvArg => {
+    plugins.beautylog.ok('Allright. We are now in Docker!');
+    plugins.beautylog.log('now trying to run your specified command');
+    let configArg = await ConfigModule.run();
+    const smartshellInstance = new plugins.smartshell.Smartshell({
+      executor: 'bash'
+    })
+    await smartshellInstance.exec(configArg.command).then(response => {
+      if (response.exitCode !== 0) {
+        process.exit(1);
+      }
+    });
+  });
+
+  npmdockerCli.addCommand('clean').subscribe(async argvArg => {
+    plugins.beautylog.ora.start();
+    plugins.beautylog.ora.text('cleaning up docker env...');
+    if (argvArg.all) {
+      const smartshellInstance = new plugins.smartshell.Smartshell({
+        executor: 'bash'
+      })
+      plugins.beautylog.ora.text('killing any running docker containers...');
+      await smartshellInstance.exec(`docker kill $(docker ps -q)`);
+
+      plugins.beautylog.ora.text('removing stopped containers...');
+      await smartshellInstance.exec(`docker rm $(docker ps -a -q)`);
+
+      plugins.beautylog.ora.text('removing images...');
+      await smartshellInstance.exec(`docker rmi $(docker images -q -f dangling=true)`);
+
+      plugins.beautylog.ora.text('removing all other images...');
+      await smartshellInstance.exec(`docker rmi $(docker images -a -q)`);
+
+      plugins.beautylog.ora.text('removing all volumes...');
+      await smartshellInstance.exec(`docker volume rm $(docker volume ls -f dangling=true -q)`);
+    }
+    plugins.beautylog.ora.endOk('docker environment now is clean!');
+  });
+
+  npmdockerCli.addCommand('speedtest').subscribe(async argvArg => {
+    const smartshellInstance = new plugins.smartshell.Smartshell({
+      executor: 'bash'
+    })
+    plugins.beautylog.figletSync('npmdocker');
+    plugins.beautylog.ok('Starting speedtest');
+    await smartshellInstance.exec(
+      `docker pull tianon/speedtest && docker run --rm tianon/speedtest`
+    );
+  });
+
+  npmdockerCli.startParse();
+};

ts/npmdocker.config.ts

@@ -1,49 +1,40 @@
-import * as plugins from './npmdocker.plugins'
+import * as plugins from './npmdocker.plugins';
-import * as paths from "./npmdocker.paths"
+import * as paths from './npmdocker.paths';
 
 // interfaces
-import { IKeyValueObject } from 'qenv'
+import { IKeyValueObject } from '@pushrocks/qenv';
 
 export interface IConfig {
-  baseImage: string
+  baseImage: string;
-  command: string
+  command: string;
-  dockerSock: boolean
+  dockerSock: boolean;
-  exitCode?: number
+  exitCode?: number;
-  keyValueObjectArray: IKeyValueObject[]
+  keyValueObjectArray: IKeyValueObject[];
+}
+
+let getQenvKeyValueObject = async () => {
+  let qenvKeyValueObjectArray: IKeyValueObject[];
+  if (plugins.smartfile.fs.fileExistsSync(plugins.path.join(paths.cwd, 'qenv.yml'))) {
+    qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObjectArray;
+  } else {
+    qenvKeyValueObjectArray = [];
+  }
+  return qenvKeyValueObjectArray;
 };
 
-let getQenvKeyValueObject = () => {
+let buildConfig = async (qenvKeyValueObjectArrayArg: IKeyValueObject[]) => {
-  let done = plugins.q.defer()
+  let npmextra = new plugins.npmextra.Npmextra(paths.cwd);
-  let qenvKeyValueObjectArray: IKeyValueObject[]
+  let config = npmextra.dataFor<IConfig>('npmdocker', {
-  if (plugins.smartfile.fs.fileExistsSync(plugins.path.join(paths.cwd, 'qenv.yml'))) {
+    baseImage: 'hosttoday/ht-docker-node:npmdocker',
-    qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObjectArray
+    init: 'rm -rf node_nodules/ && yarn install',
-  } else {
+    command: 'npmci npm test',
-    qenvKeyValueObjectArray = []
-  };
-  done.resolve(qenvKeyValueObjectArray)
-  return done.promise
-}
-
-let buildConfig = (qenvKeyValueObjectArrayArg: IKeyValueObject) => {
-  let done = plugins.q.defer()
-  let npmextra = new plugins.npmextra.Npmextra(paths.cwd)
-  let config = npmextra.dataFor<IConfig>(
-    'npmdocker',
-    {
-      baseImage: 'hosttoday/ht-docker-node:npmts',
-      command: 'npm test',
     dockerSock: false,
     keyValueObjectArray: qenvKeyValueObjectArrayArg
-    }
+  });
-  )
+  return config;
-  done.resolve(config)
+};
-  return done.promise
-}
 
-export let run = () => {
+export let run = async (): Promise<IConfig> => {
-  let done = plugins.q.defer()
+  let config = await getQenvKeyValueObject().then(buildConfig);
-  getQenvKeyValueObject()
+  return config;
-    .then(buildConfig)
+};
-    .then(done.resolve)
-  return done.promise
-}

ts/npmdocker.docker.ts

@@ -1,11 +1,15 @@
 import * as plugins from './npmdocker.plugins';
 import * as paths from './npmdocker.paths';
-import * as snippets from './npmdocker.snippets'
+import * as snippets from './npmdocker.snippets';
+
+const smartshellInstance = new plugins.smartshell.Smartshell({
+  executor: 'bash'
+})
 
 // interfaces
-import { IConfig } from './npmdocker.config'
+import { IConfig } from './npmdocker.config';
 
-let config: IConfig
+let config: IConfig;
 
 /**
  * the docker data used to build the internal testing container
@@ -16,183 +20,139 @@ let dockerData = {
   dockerProjectMountString: '',
   dockerSockString: '',
   dockerEnvString: ''
-}
+};
 
 /**
  * check if docker is available
  */
 let checkDocker = () => {
-  let done = plugins.q.defer()
+  let done = plugins.smartpromise.defer();
-  plugins.beautylog.ora.text('checking docker...')
+  plugins.beautylog.ora.text('checking docker...');
-  if (plugins.shelljs.which('docker')) {
+  
-    plugins.beautylog.ok('Docker found!')
+  if (smartshellInstance.exec('which docker')) {
-    done.resolve()
+    plugins.beautylog.ok('Docker found!');
+    done.resolve();
   } else {
-    done.reject(new Error('docker not found on this machine'))
+    done.reject(new Error('docker not found on this machine'));
   }
-  return done.promise
+  return done.promise;
-}
+};
 
 /**
  * builds the Dockerfile according to the config in the project
  */
 let buildDockerFile = () => {
-  let done = plugins.q.defer()
+  let done = plugins.smartpromise.defer();
-  plugins.beautylog.ora.text('building Dockerfile...')
+  plugins.beautylog.ora.text('building Dockerfile...');
   let dockerfile: string = snippets.dockerfileSnippet({
     baseImage: config.baseImage,
     command: config.command
-  })
+  });
-  plugins.beautylog.info(`Base image is: ${config.baseImage}`)
+  plugins.beautylog.info(`Base image is: ${config.baseImage}`);
-  plugins.beautylog.info(`Command is: ${config.command}`)
+  plugins.beautylog.info(`Command is: ${config.command}`);
-  plugins.smartfile.memory.toFsSync(dockerfile, paths.dockerfile)
+  plugins.smartfile.memory.toFsSync(dockerfile, plugins.path.join(paths.cwd, 'npmdocker'));
-  plugins.beautylog.ok('Dockerfile created!')
+  plugins.beautylog.ok('Dockerfile created!');
-  done.resolve()
+  plugins.beautylog.ora.stop();
-  return done.promise
+  done.resolve();
-}
+  return done.promise;
+};
 
 /**
  * builds the Dockerimage from the built Dockerfile
  */
-let buildDockerImage = () => {
+let buildDockerImage = async () => {
-  let done = plugins.q.defer()
+  plugins.beautylog.info('pulling latest base image from registry...');
-  plugins.beautylog.ora.text('pulling latest base image from registry...')
+  await smartshellInstance.exec(`docker pull ${config.baseImage}`);
-  plugins.shelljs.exec(
+  plugins.beautylog.ora.text('building Dockerimage...');
-    `docker pull ${config.baseImage}`,
+  let execResult = await smartshellInstance.execSilent(
-    {
+    `docker build -f npmdocker -t ${dockerData.imageTag} ${paths.cwd}`
-      silent: true
+  );
-    },
+  if (execResult.exitCode !== 0) {
-    () => {
+    console.log(execResult.stdout);
-      plugins.beautylog.ora.text('building Dockerimage...')
+    process.exit(1);
-      // are we creating a build context form project ?
-      if (process.env.CI === 'true') {
-        plugins.beautylog.ora.text('creating build context...')
-        plugins.smartfile.fs.copySync(paths.cwd, paths.buildContextDir)
   }
-      plugins.shelljs.exec(
+  plugins.beautylog.ok('Dockerimage built!');
-        `docker build -f ${paths.dockerfile} -t ${dockerData.imageTag} ${paths.assets}`,
+};
-        {
-          silent: true
-        },
-        () => {
-          plugins.beautylog.ok('Dockerimage built!')
-          done.resolve()
-        }
-      )
-    }
-  ) // first pull latest version of baseImage
-  return done.promise
-}
 
-let buildDockerProjectMountString = () => {
+let buildDockerProjectMountString = async () => {
-  let done = plugins.q.defer()
   if (process.env.CI !== 'true') {
-    dockerData.dockerProjectMountString = `-v ${paths.cwd}:/workspace`
+    dockerData.dockerProjectMountString = `-v ${paths.cwd}:/workspace`;
-  };
+  }
-  done.resolve()
+};
-  return done.promise
-}
 
 /**
  * builds an environment string that docker cli understands
  */
-let buildDockerEnvString = () => {
+let buildDockerEnvString = async () => {
-  let done = plugins.q.defer()
   for (let keyValueObjectArg of config.keyValueObjectArray) {
-    let envString = dockerData.dockerEnvString = dockerData.dockerEnvString + `-e ${keyValueObjectArg.key}=${keyValueObjectArg.value} `
+    let envString = (dockerData.dockerEnvString =
-  };
+      dockerData.dockerEnvString + `-e ${keyValueObjectArg.key}=${keyValueObjectArg.value} `);
-  done.resolve()
+  }
-  return done.promise
+};
-}
 
 /**
  * creates string to mount the docker.sock inside the testcontainer
  */
-let buildDockerSockString = () => {
+let buildDockerSockString = async () => {
-  let done = plugins.q.defer()
   if (config.dockerSock) {
-    dockerData.dockerSockString = `-v /var/run/docker.sock:/var/run/docker.sock`
+    dockerData.dockerSockString = `-v /var/run/docker.sock:/var/run/docker.sock`;
-  };
+  }
-  done.resolve()
+};
-  return done
-}
 
 /**
  * creates a container by running the built Dockerimage
  */
-let runDockerImage = () => {
+let runDockerImage = async () => {
-  let done = plugins.q.defer()
+  let done = plugins.smartpromise.defer();
-  plugins.beautylog.ora.text('starting Container...')
+  plugins.beautylog.ora.text('starting Container...');
-  plugins.beautylog.ora.end()
+  plugins.beautylog.ora.end();
-  plugins.beautylog.log('now running Dockerimage')
+  plugins.beautylog.log('now running Dockerimage');
-  config.exitCode = plugins.shelljs.exec(`docker run ${dockerData.dockerProjectMountString} ${dockerData.dockerSockString} ${dockerData.dockerEnvString} --name ${dockerData.containerName} ${dockerData.imageTag}`).code
+  config.exitCode = (await smartshellInstance.exec(
-  done.resolve()
+    `docker run ${dockerData.dockerProjectMountString} ${dockerData.dockerSockString} ${
-  return done.promise
+      dockerData.dockerEnvString
-}
+    } --name ${dockerData.containerName} ${dockerData.imageTag}`
+  )).exitCode;
+};
 
 /**
  * cleans up: deletes the test container
  */
-let deleteDockerContainer = () => {
+let deleteDockerContainer = async () => {
-  let done = plugins.q.defer()
+  await smartshellInstance.execSilent(`docker rm -f ${dockerData.containerName}`);
-  plugins.shelljs.exec(`docker rm -f ${dockerData.containerName}`, {
+};
-    silent: true
-  })
-  done.resolve()
-  return done.promise
-}
 
 /**
  * cleans up deletes the test image
  */
-let deleteDockerImage = () => {
+let deleteDockerImage = async () => {
-  let done = plugins.q.defer()
+  await smartshellInstance.execSilent(`docker rmi ${dockerData.imageTag}`).then(async response => {
-  plugins.shelljs.exec(`docker rmi ${dockerData.imageTag}`, {
+    if (response.exitCode !== 0) {
-    silent: true
+      console.log(response.stdout);
-  })
+    }
-  done.resolve()
+  });
-  return done.promise
+};
-}
 
-/**
+let preClean = async () => {
- * cleans up, deletes the build context
+  await deleteDockerImage()
- */
-let deleteBuildContext = () => {
-  let done = plugins.q.defer()
-  plugins.smartfile.fs.remove(paths.buildContextDir)
-    .then(() => {
-      done.resolve()
-    })
-  return done.promise
-}
-
-let preClean = () => {
-  let done = plugins.q.defer()
-  deleteDockerImage()
     .then(deleteDockerContainer)
-    .then(() => {
+    .then(async () => {
-      plugins.beautylog.ok('ensured clean Docker environment!')
+      plugins.beautylog.ok('ensured clean Docker environment!');
-      done.resolve()
+    });
-    })
+};
-}
 
-let postClean = () => {
+let postClean = async () => {
-  let done = plugins.q.defer()
+  await deleteDockerContainer()
-  deleteDockerContainer()
     .then(deleteDockerImage)
-    .then(deleteBuildContext)
+    .then(async () => {
-    .then(() => {
+      plugins.beautylog.ok('cleaned up!');
-      plugins.beautylog.ok('cleaned up!')
+    });
-      done.resolve()
+  plugins.smartfile.fs.removeSync(paths.npmdockerFile);
-    })
+};
-}
 
-
+export let run = async (configArg: IConfig): Promise<IConfig> => {
-
+  plugins.beautylog.ora.start();
-export let run = (configArg) => {
+  config = configArg;
-  let done = plugins.q.defer()
+  let resultConfig = await checkDocker()
-  config = configArg
-  checkDocker()
     .then(preClean)
     .then(buildDockerFile)
     .then(buildDockerImage)
@@ -201,8 +161,8 @@ export let run = (configArg) => {
     .then(buildDockerSockString)
     .then(runDockerImage)
     .then(postClean)
-    .then(() => {
+    .catch(err => {
-      done.resolve(config);
+      console.log(err);
-    }).catch(err => { console.log(err) })
+    });
-  return done.promise
+  return config;
-}
+};

ts/npmdocker.paths.ts

@@ -1,13 +1,8 @@
-import * as plugins from "./npmdocker.plugins";
+import * as plugins from './npmdocker.plugins';
 
 // directories
 export let cwd = process.cwd();
-export let packageBase = plugins.path.join(__dirname, "../");
+export let packageBase = plugins.path.join(__dirname, '../');
-export let assets = plugins.path.join(packageBase, "assets/");
+export let assets = plugins.path.join(packageBase, 'assets/');
 plugins.smartfile.fs.ensureDirSync(assets);
-
+export let npmdockerFile = plugins.path.join(cwd, 'npmdocker');
-export let buildContextDir = plugins.path.join(assets,"buildContextDir");
-plugins.smartfile.fs.ensureDirSync(buildContextDir);
-
-// files
-export let dockerfile = plugins.path.join(assets, "Dockerfile");

ts/npmdocker.plugins.ts

@@ -1,10 +1,23 @@
-import "typings-global";
+import * as beautylog from 'beautylog';
-export import beautylog = require("beautylog");
+import * as npmextra from '@pushrocks/npmextra';
-export import npmextra = require("npmextra");
+import * as path from 'path';
-export import path = require("path");
+import * as projectinfo from '@pushrocks/projectinfo';
-export import projectinfo = require("projectinfo");
+import * as smartpromise from '@pushrocks/smartpromise';
-export import q = require("smartq");
+import * as qenv from '@pushrocks/qenv';
-export import qenv = require("qenv");
+import * as smartcli from '@pushrocks/smartcli';
-export import shelljs = require("shelljs");
+import * as smartfile from '@pushrocks/smartfile';
-export import smartfile = require("smartfile");
+import * as smartshell from '@pushrocks/smartshell';
-export import smartstring = require("smartstring");
+import * as smartstring from '@pushrocks/smartstring';
+
+export {
+  beautylog,
+  npmextra,
+  path,
+  projectinfo,
+  smartpromise,
+  qenv,
+  smartcli,
+  smartfile,
+  smartshell,
+  smartstring
+};

ts/npmdocker.promisechain.ts

@@ -1,17 +0,0 @@
-import * as plugins from "./npmdocker.plugins";
-import * as paths from "./npmdocker.paths";
-
-//modules
-import * as ConfigModule from "./npmdocker.config";
-import * as DockerModule from "./npmdocker.docker";
-
-plugins.beautylog.ora.start();
-export let run = () => {
-    let done = plugins.q.defer();
-    ConfigModule.run()
-        .then(DockerModule.run)
-        .then((configArg) => {
-            done.resolve(configArg);
-        })
-    return done.promise;
-}

ts/npmdocker.snippets.ts

@@ -1,24 +1,37 @@
-import * as plugins from "./npmdocker.plugins";
+import * as plugins from './npmdocker.plugins';
 
 export interface IDockerfileSnippet {
-    baseImage:string;
+  baseImage: string;
-    command:string;
+  command: string;
 }
 
-export let dockerfileSnippet = (optionsArg:IDockerfileSnippet):string => {
+let getMountSolutionString = (optionsArg: IDockerfileSnippet) => {
-    let commandArray = optionsArg.command.split(/\s/);
+  if (process.env.CI) {
-    let commandString:string = "";
+    return 'COPY ./ /workspace';
-    for(let stringItem of commandArray){
+  } else {
-        if(!(commandString == "")){
+    return '# not copying workspcae since not in CI';
-            commandString = commandString + ",";
   }
-        commandString = commandString + '"' + stringItem + '"';
+};
-    };
+
-    return plugins.smartstring.indent.normalize(`
+let getGlobalPreparationString = (optionsArg: IDockerfileSnippet) => {
-        FROM ${optionsArg.baseImage}
+  if (optionsArg.baseImage !== 'hosttoday/ht-docker-node:npmdocker') {
-        COPY ./buildContextDir /workspace
+    return 'RUN npm install -g npmdocker';
-        WORKDIR /workspace
+  } else {
-        ENV CI=true
+    return '# not installing npmdocker since it is included in the base image';
-        CMD [${commandString}];
+  }
-    `);
+};
-}
+
+export let dockerfileSnippet = (optionsArg: IDockerfileSnippet): string => {
+  return plugins.smartstring.indent.normalize(
+    `
+FROM ${optionsArg.baseImage}
+# For info about what npmdocker does read the docs at https://gitzone.github.io/npmdocker
+${getGlobalPreparationString(optionsArg)}
+${getMountSolutionString(optionsArg)}
+WORKDIR /workspace
+ENV CI=true
+ENTRYPOINT ["npmdocker"]
+CMD ["runinside"]
+`
+  );
+};