ship.zone/npmci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start shift to making bare bash obsolete

Browse Source
This commit is contained in:
Philipp Kunz 2016-08-02 16:20:32 +02:00
parent 236df3388f
commit 2d9c225d28
17 changed files with 83 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dist/npmci.bash.d.ts vendored
View File

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

16
dist/npmci.bash.js vendored
View File

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

4
dist/npmci.build.d.ts vendored
View File

@ -1,2 +1,4 @@
/// <reference types="q" />
import "typings-global"; 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<{}>;

22
dist/npmci.build.docker.d.ts vendored
View File

@ -1,12 +1,14 @@
/// <reference types="q" />
/// <reference types="node" /> /// <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 { export declare class Dockerfile {
filePath: string; filePath: string;
repo: string; repo: string;
@ -25,8 +27,8 @@ export declare class Dockerfile {
fileContents?: string | Buffer; fileContents?: string | Buffer;
read?: boolean; read?: boolean;
}); });
build(): any; build(): plugins.q.Promise<{}>;
push(stageArg: any): any; push(stageArg: any): plugins.q.Promise<{}>;
pull(registryArg: string): void; pull(registryArg: string): void;
test(): void; test(): void;
getId(): string; getId(): string;

4
dist/npmci.clean.d.ts vendored
View File

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

4
dist/npmci.command.d.ts vendored
View File

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

4
dist/npmci.install.d.ts vendored
View File

@ -1,2 +1,4 @@
/// <reference types="q" />
import "typings-global"; 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<{}>;

4
dist/npmci.plugins.d.ts vendored
View File

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

2
dist/npmci.plugins.js vendored
View File

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

4
dist/npmci.prepare.d.ts vendored
View File

@ -1,2 +1,4 @@
/// <reference types="q" />
import "typings-global"; 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<{}>;

4
dist/npmci.publish.d.ts vendored
View File

@ -1,2 +1,4 @@
/// <reference types="q" />
import "typings-global"; 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<{}>;

4
dist/npmci.ssh.d.ts vendored
View File

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

4
dist/npmci.test.d.ts vendored
View File

@ -1,2 +1,4 @@
/// <reference types="q" />
import "typings-global"; 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<{}>;

4
dist/npmci.trigger.d.ts vendored
View File

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

19
package.json
View File

@ -3,6 +3,7 @@
"version": "2.3.12", "version": "2.3.12",
"description": "", "description": "",
"main": "dist/index.js", "main": "dist/index.js",
"typings": "dist/index.d.ts",
"bin": { "bin": {
"npmci": "dist/index.js" "npmci": "dist/index.js"
}, },
@ -21,25 +22,29 @@
}, },
"homepage": "https://gitlab.com/pushrocks/npmci#README", "homepage": "https://gitlab.com/pushrocks/npmci#README",
"devDependencies": { "devDependencies": {
"npmts-g": "^5.2.6", "npmts-g": "^5.2.8",
"should": "^10.0.0", "should": "^10.0.0",
"typings-test": "^1.0.1" "typings-test": "^1.0.1"
}, },
"dependencies": { "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": "^3.9.1",
"gulp-function": "^1.3.6", "gulp-function": "^1.3.6",
"lodash": "^4.13.1", "lodash": "^4.14.1",
"projectinfo": "^1.0.3", "projectinfo": "^1.0.3",
"q": "^1.4.1", "q": "^1.4.1",
"request": "^2.73.0", "request": "^2.74.0",
"shelljs": "^0.7.0", "shelljs": "^0.7.3",
"smartcli": "^1.0.4", "smartcli": "^1.0.4",
"smartfile": "^4.0.11", "smartfile": "^4.0.12",
"smartparam": "^0.1.1", "smartparam": "^0.1.1",
"smartssh": "^1.1.5", "smartssh": "^1.1.5",
"smartstring": "^2.0.15", "smartstring": "^2.0.15",
"through2": "^2.0.1", "through2": "^2.0.1",
"typings-global": "^1.0.6" "typings-global": "^1.0.6"
} }
} }

18
ts/npmci.bash.ts
View File

@ -1,17 +1,27 @@
import "typings-global"; import "typings-global";
import * as plugins from "./npmci.plugins"; import * as plugins from "./npmci.plugins";
let nvmSourceString:string = "";
export let nvmAvailable:boolean = false;
let checkNvm = () => {
let nvmExecCode = plugins.shelljs.exec(`bash -c "source /usr/local/nvm/nvm.sh"`).code;
if(nvmExecCode === 0){
nvmSourceString = `source /usr/local/nvm/nvm.sh && `
nvmAvailable = true;
}
};
checkNvm();
export let bash = (commandArg:string,retryArg = 2,bareArg = false) => { export let bash = (commandArg:string,retryArg = 2,bareArg = false) => {
let exitCode:number; let exitCode:number;
let stdOut:string; let stdOut:string;
let execResult; 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( execResult = plugins.shelljs.exec(
"bash -c \"source /usr/local/nvm/nvm.sh &&" + `bash -c "${nvmSourceString} ${commandArg}"`
commandArg +
"\""
); );
} else { } else {
execResult = plugins.shelljs.exec(commandArg); execResult = plugins.shelljs.exec(commandArg);

4
ts/npmci.plugins.ts
View File

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