2.0.19

.gitignore

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

.gitlab-ci.yml

@@ -3,84 +3,123 @@ image: hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .yarn/
+  - .npmci_cache/
   key: "$CI_BUILD_STAGE"
 
 stages:
-- mirror
+- security
 - test
 - release
-- trigger
-- pages
+- metadata
 
+# ====================
+# security stage
+# ====================
 mirror:
-  stage: mirror
+  stage: security
   script:
   - npmci git mirror
   tags:
   - docker
+  - notpriv
 
-testLEGACY:
-  stage: test
+snyk:
+  stage: security
   script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
+    - npmci npm prepare
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
   tags:
   - docker
-  allow_failure: true
+  - notpriv
+
+# ====================
+# test stage
+# ====================
 
 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 npm prepare
+  - npmci node install stable
   - npmci npm publish
   only:
   - tags
   tags:
   - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
+  - priv
 
 trigger:
-  stage: trigger
+  stage: metadata
   script:
   - npmci trigger
   only:
   - tags
   tags:
   - docker
+  - notpriv
 
 pages:
   image: hosttoday/ht-docker-node:npmci
-  stage: pages
+  stage: metadata
   script:
-    - npmci command yarn global add npmpage
-    - npmci command npmpage
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command tsdoc
   tags:
     - docker
+    - notpriv
   only:
     - tags
   artifacts:
     expire_in: 1 week
     paths:
     - public
+  allow_failure: true

README.md

@@ -1,28 +1,28 @@
-# smartshell
+# @pushrocks/smartshell
 shell actions designed as promises
 
-## Availabililty
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartshell)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartshell)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartshell)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartshell/)
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartshell)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartshell)
+* [github.com (source mirror)](https://github.com/pushrocks/smartshell)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartshell/)
 
 ## Status for master
-[![build status](https://GitLab.com/pushrocks/smartshell/badges/master/build.svg)](https://GitLab.com/pushrocks/smartshell/commits/master)
-[![coverage report](https://GitLab.com/pushrocks/smartshell/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartshell/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/smartshell.svg)](https://www.npmjs.com/package/smartshell)
-[![Dependency Status](https://david-dm.org/pushrocks/smartshell.svg)](https://david-dm.org/pushrocks/smartshell)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartshell/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartshell/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartshell/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartshell)
-[![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/)
+[![build status](https://gitlab.com/pushrocks/smartshell/badges/master/build.svg)](https://gitlab.com/pushrocks/smartshell/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/smartshell/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartshell/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartshell.svg)](https://www.npmjs.com/package/@pushrocks/smartshell)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartshell/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartshell)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
 
 ## Usage
+
 Use TypeScript for best in class instellisense.
 
-For further information read the linked docs at the top of this README.
+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://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)

dist/index.d.ts

@@ -1,2 +0,0 @@
-export * from './smartshell.wrap';
-export * from './smartshell.classes.smartshell';

dist/index.js

@@ -1,8 +0,0 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./smartshell.wrap"));
-__export(require("./smartshell.classes.smartshell"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHVDQUFpQztBQUNqQyxxREFBK0MifQ==

dist/smartshell.classes.smartshell.d.ts

@@ -1,28 +0,0 @@
-import * as smartshellWrap from './smartshell.wrap';
-export declare type TExecutor = 'sh' | 'bash';
-export interface ISmartshellContructorOptions {
-    executor: TExecutor;
-    sourceFilePaths: string[];
-}
-export declare class Smartshell {
-    executor: TExecutor;
-    sourceFileArray: string[];
-    constructor(optionsArg: ISmartshellContructorOptions);
-    addSourceFiles(sourceFilePathsArray: string[]): void;
-    cleanSourceFiles(): void;
-    /**
-     * executes silently and returns IExecResult
-     * @param commandArg
-     */
-    execSilent(commandArg: string): Promise<smartshellWrap.IExecResult>;
-    /**
-     * executes and returns IExecResult
-     * @param commandArg
-     */
-    exec(commandArg: string): Promise<smartshellWrap.IExecResult>;
-    /**
-     * creates the final sourcing string
-     * @param commandArg
-     */
-    private createExecString(commandArg);
-}

dist/smartshell.classes.smartshell.js

@@ -1,66 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const smartshellWrap = require("./smartshell.wrap");
-class Smartshell {
-    constructor(optionsArg) {
-        this.sourceFileArray = [];
-        this.executor = optionsArg.executor;
-        for (let sourceFilePath of optionsArg.sourceFilePaths) {
-            this.sourceFileArray.push(sourceFilePath);
-        }
-    }
-    addSourceFiles(sourceFilePathsArray) {
-        for (let sourceFilePath of sourceFilePathsArray) {
-            this.sourceFileArray.push(sourceFilePath);
-        }
-    }
-    cleanSourceFiles() {
-        this.sourceFileArray = [];
-    }
-    /**
-     * executes silently and returns IExecResult
-     * @param commandArg
-     */
-    execSilent(commandArg) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let execCommand = this.createExecString(commandArg);
-            return yield smartshellWrap.execSilent(execCommand);
-        });
-    }
-    /**
-     * executes and returns IExecResult
-     * @param commandArg
-     */
-    exec(commandArg) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let execCommand = this.createExecString(commandArg);
-            return yield smartshellWrap.exec(execCommand);
-        });
-    }
-    /**
-     * creates the final sourcing string
-     * @param commandArg
-     */
-    createExecString(commandArg) {
-        if (this.executor === 'bash') {
-            let sourceString = '';
-            for (let sourceFilePath of this.sourceFileArray) {
-                sourceString = sourceString + `source ${sourceFilePath} && `;
-            }
-            return `bash -c '${sourceString} ${commandArg}'`;
-        }
-        else {
-            return commandArg;
-        }
-    }
-}
-exports.Smartshell = Smartshell;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5jbGFzc2VzLnNtYXJ0c2hlbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNoZWxsLmNsYXNzZXMuc21hcnRzaGVsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQ0Esb0RBQW1EO0FBVW5EO0lBR0UsWUFBYSxVQUF3QztRQURyRCxvQkFBZSxHQUFhLEVBQUUsQ0FBQTtRQUU1QixJQUFJLENBQUMsUUFBUSxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUE7UUFDbkMsR0FBRyxDQUFDLENBQUMsSUFBSSxjQUFjLElBQUksVUFBVSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7WUFDdEQsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUE7UUFDM0MsQ0FBQztJQUNILENBQUM7SUFFRCxjQUFjLENBQUUsb0JBQThCO1FBQzVDLEdBQUcsQ0FBQyxDQUFDLElBQUksY0FBYyxJQUFJLG9CQUFvQixDQUFDLENBQUMsQ0FBQztZQUNoRCxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQTtRQUMzQyxDQUFDO0lBQ0gsQ0FBQztJQUVELGdCQUFnQjtRQUNkLElBQUksQ0FBQyxlQUFlLEdBQUcsRUFBRSxDQUFBO0lBQzNCLENBQUM7SUFFRDs7O09BR0c7SUFDRyxVQUFVLENBQUUsVUFBa0I7O1lBQ2xDLElBQUksV0FBVyxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsQ0FBQTtZQUNuRCxNQUFNLENBQUMsTUFBTSxjQUFjLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFBO1FBQ3JELENBQUM7S0FBQTtJQUVEOzs7T0FHRztJQUNHLElBQUksQ0FBRSxVQUFrQjs7WUFDNUIsSUFBSSxXQUFXLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxDQUFBO1lBQ25ELE1BQU0sQ0FBQyxNQUFNLGNBQWMsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUE7UUFDL0MsQ0FBQztLQUFBO0lBRUQ7OztPQUdHO0lBQ0ssZ0JBQWdCLENBQUUsVUFBVTtRQUNsQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDN0IsSUFBSSxZQUFZLEdBQUcsRUFBRSxDQUFBO1lBQ3JCLEdBQUcsQ0FBQyxDQUFDLElBQUksY0FBYyxJQUFJLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO2dCQUNoRCxZQUFZLEdBQUcsWUFBWSxHQUFHLFVBQVUsY0FBYyxNQUFNLENBQUE7WUFDOUQsQ0FBQztZQUNELE1BQU0sQ0FBQyxZQUFZLFlBQVksSUFBSSxVQUFVLEdBQUcsQ0FBQTtRQUNsRCxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDTixNQUFNLENBQUMsVUFBVSxDQUFBO1FBQ25CLENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUFyREQsZ0NBcURDIn0=

dist/smartshell.plugins.d.ts

@@ -1,4 +0,0 @@
-import * as shelljs from 'shelljs';
-import * as smartq from 'smartq';
-import * as which from 'which';
-export { shelljs, smartq, which };

dist/smartshell.plugins.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const shelljs = require("shelljs");
-exports.shelljs = shelljs;
-const smartq = require("smartq");
-exports.smartq = smartq;
-const which = require("which");
-exports.which = which;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzaGVsbC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsbUNBQWtDO0FBS2hDLDBCQUFPO0FBSlQsaUNBQWdDO0FBSzlCLHdCQUFNO0FBSlIsK0JBQThCO0FBSzVCLHNCQUFLIn0=

dist/smartshell.wrap.d.ts

@@ -1,52 +0,0 @@
-/// <reference types="node" />
-import { ChildProcess } from 'child_process';
-/**
- * interface for ExecResult
- */
-export interface IExecResult {
-    exitCode: number;
-    stdout: string;
-}
-/**
- * interface for streaming ExecResult
- */
-export interface IExecResultStreaming {
-    childProcess: ChildProcess;
-    finalPromise: Promise<IExecResult>;
-}
-/**
- * executes a given command async
- * @param commandStringArg
- */
-export declare let exec: (commandStringArg: string, silentArg?: boolean, strictArg?: boolean) => Promise<IExecResult>;
-/**
- * executes a given command async and silent
- * @param commandStringArg
- */
-export declare let execSilent: (commandStringArg: string) => Promise<IExecResult>;
-/**
- * executes strict, meaning it rejects the promise if something happens
- */
-export declare let execStrict: (commandStringArg: string) => Promise<IExecResult>;
-/**
- * executes a command and allws you to stream output
- */
-export declare let execStreaming: (commandStringArg: string, silentArg?: boolean) => {
-    childProcess: ChildProcess;
-    finalPromise: Promise<IExecResult>;
-};
-export declare let execStreamingSilent: (commandStringArg: string) => {
-    childProcess: ChildProcess;
-    finalPromise: Promise<IExecResult>;
-};
-/**
- * executes a command and returns promise that will be fullfilled once an putput line matches RegexArg
- * @param commandStringArg
- * @param regexArg
- */
-export declare let execAndWaitForLine: (commandStringArg: string, regexArg: RegExp, silentArg?: boolean) => Promise<{}>;
-export declare let execAndWaitForLineSilent: (commandStringArg: string, regexArg: RegExp) => void;
-/**
- * get a path
- */
-export declare let which: (cmd: string) => Promise<string>;

dist/smartshell.wrap.js

@@ -1,113 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = require("./smartshell.plugins");
-/**
- * import path
- */
-let importPath = (stringArg) => {
-    if (process.env.SMARTSHELL_PATH) {
-        let commandResult = `PATH=${process.env.SMARTSHELL_PATH} && ${stringArg}`;
-        // console.log(commandResult)
-        return commandResult;
-    }
-    else {
-        return stringArg;
-    }
-};
-/**
- * executes a given command async
- * @param commandStringArg
- */
-exports.exec = (commandStringArg, silentArg = false, strictArg = false) => {
-    let done = plugins.smartq.defer();
-    plugins.shelljs.exec(importPath(commandStringArg), { async: true, silent: silentArg }, (code, stdout, stderr) => {
-        if (stderr
-            && (stderr !== '')
-            && (!silentArg || strictArg)
-            && (process.env.DEBUG === 'true')) {
-            console.log('StdErr found.');
-            console.log(stderr);
-        }
-        if (strictArg) {
-            done.reject(new Error(stderr));
-            return;
-        }
-        done.resolve({
-            exitCode: code,
-            stdout: stdout
-        });
-    });
-    return done.promise;
-};
-/**
- * executes a given command async and silent
- * @param commandStringArg
- */
-exports.execSilent = (commandStringArg) => __awaiter(this, void 0, void 0, function* () {
-    return yield exports.exec(commandStringArg, true);
-});
-/**
- * executes strict, meaning it rejects the promise if something happens
- */
-exports.execStrict = (commandStringArg) => __awaiter(this, void 0, void 0, function* () {
-    return yield exports.exec(commandStringArg, true, true);
-});
-/**
- * executes a command and allws you to stream output
- */
-exports.execStreaming = (commandStringArg, silentArg = false) => {
-    let childProcessEnded = plugins.smartq.defer();
-    let execChildProcess = plugins.shelljs.exec(importPath(commandStringArg), { async: true, silent: silentArg }, (code, stdout, stderr) => {
-        childProcessEnded.resolve({
-            exitCode: code,
-            stdout: stdout
-        });
-    });
-    return {
-        childProcess: execChildProcess,
-        finalPromise: childProcessEnded.promise
-    };
-};
-exports.execStreamingSilent = (commandStringArg) => {
-    return exports.execStreaming(commandStringArg, true);
-};
-/**
- * executes a command and returns promise that will be fullfilled once an putput line matches RegexArg
- * @param commandStringArg
- * @param regexArg
- */
-exports.execAndWaitForLine = (commandStringArg, regexArg, silentArg = false) => {
-    let done = plugins.smartq.defer();
-    let execStreamingResult = exports.execStreaming(commandStringArg, silentArg);
-    execStreamingResult.childProcess.stdout.on('data', (stdOutChunk) => {
-        if (regexArg.test(stdOutChunk)) {
-            done.resolve();
-        }
-    });
-    return done.promise;
-};
-exports.execAndWaitForLineSilent = (commandStringArg, regexArg) => {
-    exports.execAndWaitForLine(commandStringArg, regexArg, true);
-};
-/**
- * get a path
- */
-exports.which = (cmd) => {
-    let done = plugins.smartq.defer();
-    plugins.which(cmd, (err, path) => {
-        if (err) {
-            done.reject(err);
-        }
-        done.resolve(path);
-    });
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC53cmFwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzaGVsbC53cmFwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxnREFBK0M7QUFzQi9DOztHQUVHO0FBQ0gsSUFBSSxVQUFVLEdBQUcsQ0FBQyxTQUFTO0lBQ3pCLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQztRQUNoQyxJQUFJLGFBQWEsR0FBRyxRQUFRLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxPQUFPLFNBQVMsRUFBRSxDQUFBO1FBQ3pFLDZCQUE2QjtRQUM3QixNQUFNLENBQUMsYUFBYSxDQUFBO0lBQ3RCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE1BQU0sQ0FBQyxTQUFTLENBQUE7SUFDbEIsQ0FBQztBQUNILENBQUMsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsSUFBSSxHQUFHLENBQUMsZ0JBQXdCLEVBQUUsWUFBcUIsS0FBSyxFQUFFLFNBQVMsR0FBRyxLQUFLO0lBQ3hGLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFlLENBQUE7SUFDOUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLGdCQUFnQixDQUFDLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsRUFBRSxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTTtRQUMxRyxFQUFFLENBQUMsQ0FDRCxNQUFNO2VBQ0gsQ0FBQyxNQUFNLEtBQUssRUFBRSxDQUFDO2VBQ2YsQ0FBQyxDQUFDLFNBQVMsSUFBSSxTQUFTLENBQUM7ZUFDekIsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssS0FBSyxNQUFNLENBQ2xDLENBQUMsQ0FBQyxDQUFDO1lBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxl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

npmextra.json

@@ -1,8 +1,17 @@
 {
   "npmci": {
-    "npmGlobalTools": [
-      "npmts",
-      "ts-node"
-    ]
+    "npmGlobalTools": [],
+    "npmAccessLevel": "public",
+    "npmRegistryUrl": "registry.npmjs.org"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartshell",
+      "shortDescription": "shell actions designed as promises",
+      "npmPackagename": "@pushrocks/smartshell",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,12 +1,13 @@
 {
-  "name": "smartshell",
-  "version": "1.0.17",
+  "name": "@pushrocks/smartshell",
+  "private": false,
+  "version": "2.0.19",
   "description": "shell actions designed as promises",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)",
-    "testLocal": "(ts-node --compilerOptions '{\"target\":\"es6\"}' test/test.ts)"
+    "test": "(tstest test/)",
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -23,14 +24,18 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartshell#README",
   "devDependencies": {
-    "tapbundle": "^1.1.1"
+    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsrun": "^1.2.6",
+    "@gitzone/tstest": "^1.0.22",
+    "@pushrocks/tapbundle": "^3.0.9",
+    "@types/node": "^12.0.2",
+    "tslint": "^5.16.0",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@types/shelljs": "^0.7.4",
-    "@types/which": "^1.0.28",
-    "shelljs": "^0.7.8",
-    "smartq": "^1.1.6",
-    "typings-global": "^1.0.20",
-    "which": "^1.3.0"
+    "@pushrocks/smartexit": "^1.0.11",
+    "@pushrocks/smartpromise": "^3.0.2",
+    "@types/which": "^1.3.1",
+    "which": "^1.3.1"
   }
 }

test/test.ts

@@ -1,51 +1,53 @@
-import { expect, tap } from 'tapbundle'
+import { expect, tap } from '@pushrocks/tapbundle';
 
-import * as smartshell from '../ts/index'
-import * as smartq from 'smartq'
+import * as smartshell from '../ts';
+import * as smartpromise from '@pushrocks/smartpromise';
 
-let testSmartshell: smartshell.Smartshell
-
-tap.test('smartshell should run async', async () => {
-  let execResult = await smartshell.exec('npm -v')
-  expect(execResult.stdout).to.match(/[0-9\.]*/)
-})
-
-tap.test('smartshell should run async and silent', async () => {
-  let execResult = await smartshell.execSilent('npm -v')
-  expect(execResult.stdout).to.match(/[0-9\.]*/)
-})
-
-tap.test('smartshell should stream a shell execution', async () => {
-  let done = smartq.defer()
-  let execStreamingResponse = smartshell.execStreaming('npm -v')
-  execStreamingResponse.childProcess.stdout.on('data', data => {
-    done.resolve(data)
-  })
-  let data = await done.promise
-  expect(data).to.match(/[0-9\.]*/)
-  await execStreamingResponse.finalPromise
-})
-
-tap.test('it should execute and wait for a line in the output', async () => {
-  await smartshell.execAndWaitForLine('echo "5.0.4"', /5.0.4/)
-})
-
-// Smartshell class
+let testSmartshell: smartshell.Smartshell;
 
 tap.test('smartshell should create a Smartshell instance', async () => {
   testSmartshell = new smartshell.Smartshell({
     executor: 'bash',
     sourceFilePaths: []
-  })
-  expect(testSmartshell).to.be.instanceof(smartshell.Smartshell)
-})
+  });
+  expect(testSmartshell).to.be.instanceof(smartshell.Smartshell);
+});
 
 tap.test('smartshell should run async', async () => {
-  return testSmartshell.execSilent('sleep 1 && npm -v').then(async (execResult) => {
-    console.log(execResult.stdout)
-  })
-})
+  let execResult = await testSmartshell.exec('npm -v');
+  expect(execResult.stdout).to.match(/[0-9\.]*/);
+});
+
+tap.test('smartshell should run async and silent', async () => {
+  let execResult = await testSmartshell.execSilent('npm -v');
+  expect(execResult.stdout).to.match(/[0-9\.]*/);
+});
+
+tap.test('smartshell should stream a shell execution', async () => {
+  let done = smartpromise.defer();
+  let execStreamingResponse = await testSmartshell.execStreaming('npm -v');
+  execStreamingResponse.childProcess.stdout.on('data', data => {
+    done.resolve(data);
+  });
+  let data = await done.promise;
+  expect(data).to.match(/[0-9\.]*/);
+  await execStreamingResponse.finalPromise;
+});
+
+tap.test('it should execute and wait for a line in the output', async () => {
+  await testSmartshell.execAndWaitForLine('echo "5.0.4"', /5.0.4/);
+});
+
+tap.test('smartshell should run async', async () => {
+  return testSmartshell.execSilent('sleep 1 && npm -v').then(async execResult => {
+    console.log(execResult.stdout);
+  });
+});
+
+tap.test('should be able to find git', async () => {
+  testSmartshell.exec('git --version');
+});
 
 tap.start({
   throwOnError: true
-})
+});

ts/index.ts

@@ -1,2 +1 @@
-export * from './smartshell.wrap'
-export * from './smartshell.classes.smartshell'
+export * from './smartshell.classes.smartshell';

ts/smartshell.classes.shellenv.ts

@@ -0,0 +1,103 @@
+export type TExecutor = 'sh' | 'bash';
+
+export interface IShellEnvContructorOptions {
+  executor: TExecutor;
+  sourceFilePaths?: string[];
+  pathDirectories?: string[];
+}
+
+export class ShellEnv {
+  executor: TExecutor;
+  sourceFileArray: string[] = [];
+  pathDirArray: string[] = [];
+
+  /**
+   * constructor for the shellenv
+   */
+  constructor(optionsArg: IShellEnvContructorOptions) {
+    this.executor = optionsArg.executor;
+
+    // add sourcefiles
+    if (optionsArg.sourceFilePaths) {
+      this.sourceFileArray = this.sourceFileArray.concat(optionsArg.sourceFilePaths);
+    }
+
+    // add pathDirectories
+    if (optionsArg.pathDirectories) {
+      this.pathDirArray = this.pathDirArray.concat(optionsArg.pathDirectories);
+    }
+  }
+
+  /**
+   * imports path into the shell from env if available and returns it with
+   */
+  private _setPath(commandStringArg): string {
+    let commandResult = commandStringArg;
+    let commandPaths: string[] = [];
+    commandPaths = commandPaths.concat(process.env.PATH.split(':'));
+    if (process.env.SMARTSHELL_PATH) {
+      commandPaths = commandPaths.concat(process.env.SMARTSHELL_PATH.split(':'));
+    }
+
+    // lets filter for unwanted paths
+    // Windows WSL
+    commandPaths = commandPaths.filter(commandPathArg => {
+      const filterResult =
+        !commandPathArg.startsWith('/mnt/c/') &&
+        !commandPathArg.startsWith('Files/1E') &&
+        !commandPathArg.includes(' ');
+      if (!filterResult) {
+        // console.log(`${commandPathArg} will be filtered!`);
+      }
+      return filterResult;
+    });
+
+    commandResult = `PATH=${commandPaths.join(':')} && ${commandStringArg}`;
+    return commandResult;
+  }
+
+  /**
+   * add files that are going to be sourced when running a command
+   * @param sourceFilePathsArray
+   */
+  addSourceFiles(sourceFilePathsArray: string[]) {
+    for (let sourceFilePath of sourceFilePathsArray) {
+      this.sourceFileArray.push(sourceFilePath);
+    }
+  }
+
+  /**
+   * cleans the source files array
+   */
+  cleanSourceFiles() {
+    this.sourceFileArray = [];
+  }
+
+  public createEnvExecString(commandArg: string): string {
+    let commandResult = '';
+    let sourceString = '';
+
+    // deal with sourcestring
+    for (const sourceFilePath of this.sourceFileArray) {
+      sourceString = sourceString + `source ${sourceFilePath} && `;
+    }
+
+    // deal with avaiable path
+    let pathString = 'PATH=$PATH';
+    for (const pathDir of this.pathDirArray) {
+      pathString += `:${pathDir}`;
+    }
+    pathString += ` && `;
+
+    switch (this.executor) {
+      case 'bash':
+        commandResult = `bash -c '${pathString}${sourceString}${commandArg}'`;
+        break;
+      case 'sh':
+        commandResult = `${pathString}${sourceString}${commandArg}`;
+        break;
+    }
+    commandResult = this._setPath(commandResult);
+    return commandResult;
+  }
+}

ts/smartshell.classes.shelllog.ts

@@ -0,0 +1,38 @@
+import * as plugins from './smartshell.plugins';
+
+/**
+ * a log handler for spawned logs
+ * making sure the process doesn't run out of memory
+ */
+export class ShellLog {
+  logStore = Buffer.from('');
+
+  /**
+   * log data to console
+   * @param dataArg
+   */
+  logToConsole(dataArg: string | Buffer): void {
+    // make sure we have the data as string
+    process.stdout.write(dataArg);
+  }
+
+  /**
+   * add data to Buffer for later consumption
+   * @param dataArg
+   */
+  addToBuffer(dataArg: string | Buffer): void {
+    // make sure we have the data as Buffer
+    const dataBuffer: Buffer = (() => {
+      if (!Buffer.isBuffer(dataArg)) {
+        return Buffer.from(dataArg);
+      }
+      return dataArg;
+    })();
+    this.logStore = Buffer.concat([this.logStore, dataBuffer]);
+  }
+
+  logAndAdd(dataArg: string | Buffer): void {
+    this.logToConsole(dataArg);
+    this.addToBuffer(dataArg);
+  }
+}

ts/smartshell.classes.smartshell.ts

@@ -1,65 +1,158 @@
-import * as plugins from './smartshell.plugins'
-import * as smartshellWrap from './smartshell.wrap'
+// -- imports --
+import * as plugins from './smartshell.plugins';
+import { ShellEnv, IShellEnvContructorOptions, TExecutor } from './smartshell.classes.shellenv';
+import { ShellLog } from './smartshell.classes.shelllog';
 
-export type TExecutor = 'sh' | 'bash'
-
-export interface ISmartshellContructorOptions {
-  executor: TExecutor
-  sourceFilePaths: string[]
+import * as cp from 'child_process';
+import { Deferred } from '@pushrocks/smartpromise';
 
+// -- interfaces --
+/**
+ * interface for ExecResult
+ */
+export interface IExecResult {
+  exitCode: number;
+  stdout: string;
 }
 
+/**
+ * interface for streaming ExecResult
+ */
+export interface IExecResultStreaming {
+  childProcess: cp.ChildProcess;
+  finalPromise: Promise<IExecResult>;
+  kill: () => void;
+}
+
+// -- SmartShell --
 export class Smartshell {
-  executor: TExecutor
-  sourceFileArray: string[] = []
-  constructor (optionsArg: ISmartshellContructorOptions) {
-    this.executor = optionsArg.executor
-    for (let sourceFilePath of optionsArg.sourceFilePaths) {
-      this.sourceFileArray.push(sourceFilePath)
-    }
-  }
+  public shellEnv: ShellEnv;
+  public smartexit = new plugins.smartexit.SmartExit();
 
-  addSourceFiles (sourceFilePathsArray: string[]) {
-    for (let sourceFilePath of sourceFilePathsArray) {
-      this.sourceFileArray.push(sourceFilePath)
-    }
-  }
-
-  cleanSourceFiles () {
-    this.sourceFileArray = []
+  constructor(optionsArg: IShellEnvContructorOptions) {
+    this.shellEnv = new ShellEnv(optionsArg);
   }
 
   /**
-   * executes silently and returns IExecResult
-   * @param commandArg
+   * executes a given command async
+   * @param commandStringArg
    */
-  async execSilent (commandArg: string) {
-    let execCommand = this.createExecString(commandArg)
-    return await smartshellWrap.execSilent(execCommand)
-  }
+  private async _exec(
+    commandStringArg: string,
+    silentArg: boolean = false,
+    strictArg = false,
+    streamingArg = false
+  ): Promise<IExecResult | IExecResultStreaming> {
+    // flow control promises
+    const done = plugins.smartpromise.defer<IExecResult | IExecResultStreaming>();
+    const childProcessEnded = plugins.smartpromise.defer<IExecResult>();
+    // build commandToExecute
+    let commandToExecute = commandStringArg;
+    commandToExecute = this.shellEnv.createEnvExecString(commandStringArg);
+    const spawnlogInstance = new ShellLog();
+    const execChildProcess = cp.spawn(commandToExecute, [], {
+      shell: true,
+      env: process.env,
+      detached: false
+    });
 
-  /**
-   * executes and returns IExecResult
-   * @param commandArg
-   */
-  async exec (commandArg: string) {
-    let execCommand = this.createExecString(commandArg)
-    return await smartshellWrap.exec(execCommand)
-  }
+    this.smartexit.addProcess(execChildProcess);
 
-  /**
-   * creates the final sourcing string
-   * @param commandArg
-   */
-  private createExecString (commandArg): string {
-    if (this.executor === 'bash') {
-      let sourceString = ''
-      for (let sourceFilePath of this.sourceFileArray) {
-        sourceString = sourceString + `source ${sourceFilePath} && `
+    execChildProcess.stdout.on('data', data => {
+      if (!silentArg) {
+        spawnlogInstance.logToConsole(data);
       }
-      return `bash -c '${sourceString} ${commandArg}'`
-    } else {
-      return commandArg
+      spawnlogInstance.addToBuffer(data);
+    });
+    execChildProcess.stderr.on('data', data => {
+      if (!silentArg) {
+        spawnlogInstance.logToConsole(data);
+      }
+      spawnlogInstance.addToBuffer(data);
+    });
+
+    if (streamingArg) {
+      done.resolve({
+        childProcess: execChildProcess,
+        finalPromise: childProcessEnded.promise,
+        kill: () => {
+          // this notation with the - kills the whole process group
+          process.kill(-execChildProcess.pid);
+        }
+      });
     }
+
+    execChildProcess.on('exit', (code, signal) => {
+      this.smartexit.removeProcess(execChildProcess);
+      if (strictArg && code === 1) {
+        done.reject();
+      }
+
+      const execResult = {
+        exitCode: code,
+        stdout: spawnlogInstance.logStore.toString()
+      };
+
+      if (!streamingArg) {
+        done.resolve(execResult);
+      }
+      childProcessEnded.resolve(execResult);
+    });
+
+    const result = await done.promise;
+    return result;
+  }
+
+  async exec(commandStringArg: string): Promise<IExecResult> {
+    return (await this._exec(commandStringArg, false)) as IExecResult;
+  }
+
+  /**
+   * executes a given command async and silent
+   * @param commandStringArg
+   */
+  async execSilent(commandStringArg: string): Promise<IExecResult> {
+    return (await this._exec(commandStringArg, true)) as IExecResult;
+  }
+
+  /**
+   * executes a command async and strict, meaning it rejects the promise if something happens
+   */
+  async execStrict(commandStringArg: string): Promise<IExecResult> {
+    return (await this._exec(commandStringArg, true, true)) as IExecResult;
+  }
+
+  /**
+   * executes a command and allows you to stream output
+   */
+  async execStreaming(
+    commandStringArg: string,
+    silentArg: boolean = false
+  ): Promise<IExecResultStreaming> {
+    return (await this._exec(commandStringArg, silentArg, false, true)) as IExecResultStreaming;
+  }
+
+  async execStreamingSilent(commandStringArg: string) {
+    return (await this.execStreaming(commandStringArg, true)) as IExecResultStreaming;
+  }
+
+  /**
+   * executes a command and returns promise that will be fullfilled once an putput line matches RegexArg
+   * @param commandStringArg
+   * @param regexArg
+   */
+  async execAndWaitForLine(commandStringArg: string, regexArg: RegExp, silentArg: boolean = false) {
+    let done = plugins.smartpromise.defer();
+    let execStreamingResult = await this.execStreaming(commandStringArg, silentArg);
+    execStreamingResult.childProcess.stdout.on('data', (stdOutChunk: string) => {
+      if (regexArg.test(stdOutChunk)) {
+        done.resolve();
+      }
+    });
+    return done.promise;
+  }
+
+  async execAndWaitForLineSilent(commandStringArg: string, regexArg: RegExp) {
+    this.execAndWaitForLine(commandStringArg, regexArg, true);
   }
 }

ts/smartshell.plugins.ts

@@ -1,9 +1,5 @@
-import * as shelljs from 'shelljs'
-import * as smartq from 'smartq'
-import * as which from 'which'
+import * as smartexit from '@pushrocks/smartexit';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as which from 'which';
 
-export {
-  shelljs,
-  smartq,
-  which
-}
+export { smartexit, smartpromise, which };

ts/smartshell.wrap.ts

@@ -1,132 +0,0 @@
-import * as plugins from './smartshell.plugins'
-
-// interfaces
-import { ChildProcess } from 'child_process'
-import { Deferred } from 'smartq'
-
-/**
- * interface for ExecResult
- */
-export interface IExecResult {
-  exitCode: number,
-  stdout: string
-}
-
-/**
- * interface for streaming ExecResult
- */
-export interface IExecResultStreaming {
-  childProcess: ChildProcess,
-  finalPromise: Promise<IExecResult>
-}
-
-/**
- * import path
- */
-let importPath = (stringArg): string => {
-  if (process.env.SMARTSHELL_PATH) {
-    let commandResult = `PATH=${process.env.SMARTSHELL_PATH} && ${stringArg}`
-    // console.log(commandResult)
-    return commandResult
-  } else {
-    return stringArg
-  }
-}
-
-/**
- * executes a given command async
- * @param commandStringArg
- */
-export let exec = (commandStringArg: string, silentArg: boolean = false, strictArg = false): Promise<IExecResult> => {
-  let done = plugins.smartq.defer<IExecResult>()
-  plugins.shelljs.exec(importPath(commandStringArg), { async: true, silent: silentArg }, (code, stdout, stderr) => {
-    if (
-      stderr
-      && (stderr !== '')
-      && (!silentArg || strictArg)
-      && (process.env.DEBUG === 'true')
-    ) {
-      console.log('StdErr found.')
-      console.log(stderr)
-    }
-    if (strictArg) {
-      done.reject(new Error(stderr))
-      return
-    }
-    done.resolve({
-      exitCode: code,
-      stdout: stdout
-    })
-  })
-  return done.promise
-}
-
-/**
- * executes a given command async and silent
- * @param commandStringArg
- */
-export let execSilent = async (commandStringArg: string): Promise<IExecResult> => {
-  return await exec(commandStringArg, true)
-}
-
-/**
- * executes strict, meaning it rejects the promise if something happens
- */
-export let execStrict = async (commandStringArg: string): Promise<IExecResult> => {
-  return await exec(commandStringArg, true, true)
-}
-
-/**
- * executes a command and allws you to stream output
- */
-export let execStreaming = (commandStringArg: string, silentArg: boolean = false) => {
-  let childProcessEnded = plugins.smartq.defer<IExecResult>()
-  let execChildProcess = plugins.shelljs.exec(importPath(commandStringArg), {async: true, silent: silentArg}, (code, stdout, stderr) => {
-    childProcessEnded.resolve({
-      exitCode: code,
-      stdout: stdout
-    })
-  })
-  return {
-    childProcess: execChildProcess,
-    finalPromise: childProcessEnded.promise
-  }
-}
-
-export let execStreamingSilent = (commandStringArg: string) => {
-  return execStreaming(commandStringArg, true)
-}
-
-/**
- * executes a command and returns promise that will be fullfilled once an putput line matches RegexArg
- * @param commandStringArg
- * @param regexArg
- */
-export let execAndWaitForLine = (commandStringArg: string, regexArg: RegExp, silentArg: boolean = false) => {
-  let done = plugins.smartq.defer()
-  let execStreamingResult = execStreaming(commandStringArg, silentArg)
-  execStreamingResult.childProcess.stdout.on('data', (stdOutChunk: string) => {
-    if (regexArg.test(stdOutChunk)) {
-      done.resolve()
-    }
-  })
-  return done.promise
-}
-
-export let execAndWaitForLineSilent = (commandStringArg: string, regexArg: RegExp) => {
-  execAndWaitForLine(commandStringArg, regexArg, true)
-}
-
-/**
- * get a path
- */
-export let which = (cmd: string): Promise<string> => {
-  let done = plugins.smartq.defer<string>()
-  plugins.which(cmd, (err, path: string) => {
-    if (err) {
-      done.reject(err)
-    }
-    done.resolve(path)
-  })
-  return done.promise
-}

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"
 }

yarn.lock

@@ -1,386 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/chai-as-promised@0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-0.0.29.tgz#43d52892aa998e185a3de3e2477edb8573be1d77"
-  dependencies:
-    "@types/chai" "*"
-    "@types/promises-a-plus" "*"
-
-"@types/chai-string@^1.1.30":
-  version "1.1.31"
-  resolved "https://registry.yarnpkg.com/@types/chai-string/-/chai-string-1.1.31.tgz#a22f75d713f69da8c5cf34f8bc808a62cd249405"
-  dependencies:
-    "@types/chai" "*"
-
-"@types/chai@*":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.0.4.tgz#fe86315d9a66827feeb16f73bc954688ec950e18"
-
-"@types/chai@^3.4.35":
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-3.5.2.tgz#c11cd2817d3a401b7ba0f5a420f35c56139b1c1e"
-
-"@types/glob@*":
-  version "5.0.32"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.32.tgz#aec5cfe987c72f099fdb1184452986aa506d5e8f"
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/minimatch@*":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.1.tgz#b683eb60be358304ef146f5775db4c0e3696a550"
-
-"@types/node@*":
-  version "8.0.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.28.tgz#86206716f8d9251cf41692e384264cbd7058ad60"
-
-"@types/promises-a-plus@*":
-  version "0.0.27"
-  resolved "https://registry.yarnpkg.com/@types/promises-a-plus/-/promises-a-plus-0.0.27.tgz#c64651134614c84b8f5d7114ce8901d36a609780"
-
-"@types/shelljs@^0.7.2", "@types/shelljs@^0.7.4":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.4.tgz#137b5f31306eaff4de120ffe5b9d74b297809cfc"
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
-
-"@types/which@^1.0.28":
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
-
-ansi-256-colors@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz#910de50efcc7c09e3d82f2f87abd6b700c18818a"
-
-assertion-error@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-
-beautycolor@^1.0.7:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/beautycolor/-/beautycolor-1.0.11.tgz#71c5568d5a7ed5c144d3a54f753ad1b08862aea5"
-  dependencies:
-    ansi-256-colors "^1.1.0"
-    typings-global "^1.0.14"
-
-bindings@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
-
-brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-chai-as-promised@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-6.0.0.tgz#1a02a433a6f24dafac63b9c96fa1684db1aa8da6"
-  dependencies:
-    check-error "^1.0.2"
-
-chai-string@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/chai-string/-/chai-string-1.4.0.tgz#359140c051d36a4e4b1a5fc6b910152f438a8d49"
-
-chai@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
-  dependencies:
-    assertion-error "^1.0.1"
-    deep-eql "^0.1.3"
-    type-detect "^1.0.0"
-
-check-error@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-deep-eql@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
-  dependencies:
-    type-detect "0.1.1"
-
-define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
-  dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
-
-early@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/early/-/early-2.1.1.tgz#841e23254ea5dc54d8afaeee82f5ab65c00ee23c"
-  dependencies:
-    beautycolor "^1.0.7"
-    smartq "^1.1.1"
-    typings-global "^1.0.16"
-
-es-abstract@^1.5.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.2.tgz#25103263dc4decbda60e0c737ca32313518027ee"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
-es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
-  dependencies:
-    is-callable "^1.1.1"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
-
-es6-error@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
-
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-function-bind@^1.0.2, function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-
-glob@^7.0.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
-  dependencies:
-    function-bind "^1.0.2"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-interpret@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
-
-is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  dependencies:
-    has "^1.0.1"
-
-is-symbol@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
-leakage@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/leakage/-/leakage-0.3.0.tgz#15d698abdc76bbc6439601f4f3020e77e2d50c39"
-  dependencies:
-    es6-error "^4.0.2"
-    left-pad "^1.1.3"
-    memwatch-next "^0.3.0"
-    minimist "^1.2.0"
-    pretty-bytes "^4.0.2"
-
-left-pad@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a"
-
-memwatch-next@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/memwatch-next/-/memwatch-next-0.3.0.tgz#2111050f9a906e0aa2d72a4ec0f0089c78726f8f"
-  dependencies:
-    bindings "^1.2.1"
-    nan "^2.3.2"
-
-minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-nan@^2.3.2:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
-
-object-keys@^1.0.8:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-
-pretty-bytes@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  dependencies:
-    resolve "^1.1.6"
-
-resolve@^1.1.6:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
-  dependencies:
-    path-parse "^1.0.5"
-
-semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
-shelljs@^0.7.8:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
-smartchai@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/smartchai/-/smartchai-1.0.3.tgz#de6d010bb8b5aef24cb70b31a5f5334e8c41b72f"
-  dependencies:
-    "@types/chai" "^3.4.35"
-    "@types/chai-as-promised" "0.0.29"
-    "@types/chai-string" "^1.1.30"
-    chai "^3.5.0"
-    chai-as-promised "^6.0.0"
-    chai-string "^1.3.0"
-
-smartdelay@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/smartdelay/-/smartdelay-1.0.3.tgz#5fd44dad77262d110702f0293efa80c072cfb579"
-  dependencies:
-    smartq "^1.1.1"
-    typings-global "^1.0.16"
-
-smartq@^1.1.1, smartq@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/smartq/-/smartq-1.1.6.tgz#0c1ff4336d95e95b4f1fdd8ccd7e2c5a323b8412"
-  dependencies:
-    typings-global "^1.0.19"
-    util.promisify "^1.0.0"
-
-smartshell@^1.0.6:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/smartshell/-/smartshell-1.0.13.tgz#277b34e6624df70003e0e3a6c900cd5ebab7eb92"
-  dependencies:
-    "@types/shelljs" "^0.7.2"
-    "@types/which" "^1.0.28"
-    shelljs "^0.7.8"
-    smartq "^1.1.6"
-    typings-global "^1.0.19"
-    which "^1.2.14"
-
-tapbundle@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tapbundle/-/tapbundle-1.1.1.tgz#ec4172c0e82a77b1f6133fef2606311ede28a62d"
-  dependencies:
-    early "^2.1.1"
-    leakage "^0.3.0"
-    smartchai "^1.0.3"
-    smartdelay "^1.0.3"
-    smartq "^1.1.1"
-    typings-global "^1.0.19"
-
-type-detect@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
-
-type-detect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
-
-typings-global@^1.0.14, typings-global@^1.0.16, typings-global@^1.0.19, typings-global@^1.0.20:
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.20.tgz#3da769c54db538247c5d877d1d9e97eb2ec981ff"
-  dependencies:
-    semver "^5.3.0"
-    smartshell "^1.0.6"
-
-util.promisify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
-
-which@^1.2.14, which@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-  dependencies:
-    isexe "^2.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"