2.3.49

dist/npmci.bash.d.ts

@@ -3,6 +3,7 @@ import * as plugins from './npmci.plugins';
  * wether nvm is available or not
  */
 export declare let nvmAvailable: plugins.q.Deferred<boolean>;
+export declare let yarnAvailable: plugins.q.Deferred<boolean>;
 /**
  * bash() allows using bash with nvm in path
  * @param commandArg - The command to execute

dist/npmci.bash.js

@@ -9,11 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
+const paths = require("./npmci.paths");
 const smartq = require("smartq");
 /**
  * wether nvm is available or not
  */
 exports.nvmAvailable = smartq.defer();
+exports.yarnAvailable = smartq.defer();
 /**
  * the smartshell instance for npmci
  */
@@ -21,21 +23,30 @@ let npmciSmartshell = new plugins.smartshell.Smartshell({
     executor: 'bash',
     sourceFilePaths: []
 });
-let checkNvm = () => __awaiter(this, void 0, void 0, function* () {
+/**
+ * check for tools.
+ */
+let checkToolsAvailable = () => __awaiter(this, void 0, void 0, function* () {
+    // check for nvm
     if ((yield plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0) {
-        npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh && `]);
+        npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh`]);
         exports.nvmAvailable.resolve(true);
     }
     else if ((yield plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0) {
-        npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh && `]);
+        npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh`]);
         exports.nvmAvailable.resolve(true);
     }
     else {
         exports.nvmAvailable.resolve(false);
     }
     ;
+    // check for yarn
+    yield plugins.smartshell.which('yarn').then(() => {
+        plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`);
+        exports.yarnAvailable.resolve(true);
+    }, () => { exports.yarnAvailable.resolve(false); });
 });
-checkNvm();
+checkToolsAvailable();
 /**
  * bash() allows using bash with nvm in path
  * @param commandArg - The command to execute
@@ -53,7 +64,7 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => __awaiter(this, vo
     if (!process.env.NPMTS_TEST) {
         for (let i = 0; i <= retryArg; i++) {
             if (!bareArg) {
-                execResult = yield npmciSmartshell.execSilent(commandArg);
+                execResult = yield npmciSmartshell.exec(commandArg);
             }
             else {
                 execResult = yield plugins.smartshell.exec(commandArg);
@@ -76,6 +87,7 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => __awaiter(this, vo
     }
     else {
         plugins.beautylog.log('ShellExec would be: ' + commandArg);
+        yield plugins.smartdelay.delayFor(100);
         execResult = {
             exitCode: 0,
             stdout: 'testOutput'
@@ -95,4 +107,4 @@ exports.bashBare = (commandArg, retryArg = 2) => __awaiter(this, void 0, void 0,
 exports.bashNoError = (commandArg) => __awaiter(this, void 0, void 0, function* () {
     return yield exports.bash(commandArg, -1);
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyxpQ0FBZ0M7QUFFaEM7O0dBRUc7QUFDUSxRQUFBLFlBQVksR0FBRyxNQUFNLENBQUMsS0FBSyxFQUFXLENBQUE7QUFFakQ7O0dBRUc7QUFDSCxJQUFJLGVBQWUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO0lBQ3RELFFBQVEsRUFBRSxNQUFNO0lBQ2hCLGVBQWUsRUFBRSxFQUFFO0NBQ3BCLENBQUMsQ0FBQTtBQUVGLElBQUksUUFBUSxHQUFHO0lBQ2IsRUFBRSxDQUFDLENBQ0QsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLHdDQUF3QyxDQUFDLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FDL0YsQ0FBQyxDQUFDLENBQUM7UUFDRCxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUMsMkJBQTJCLENBQUMsQ0FBQyxDQUFBO1FBQzdELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQ1IsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLGdDQUFnQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FDdkYsQ0FBQyxDQUFDLENBQUM7UUFDRCxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFBO1FBQ3JELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLG9CQUFZLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzdCLENBQUM7SUFBQSxDQUFDO0FBQ0osQ0FBQyxDQUFBLENBQUE7QUFDRCxR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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFFdEMsaUNBQWdDO0FBRWhDOztHQUVHO0FBQ1EsUUFBQSxZQUFZLEdBQUcsTUFBTSxDQUFDLEtBQUssRUFBVyxDQUFBO0FBQ3RDLFFBQUEsYUFBYSxHQUFHLE1BQU0sQ0FBQyxLQUFLLEVBQVcsQ0FBQTtBQUNsRDs7R0FFRztBQUNILElBQUksZUFBZSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7SUFDdEQsUUFBUSxFQUFFLE1BQU07SUFDaEIsZUFBZSxFQUFFLEVBQUU7Q0FDcEIsQ0FBQyxDQUFBO0FBRUY7O0dBRUc7QUFDSCxJQUFJLG1CQUFtQixHQUFHO0lBQ3hCLGdCQUFnQjtJQUNoQixFQUFFLENBQUMsQ0FDRCxDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsd0NBQXdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUMvRixDQUFDLENBQUMsQ0FBQztRQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLENBQUE7UUFDekQsb0JBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDNUIsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FDUixDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsZ0NBQWdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUN2RixDQUFDLENBQUMsQ0FBQztRQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFBO1FBQ2pELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNO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

dist/npmci.install.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmci.plugins");
 const configModule = require("./npmci.config");
 const npmci_bash_1 = require("./npmci.bash");
-const npmci_bash_2 = require("./npmci.bash");
 /**
  * Install a specific version of node
  * @param versionArg
@@ -32,7 +31,7 @@ exports.install = (versionArg) => __awaiter(this, void 0, void 0, function* () {
         version = versionArg;
     }
     ;
-    if (yield npmci_bash_2.nvmAvailable.promise) {
+    if (yield npmci_bash_1.nvmAvailable.promise) {
         yield npmci_bash_1.bash(`nvm install ${version} && nvm alias default ${version}`);
         plugins.beautylog.success(`Node version ${version} successfully installed!`);
     }
@@ -43,7 +42,7 @@ exports.install = (versionArg) => __awaiter(this, void 0, void 0, function* () {
     yield npmci_bash_1.bash('node -v');
     yield npmci_bash_1.bash('npm -v');
     // lets look for further config
-    configModule.getConfig()
+    yield configModule.getConfig()
         .then((configArg) => __awaiter(this, void 0, void 0, function* () {
         plugins.beautylog.log('Now checking for needed global npm tools...');
         for (let npmTool of configArg.globalNpmTools) {
@@ -55,10 +54,15 @@ exports.install = (versionArg) => __awaiter(this, void 0, void 0, function* () {
             }
             else {
                 plugins.beautylog.info(`globally installing ${npmTool} from npm`);
-                yield npmci_bash_1.bash(`npm install ${npmTool} -q -g`);
+                if (yield npmci_bash_1.yarnAvailable) {
+                    yield npmci_bash_1.bash(`yarn global add ${npmTool}`);
+                }
+                else {
+                    yield npmci_bash_1.bash(`npm install ${npmTool} -q -g`);
+                }
             }
         }
         plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!');
     }));
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQywrQ0FBOEM7QUFDOUMsNkNBQWdEO0FBQ2hELDZDQUEyQztBQUUzQzs7O0dBR0c7QUFDUSxRQUFBLE9BQU8sR0FBRyxDQUFPLFVBQVU7SUFDcEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsK0JBQStCLFVBQVUsRUFBRSxDQUFDLENBQUE7SUFDbEUsSUFBSSxPQUFlLENBQUE7SUFDbkIsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDNUIsT0FBTyxHQUFHLFFBQVEsQ0FBQTtJQUNwQixDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQ2hDLE9BQU8sR0FBRyxHQUFHLENBQUE7SUFDZixDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ25DLE9BQU8sR0FBRyxHQUFHLENBQUE7SUFDZixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixPQUFPLEdBQUcsVUFBVSxDQUFBO0lBQ3RCLENBQUM7SUFBQSxDQUFDO0lBQ0YsRUFBRSxDQUFDLENBQUMsTUFBTSx5QkFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDL0IsTUFBTSxpQkFBSSxDQUFDLGVBQWUsT0FBTyx5QkFBeUIsT0FBTyxFQUFFLENBQUMsQ0FBQTtRQUNwRSxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsT0FBTywwQkFBMEIsQ0FBQyxDQUFBO0lBQzlFLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHVEQUF1RCxDQUFDLENBQUE7SUFDakYsQ0FBQztJQUFBLENBQUM7SUFDRixNQUFNLGlCQUFJLENBQUMsU0FBUyxDQUFDLENBQUE7SUFDckIsTUFBTSxpQkFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ3BCLCtCQUErQjtJQUMvQixZQUFZLENBQUMsU0FBUyxFQUFFO1NBQ3JCLElBQUksQ0FBQyxDQUFNLFNBQVM7UUFDbkIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsNkNBQTZDLENBQUMsQ0FBQTtRQUNwRSxHQUFHLENBQUMsQ0FBQyxJQUFJLE9BQU8sSUFBSSxTQUFTLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUM3QyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyx3QkFBd0IsT0FBTyxHQUFHLENBQUMsQ0FBQTtZQUMxRCxJQUFJLFdBQVcsR0FBVyxNQUFNLHdCQUFXLENBQUMsU0FBUyxPQUFPLEVBQUUsQ0FBQyxDQUFBO1lBQy9ELElBQUksYUFBYSxHQUFZLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsSUFBSSxXQUFXLEtBQUssRUFBRSxDQUFDLENBQUE7WUFDdEYsRUFBRSxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztnQkFDbEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsUUFBUSxPQUFPLGVBQWUsQ0FBQyxDQUFBO1lBQ3ZELENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDTixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyx1QkFBdUIsT0FBTyxXQUFXLENBQUMsQ0FBQTtnQkFDakUsTUFBTSxpQkFBSSxDQUFDLGVBQWUsT0FBTyxRQUFRLENBQUMsQ0FBQTtZQUM1QyxDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLG9FQUFvRSxDQUFDLENBQUE7SUFDakcsQ0FBQyxDQUFBLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQSxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQywrQ0FBOEM7QUFDOUMsNkNBSXFDO0FBRXJDOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLENBQU8sVUFBVTtJQUNwQyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsVUFBVSxFQUFFLENBQUMsQ0FBQTtJQUNsRSxJQUFJLE9BQWUsQ0FBQTtJQUNuQixFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUM1QixPQUFPLEdBQUcsUUFBUSxDQUFBO0lBQ3BCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDaEMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDbkMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE9BQU8sR0FBRyxVQUFVLENBQUE7SUFDdEIsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyxNQUFNLHlCQUFZLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUMvQixNQUFNLGlCQUFJLENBQUMsZUFBZSxPQUFPLHlCQUF5QixPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBQ3BFLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLGdCQUFnQixPQUFPLDBCQUEwQixDQUFDLENBQUE7SUFDOUUsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdURBQXVELENBQUMsQ0FBQTtJQUNqRixDQUFDO0lBQUEsQ0FBQztJQUNGLE1BQU0saUJBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUNyQixNQUFNLGlCQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDcEIsK0JBQStCO0lBQy9CLE1BQU0sWUFBWSxDQUFDLFNBQVMsRUFBRTtTQUMzQixJQUFJLENBQUMsQ0FBTSxTQUFTO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLDZDQUE2QyxDQUFDLENBQUE7UUFDcEUsR0FBRyxDQUFDLENBQUMsSUFBSSxPQUFPLElBQUksU0FBUyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUM7WUFDN0MsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsd0JBQXdCLE9BQU8sR0FBRyxDQUFDLENBQUE7WUFDMUQsSUFBSSxXQUFXLEdBQVcsTUFBTSx3QkFBVyxDQUFDLFNBQVMsT0FBTyxFQUFFLENBQUMsQ0FBQTtZQUMvRCxJQUFJLGFBQWEsR0FBWSxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksV0FBVyxLQUFLLEVBQUUsQ0FBQyxDQUFBO1lBQ3RGLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7Z0JBQ2xCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLFFBQVEsT0FBTyxlQUFlLENBQUMsQ0FBQTtZQUN2RCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ04sT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLE9BQU8sV0FBVyxDQUFDLENBQUE7Z0JBQ2pFLEVBQUUsQ0FBQyxDQUFDLE1BQU0sMEJBQWEsQ0FBQyxDQUFDLENBQUM7b0JBQ3hCLE1BQU0saUJBQUksQ0FBQyxtQkFBbUIsT0FBTyxFQUFFLENBQUMsQ0FBQTtnQkFDMUMsQ0FBQztnQkFBQyxJQUFJLENBQUMsQ0FBQztvQkFDTixNQUFNLGlCQUFJLENBQUMsZUFBZSxPQUFPLFFBQVEsQ0FBQyxDQUFBO2dCQUM1QyxDQUFDO1lBQ0gsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxvRUFBb0UsQ0FBQyxDQUFBO0lBQ2pHLENBQUMsQ0FBQSxDQUFDLENBQUE7QUFDTixDQUFDLENBQUEsQ0FBQSJ9

dist/npmci.plugins.d.ts

@@ -1,13 +1,14 @@
 export import beautylog = require('beautylog');
 export declare let gulp: any;
 export import gulpFunction = require('gulp-function');
-export declare let lodash: any;
+export import lodash = require('lodash');
 export import npmextra = require('npmextra');
 export import path = require('path');
 export import projectinfo = require('projectinfo');
 export import q = require('smartq');
 export declare let request: any;
 export import smartcli = require('smartcli');
+export import smartdelay = require('smartdelay');
 export import smartfile = require('smartfile');
 export import shelljs = require('shelljs');
 export import smartparam = require('smartparam');

dist/npmci.plugins.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.beautylog = require("beautylog");
 exports.gulp = require('gulp');
 exports.gulpFunction = require("gulp-function");
-exports.lodash = require('lodash');
+exports.lodash = require("lodash");
 exports.npmextra = require("npmextra");
 exports.path = require("path");
 exports.projectinfo = require("projectinfo");
 exports.q = require("smartq");
 exports.request = require('request');
 exports.smartcli = require("smartcli");
+exports.smartdelay = require("smartdelay");
 exports.smartfile = require("smartfile");
 exports.shelljs = require("shelljs");
 exports.smartparam = require("smartparam");
@@ -19,4 +20,4 @@ exports.smartsocket = require("smartsocket");
 exports.smartssh = require("smartssh");
 exports.smartstring = require("smartstring");
 exports.through2 = require("through2");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBOEM7QUFDbkMsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ2pDLGdEQUFxRDtBQUMxQyxRQUFBLE1BQU0sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7QUFDckMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyw2Q0FBa0Q7QUFDbEQsOEJBQW1DO0FBQ3hCLFFBQUEsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUN2Qyx1Q0FBNEM7QUFDNUMseUNBQThDO0FBQzlDLHFDQUEwQztBQUMxQywyQ0FBZ0Q7QUFDaEQsbUNBQXdDO0FBQ3hDLDJDQUFnRDtBQUNoRCw2Q0FBa0Q7QUFDbEQsdUNBQTRDO0FBQzVDLDZDQUFrRDtBQUNsRCx1Q0FBNEMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBOEM7QUFDbkMsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ2pDLGdEQUFxRDtBQUNyRCxtQ0FBd0M7QUFDeEMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyw2Q0FBa0Q7QUFDbEQsOEJBQW1DO0FBQ3hCLFFBQUEsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUN2Qyx1Q0FBNEM7QUFDNUMsMkNBQWdEO0FBQ2hELHlDQUE4QztBQUM5QyxxQ0FBMEM7QUFDMUMsMkNBQWdEO0FBQ2hELG1DQUF3QztBQUN4QywyQ0FBZ0Q7QUFDaEQsNkNBQWtEO0FBQ2xELHVDQUE0QztBQUM1Qyw2Q0FBa0Q7QUFDbEQsdUNBQTRDIn0=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmci",
-  "version": "2.3.44",
+  "version": "2.3.49",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -33,7 +33,7 @@
     "@types/request": "0.x.x",
     "@types/shelljs": "^0.7.0",
     "@types/through2": "^2.0.32",
-    "beautylog": "^6.1.3",
+    "beautylog": "^6.1.5",
     "gulp": "^3.9.1",
     "gulp-function": "^2.2.3",
     "lodash": "^4.17.4",
@@ -42,10 +42,11 @@
     "request": "^2.81.0",
     "shelljs": "^0.7.7",
     "smartcli": "^2.0.1",
+    "smartdelay": "^1.0.1",
     "smartfile": "^4.1.7",
     "smartparam": "^0.1.1",
     "smartq": "^1.1.1",
-    "smartshell": "^1.0.2",
+    "smartshell": "^1.0.6",
     "smartsocket": "^1.1.7",
     "smartssh": "^1.2.1",
     "smartstring": "^2.0.24",

ts/npmci.bash.ts

@@ -1,11 +1,13 @@
 import * as plugins from './npmci.plugins'
+import * as paths from './npmci.paths'
+
 import * as smartq from 'smartq'
 
 /**
  * wether nvm is available or not
  */
 export let nvmAvailable = smartq.defer<boolean>()
-
+export let yarnAvailable = smartq.defer<boolean>()
 /**
  * the smartshell instance for npmci
  */
@@ -14,22 +16,35 @@ let npmciSmartshell = new plugins.smartshell.Smartshell({
   sourceFilePaths: []
 })
 
-let checkNvm = async () => {
+/**
+ * check for tools.
+ */
+let checkToolsAvailable = async () => {
+  // check for nvm
   if (
     (await plugins.smartshell.execSilent(`bash -c "source /usr/local/nvm/nvm.sh"`)).exitCode === 0
   ) {
-    npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh && `])
+    npmciSmartshell.addSourceFiles([`/usr/local/nvm/nvm.sh`])
     nvmAvailable.resolve(true)
   } else if (
     (await plugins.smartshell.execSilent(`bash -c "source ~/.nvm/nvm.sh"`)).exitCode === 0
   ) {
-    npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh && `])
+    npmciSmartshell.addSourceFiles([`~/.nvm/nvm.sh`])
     nvmAvailable.resolve(true)
   } else {
     nvmAvailable.resolve(false)
   };
+
+  // check for yarn
+  await plugins.smartshell.which('yarn').then(
+    () => {
+      plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd,'.yarn')}`)
+      yarnAvailable.resolve(true)
+    },
+    () => { yarnAvailable.resolve(false) }
+  )
 }
-checkNvm()
+checkToolsAvailable()
 
 
 
@@ -52,7 +67,7 @@ export let bash = async (commandArg: string, retryArg: number = 2, bareArg: bool
   if (!process.env.NPMTS_TEST) { // NPMTS_TEST is used during testing
     for (let i = 0; i <= retryArg; i++) {
       if (!bareArg) {
-        execResult = await npmciSmartshell.execSilent(commandArg)
+        execResult = await npmciSmartshell.exec(commandArg)
       } else {
         execResult = await plugins.smartshell.exec(commandArg)
       }
@@ -72,6 +87,7 @@ export let bash = async (commandArg: string, retryArg: number = 2, bareArg: bool
     }
   } else {
     plugins.beautylog.log('ShellExec would be: ' + commandArg)
+    await plugins.smartdelay.delayFor(100)
     execResult = {
       exitCode: 0,
       stdout: 'testOutput'
@@ -83,7 +99,7 @@ export let bash = async (commandArg: string, retryArg: number = 2, bareArg: bool
 /**
  * bashBare allows usage of bash without sourcing any files like nvm
  */
-export let bashBare = async(commandArg: string, retryArg: number = 2): Promise<string> => {
+export let bashBare = async (commandArg: string, retryArg: number = 2): Promise<string> => {
   return await bash(commandArg, retryArg, true)
 }
 

ts/npmci.build.docker.ts

@@ -86,9 +86,9 @@ export let mapDockerfiles = async (sortedArray: Dockerfile[]): Promise<Dockerfil
  * builds the correspoding real docker image for each Dockerfile class instance
  */
 export let buildDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
-  sortedArrayArg.forEach(async function (dockerfileArg) {
+  for (let dockerfileArg of sortedArrayArg) {
     await dockerfileArg.build()
-  })
+  }
   return sortedArrayArg
 }
 
@@ -96,9 +96,9 @@ export let buildDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
  * pushes the real Dockerfile images to a Docker registry
  */
 export let pushDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
-  sortedArrayArg.forEach(async (dockerfileArg) => {
+  for (let dockerfileArg of sortedArrayArg) {
     await dockerfileArg.push(NpmciEnv.buildStage)
-  })
+  }
   return sortedArrayArg
 }
 
@@ -107,9 +107,9 @@ export let pushDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
  * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages.
  */
 export let pullDockerfileImages = async (sortableArrayArg: Dockerfile[], registryArg = 'registry.gitlab.com') => {
-  sortableArrayArg.forEach(async (dockerfileArg) => {
+  for (let dockerfileArg of sortableArrayArg) {
     await dockerfileArg.pull(registryArg)
-  })
+  }
   return sortableArrayArg
 }
 
@@ -118,9 +118,9 @@ export let pullDockerfileImages = async (sortableArrayArg: Dockerfile[], registr
  * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
  */
 export let testDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
-  sortedArrayArg.forEach(async (dockerfileArg) => {
+  for (let dockerfileArg of sortedArrayArg) {
     await dockerfileArg.test()
-  })
+  }
   return sortedArrayArg
 }
 
@@ -163,6 +163,7 @@ export class Dockerfile {
     plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
     await bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .')
     NpmciEnv.dockerFilesBuilt.push(this)
+    return
   };
 
   /**

ts/npmci.install.ts

@@ -1,7 +1,10 @@
 import * as plugins from './npmci.plugins'
 import * as configModule from './npmci.config'
-import { bash, bashNoError } from './npmci.bash'
+import {
-import { nvmAvailable } from './npmci.bash'
+  bash,
+  bashNoError,
+  nvmAvailable,
+  yarnAvailable } from './npmci.bash'
 
 /**
  * Install a specific version of node
@@ -28,7 +31,7 @@ export let install = async (versionArg) => {
   await bash('node -v')
   await bash('npm -v')
   // lets look for further config
-  configModule.getConfig()
+  await configModule.getConfig()
     .then(async configArg => {
       plugins.beautylog.log('Now checking for needed global npm tools...')
       for (let npmTool of configArg.globalNpmTools) {
@@ -39,7 +42,11 @@ export let install = async (versionArg) => {
           plugins.beautylog.log(`Tool ${npmTool} is available`)
         } else {
           plugins.beautylog.info(`globally installing ${npmTool} from npm`)
-          await bash(`npm install ${npmTool} -q -g`)
+          if (await yarnAvailable) {
+            await bash(`yarn global add ${npmTool}`)
+          } else {
+            await bash(`npm install ${npmTool} -q -g`)
+          }
         }
       }
       plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!')

ts/npmci.plugins.ts

@@ -1,13 +1,14 @@
 export import beautylog = require('beautylog')
 export let gulp = require('gulp')
 export import gulpFunction = require('gulp-function')
-export let lodash = require('lodash')
+export import lodash = require('lodash')
 export import npmextra = require('npmextra')
 export import path = require('path')
 export import projectinfo = require('projectinfo')
 export import q = require('smartq')
 export let request = require('request')
 export import smartcli = require('smartcli')
+export import smartdelay = require('smartdelay')
 export import smartfile = require('smartfile')
 export import shelljs = require('shelljs')
 export import smartparam = require('smartparam')

yarn.lock

@@ -22,11 +22,7 @@
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@types/js-base64/-/js-base64-2.1.5.tgz#31b6d36a66a4c59ae3f31b5e16bfd6b832a6eb41"
 
-"@types/lodash@4.x.x", "@types/lodash@^4.14.35":
+"@types/lodash@4.x.x", "@types/lodash@^4.14.35", "@types/lodash@^4.14.55":
-  version "4.14.52"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.52.tgz#de5c7ab14da1289733233c9b0ec6f9e377db90f5"
-
-"@types/lodash@^4.14.55":
   version "4.14.55"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.55.tgz#75d7d4eba020ee4103d4cbd0f2a3ef5db8f7534f"
 
@@ -42,11 +38,7 @@
   version "2.2.39"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.39.tgz#f68d63db8b69c38e9558b4073525cf96c4f7a829"
 
-"@types/node@*":
+"@types/node@*", "@types/node@^7.0.8":
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.5.tgz#96a0f0a618b7b606f1ec547403c00650210bfbb7"
-
-"@types/node@^7.0.8":
   version "7.0.8"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.8.tgz#25e4dd804b630c916ae671233e6d71f6ce18124a"
 
@@ -115,6 +107,10 @@
   dependencies:
     "@types/node" "*"
 
+"@types/which@^1.0.28":
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
+
 "@types/yargs@6.x.x":
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-6.6.0.tgz#91f8e2580a8083049f78311c059aa57d6949df6b"
@@ -231,7 +227,7 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-beautycolor@^1.0.5:
+beautycolor@^1.0.5, beautycolor@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/beautycolor/-/beautycolor-1.0.7.tgz#a4715738ac4c8221371e9cbeb5a6cc6d11ecbf7c"
   dependencies:
@@ -285,19 +281,6 @@ beautylog@^5.0.23:
     typings-global "^1.0.13"
 
 beautylog@^6.0.0, beautylog@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/beautylog/-/beautylog-6.1.1.tgz#2a83603ad7e2a0a09701ac63d7d3064a588dc779"
-  dependencies:
-    "@types/lodash" "4.x.x"
-    beautycolor "^1.0.5"
-    figlet "^1.2.0"
-    lodash "^4.17.4"
-    ora "^1.1.0"
-    smartenv "^2.0.0"
-    smartq "^1.0.4"
-    typings-global "^1.0.14"
-
-beautylog@^6.1.3:
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/beautylog/-/beautylog-6.1.3.tgz#0e8640cc429746b1e0c46e8767e9273b6b1902f1"
   dependencies:
@@ -310,6 +293,19 @@ beautylog@^6.1.3:
     smartq "^1.0.4"
     typings-global "^1.0.14"
 
+beautylog@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/beautylog/-/beautylog-6.1.5.tgz#5d1eca8d32ca9ed49954a1622134b03ed904c44f"
+  dependencies:
+    "@types/lodash" "^4.14.55"
+    beautycolor "^1.0.7"
+    figlet "^1.2.0"
+    lodash "^4.17.4"
+    ora "^1.1.0"
+    smartenv "^2.0.0"
+    smartq "^1.1.1"
+    typings-global "^1.0.14"
+
 beeper@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
@@ -2147,15 +2143,7 @@ set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
 
-shelljs@^0.7.4, shelljs@^0.7.5:
+shelljs@^0.7.4, shelljs@^0.7.5, shelljs@^0.7.6, shelljs@^0.7.7:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
-shelljs@^0.7.6, shelljs@^0.7.7:
   version "0.7.7"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
   dependencies:
@@ -2227,6 +2215,12 @@ smartcli@^2.0.1:
     typings-global "^1.0.14"
     yargs "^6.4.0"
 
+smartdelay@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/smartdelay/-/smartdelay-1.0.1.tgz#687f8bcc09d7c62c9c5a8a1771c1aba3aff54156"
+  dependencies:
+    typings-global "^1.0.14"
+
 smartenv@^1.2.2, smartenv@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/smartenv/-/smartenv-1.2.5.tgz#5e50343ec4653953ef24929fc548cd74ea53205c"
@@ -2244,7 +2238,7 @@ smartenv@^2.0.0:
     q "^1.4.1"
     typings-global "^1.0.14"
 
-smartfile@4.1.6, smartfile@^4.0.21, smartfile@^4.1.0:
+smartfile@4.1.6:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/smartfile/-/smartfile-4.1.6.tgz#d71026aefef99233c56766c3c6c11afc41a19b3a"
   dependencies:
@@ -2261,7 +2255,7 @@ smartfile@4.1.6, smartfile@^4.0.21, smartfile@^4.1.0:
     vinyl "^2.0.1"
     vinyl-file "^3.0.0"
 
-smartfile@^4.1.7:
+smartfile@^4.0.21, smartfile@^4.1.0, smartfile@^4.1.7:
   version "4.1.7"
   resolved "https://registry.yarnpkg.com/smartfile/-/smartfile-4.1.7.tgz#5657bea62ad673d891b2c9a00f5866154e768c3f"
   dependencies:
@@ -2309,13 +2303,15 @@ smartrequest@^1.0.4:
     smartq "^1.1.0"
     typings-global "^1.0.14"
 
-smartshell@^1.0.2:
+smartshell@^1.0.6:
-  version "1.0.2"
+  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/smartshell/-/smartshell-1.0.2.tgz#b05b8ea6b5ea7191f577028f96bf961c26302182"
+  resolved "https://registry.yarnpkg.com/smartshell/-/smartshell-1.0.6.tgz#27b1c79029784abe72ac7e91fe698b7ebecc6629"
   dependencies:
     "@types/shelljs" "^0.6.0"
+    "@types/which" "^1.0.28"
     shelljs "^0.7.6"
     smartq "^1.1.0"
+    which "^1.2.12"
 
 smartsocket@^1.1.7:
   version "1.1.7"