2.3.14

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: hosttoday/ht-docker-node:lts
+image: hosttoday/ht-docker-node:stable
 
 stages:
 - test
@@ -7,11 +7,14 @@ stages:
 
 
 before_script:
+  - npm uninstall -g npmci
   - npm install -g npmci
 
 testLTS:
   stage: test
   script:
+    - npmci install lts
+    - npmci command npm install -g npmts
     - npmci test lts
   tags:
     - docker
@@ -19,6 +22,8 @@ testLTS:
 testSTABLE:
   stage: test
   script:
+    - npmci install stable
+    - npmci command npm install -g npmts
     - npmci test stable
   tags:
     - docker
@@ -26,6 +31,8 @@ testSTABLE:
 testLEGACY:
   stage: test
   script:
+    - npmci install legacy
+    - npmci command npm install -g npmts
     - npmci test legacy
   tags:
     - docker

dist/npmci.bash.d.ts

@@ -1,3 +1,4 @@
 import "typings-global";
+export declare let nvmAvailable: boolean;
 export declare let bash: (commandArg: string, retryArg?: number, bareArg?: boolean) => string;
 export declare let bashBare: (commandArg: any, retryArg?: number) => string;

dist/npmci.bash.js

@@ -1,6 +1,20 @@
 "use strict";
 require("typings-global");
 const plugins = require("./npmci.plugins");
+let nvmSourceString = "";
+exports.nvmAvailable = false;
+let checkNvm = () => {
+    if (plugins.shelljs.exec(`bash -c "source /usr/local/nvm/nvm.sh"`, { silent: true }).code === 0) {
+        nvmSourceString = `source /usr/local/nvm/nvm.sh && `;
+        exports.nvmAvailable = true;
+    }
+    else if (plugins.shelljs.exec(`bash -c "source ~/.nvm/nvm.sh"`, { silent: true }).code === 0) {
+        nvmSourceString = `source ~/.nvm/nvm.sh && `;
+        exports.nvmAvailable = true;
+    }
+    ;
+};
+checkNvm();
 exports.bash = (commandArg, retryArg = 2, bareArg = false) => {
     let exitCode;
     let stdOut;
@@ -8,9 +22,7 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => {
     if (!process.env.NPMTS_TEST) {
         for (let i = 0; i <= retryArg; i++) {
             if (!bareArg) {
-                execResult = plugins.shelljs.exec("bash -c \"source /usr/local/nvm/nvm.sh &&" +
+                execResult = plugins.shelljs.exec(`bash -c "${nvmSourceString} ${commandArg}"`);
-                    commandArg +
-                    "\"");
             }
             else {
                 execResult = plugins.shelljs.exec(commandArg);
@@ -37,4 +49,4 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => {
 exports.bashBare = (commandArg, retryArg = 2) => {
     return exports.bash(commandArg, retryArg, true);
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBRWhDLFlBQUksR0FBRyxDQUFDLFVBQWlCLEVBQUMsUUFBUSxHQUFHLENBQUMsRUFBQyxPQUFPLEdBQUcsS0FBSztJQUM3RCxJQUFJLFFBQWUsQ0FBQztJQUNwQixJQUFJLE1BQWEsQ0FBQztJQUNsQixJQUFJLFVBQVUsQ0FBQztJQUNmLEVBQUUsQ0FBQSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQSxDQUFDO1FBQ3hCLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksUUFBUSxFQUFFLENBQUMsRUFBRSxFQUFDLENBQUM7WUFDaEMsRUFBRSxDQUFBLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQSxDQUFDO2dCQUNULFVBQVUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FDN0IsMkNBQTJDO29CQUMzQyxVQUFVO29CQUNWLElBQUksQ0FDUCxDQUFDO1lBQ04sQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLFVBQVUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNsRCxDQUFDO1lBQ0QsUUFBUSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7WUFDM0IsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUM7WUFDM0IsRUFBRSxDQUFBLENBQUMsUUFBUSxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksUUFBUSxDQUFDLENBQUEsQ0FBQztnQkFDaEMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNwQixDQUFDO1lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQSxDQUFDLFFBQVEsSUFBSSxDQUFDLENBQUMsQ0FBQSxDQUFDO2dCQUNyQixDQUFDLEdBQUcsUUFBUSxHQUFHLENBQUMsQ0FBQyxDQUFDLHFEQUFxRDtZQUMzRSxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsbUNBQW1DLEdBQUcsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7Z0JBQ2xGLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsR0FBRyxNQUFNLEdBQUksUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDMUYsQ0FBQztRQUNMLENBQUM7SUFDTCxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDbkUsQ0FBQztJQUNELE1BQU0sQ0FBQyxNQUFNLENBQUM7QUFDbEIsQ0FBQyxDQUFBO0FBRVUsZ0JBQVEsR0FBRyxDQUFDLFVBQVUsRUFBQyxRQUFRLEdBQUcsQ0FBQztJQUMxQyxNQUFNLENBQUMsWUFBSSxDQUFDLFVBQVUsRUFBQyxRQUFRLEVBQUMsSUFBSSxDQUFDLENBQUM7QUFDMUMsQ0FBQyxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBRzNDLElBQUksZUFBZSxHQUFXLEVBQUUsQ0FBQztBQUN0QixvQkFBWSxHQUFZLEtBQUssQ0FBQztBQUN6QyxJQUFJLFFBQVEsR0FBRztJQUNYLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHdDQUF3QyxFQUFDLEVBQUMsTUFBTSxFQUFDLElBQUksRUFBQyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDMUYsZUFBZSxHQUFHLGtDQUFrQyxDQUFBO1FBQ3BELG9CQUFZLEdBQUcsSUFBSSxDQUFDO0lBQ3hCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLEVBQUMsRUFBQyxNQUFNLEVBQUMsSUFBSSxFQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN6RixlQUFlLEdBQUcsMEJBQTBCLENBQUE7UUFDNUMsb0JBQVksR0FBRyxJQUFJLENBQUM7SUFDeEIsQ0FBQztJQUFBLENBQUM7QUFDTixDQUFDLENBQUM7QUFDRixRQUFRLEVBQUUsQ0FBQztBQUVBLFlBQUksR0FBRyxDQUFDLFVBQWtCLEVBQUUsUUFBUSxHQUFHLENBQUMsRUFBRSxPQUFPLEdBQUcsS0FBSztJQUNoRSxJQUFJLFFBQWdCLENBQUM7SUFDckIsSUFBSSxNQUFjLENBQUM7SUFDbkIsSUFBSSxVQUFVLENBQUM7SUFDZixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUMxQixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLFFBQVEsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ2pDLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztnQkFDWCxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQzdCLFlBQVksZUFBZSxJQUFJLFVBQVUsR0FBRyxDQUMvQyxDQUFDO1lBQ04sQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLFVBQVUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNsRCxDQUFDO1lBQ0QsUUFBUSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7WUFDM0IsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUM7WUFDM0IsRUFBRSxDQUFDLENBQUMsUUFBUSxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDbEMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNwQixDQUFDO1lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUN2QixDQUFDLEdBQUcsUUFBUSxHQUFHLENBQUMsQ0FBQyxDQUFDLHFEQUFxRDtZQUMzRSxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsbUNBQW1DLEdBQUcsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7Z0JBQ2xGLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsR0FBRyxNQUFNLEdBQUcsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDekYsQ0FBQztRQUNMLENBQUM7SUFDTCxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDbkUsQ0FBQztJQUNELE1BQU0sQ0FBQyxNQUFNLENBQUM7QUFDbEIsQ0FBQyxDQUFBO0FBRVUsZ0JBQVEsR0FBRyxDQUFDLFVBQVUsRUFBRSxRQUFRLEdBQUcsQ0FBQztJQUMzQyxNQUFNLENBQUMsWUFBSSxDQUFDLFVBQVUsRUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFDNUMsQ0FBQyxDQUFBIn0=

dist/npmci.build.d.ts

@@ -1,2 +1,4 @@
+/// <reference types="q" />
 import "typings-global";
-export declare let build: (commandArg: any) => any;
+import * as plugins from "./npmci.plugins";
+export declare let build: (commandArg: any) => plugins.q.Promise<{}>;

dist/npmci.build.docker.d.ts

@@ -1,12 +1,14 @@
+/// <reference types="q" />
 /// <reference types="node" />
-export declare let build: () => any;
+import * as plugins from "./npmci.plugins";
-export declare let readDockerfiles: () => any;
+export declare let build: () => plugins.q.Promise<{}>;
-export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => any;
+export declare let readDockerfiles: () => plugins.q.Promise<{}>;
-export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => any;
+export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
-export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => any;
+export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => plugins.q.Promise<{}>;
-export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[]) => any;
+export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
-export declare let pullDockerfileImages: (sortableArrayArg: Dockerfile[], registryArg?: string) => any;
+export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
-export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => any;
+export declare let pullDockerfileImages: (sortableArrayArg: Dockerfile[], registryArg?: string) => plugins.q.Promise<{}>;
+export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => plugins.q.Promise<{}>;
 export declare class Dockerfile {
     filePath: string;
     repo: string;
@@ -25,8 +27,8 @@ export declare class Dockerfile {
         fileContents?: string | Buffer;
         read?: boolean;
     });
-    build(): any;
+    build(): plugins.q.Promise<{}>;
-    push(stageArg: any): any;
+    push(stageArg: any): plugins.q.Promise<{}>;
     pull(registryArg: string): void;
     test(): void;
     getId(): string;

dist/npmci.clean.d.ts

@@ -1,5 +1,7 @@
+/// <reference types="q" />
 import "typings-global";
+import * as plugins from "./npmci.plugins";
 /**
  * cleans npmci config files
  */
-export declare let clean: () => any;
+export declare let clean: () => plugins.q.Promise<{}>;

dist/npmci.command.d.ts

@@ -1,2 +1,4 @@
+/// <reference types="q" />
 import "typings-global";
-export declare let command: () => any;
+import * as plugins from "./npmci.plugins";
+export declare let command: () => plugins.q.Promise<{}>;

dist/npmci.install.d.ts

@@ -1,2 +1,4 @@
+/// <reference types="q" />
 import "typings-global";
-export declare let install: (versionArg: any) => any;
+import * as plugins from "./npmci.plugins";
+export declare let install: (versionArg: any) => plugins.q.Promise<{}>;

dist/npmci.install.js

@@ -2,6 +2,7 @@
 require("typings-global");
 const plugins = require("./npmci.plugins");
 const npmci_bash_1 = require("./npmci.bash");
+const npmci_bash_2 = require("./npmci.bash");
 exports.install = (versionArg) => {
     let done = plugins.q.defer();
     plugins.beautylog.log("now installing " + "node ".green + ("version " + versionArg).yellow);
@@ -19,12 +20,17 @@ exports.install = (versionArg) => {
         version = versionArg;
     }
     ;
-    npmci_bash_1.bash("nvm install " + version +
+    if (npmci_bash_2.nvmAvailable) {
-        " && nvm alias default " + version);
+        npmci_bash_1.bash(`nvm install ${version} && nvm alias default ${version}`);
-    plugins.beautylog.success("Node version " + version + " successfully installed!");
+        plugins.beautylog.success(`Node version ${version} successfully installed!`);
+    }
+    else {
+        plugins.beautylog.warn("Nvm not in path so staying at installed node version!");
+    }
+    ;
     npmci_bash_1.bash("node -v");
     npmci_bash_1.bash("npm -v");
     done.resolve();
     return done.promise;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDZCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUV2QixlQUFPLEdBQUcsQ0FBQyxVQUFVO0lBQzVCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLEtBQUssR0FBRyxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUM1RixJQUFJLE9BQWMsQ0FBQztJQUNuQixFQUFFLENBQUEsQ0FBQyxVQUFVLElBQUksUUFBUSxDQUFDLENBQUEsQ0FBQztRQUN2QixPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQ3RCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFBLENBQUMsVUFBVSxJQUFJLEtBQUssQ0FBQyxDQUFBLENBQUM7UUFDM0IsT0FBTyxHQUFHLE9BQU8sQ0FBQztJQUN0QixDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQSxDQUFDLFVBQVUsSUFBSSxRQUFRLENBQUMsQ0FBQSxDQUFDO1FBQzlCLE9BQU8sR0FBRyxPQUFPLENBQUE7SUFDckIsQ0FBQztJQUFDLElBQUksQ0FBRSxDQUFDO1FBQ0wsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUN6QixDQUFDO0lBQUEsQ0FBQztJQUNGLGlCQUFJLENBQ0EsY0FBYyxHQUFHLE9BQU87UUFDeEIsd0JBQXdCLEdBQUcsT0FBTyxDQUNyQyxDQUFDO0lBQ0YsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsZUFBZSxHQUFHLE9BQU8sR0FBRywwQkFBMEIsQ0FBQyxDQUFDO0lBQ2xGLGlCQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDaEIsaUJBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNmLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixNQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDZCQUFxQixjQUFjLENBQUMsQ0FBQTtBQUNwQyw2QkFBNkIsY0FFN0IsQ0FBQyxDQUYwQztBQUVoQyxlQUFPLEdBQUcsQ0FBQyxVQUFVO0lBQzVCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLEtBQUssR0FBRyxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUM1RixJQUFJLE9BQWUsQ0FBQztJQUNwQixFQUFFLENBQUMsQ0FBQyxVQUFVLElBQUksUUFBUSxDQUFDLENBQUMsQ0FBQztRQUN6QixPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQ3RCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDN0IsT0FBTyxHQUFHLE9BQU8sQ0FBQztJQUN0QixDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsSUFBSSxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2hDLE9BQU8sR0FBRyxPQUFPLENBQUE7SUFDckIsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUN6QixDQUFDO0lBQUEsQ0FBQztJQUNGLEVBQUUsQ0FBQyxDQUFDLHlCQUFZLENBQUMsQ0FBQyxDQUFDO1FBQ2YsaUJBQUksQ0FBQyxlQUFlLE9BQU8seUJBQXlCLE9BQU8sRUFBRSxDQUFDLENBQUE7UUFDOUQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLE9BQU8sMEJBQTBCLENBQUMsQ0FBQztJQUNqRixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyx1REFBdUQsQ0FBQyxDQUFDO0lBQ3BGLENBQUM7SUFBQSxDQUFDO0lBQ0YsaUJBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNoQixpQkFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBIn0=

dist/npmci.plugins.d.ts

@@ -5,9 +5,9 @@ export declare let gulpFunction: any;
 export declare let lodash: any;
 export import path = require("path");
 export import projectinfo = require("projectinfo");
-export declare let q: any;
+export import q = require("q");
 export declare let request: any;
-export declare let shelljs: any;
+export import shelljs = require("shelljs");
 export import smartcli = require("smartcli");
 export import smartfile = require("smartfile");
 export import smartparam = require("smartparam");

dist/npmci.plugins.js

@@ -15,4 +15,4 @@ exports.smartparam = require("smartparam");
 exports.smartssh = require("smartssh");
 exports.smartstring = require("smartstring");
 exports.through2 = require("through2");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN2QixvQkFBWSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUN4QyxjQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQ3hCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUN2QixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDO0FBQ3hDLFNBQUMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDakIsZUFBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUM3QixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzFCLGdCQUFRLFdBQVcsVUFBVSxDQUFDLENBQUM7QUFDL0IsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNqQyxrQkFBVSxXQUFXLFlBQVksQ0FBQyxDQUFDO0FBQ25DLGdCQUFRLFdBQVcsVUFBVSxDQUFDLENBQUM7QUFDL0IsbUJBQVcsV0FBVyxhQUFhLENBQUMsQ0FBQztBQUN4QyxnQkFBUSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN2QixvQkFBWSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUN4QyxjQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQ3hCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUN2QixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDO0FBQ3JDLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNwQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzFCLGVBQU8sV0FBVyxTQUFTLENBQUMsQ0FBQztBQUM3QixnQkFBUSxXQUFXLFVBQVUsQ0FBQyxDQUFDO0FBQy9CLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDakMsa0JBQVUsV0FBVyxZQUFZLENBQUMsQ0FBQztBQUNuQyxnQkFBUSxXQUFXLFVBQVUsQ0FBQyxDQUFDO0FBQy9CLG1CQUFXLFdBQVcsYUFBYSxDQUFDLENBQUM7QUFDeEMsZ0JBQVEsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUMifQ==

dist/npmci.prepare.d.ts

@@ -1,2 +1,4 @@
+/// <reference types="q" />
 import "typings-global";
-export declare let prepare: (serviceArg: string) => any;
+import * as plugins from "./npmci.plugins";
+export declare let prepare: (serviceArg: string) => plugins.q.Promise<{}>;

dist/npmci.publish.d.ts

@@ -1,2 +1,4 @@
+/// <reference types="q" />
 import "typings-global";
-export declare let publish: (serviceArg?: string) => any;
+import * as plugins from "./npmci.plugins";
+export declare let publish: (serviceArg?: string) => plugins.q.Promise<{}>;

dist/npmci.ssh.d.ts

@@ -1,2 +1,4 @@
+/// <reference types="q" />
 import "typings-global";
-export declare let ssh: () => any;
+import * as plugins from "./npmci.plugins";
+export declare let ssh: () => plugins.q.Promise<{}>;

dist/npmci.test.d.ts

@@ -1,2 +1,4 @@
+/// <reference types="q" />
 import "typings-global";
-export declare let test: (versionArg: any) => any;
+import * as plugins from "./npmci.plugins";
+export declare let test: (versionArg: any) => plugins.q.Promise<{}>;

dist/npmci.trigger.d.ts

@@ -1,2 +1,4 @@
+/// <reference types="q" />
 import "typings-global";
-export declare let trigger: () => any;
+import * as plugins from "./npmci.plugins";
+export declare let trigger: () => plugins.q.Promise<{}>;

npmextra.json

@@ -0,0 +1,8 @@
+{
+    "npmts":{
+        "mode":"default"
+    },
+    "npmdocker":{
+        "baseImage":"hosttoday/ht-docker-node:npmts"
+    }
+}

package.json

@@ -1,8 +1,9 @@
 {
   "name": "npmci",
-  "version": "2.3.10",
+  "version": "2.3.14",
   "description": "",
   "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "bin": {
     "npmci": "dist/index.js"
   },
@@ -21,21 +22,25 @@
   },
   "homepage": "https://gitlab.com/pushrocks/npmci#README",
   "devDependencies": {
-    "npmts-g": "^5.2.6",
+    "npmts-g": "^5.2.8",
     "should": "^10.0.0",
     "typings-test": "^1.0.1"
   },
   "dependencies": {
-    "beautylog": "^5.0.14",
+    "@types/lodash": "^0.0.28",
+    "@types/q": "^0.0.27",
+    "@types/request": "^0.0.27",
+    "@types/shelljs": "^0.3.27",
+    "beautylog": "^5.0.18",
     "gulp": "^3.9.1",
     "gulp-function": "^1.3.6",
-    "lodash": "^4.13.1",
+    "lodash": "^4.14.1",
     "projectinfo": "^1.0.3",
     "q": "^1.4.1",
-    "request": "^2.73.0",
+    "request": "^2.74.0",
-    "shelljs": "^0.7.0",
+    "shelljs": "^0.7.3",
     "smartcli": "^1.0.4",
-    "smartfile": "^4.0.11",
+    "smartfile": "^4.0.12",
     "smartparam": "^0.1.1",
     "smartssh": "^1.1.5",
     "smartstring": "^2.0.15",

ts/npmci.bash.ts

@@ -1,26 +1,38 @@
 import "typings-global";
 import * as plugins from "./npmci.plugins";
 
-export let bash = (commandArg:string,retryArg = 2,bareArg = false) => {
+
-    let exitCode:number;
+let nvmSourceString: string = "";
-    let stdOut:string;
+export let nvmAvailable: boolean = false;
+let checkNvm = () => {
+    if (plugins.shelljs.exec(`bash -c "source /usr/local/nvm/nvm.sh"`,{silent:true}).code === 0) {
+        nvmSourceString = `source /usr/local/nvm/nvm.sh && `
+        nvmAvailable = true;
+    } else if (plugins.shelljs.exec(`bash -c "source ~/.nvm/nvm.sh"`,{silent:true}).code === 0) {
+        nvmSourceString = `source ~/.nvm/nvm.sh && `
+        nvmAvailable = true;
+    };
+};
+checkNvm();
+
+export let bash = (commandArg: string, retryArg = 2, bareArg = false) => {
+    let exitCode: number;
+    let stdOut: string;
     let execResult;
-    if(!process.env.NPMTS_TEST){
+    if (!process.env.NPMTS_TEST) { // NPMTS_TEST is used during testing
-        for (let i = 0; i <= retryArg; i++){
+        for (let i = 0; i <= retryArg; i++) {
-            if(!bareArg){
+            if (!bareArg) {
                 execResult = plugins.shelljs.exec(
-                    "bash -c \"source /usr/local/nvm/nvm.sh &&" +
+                    `bash -c "${nvmSourceString} ${commandArg}"`
-                    commandArg +
-                    "\""
                 );
             } else {
                 execResult = plugins.shelljs.exec(commandArg);
             }
             exitCode = execResult.code;
             stdOut = execResult.stdout;
-            if(exitCode !== 0 && i == retryArg){
+            if (exitCode !== 0 && i == retryArg) {
                 process.exit(1);
-            } else if(exitCode == 0){
+            } else if (exitCode == 0) {
                 i = retryArg + 1; // if everything works out ok retrials are not wanted
             } else {
                 plugins.beautylog.warn("Something went wrong! Exit Code: " + exitCode.toString());
@@ -33,6 +45,6 @@ export let bash = (commandArg:string,retryArg = 2,bareArg = false) => {
     return stdOut;
 }
 
-export let bashBare = (commandArg,retryArg = 2) => {
+export let bashBare = (commandArg, retryArg = 2) => {
-    return bash(commandArg,retryArg,true);
+    return bash(commandArg, retryArg, true);
 }

ts/npmci.install.ts

@@ -1,25 +1,27 @@
 import "typings-global";
 import * as plugins from "./npmci.plugins";
-import {bash} from "./npmci.bash";
+import { bash } from "./npmci.bash";
+import { nvmAvailable } from "./npmci.bash"
 
 export let install = (versionArg) => {
     let done = plugins.q.defer();
     plugins.beautylog.log("now installing " + "node ".green + ("version " + versionArg).yellow);
-    let version:string;
+    let version: string;
-    if(versionArg == "stable"){
+    if (versionArg == "stable") {
         version = "6.3.0";
-    } else if(versionArg == "lts"){
+    } else if (versionArg == "lts") {
         version = "6.3.0";
-    } else if(versionArg == "legacy"){
+    } else if (versionArg == "legacy") {
         version = "6.3.0"
     } else {
         version = versionArg;
     };
-    bash(
+    if (nvmAvailable) {
-        "nvm install " + version +
+        bash(`nvm install ${version} && nvm alias default ${version}`)
-        " && nvm alias default " + version
+        plugins.beautylog.success(`Node version ${version} successfully installed!`);
-    );
+    } else {
-    plugins.beautylog.success("Node version " + version + " successfully installed!");
+        plugins.beautylog.warn("Nvm not in path so staying at installed node version!");
+    };
     bash("node -v");
     bash("npm -v");
     done.resolve();

ts/npmci.plugins.ts

@@ -5,9 +5,9 @@ export let gulpFunction = require("gulp-function");
 export let lodash = require("lodash");
 export import path = require("path");
 export import projectinfo = require("projectinfo");
-export let q = require("q");
+export import q = require("q");
 export let request = require("request");
-export let shelljs = require("shelljs");
+export import shelljs = require("shelljs");
 export import smartcli = require("smartcli");
 export import smartfile = require("smartfile");
 export import smartparam = require("smartparam");