diff --git a/dist/index.d.ts b/dist/index.d.ts index 1a378bd..e76b3f1 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,4 +1,4 @@ -import "typings-global"; -export { build } from "./npmci.build"; -export { install } from "./npmci.install"; -export { publish } from "./npmci.publish"; +import 'typings-global'; +export { build } from './npmci.build'; +export { install } from './npmci.install'; +export { publish } from './npmci.publish'; diff --git a/dist/index.js b/dist/index.js index 09c26dd..86a0d0c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -4,7 +4,7 @@ require("typings-global"); const plugins = require("./npmci.plugins"); const paths = require("./npmci.paths"); let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot); -plugins.beautylog.log("npmci version: " + npmciInfo.version); +plugins.beautylog.log('npmci version: ' + npmciInfo.version); const npmci_build_1 = require("./npmci.build"); const npmci_clean_1 = require("./npmci.clean"); const npmci_command_1 = require("./npmci.command"); @@ -24,58 +24,58 @@ let smartcli = new plugins.smartcli.Smartcli(); smartcli.addVersion(npmciInfo.version); // build smartcli.addCommand({ - commandName: "build" + commandName: 'build' }).then((argv) => { npmci_build_1.build(argv._[1]) .then(NpmciEnv.configStore); }); // clean smartcli.addCommand({ - commandName: "clean" + commandName: 'clean' }).then((argv) => { npmci_clean_1.clean() .then(NpmciEnv.configStore); }); // command smartcli.addCommand({ - commandName: "command" + commandName: 'command' }).then((argv) => { npmci_command_1.command() .then(NpmciEnv.configStore); }); // install smartcli.addCommand({ - commandName: "install" + commandName: 'install' }).then((argv) => { npmci_install_1.install(argv._[1]) .then(NpmciEnv.configStore); }); // prepare smartcli.addCommand({ - commandName: "prepare" + commandName: 'prepare' }).then((argv) => { npmci_prepare_1.prepare(argv._[1]) .then(NpmciEnv.configStore); }); // publish smartcli.addCommand({ - commandName: "publish" + commandName: 'publish' }).then((argv) => { npmci_publish_1.publish(argv._[1]) .then(NpmciEnv.configStore); }); // test smartcli.addCommand({ - commandName: "test" + commandName: 'test' }).then((argv) => { npmci_test_1.test(argv._[1]) .then(NpmciEnv.configStore); }); // trigger smartcli.addCommand({ - commandName: "trigger" + commandName: 'trigger' }).then((argv) => { npmci_trigger_1.trigger(); }); smartcli.startParse(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDBCQUF3QjtBQUN4QiwyQ0FBMkM7QUFDM0MsdUNBQXVDO0FBQ3ZDLElBQUksU0FBUyxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFDL0UsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRTdELCtDQUFtQztBQUNuQywrQ0FBb0M7QUFDcEMsbURBQXdDO0FBQ3hDLG1EQUF3QztBQUN4QyxtREFBd0M7QUFDeEMsbURBQXdDO0FBQ3hDLDZDQUFrQztBQUNsQyxtREFBd0M7QUFDeEMsd0NBQXdDO0FBRXhDLDZDQUFtQztBQUEzQiw4QkFBQSxLQUFLLENBQUE7QUFDYixpREFBd0M7QUFBaEMsa0NBQUEsT0FBTyxDQUFBO0FBQ2YsaURBQXdDO0FBQWhDLGtDQUFBLE9BQU8sQ0FBQTtBQUdmLElBQUksUUFBUSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUMvQyxRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUV2QyxRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUMsT0FBTztDQUN0QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULG1CQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNYLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDcEMsQ0FBQyxDQUFDLENBQUM7QUFFSCxRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUMsT0FBTztDQUN0QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULG1CQUFLLEVBQUU7U0FDRixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQ3BDLENBQUMsQ0FBQyxDQUFDO0FBRUgsVUFBVTtBQUNWLFFBQVEsQ0FBQyxVQUFVLENBQUM7SUFDaEIsV0FBVyxFQUFDLFNBQVM7Q0FDeEIsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCx1QkFBTyxFQUFFO1NBQ0osSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUMsQ0FBQztBQUVILFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBQyxTQUFTO0NBQ3hCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUMsQ0FBQztBQUVILFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBQyxTQUFTO0NBQ3hCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUMsQ0FBQztBQUVILFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBQyxTQUFTO0NBQ3hCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUMsQ0FBQztBQUVILE9BQU87QUFDUCxRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBQyxNQUFNO0NBQ3JCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsaUJBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ1YsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUMsQ0FBQztBQUVILFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBQyxTQUFTO0NBQ3hCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sRUFBRSxDQUFDO0FBQ2QsQ0FBQyxDQUFDLENBQUM7QUFFSCxRQUFRLENBQUMsVUFBVSxFQUFFLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDBCQUF1QjtBQUN2QiwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBQ3RDLElBQUksU0FBUyxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUE7QUFDOUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRTVELCtDQUFtQztBQUNuQywrQ0FBbUM7QUFDbkMsbURBQXVDO0FBQ3ZDLG1EQUF1QztBQUN2QyxtREFBdUM7QUFDdkMsbURBQXVDO0FBQ3ZDLDZDQUFpQztBQUNqQyxtREFBdUM7QUFDdkMsd0NBQXVDO0FBRXZDLDZDQUFtQztBQUEzQiw4QkFBQSxLQUFLLENBQUE7QUFDYixpREFBd0M7QUFBaEMsa0NBQUEsT0FBTyxDQUFBO0FBQ2YsaURBQXdDO0FBQWhDLGtDQUFBLE9BQU8sQ0FBQTtBQUVmLElBQUksUUFBUSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUM5QyxRQUFRLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtBQUV0QyxRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUUsT0FBTztDQUN2QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULG1CQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNYLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUFDLENBQUE7QUFFRixRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUUsT0FBTztDQUN2QixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSTtJQUNULG1CQUFLLEVBQUU7U0FDRixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQ25DLENBQUMsQ0FBQyxDQUFBO0FBRUYsVUFBVTtBQUNWLFFBQVEsQ0FBQyxVQUFVLENBQUM7SUFDaEIsV0FBVyxFQUFFLFNBQVM7Q0FDekIsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUk7SUFDVCx1QkFBTyxFQUFFO1NBQ0osSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUNuQyxDQUFDLENBQUMsQ0FBQTtBQUVGLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxTQUFTO0NBQ3pCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUNuQyxDQUFDLENBQUMsQ0FBQTtBQUVGLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxTQUFTO0NBQ3pCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUNuQyxDQUFDLENBQUMsQ0FBQTtBQUVGLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxTQUFTO0NBQ3pCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUNuQyxDQUFDLENBQUMsQ0FBQTtBQUVGLE9BQU87QUFDUCxRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxNQUFNO0NBQ3RCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsaUJBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ1YsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUNuQyxDQUFDLENBQUMsQ0FBQTtBQUVGLFVBQVU7QUFDVixRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxTQUFTO0NBQ3pCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJO0lBQ1QsdUJBQU8sRUFBRSxDQUFBO0FBQ2IsQ0FBQyxDQUFDLENBQUE7QUFFRixRQUFRLENBQUMsVUFBVSxFQUFFLENBQUEifQ== \ No newline at end of file diff --git a/dist/npmci.bash.d.ts b/dist/npmci.bash.d.ts index a40a79c..0a3695a 100644 --- a/dist/npmci.bash.d.ts +++ b/dist/npmci.bash.d.ts @@ -1,4 +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 bashBare: (commandArg: any, retryArg?: number) => string; diff --git a/dist/npmci.bash.js b/dist/npmci.bash.js index 3564dcb..8a799af 100644 --- a/dist/npmci.bash.js +++ b/dist/npmci.bash.js @@ -1,7 +1,7 @@ "use strict"; require("typings-global"); const plugins = require("./npmci.plugins"); -let nvmSourceString = ""; +let nvmSourceString = ''; exports.nvmAvailable = false; let checkNvm = () => { if (plugins.shelljs.exec(`bash -c "source /usr/local/nvm/nvm.sh"`, { silent: true }).code === 0) { @@ -29,24 +29,24 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => { } 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()); - plugins.beautylog.info("Retry " + (i + 1).toString() + " of " + retryArg.toString()); + plugins.beautylog.warn('Something went wrong! Exit Code: ' + exitCode.toString()); + plugins.beautylog.info('Retry ' + (i + 1).toString() + ' of ' + retryArg.toString()); } } } else { - plugins.beautylog.log("ShellExec would be: " + commandArg); + plugins.beautylog.log('ShellExec would be: ' + commandArg); } return stdOut; }; exports.bashBare = (commandArg, retryArg = 2) => { return exports.bash(commandArg, retryArg, true); }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF3QjtBQUN4QiwyQ0FBMkM7QUFHM0MsSUFBSSxlQUFlLEdBQVcsRUFBRSxDQUFDO0FBQ3RCLFFBQUEsWUFBWSxHQUFZLEtBQUssQ0FBQztBQUN6QyxJQUFJLFFBQVEsR0FBRztJQUNYLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHdDQUF3QyxFQUFDLEVBQUMsTUFBTSxFQUFDLElBQUksRUFBQyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDMUYsZUFBZSxHQUFHLGtDQUFrQyxDQUFBO1FBQ3BELG9CQUFZLEdBQUcsSUFBSSxDQUFDO0lBQ3hCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLEVBQUMsRUFBQyxNQUFNLEVBQUMsSUFBSSxFQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN6RixlQUFlLEdBQUcsMEJBQTBCLENBQUE7UUFDNUMsb0JBQVksR0FBRyxJQUFJLENBQUM7SUFDeEIsQ0FBQztJQUFBLENBQUM7QUFDTixDQUFDLENBQUM7QUFDRixRQUFRLEVBQUUsQ0FBQztBQUVBLFFBQUEsSUFBSSxHQUFHLENBQUMsVUFBa0IsRUFBRSxRQUFRLEdBQUcsQ0FBQyxFQUFFLE9BQU8sR0FBRyxLQUFLO0lBQ2hFLElBQUksUUFBZ0IsQ0FBQztJQUNyQixJQUFJLE1BQWMsQ0FBQztJQUNuQixJQUFJLFVBQVUsQ0FBQztJQUNmLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1FBQzFCLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksUUFBUSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDakMsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO2dCQUNYLFVBQVUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FDN0IsWUFBWSxlQUFlLElBQUksVUFBVSxHQUFHLENBQy9DLENBQUM7WUFDTixDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ2xELENBQUM7WUFDRCxRQUFRLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztZQUMzQixNQUFNLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQztZQUMzQixFQUFFLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUNsQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3BCLENBQUM7WUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsUUFBUSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3ZCLENBQUMsR0FBRyxRQUFRLEdBQUcsQ0FBQyxDQUFDLENBQUMscURBQXFEO1lBQzNFLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsR0FBRyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztnQkFDbEYsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxHQUFHLE1BQU0sR0FBRyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztZQUN6RixDQUFDO1FBQ0wsQ0FBQztJQUNMLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHNCQUFzQixHQUFHLFVBQVUsQ0FBQyxDQUFBO0lBQzlELENBQUM7SUFDRCxNQUFNLENBQUMsTUFBTSxDQUFDO0FBQ2xCLENBQUMsQ0FBQTtBQUVVLFFBQUEsUUFBUSxHQUFHLENBQUMsVUFBVSxFQUFFLFFBQVEsR0FBRyxDQUFDO0lBQzNDLE1BQU0sQ0FBQyxZQUFJLENBQUMsVUFBVSxFQUFFLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQztBQUM1QyxDQUFDLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2QiwyQ0FBMEM7QUFFMUMsSUFBSSxlQUFlLEdBQVcsRUFBRSxDQUFBO0FBQ3JCLFFBQUEsWUFBWSxHQUFZLEtBQUssQ0FBQTtBQUN4QyxJQUFJLFFBQVEsR0FBRztJQUNYLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHdDQUF3QyxFQUFDLEVBQUMsTUFBTSxFQUFFLElBQUksRUFBQyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDM0YsZUFBZSxHQUFHLGtDQUFrQyxDQUFBO1FBQ3BELG9CQUFZLEdBQUcsSUFBSSxDQUFBO0lBQ3ZCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLEVBQUMsRUFBQyxNQUFNLEVBQUUsSUFBSSxFQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMxRixlQUFlLEdBQUcsMEJBQTBCLENBQUE7UUFDNUMsb0JBQVksR0FBRyxJQUFJLENBQUE7SUFDdkIsQ0FBQztJQUFBLENBQUM7QUFDTixDQUFDLENBQUE7QUFDRCxRQUFRLEVBQUUsQ0FBQTtBQUVDLFFBQUEsSUFBSSxHQUFHLENBQUMsVUFBa0IsRUFBRSxRQUFRLEdBQUcsQ0FBQyxFQUFFLE9BQU8sR0FBRyxLQUFLO0lBQ2hFLElBQUksUUFBZ0IsQ0FBQTtJQUNwQixJQUFJLE1BQWMsQ0FBQTtJQUNsQixJQUFJLFVBQVUsQ0FBQTtJQUNkLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1FBQzFCLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksUUFBUSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDakMsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO2dCQUNYLFVBQVUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FDN0IsWUFBWSxlQUFlLElBQUksVUFBVSxHQUFHLENBQy9DLENBQUE7WUFDTCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFBO1lBQ2pELENBQUM7WUFDRCxRQUFRLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQTtZQUMxQixNQUFNLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQTtZQUMxQixFQUFFLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUNuQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQ25CLENBQUM7WUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsUUFBUSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3hCLENBQUMsR0FBRyxRQUFRLEdBQUcsQ0FBQyxDQUFBLENBQUMscURBQXFEO1lBQzFFLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsR0FBRyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtnQkFDakYsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxHQUFHLE1BQU0sR0FBRyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtZQUN4RixDQUFDO1FBQ0wsQ0FBQztJQUNMLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHNCQUFzQixHQUFHLFVBQVUsQ0FBQyxDQUFBO0lBQzlELENBQUM7SUFDRCxNQUFNLENBQUMsTUFBTSxDQUFBO0FBQ2pCLENBQUMsQ0FBQTtBQUVVLFFBQUEsUUFBUSxHQUFHLENBQUMsVUFBVSxFQUFFLFFBQVEsR0FBRyxDQUFDO0lBQzNDLE1BQU0sQ0FBQyxZQUFJLENBQUMsVUFBVSxFQUFFLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQTtBQUMzQyxDQUFDLENBQUEifQ== \ No newline at end of file diff --git a/dist/npmci.build.d.ts b/dist/npmci.build.d.ts index 35e0d39..32da757 100644 --- a/dist/npmci.build.d.ts +++ b/dist/npmci.build.d.ts @@ -1,10 +1,10 @@ /// -import "typings-global"; -import * as plugins from "./npmci.plugins"; +import 'typings-global'; +import * as plugins from './npmci.plugins'; /** * defines possible build services */ -export declare type TBuildService = "docker"; +export declare type TBuildService = 'docker'; /** * builds for a specific service */ diff --git a/dist/npmci.build.docker.d.ts b/dist/npmci.build.docker.d.ts index cb50b81..13bd264 100644 --- a/dist/npmci.build.docker.d.ts +++ b/dist/npmci.build.docker.d.ts @@ -1,6 +1,6 @@ /// /// -import * as plugins from "./npmci.plugins"; +import * as plugins from './npmci.plugins'; /** * builds a cwd of Dockerfiles by triggering a promisechain */ diff --git a/dist/npmci.build.docker.js b/dist/npmci.build.docker.js index cdd8dae..564d276 100644 --- a/dist/npmci.build.docker.js +++ b/dist/npmci.build.docker.js @@ -25,7 +25,7 @@ exports.build = function () { exports.readDockerfiles = function () { let done = plugins.q.defer(); let readDockerfilesArray = []; - plugins.gulp.src("./Dockerfile*") + plugins.gulp.src('./Dockerfile*') .pipe(plugins.through2.obj(function (file, enc, cb) { let myDockerfile = new Dockerfile({ filePath: file.path, @@ -51,16 +51,16 @@ exports.sortDockerfiles = function (sortableArrayArg) { let sorterFunction = function () { sortableArrayArg.forEach((dockerfileArg) => { let cleanTags = exports.cleanTagsArrayFunction(sortableArrayArg, sortedArray); - if (cleanTags.indexOf(dockerfileArg.baseImage) == -1 && sortedArray.indexOf(dockerfileArg) == -1) { + if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) { sortedArray.push(dockerfileArg); } ; - if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) != -1) { + if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) { dockerfileArg.localBaseImageDependent = true; } ; }); - if (sortableArrayArg.length == sortedArray.length) { + if (sortableArrayArg.length === sortedArray.length) { done.resolve(sortedArray); } else if (sorterFunctionCounter < 10) { @@ -80,7 +80,7 @@ exports.mapDockerfiles = function (sortedArray) { sortedArray.forEach((dockerfileArg) => { if (dockerfileArg.localBaseImageDependent) { sortedArray.forEach((dockfile2) => { - if (dockfile2.cleanTag == dockerfileArg.baseImage) { + if (dockfile2.cleanTag === dockerfileArg.baseImage) { dockerfileArg.localBaseDockerfile = dockfile2; } }); @@ -116,7 +116,7 @@ exports.pushDockerfiles = function (sortedArrayArg) { * pulls corresponding real Docker images for instances of Dockerfile from a registry. * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages. */ -exports.pullDockerfileImages = (sortableArrayArg, registryArg = "registry.gitlab.com") => { +exports.pullDockerfileImages = (sortableArrayArg, registryArg = 'registry.gitlab.com') => { let done = plugins.q.defer(); sortableArrayArg.forEach((dockerfileArg) => { dockerfileArg.pull(registryArg); @@ -142,13 +142,13 @@ exports.testDockerfiles = (sortedArrayArg) => { class Dockerfile { constructor(options) { this.filePath = options.filePath; - this.repo = NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo; + this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo; this.version = exports.dockerFileVersion(plugins.path.parse(options.filePath).base); - this.cleanTag = this.repo + ":" + this.version; + this.cleanTag = this.repo + ':' + this.version; this.buildTag = this.cleanTag; - this.testTag = exports.dockerTag("registry.gitlab.com", this.repo, this.version, "test"); + this.testTag = exports.dockerTag('registry.gitlab.com', this.repo, this.version, 'test'); this.releaseTag = exports.dockerTag(NpmciEnv.dockerRegistry, this.repo, this.version); - this.containerName = "dockerfile-" + this.version; + this.containerName = 'dockerfile-' + this.version; if (options.filePath && options.read) { this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath)); } @@ -162,8 +162,8 @@ class Dockerfile { */ build() { let done = plugins.q.defer(); - plugins.beautylog.info("now building Dockerfile for " + this.cleanTag); - npmci_bash_1.bashBare("docker build -t " + this.buildTag + " -f " + this.filePath + " ."); + plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag); + npmci_bash_1.bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .'); NpmciEnv.dockerFilesBuilt.push(this); done.resolve(); return done.promise; @@ -176,16 +176,16 @@ class Dockerfile { let done = plugins.q.defer(); let pushTag; switch (stageArg) { - case "release": + case 'release': pushTag = this.releaseTag; break; - case "test": + case 'test': default: pushTag = this.testTag; break; } - npmci_bash_1.bashBare("docker tag " + this.buildTag + " " + pushTag); - npmci_bash_1.bashBare("docker push " + pushTag); + npmci_bash_1.bashBare('docker tag ' + this.buildTag + ' ' + pushTag); + npmci_bash_1.bashBare('docker push ' + pushTag); done.resolve(); return done.promise; } @@ -195,26 +195,26 @@ class Dockerfile { */ pull(registryArg) { let pullTag = this.testTag; - npmci_bash_1.bashBare("docker pull " + pullTag); - npmci_bash_1.bashBare("docker tag " + pullTag + " " + this.buildTag); + npmci_bash_1.bashBare('docker pull ' + pullTag); + npmci_bash_1.bashBare('docker tag ' + pullTag + ' ' + this.buildTag); } ; /** * tests the Dockerfile; */ test() { - let testFile = plugins.path.join(paths.NpmciTestDir, "test_" + this.version + ".sh"); + let testFile = plugins.path.join(paths.NpmciTestDir, 'test_' + this.version + '.sh'); let testFileExists = plugins.smartfile.fs.fileExistsSync(testFile); if (testFileExists) { - npmci_bash_1.bashBare("docker run --name npmci_test_container " + this.buildTag + " mkdir /npmci_test"); - npmci_bash_1.bashBare("docker cp " + testFile + " npmci_test_container:/npmci_test/test.sh"); - npmci_bash_1.bashBare("docker commit npmci_test_container npmci_test_image"); - npmci_bash_1.bashBare("docker run npmci_test_image sh /npmci_test/test.sh"); - npmci_bash_1.bashBare("docker rm npmci_test_container"); - npmci_bash_1.bashBare("docker rmi --force npmci_test_image"); + npmci_bash_1.bashBare('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test'); + npmci_bash_1.bashBare('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh'); + npmci_bash_1.bashBare('docker commit npmci_test_container npmci_test_image'); + npmci_bash_1.bashBare('docker run npmci_test_image sh /npmci_test/test.sh'); + npmci_bash_1.bashBare('docker rm npmci_test_container'); + npmci_bash_1.bashBare('docker rmi --force npmci_test_image'); } else { - plugins.beautylog.warn("skipping tests for " + this.cleanTag + " because no testfile was found!"); + plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!'); } } ; @@ -222,7 +222,7 @@ class Dockerfile { * gets the id of a Dockerfile */ getId() { - let containerId = npmci_bash_1.bashBare("docker inspect --type=image --format=\"{{.Id}}\" " + this.buildTag); + let containerId = npmci_bash_1.bashBare('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag); return containerId; } ; @@ -235,11 +235,11 @@ exports.dockerFileVersion = function (dockerfileNameArg) { let versionString; let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/; let regexResultArray = versionRegex.exec(dockerfileNameArg); - if (regexResultArray && regexResultArray.length == 2) { + if (regexResultArray && regexResultArray.length === 2) { versionString = regexResultArray[1]; } else { - versionString = "latest"; + versionString = 'latest'; } return versionString; }; @@ -260,10 +260,10 @@ exports.dockerTag = function (registryArg, repoArg, versionArg, suffixArg) { let repo = repoArg; let version = versionArg; if (suffixArg) { - version = versionArg + "_" + suffixArg; + version = versionArg + '_' + suffixArg; } ; - tagString = registry + "/" + repo + ":" + version; + tagString = registry + '/' + repo + ':' + version; return tagString; }; /** @@ -272,10 +272,10 @@ exports.dockerTag = function (registryArg, repoArg, versionArg, suffixArg) { exports.cleanTagsArrayFunction = function (dockerfileArrayArg, trackingArrayArg) { let cleanTagsArray = []; dockerfileArrayArg.forEach(function (dockerfileArg) { - if (trackingArrayArg.indexOf(dockerfileArg) == -1) { + if (trackingArrayArg.indexOf(dockerfileArg) === -1) { cleanTagsArray.push(dockerfileArg.cleanTag); } }); return cleanTagsArray; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"npmci.build.docker.js","sourceRoot":"","sources":["../ts/npmci.build.docker.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"npmci.build.docker.js","sourceRoot":"","sources":["../ts/npmci.build.docker.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/npmci.build.js b/dist/npmci.build.js index f64b0df..f9601d7 100644 --- a/dist/npmci.build.js +++ b/dist/npmci.build.js @@ -7,12 +7,12 @@ const buildDocker = require("./npmci.build.docker"); */ exports.build = function (commandArg) { switch (commandArg) { - case "docker": + case 'docker': return buildDocker.build(); default: - plugins.beautylog.log("build target " + commandArg + " not recognised!"); + plugins.beautylog.log('build target ' + commandArg + ' not recognised!'); } ; return; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5idWlsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXdCO0FBQ3hCLDJDQUEyQztBQUczQyxvREFBbUQ7QUFPbkQ7O0dBRUc7QUFDUSxRQUFBLEtBQUssR0FBRyxVQUFTLFVBQVU7SUFDbEMsTUFBTSxDQUFBLENBQUMsVUFBVSxDQUFDLENBQUEsQ0FBQztRQUNmLEtBQUssUUFBUTtZQUNULE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDL0I7WUFDSSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEdBQUcsVUFBVSxHQUFHLGtCQUFrQixDQUFDLENBQUM7SUFDakYsQ0FBQztJQUFBLENBQUM7SUFDRixNQUFNLENBQUM7QUFDWCxDQUFDLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5idWlsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLDJDQUEwQztBQUcxQyxvREFBbUQ7QUFPbkQ7O0dBRUc7QUFDUSxRQUFBLEtBQUssR0FBRyxVQUFTLFVBQVU7SUFDbEMsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUNqQixLQUFLLFFBQVE7WUFDVCxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQzlCO1lBQ0ksT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZUFBZSxHQUFHLFVBQVUsR0FBRyxrQkFBa0IsQ0FBQyxDQUFBO0lBQ2hGLENBQUM7SUFBQSxDQUFDO0lBQ0YsTUFBTSxDQUFBO0FBQ1YsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/dist/npmci.config.d.ts b/dist/npmci.config.d.ts new file mode 100644 index 0000000..6631064 --- /dev/null +++ b/dist/npmci.config.d.ts @@ -0,0 +1,6 @@ +/// +import * as q from 'q'; +export interface INpmciOptions { + globalNpmTools: string[]; +} +export declare let getConfig: () => q.Promise; diff --git a/dist/npmci.config.js b/dist/npmci.config.js new file mode 100644 index 0000000..9d06e3f --- /dev/null +++ b/dist/npmci.config.js @@ -0,0 +1,16 @@ +"use strict"; +const q = require("q"); +const plugins = require("./npmci.plugins"); +const paths = require("./npmci.paths"); +exports.getConfig = () => { + console.log('getting config'); + let done = q.defer(); + let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd); + let defaultConfig = { + globalNpmTools: [] + }; + let npmciConfig = npmciNpmextra.dataFor('npmci', defaultConfig); + done.resolve(npmciConfig); + return done.promise; +}; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx1QkFBc0I7QUFFdEIsMkNBQTBDO0FBQzFDLHVDQUFzQztBQU0zQixRQUFBLFNBQVMsR0FBRztJQUNuQixPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUE7SUFDN0IsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBaUIsQ0FBQTtJQUNuQyxJQUFJLGFBQWEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUM1RCxJQUFJLGFBQWEsR0FBa0I7UUFDL0IsY0FBYyxFQUFFLEVBQUU7S0FDckIsQ0FBQTtJQUNELElBQUksV0FBVyxHQUFHLGFBQWEsQ0FBQyxPQUFPLENBQWdCLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQTtJQUM5RSxJQUFJLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQ3pCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQSJ9 \ No newline at end of file diff --git a/dist/npmci.install.js b/dist/npmci.install.js index 29f48d6..9b9179e 100644 --- a/dist/npmci.install.js +++ b/dist/npmci.install.js @@ -1,6 +1,7 @@ "use strict"; require("typings-global"); const plugins = require("./npmci.plugins"); +const configModule = require("./npmci.config"); const npmci_bash_1 = require("./npmci.bash"); const npmci_bash_2 = require("./npmci.bash"); exports.install = (versionArg) => { @@ -30,7 +31,15 @@ exports.install = (versionArg) => { ; npmci_bash_1.bash('node -v'); npmci_bash_1.bash('npm -v'); - done.resolve(); + // lets look for further config + configModule.getConfig() + .then(config => { + for (let npmTool of config.globalNpmTools) { + plugins.beautylog.info(`globally installing ${npmTool} from npm`); + npmci_bash_1.bash(`npm install --loglevel=silent -g ${npmTool}`); + } + done.resolve(); + }); return done.promise; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF3QjtBQUN4QiwyQ0FBMkM7QUFDM0MsNkNBQW9DO0FBQ3BDLDZDQUEyQztBQUVoQyxRQUFBLE9BQU8sR0FBRyxDQUFDLFVBQVU7SUFDNUIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsVUFBVSxFQUFFLENBQUMsQ0FBQTtJQUNsRSxJQUFJLE9BQWUsQ0FBQTtJQUNuQixFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUMxQixPQUFPLEdBQUcsUUFBUSxDQUFBO0lBQ3RCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDOUIsT0FBTyxHQUFHLEdBQUcsQ0FBQTtJQUNqQixDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLE9BQU8sR0FBRyxHQUFHLENBQUE7SUFDakIsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxHQUFHLFVBQVUsQ0FBQTtJQUN4QixDQUFDO0lBQUEsQ0FBQztJQUNGLEVBQUUsQ0FBQyxDQUFDLHlCQUFZLENBQUMsQ0FBQyxDQUFDO1FBQ2YsaUJBQUksQ0FBQyxlQUFlLE9BQU8seUJBQXlCLE9BQU8sRUFBRSxDQUFDLENBQUE7UUFDOUQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLE9BQU8sMEJBQTBCLENBQUMsQ0FBQTtJQUNoRixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyx1REFBdUQsQ0FBQyxDQUFBO0lBQ25GLENBQUM7SUFBQSxDQUFDO0lBQ0YsaUJBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUNmLGlCQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDZCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDZCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2QiwyQ0FBMEM7QUFDMUMsK0NBQThDO0FBQzlDLDZDQUFtQztBQUNuQyw2Q0FBMkM7QUFDaEMsUUFBQSxPQUFPLEdBQUcsQ0FBQyxVQUFVO0lBQzVCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDNUIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsK0JBQStCLFVBQVUsRUFBRSxDQUFDLENBQUE7SUFDbEUsSUFBSSxPQUFlLENBQUE7SUFDbkIsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDMUIsT0FBTyxHQUFHLFFBQVEsQ0FBQTtJQUN0QixDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQzlCLE9BQU8sR0FBRyxHQUFHLENBQUE7SUFDakIsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNqQyxPQUFPLEdBQUcsR0FBRyxDQUFBO0lBQ2pCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE9BQU8sR0FBRyxVQUFVLENBQUE7SUFDeEIsQ0FBQztJQUFBLENBQUM7SUFDRixFQUFFLENBQUMsQ0FBQyx5QkFBWSxDQUFDLENBQUMsQ0FBQztRQUNmLGlCQUFJLENBQUMsZUFBZSxPQUFPLHlCQUF5QixPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBQzlELE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLGdCQUFnQixPQUFPLDBCQUEwQixDQUFDLENBQUE7SUFDaEYsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsdURBQXVELENBQUMsQ0FBQTtJQUNuRixDQUFDO0lBQUEsQ0FBQztJQUNGLGlCQUFJLENBQUMsU0FBUyxDQUFDLENBQUE7SUFDZixpQkFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBRWQsK0JBQStCO0lBQy9CLFlBQVksQ0FBQyxTQUFTLEVBQUU7U0FDbkIsSUFBSSxDQUFDLE1BQU07UUFDUixHQUFHLENBQUMsQ0FBQyxJQUFJLE9BQU8sSUFBSSxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUN4QyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyx1QkFBdUIsT0FBTyxXQUFXLENBQUMsQ0FBQTtZQUNqRSxpQkFBSSxDQUFDLHFDQUFxQyxPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBQ3hELENBQUM7UUFDRCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDbEIsQ0FBQyxDQUFDLENBQUE7SUFDTixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUEifQ== \ No newline at end of file diff --git a/dist/npmci.paths.d.ts b/dist/npmci.paths.d.ts index 7eed4ea..22c01e4 100644 --- a/dist/npmci.paths.d.ts +++ b/dist/npmci.paths.d.ts @@ -1,4 +1,4 @@ -import "typings-global"; +import 'typings-global'; export declare let cwd: string; export declare let NpmciPackageRoot: string; export declare let NpmciPackageConfig: string; diff --git a/dist/npmci.paths.js b/dist/npmci.paths.js index 47a9ce7..67fe60e 100644 --- a/dist/npmci.paths.js +++ b/dist/npmci.paths.js @@ -2,8 +2,8 @@ require("typings-global"); const plugins = require("./npmci.plugins"); exports.cwd = process.cwd(); -exports.NpmciPackageRoot = plugins.path.join(__dirname, "../"); -exports.NpmciPackageConfig = plugins.path.join(exports.NpmciPackageRoot, "./config.json"); +exports.NpmciPackageRoot = plugins.path.join(__dirname, '../'); +exports.NpmciPackageConfig = plugins.path.join(exports.NpmciPackageRoot, './config.json'); exports.NpmciProjectDir = exports.cwd; -exports.NpmciTestDir = plugins.path.join(exports.cwd, "./test"); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXdCO0FBQ3hCLDJDQUEyQztBQUVoQyxRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7QUFFcEIsUUFBQSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsS0FBSyxDQUFDLENBQUM7QUFDdEQsUUFBQSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx3QkFBZ0IsRUFBQyxlQUFlLENBQUMsQ0FBQztBQUN6RSxRQUFBLGVBQWUsR0FBRyxXQUFHLENBQUM7QUFDdEIsUUFBQSxZQUFZLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBRyxFQUFDLFFBQVEsQ0FBQyxDQUFDIn0= \ No newline at end of file +exports.NpmciTestDir = plugins.path.join(exports.cwd, './test'); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1jaS5wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLDJDQUEwQztBQUUvQixRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUE7QUFFbkIsUUFBQSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsS0FBSyxDQUFDLENBQUE7QUFDckQsUUFBQSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx3QkFBZ0IsRUFBQyxlQUFlLENBQUMsQ0FBQTtBQUN4RSxRQUFBLGVBQWUsR0FBRyxXQUFHLENBQUE7QUFDckIsUUFBQSxZQUFZLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBRyxFQUFDLFFBQVEsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/dist/npmci.plugins.d.ts b/dist/npmci.plugins.d.ts index dd3899f..593a22b 100644 --- a/dist/npmci.plugins.d.ts +++ b/dist/npmci.plugins.d.ts @@ -1,17 +1,18 @@ -import "typings-global"; -export import beautylog = require("beautylog"); +import 'typings-global'; +export import beautylog = require('beautylog'); export declare let gulp: any; -export declare let gulpFunction: any; -export declare let lodash: any; -export import path = require("path"); -export import projectinfo = require("projectinfo"); -export import q = require("q"); +export import gulpFunction = require('gulp-function'); +export import lodash = require('lodash'); +export import npmextra = require('npmextra'); +export import path = require('path'); +export import projectinfo = require('projectinfo'); +export import q = require('q'); export declare let request: any; -export import shelljs = require("shelljs"); -export import smartcli = require("smartcli"); -export import smartfile = require("smartfile"); -export import smartparam = require("smartparam"); -export import smartsocket = require("smartsocket"); -export import smartssh = require("smartssh"); -export import smartstring = require("smartstring"); -export declare let through2: any; +export import shelljs = require('shelljs'); +export import smartcli = require('smartcli'); +export import smartfile = require('smartfile'); +export import smartparam = require('smartparam'); +export import smartsocket = require('smartsocket'); +export import smartssh = require('smartssh'); +export import smartstring = require('smartstring'); +export import through2 = require('through2'); diff --git a/dist/npmci.plugins.js b/dist/npmci.plugins.js index cf48e96..e202995 100644 --- a/dist/npmci.plugins.js +++ b/dist/npmci.plugins.js @@ -1,13 +1,14 @@ "use strict"; require("typings-global"); exports.beautylog = require("beautylog"); -exports.gulp = require("gulp"); +exports.gulp = require('gulp'); exports.gulpFunction = require("gulp-function"); exports.lodash = require("lodash"); +exports.npmextra = require("npmextra"); exports.path = require("path"); exports.projectinfo = require("projectinfo"); exports.q = require("q"); -exports.request = require("request"); +exports.request = require('request'); exports.shelljs = require("shelljs"); exports.smartcli = require("smartcli"); exports.smartfile = require("smartfile"); @@ -16,4 +17,4 @@ exports.smartsocket = require("smartsocket"); exports.smartssh = require("smartssh"); exports.smartstring = require("smartstring"); exports.through2 = require("through2"); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF3QjtBQUN4Qix5Q0FBK0M7QUFDcEMsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQ3ZCLFFBQUEsWUFBWSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUN4QyxRQUFBLE1BQU0sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7QUFDdEMsK0JBQXFDO0FBQ3JDLDZDQUFtRDtBQUNuRCx5QkFBK0I7QUFDcEIsUUFBQSxPQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQ3hDLHFDQUEyQztBQUMzQyx1Q0FBNkM7QUFDN0MseUNBQStDO0FBQy9DLDJDQUFpRDtBQUNqRCw2Q0FBbUQ7QUFDbkQsdUNBQTZDO0FBQzdDLDZDQUFtRDtBQUN4QyxRQUFBLFFBQVEsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2Qix5Q0FBOEM7QUFDbkMsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ2pDLGdEQUFxRDtBQUNyRCxtQ0FBd0M7QUFDeEMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyw2Q0FBa0Q7QUFDbEQseUJBQThCO0FBQ25CLFFBQUEsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUN2QyxxQ0FBMEM7QUFDMUMsdUNBQTRDO0FBQzVDLHlDQUE4QztBQUM5QywyQ0FBZ0Q7QUFDaEQsNkNBQWtEO0FBQ2xELHVDQUE0QztBQUM1Qyw2Q0FBa0Q7QUFDbEQsdUNBQTRDIn0= \ No newline at end of file diff --git a/dist/npmci.prepare.d.ts b/dist/npmci.prepare.d.ts index 2ef0ab7..51838b9 100644 --- a/dist/npmci.prepare.d.ts +++ b/dist/npmci.prepare.d.ts @@ -1,10 +1,10 @@ /// -import "typings-global"; -import * as plugins from "./npmci.plugins"; +import 'typings-global'; +import * as plugins from './npmci.plugins'; /** * defines possible prepare services */ -export declare type TPrepService = "npm" | "docker" | "docker-gitlab" | "ssh"; +export declare type TPrepService = 'npm' | 'docker' | 'docker-gitlab' | 'ssh'; /** * the main exported prepare function * @param servieArg describes the service to prepare diff --git a/dist/npmci.prepare.js b/dist/npmci.prepare.js index 6e5d199..66832f5 100644 --- a/dist/npmci.prepare.js +++ b/dist/npmci.prepare.js @@ -8,17 +8,17 @@ const sshModule = require("./npmci.ssh"); */ let npm = function () { let done = plugins.q.defer(); - let npmrcPrefix = "//registry.npmjs.org/:_authToken="; + let npmrcPrefix = '//registry.npmjs.org/:_authToken='; let npmToken = process.env.NPMCI_TOKEN_NPM; let npmrcFileString = npmrcPrefix + npmToken; if (npmToken) { - plugins.beautylog.info("found access token"); + plugins.beautylog.info('found access token'); } else { - plugins.beautylog.error("no access token found! Exiting!"); + plugins.beautylog.error('no access token found! Exiting!'); process.exit(1); } - plugins.smartfile.memory.toFsSync(npmrcFileString, "/root/.npmrc"); + plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc'); done.resolve(); return done.promise; }; @@ -27,17 +27,17 @@ let npm = function () { */ let docker = function () { let done = plugins.q.defer(); - env.setDockerRegistry("docker.io"); + env.setDockerRegistry('docker.io'); let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/; if (!process.env.NPMCI_LOGIN_DOCKER) { - plugins.beautylog.error("You have to specify Login Data to the Docker Registry"); + plugins.beautylog.error('You have to specify Login Data to the Docker Registry'); process.exit(1); } - plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + process.env.CI_BUILD_TOKEN + " " + "registry.gitlab.com"); // Always also login to GitLab Registry + plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com'); // Always also login to GitLab Registry let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER); let username = dockerRegexResultArray[1]; let password = dockerRegexResultArray[2]; - plugins.shelljs.exec("docker login -u " + username + " -p " + password); + plugins.shelljs.exec('docker login -u ' + username + ' -p ' + password); done.resolve(); return done.promise; }; @@ -46,8 +46,8 @@ let docker = function () { */ let dockerGitlab = function () { let done = plugins.q.defer(); - env.setDockerRegistry("registry.gitlab.com"); - plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + process.env.CI_BUILD_TOKEN + " " + "registry.gitlab.com"); + env.setDockerRegistry('registry.gitlab.com'); + plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com'); done.resolve(); return done.promise; }; @@ -66,16 +66,16 @@ let ssh = function () { */ exports.prepare = function (serviceArg) { switch (serviceArg) { - case "npm": + case 'npm': return npm(); - case "docker": + case 'docker': return docker(); - case "docker-gitlab": + case 'docker-gitlab': return dockerGitlab(); - case "ssh": + case 'ssh': return ssh(); default: break; } }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHJlcGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnByZXBhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF3QjtBQUN4QiwyQ0FBMkM7QUFFM0MsbUNBQWtDO0FBQ2xDLHlDQUF3QztBQVV4Qzs7R0FFRztBQUNILElBQUksR0FBRyxHQUFHO0lBQ04sSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUU3QixJQUFJLFdBQVcsR0FBVSxtQ0FBbUMsQ0FBQztJQUM3RCxJQUFJLFFBQVEsR0FBVSxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQztJQUNsRCxJQUFJLGVBQWUsR0FBRyxXQUFXLEdBQUcsUUFBUSxDQUFDO0lBRTdDLEVBQUUsQ0FBQSxDQUFDLFFBQVEsQ0FBQyxDQUFBLENBQUM7UUFDVCxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUM7UUFDM0QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLGVBQWUsRUFBQyxjQUFjLENBQUMsQ0FBQztJQUNsRSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUM7QUFFRjs7R0FFRztBQUNILElBQUksTUFBTSxHQUFHO0lBQ1QsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixHQUFHLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbkMsSUFBSSxXQUFXLEdBQUcscUNBQXFDLENBQUE7SUFDdkQsRUFBRSxDQUFBLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUEsQ0FBQztRQUNoQyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyx1REFBdUQsQ0FBQyxDQUFDO1FBQ2pGLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDcEIsQ0FBQztJQUNELE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxHQUFHLEdBQUcsR0FBRyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsdUNBQXVDO0lBQy9KLElBQUksc0JBQXNCLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUM7SUFDOUUsSUFBSSxRQUFRLEdBQUcsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDekMsSUFBSSxRQUFRLEdBQUcsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDekMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEdBQUcsUUFBUSxHQUFHLE1BQU0sR0FBRyxRQUFRLENBQUMsQ0FBQztJQUN4RSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksWUFBWSxHQUFHO0lBQ2YsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixHQUFHLENBQUMsaUJBQWlCLENBQUMscUJBQXFCLENBQUMsQ0FBQztJQUM3QyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRyxHQUFHLEdBQUcscUJBQXFCLENBQUMsQ0FBQztJQUN2SCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksR0FBRyxHQUFHO0lBQ04sSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixTQUFTLENBQUMsR0FBRyxFQUFFO1NBQ1YsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN4QixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUM7QUFFRjs7O0dBR0c7QUFDUSxRQUFBLE9BQU8sR0FBRyxVQUFTLFVBQXVCO0lBQ2pELE1BQU0sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7UUFDakIsS0FBSyxLQUFLO1lBQ04sTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ2pCLEtBQUssUUFBUTtZQUNULE1BQU0sQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNwQixLQUFLLGVBQWU7WUFDaEIsTUFBTSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQzFCLEtBQUssS0FBSztZQUNOLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNqQjtZQUNJLEtBQUssQ0FBQztJQUNkLENBQUM7QUFDTCxDQUFDLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHJlcGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnByZXBhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2QiwyQ0FBMEM7QUFFMUMsbUNBQWtDO0FBQ2xDLHlDQUF3QztBQVV4Qzs7R0FFRztBQUNILElBQUksR0FBRyxHQUFHO0lBQ04sSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUU1QixJQUFJLFdBQVcsR0FBVyxtQ0FBbUMsQ0FBQTtJQUM3RCxJQUFJLFFBQVEsR0FBVyxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQTtJQUNsRCxJQUFJLGVBQWUsR0FBRyxXQUFXLEdBQUcsUUFBUSxDQUFBO0lBRTVDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDWCxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO0lBQ2hELENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUE7UUFDMUQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNuQixDQUFDO0lBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLGVBQWUsRUFBQyxjQUFjLENBQUMsQ0FBQTtJQUNqRSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDZCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksTUFBTSxHQUFHO0lBQ1QsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixHQUFHLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDbEMsSUFBSSxXQUFXLEdBQUcscUNBQXFDLENBQUE7SUFDdkQsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztRQUNsQyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyx1REFBdUQsQ0FBQyxDQUFBO1FBQ2hGLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDbkIsQ0FBQztJQUNELE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxHQUFHLEdBQUcsR0FBRyxxQkFBcUIsQ0FBQyxDQUFBLENBQUMsdUNBQXVDO0lBQzlKLElBQUksc0JBQXNCLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUE7SUFDN0UsSUFBSSxRQUFRLEdBQUcsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDeEMsSUFBSSxRQUFRLEdBQUcsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDeEMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEdBQUcsUUFBUSxHQUFHLE1BQU0sR0FBRyxRQUFRLENBQUMsQ0FBQTtJQUN2RSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDZCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksWUFBWSxHQUFHO0lBQ2YsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixHQUFHLENBQUMsaUJBQWlCLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM1QyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRyxHQUFHLEdBQUcscUJBQXFCLENBQUMsQ0FBQTtJQUN0SCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDZCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksR0FBRyxHQUFHO0lBQ04sSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixTQUFTLENBQUMsR0FBRyxFQUFFO1NBQ1YsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUN2QixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFFRDs7O0dBR0c7QUFDUSxRQUFBLE9BQU8sR0FBRyxVQUFTLFVBQXdCO0lBQ2xELE1BQU0sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7UUFDakIsS0FBSyxLQUFLO1lBQ04sTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFBO1FBQ2hCLEtBQUssUUFBUTtZQUNULE1BQU0sQ0FBQyxNQUFNLEVBQUUsQ0FBQTtRQUNuQixLQUFLLGVBQWU7WUFDaEIsTUFBTSxDQUFDLFlBQVksRUFBRSxDQUFBO1FBQ3pCLEtBQUssS0FBSztZQUNOLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQTtRQUNoQjtZQUNJLEtBQUssQ0FBQTtJQUNiLENBQUM7QUFDTCxDQUFDLENBQUEifQ== \ No newline at end of file diff --git a/dist/npmci.publish.d.ts b/dist/npmci.publish.d.ts index 72d916e..8492ed9 100644 --- a/dist/npmci.publish.d.ts +++ b/dist/npmci.publish.d.ts @@ -1,10 +1,10 @@ /// -import "typings-global"; -import * as plugins from "./npmci.plugins"; +import 'typings-global'; +import * as plugins from './npmci.plugins'; /** * type of supported services */ -export declare type TPubService = "npm" | "docker"; +export declare type TPubService = 'npm' | 'docker'; /** * the main exported publish function. * @param pubServiceArg references targeted service to publish to diff --git a/dist/npmci.publish.js b/dist/npmci.publish.js index f71c20c..ac908c0 100644 --- a/dist/npmci.publish.js +++ b/dist/npmci.publish.js @@ -8,11 +8,11 @@ const NpmciBuildDocker = require("./npmci.build.docker"); * the main exported publish function. * @param pubServiceArg references targeted service to publish to */ -exports.publish = (pubServiceArg = "npm") => { +exports.publish = (pubServiceArg = 'npm') => { switch (pubServiceArg) { - case "npm": + case 'npm': return publishNpm(); - case "docker": + case 'docker': return publishDocker(); } }; @@ -21,10 +21,10 @@ exports.publish = (pubServiceArg = "npm") => { */ let publishNpm = function () { let done = plugins.q.defer(); - npmci_prepare_1.prepare("npm") + npmci_prepare_1.prepare('npm') .then(function () { - npmci_bash_1.bash("npm publish"); - plugins.beautylog.ok("Done!"); + npmci_bash_1.bash('npm publish'); + plugins.beautylog.ok('Done!'); done.resolve(); }); return done.promise; @@ -40,4 +40,4 @@ let publishDocker = function () { .then(done.resolve); return done.promise; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHVibGlzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF3QjtBQUN4QiwyQ0FBMkM7QUFDM0MsbURBQXdDO0FBQ3hDLDZDQUFrQztBQUVsQyx5REFBd0Q7QUFPeEQ7OztHQUdHO0FBQ1EsUUFBQSxPQUFPLEdBQUcsQ0FBQyxnQkFBNEIsS0FBSztJQUNuRCxNQUFNLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQSxDQUFDO1FBQ25CLEtBQUssS0FBSztZQUNOLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUN4QixLQUFLLFFBQVE7WUFDVCxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7SUFDL0IsQ0FBQztBQUNMLENBQUMsQ0FBQztBQUVGOztHQUVHO0FBQ0gsSUFBSSxVQUFVLEdBQUk7SUFDZCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLHVCQUFPLENBQUMsS0FBSyxDQUFDO1NBQ1QsSUFBSSxDQUFDO1FBQ0YsaUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBRTtRQUMvQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDUixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN2QixDQUFDLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksYUFBYSxHQUFHO0lBQ2hCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDekIsZ0JBQWdCLENBQUMsZUFBZSxFQUFFO1NBQ2pDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxvQkFBb0IsQ0FBQztTQUMzQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDO1NBQ3RDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDeEIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucHVibGlzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2QiwyQ0FBMEM7QUFDMUMsbURBQXVDO0FBQ3ZDLDZDQUFpQztBQUVqQyx5REFBd0Q7QUFPeEQ7OztHQUdHO0FBQ1EsUUFBQSxPQUFPLEdBQUcsQ0FBQyxnQkFBNkIsS0FBSztJQUNwRCxNQUFNLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQ3BCLEtBQUssS0FBSztZQUNOLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQTtRQUN2QixLQUFLLFFBQVE7WUFDVCxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUE7SUFDOUIsQ0FBQztBQUNMLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxVQUFVLEdBQUk7SUFDZCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLHVCQUFPLENBQUMsS0FBSyxDQUFDO1NBQ1QsSUFBSSxDQUFDO1FBQ0YsaUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtRQUNuQixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUM3QixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDbEIsQ0FBQyxDQUFDLENBQUE7SUFDUCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN0QixDQUFDLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksYUFBYSxHQUFHO0lBQ2hCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDeEIsZ0JBQWdCLENBQUMsZUFBZSxFQUFFO1NBQ2pDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxvQkFBb0IsQ0FBQztTQUMzQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDO1NBQ3RDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDdkIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDdkIsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/dist/npmci.servezone.js b/dist/npmci.servezone.js index 9cb0fbb..2bcd3a6 100644 --- a/dist/npmci.servezone.js +++ b/dist/npmci.servezone.js @@ -13,10 +13,10 @@ let servezoneRegexResultArray = servezoneRegex.exec(process.env.NPMCI_SERVEZONE) * the data object that is used for the smartsocket client object */ let smartsocketClientConstructorOptions = { - alias: "npmci", + alias: 'npmci', password: servezoneRegexResultArray[3], port: parseInt(servezoneRegexResultArray[2]), - role: "ci", + role: 'ci', url: servezoneRegexResultArray[1] }; /** @@ -25,4 +25,4 @@ let smartsocketClientConstructorOptions = { exports.run = (configArg) => { new plugins.smartsocket.SmartsocketClient(smartsocketClientConstructorOptions); }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc2VydmV6b25lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc2VydmV6b25lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwyQ0FBMkM7QUFFM0M7OztHQUdHO0FBQ0gsSUFBSSxjQUFjLEdBQUcsbUJBQW1CLENBQUM7QUFFekM7O0dBRUc7QUFDSCxJQUFJLHlCQUF5QixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUVqRjs7R0FFRztBQUNILElBQUksbUNBQW1DLEdBQUc7SUFDdEMsS0FBSyxFQUFFLE9BQU87SUFDZCxRQUFRLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0lBQ3RDLElBQUksRUFBRSxRQUFRLENBQUMseUJBQXlCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUMsSUFBSSxFQUFFLElBQUk7SUFDVixHQUFHLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0NBQ3BDLENBQUM7QUFFRjs7R0FFRztBQUNRLFFBQUEsR0FBRyxHQUFHLENBQUMsU0FBUztJQUN2QixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQ3JDLG1DQUFtQyxDQUN0QyxDQUFDO0FBQ04sQ0FBQyxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc2VydmV6b25lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc2VydmV6b25lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwyQ0FBMEM7QUFFMUM7OztHQUdHO0FBQ0gsSUFBSSxjQUFjLEdBQUcsbUJBQW1CLENBQUE7QUFFeEM7O0dBRUc7QUFDSCxJQUFJLHlCQUF5QixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUVoRjs7R0FFRztBQUNILElBQUksbUNBQW1DLEdBQUc7SUFDdEMsS0FBSyxFQUFFLE9BQU87SUFDZCxRQUFRLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0lBQ3RDLElBQUksRUFBRSxRQUFRLENBQUMseUJBQXlCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUMsSUFBSSxFQUFFLElBQUk7SUFDVixHQUFHLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDO0NBQ3BDLENBQUE7QUFFRDs7R0FFRztBQUNRLFFBQUEsR0FBRyxHQUFHLENBQUMsU0FBUztJQUN2QixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQ3JDLG1DQUFtQyxDQUN0QyxDQUFBO0FBQ0wsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/dist/npmci.ssh.d.ts b/dist/npmci.ssh.d.ts index f47163a..2ddaeb5 100644 --- a/dist/npmci.ssh.d.ts +++ b/dist/npmci.ssh.d.ts @@ -1,6 +1,6 @@ /// -import "typings-global"; -import * as plugins from "./npmci.plugins"; +import 'typings-global'; +import * as plugins from './npmci.plugins'; /** * checks for ENV vars in form of NPMCI_SSHKEY_* and deploys any found ones */ diff --git a/dist/npmci.ssh.js b/dist/npmci.ssh.js index 7a92b84..7e2327d 100644 --- a/dist/npmci.ssh.js +++ b/dist/npmci.ssh.js @@ -9,12 +9,12 @@ let sshInstance; exports.ssh = () => { let done = plugins.q.defer(); sshInstance = new plugins.smartssh.SshInstance(); // init ssh instance - plugins.smartparam.forEachMinimatch(process.env, "NPMCI_SSHKEY_*", evaluateSshEnv); + plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_SSHKEY_*', evaluateSshEnv); if (!process.env.NPMTS_TEST) { sshInstance.writeToDisk(); } else { - plugins.beautylog.log("In test mode, so not storing SSH keys to disk!"); + plugins.beautylog.log('In test mode, so not storing SSH keys to disk!'); } ; done.resolve(); @@ -26,18 +26,18 @@ exports.ssh = () => { let evaluateSshEnv = (sshkeyEnvVarArg) => { let resultArray = sshRegex.exec(sshkeyEnvVarArg); let sshKey = new plugins.smartssh.SshKey(); - plugins.beautylog.info("Found SSH identity for " + resultArray[1]); + plugins.beautylog.info('Found SSH identity for ' + resultArray[1]); if (notUndefined(resultArray[1])) { - plugins.beautylog.log("---> host defined!"); + plugins.beautylog.log('---> host defined!'); sshKey.host = resultArray[1]; } if (notUndefined(resultArray[2])) { - plugins.beautylog.log("---> privKey defined!"); + plugins.beautylog.log('---> privKey defined!'); sshKey.privKeyBase64 = resultArray[2]; } ; if (notUndefined(resultArray[3])) { - "---> pubKey defined!"; + '---> pubKey defined!'; sshKey.pubKeyBase64 = resultArray[3]; } ; @@ -47,6 +47,6 @@ let evaluateSshEnv = (sshkeyEnvVarArg) => { * checks if not undefined */ let notUndefined = (stringArg) => { - return (stringArg && stringArg != "undefined" && stringArg != "##"); + return (stringArg && stringArg !== 'undefined' && stringArg !== '##'); }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc3NoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc3NoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwwQkFBd0I7QUFDeEIsMkNBQTJDO0FBRTNDLElBQUksUUFBUSxHQUFHLG1CQUFtQixDQUFBO0FBQ2xDLElBQUksV0FBd0MsQ0FBQztBQUU3Qzs7R0FFRztBQUNRLFFBQUEsR0FBRyxHQUFHO0lBQ2IsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsb0JBQW9CO0lBQ3RFLE9BQU8sQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBQyxnQkFBZ0IsRUFBQyxjQUFjLENBQUMsQ0FBQztJQUNqRixFQUFFLENBQUEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUEsQ0FBQztRQUN4QixXQUFXLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDOUIsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZ0RBQWdELENBQUMsQ0FBQztJQUM1RSxDQUFDO0lBQUEsQ0FBQztJQUNGLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQztBQUVGOztHQUVHO0FBQ0gsSUFBSSxjQUFjLEdBQUcsQ0FBQyxlQUFlO0lBQ2pDLElBQUksV0FBVyxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDakQsSUFBSSxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQzNDLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHlCQUF5QixHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ25FLEVBQUUsQ0FBQSxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUM7UUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtRQUMzQyxNQUFNLENBQUMsSUFBSSxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBQ0QsRUFBRSxDQUFBLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUEsQ0FBQztRQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBQzlDLE1BQU0sQ0FBQyxhQUFhLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFBQSxDQUFDO0lBQ0YsRUFBRSxDQUFBLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUEsQ0FBQztRQUM3QixzQkFBc0IsQ0FBQTtRQUN0QixNQUFNLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN6QyxDQUFDO0lBQUEsQ0FBQztJQUVGLFdBQVcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDL0IsQ0FBQyxDQUFDO0FBRUY7O0dBRUc7QUFDSCxJQUFJLFlBQVksR0FBRyxDQUFDLFNBQWdCO0lBQ2hDLE1BQU0sQ0FBQyxDQUFDLFNBQVMsSUFBSSxTQUFTLElBQUksV0FBVyxJQUFJLFNBQVMsSUFBSSxJQUFJLENBQUMsQ0FBQztBQUN4RSxDQUFDLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuc3NoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuc3NoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwwQkFBdUI7QUFDdkIsMkNBQTBDO0FBRTFDLElBQUksUUFBUSxHQUFHLG1CQUFtQixDQUFBO0FBQ2xDLElBQUksV0FBeUMsQ0FBQTtBQUU3Qzs7R0FFRztBQUNRLFFBQUEsR0FBRyxHQUFHO0lBQ2IsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFBLENBQUMsb0JBQW9CO0lBQ3JFLE9BQU8sQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBQyxnQkFBZ0IsRUFBQyxjQUFjLENBQUMsQ0FBQTtJQUNoRixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUMxQixXQUFXLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDN0IsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZ0RBQWdELENBQUMsQ0FBQTtJQUMzRSxDQUFDO0lBQUEsQ0FBQztJQUNGLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxjQUFjLEdBQUcsQ0FBQyxlQUFlO0lBQ2pDLElBQUksV0FBVyxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUE7SUFDaEQsSUFBSSxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxDQUFBO0lBQzFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHlCQUF5QixHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2xFLEVBQUUsQ0FBQyxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDL0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtRQUMzQyxNQUFNLENBQUMsSUFBSSxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNoQyxDQUFDO0lBQ0QsRUFBRSxDQUFDLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMvQixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBQzlDLE1BQU0sQ0FBQyxhQUFhLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3pDLENBQUM7SUFBQSxDQUFDO0lBQ0YsRUFBRSxDQUFDLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMvQixzQkFBc0IsQ0FBQTtRQUN0QixNQUFNLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4QyxDQUFDO0lBQUEsQ0FBQztJQUVGLFdBQVcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUE7QUFDOUIsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLFlBQVksR0FBRyxDQUFDLFNBQWlCO0lBQ2pDLE1BQU0sQ0FBQyxDQUFDLFNBQVMsSUFBSSxTQUFTLEtBQUssV0FBVyxJQUFJLFNBQVMsS0FBSyxJQUFJLENBQUMsQ0FBQTtBQUN6RSxDQUFDLENBQUEifQ== \ No newline at end of file diff --git a/dist/npmci.test.d.ts b/dist/npmci.test.d.ts index 8b2b2e8..576719a 100644 --- a/dist/npmci.test.d.ts +++ b/dist/npmci.test.d.ts @@ -1,4 +1,4 @@ /// -import "typings-global"; -import * as plugins from "./npmci.plugins"; +import 'typings-global'; +import * as plugins from './npmci.plugins'; export declare let test: (versionArg: any) => plugins.q.Promise<{}>; diff --git a/dist/npmci.test.js b/dist/npmci.test.js index ef98f94..5c45736 100644 --- a/dist/npmci.test.js +++ b/dist/npmci.test.js @@ -6,7 +6,7 @@ const npmci_install_1 = require("./npmci.install"); const NpmciBuildDocker = require("./npmci.build.docker"); exports.test = (versionArg) => { let done = plugins.q.defer(); - if (versionArg == "docker") { + if (versionArg === 'docker') { testDocker() .then(() => { done.resolve(); @@ -24,15 +24,15 @@ exports.test = (versionArg) => { }; let npmDependencies = function () { let done = plugins.q.defer(); - plugins.beautylog.info("now installing dependencies:"); - npmci_bash_1.bash("npm install"); + plugins.beautylog.info('now installing dependencies:'); + npmci_bash_1.bash('npm install'); done.resolve(); return done.promise; }; let npmTest = () => { let done = plugins.q.defer(); - plugins.beautylog.info("now starting tests:"); - npmci_bash_1.bash("npm test"); + plugins.beautylog.info('now starting tests:'); + npmci_bash_1.bash('npm test'); done.resolve(); return done.promise; }; @@ -44,4 +44,4 @@ let testDocker = function () { .then(done.resolve); return done.promise; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF3QjtBQUN4QiwyQ0FBMkM7QUFDM0MsNkNBQWtDO0FBQ2xDLG1EQUF3QztBQUV4Qyx5REFBeUQ7QUFFOUMsUUFBQSxJQUFJLEdBQUcsQ0FBQyxVQUFVO0lBQ3pCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsRUFBRSxDQUFBLENBQUMsVUFBVSxJQUFJLFFBQVEsQ0FBQyxDQUFBLENBQUM7UUFDdkIsVUFBVSxFQUFFO2FBQ1AsSUFBSSxDQUFDO1lBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1gsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osdUJBQU8sQ0FBQyxVQUFVLENBQUM7YUFDZCxJQUFJLENBQUMsZUFBZSxDQUFDO2FBQ3JCLElBQUksQ0FBQyxPQUFPLENBQUM7YUFDYixJQUFJLENBQUM7WUFDRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDWCxDQUFDO0lBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxlQUFlLEdBQUc7SUFDbEIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDO0lBQ3ZELGlCQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDcEIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxPQUFPLEdBQUc7SUFDVixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLENBQUM7SUFDOUMsaUJBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUNqQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUE7QUFFRCxJQUFJLFVBQVUsR0FBRztJQUNiLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsZ0JBQWdCLENBQUMsZUFBZSxFQUFFO1NBQzdCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxvQkFBb0IsQ0FBQztTQUMzQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDO1NBQ3RDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDdkIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2QiwyQ0FBMEM7QUFDMUMsNkNBQWlDO0FBQ2pDLG1EQUF1QztBQUV2Qyx5REFBd0Q7QUFFN0MsUUFBQSxJQUFJLEdBQUcsQ0FBQyxVQUFVO0lBQ3pCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDNUIsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDMUIsVUFBVSxFQUFFO2FBQ1AsSUFBSSxDQUFDO1lBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ2xCLENBQUMsQ0FBQyxDQUFBO0lBQ1YsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osdUJBQU8sQ0FBQyxVQUFVLENBQUM7YUFDZCxJQUFJLENBQUMsZUFBZSxDQUFDO2FBQ3JCLElBQUksQ0FBQyxPQUFPLENBQUM7YUFDYixJQUFJLENBQUM7WUFDRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDbEIsQ0FBQyxDQUFDLENBQUE7SUFDVixDQUFDO0lBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDdkIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxlQUFlLEdBQUc7SUFDbEIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxDQUFBO0lBQ3RELGlCQUFJLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDbkIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ2QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDdkIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxPQUFPLEdBQUc7SUFDVixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLENBQUE7SUFDN0MsaUJBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUNoQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDZCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFFRCxJQUFJLFVBQVUsR0FBRztJQUNiLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDNUIsZ0JBQWdCLENBQUMsZUFBZSxFQUFFO1NBQzdCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxvQkFBb0IsQ0FBQztTQUMzQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDO1NBQ3RDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDdkIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDdkIsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/dist/npmci.trigger.d.ts b/dist/npmci.trigger.d.ts index 41db310..656841e 100644 --- a/dist/npmci.trigger.d.ts +++ b/dist/npmci.trigger.d.ts @@ -1,4 +1,4 @@ /// -import "typings-global"; -import * as plugins from "./npmci.plugins"; +import 'typings-global'; +import * as plugins from './npmci.plugins'; export declare let trigger: () => plugins.q.Promise<{}>; diff --git a/dist/npmci.trigger.js b/dist/npmci.trigger.js index 6ed33b5..f91de82 100644 --- a/dist/npmci.trigger.js +++ b/dist/npmci.trigger.js @@ -4,8 +4,8 @@ const plugins = require("./npmci.plugins"); let triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/; exports.trigger = function () { let done = plugins.q.defer(); - plugins.beautylog.info("now running triggers"); - plugins.smartparam.forEachMinimatch(process.env, "NPMCI_TRIGGER_*", evaluateTrigger); + plugins.beautylog.info('now running triggers'); + plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger); done.resolve(); return done.promise; }; @@ -16,14 +16,14 @@ let evaluateTrigger = (triggerEnvVarArg) => { let regexProjectTriggerToken = triggerRegexResultArray[3]; let regexRefName = triggerRegexResultArray[4]; let regexTriggerName; - if (triggerRegexResultArray.length == 6) { + if (triggerRegexResultArray.length === 6) { regexTriggerName = triggerRegexResultArray[5]; } else { - regexTriggerName = "Unnamed Trigger"; + regexTriggerName = 'Unnamed Trigger'; } - plugins.beautylog.info("Found Trigger!"); - plugins.beautylog.log("triggering build for ref " + regexRefName + " of " + regexTriggerName); - plugins.request.post("https://gitlab.com/api/v3/projects/" + regexProjectId + "/trigger/builds", { form: { token: regexProjectTriggerToken, ref: regexRefName } }); + plugins.beautylog.info('Found Trigger!'); + plugins.beautylog.log('triggering build for ref ' + regexRefName + ' of ' + regexTriggerName); + plugins.request.post('https://gitlab.com/api/v3/projects/' + regexProjectId + '/trigger/builds', { form: { token: regexProjectTriggerToken, ref: regexRefName } }); }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudHJpZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRyaWdnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF3QjtBQUN4QiwyQ0FBMkM7QUFLM0MsSUFBSSxpQkFBaUIsR0FBRyxnR0FBZ0csQ0FBQztBQUU5RyxRQUFBLE9BQU8sR0FBRztJQUNqQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUM7SUFDL0MsT0FBTyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLGlCQUFpQixFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBQ3JGLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQTtBQUVELElBQUksZUFBZSxHQUFHLENBQUMsZ0JBQWdCO0lBQ25DLElBQUksdUJBQXVCLEdBQUcsaUJBQWlCLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDdkUsSUFBSSxXQUFXLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDN0MsSUFBSSxjQUFjLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDaEQsSUFBSSx3QkFBd0IsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUMxRCxJQUFJLFlBQVksR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM5QyxJQUFJLGdCQUFnQixDQUFDO0lBQ3JCLEVBQUUsQ0FBQyxDQUFDLHVCQUF1QixDQUFDLE1BQU0sSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3RDLGdCQUFnQixHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLGdCQUFnQixHQUFHLGlCQUFpQixDQUFDO0lBQ3pDLENBQUM7SUFDRCxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQ3pDLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLDJCQUEyQixHQUFHLFlBQVksR0FBRyxNQUFNLEdBQUcsZ0JBQWdCLENBQUMsQ0FBQztJQUM5RixPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxjQUFjLEdBQUcsaUJBQWlCLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsR0FBRyxFQUFFLFlBQVksRUFBRSxFQUFFLENBQUMsQ0FBQztBQUN2SyxDQUFDLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kudHJpZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnRyaWdnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2QiwyQ0FBMEM7QUFJMUMsSUFBSSxpQkFBaUIsR0FBRyxnR0FBZ0csQ0FBQTtBQUU3RyxRQUFBLE9BQU8sR0FBRztJQUNqQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUE7SUFDOUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLGlCQUFpQixFQUFFLGVBQWUsQ0FBQyxDQUFBO0lBQ3BGLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQUVELElBQUksZUFBZSxHQUFHLENBQUMsZ0JBQWdCO0lBQ25DLElBQUksdUJBQXVCLEdBQUcsaUJBQWlCLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUE7SUFDdEUsSUFBSSxXQUFXLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDNUMsSUFBSSxjQUFjLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDL0MsSUFBSSx3QkFBd0IsR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6RCxJQUFJLFlBQVksR0FBRyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUM3QyxJQUFJLGdCQUFnQixDQUFBO0lBQ3BCLEVBQUUsQ0FBQyxDQUFDLHVCQUF1QixDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3ZDLGdCQUFnQixHQUFHLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2pELENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLGdCQUFnQixHQUFHLGlCQUFpQixDQUFBO0lBQ3hDLENBQUM7SUFDRCxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFBO0lBQ3hDLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLDJCQUEyQixHQUFHLFlBQVksR0FBRyxNQUFNLEdBQUcsZ0JBQWdCLENBQUMsQ0FBQTtJQUM3RixPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsR0FBRyxjQUFjLEdBQUcsaUJBQWlCLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsR0FBRyxFQUFFLFlBQVksRUFBRSxFQUFFLENBQUMsQ0FBQTtBQUN0SyxDQUFDLENBQUEifQ== \ No newline at end of file diff --git a/package.json b/package.json index 0411b6a..cc42975 100644 --- a/package.json +++ b/package.json @@ -27,24 +27,26 @@ "typings-test": "^1.0.3" }, "dependencies": { - "@types/lodash": "^4.14.39", - "@types/node": "^6.0.47", + "@types/lodash": "^4.14.40", + "@types/node": "^6.0.51", "@types/q": "0.x.x", "@types/request": "0.x.x", - "@types/shelljs": "^0.3.32", + "@types/shelljs": "^0.3.33", + "@types/through2": "^2.0.32", "beautylog": "^6.0.0", "gulp": "^3.9.1", "gulp-function": "^2.2.0", - "lodash": "^4.17.0", + "lodash": "^4.17.2", + "npmextra": "^2.0.3", "projectinfo": "^1.0.4", "q": "^1.4.1", - "request": "^2.78.0", + "request": "^2.79.0", "shelljs": "^0.7.5", - "smartcli": "^1.0.10", + "smartcli": "^1.0.15", "smartfile": "^4.1.0", "smartparam": "^0.1.1", "smartsocket": "^1.1.7", - "smartssh": "^1.1.5", + "smartssh": "^1.2.1", "smartstring": "^2.0.22", "through2": "^2.0.1", "typings-global": "^1.0.14" diff --git a/test/assets/npmextra.json b/test/assets/npmextra.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/test/assets/npmextra.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/test/test.js b/test/test.js index e7429da..5133764 100644 --- a/test/test.js +++ b/test/test.js @@ -2,7 +2,6 @@ require("typings-test"); const should = require("should"); const path = require("path"); -const beautylog = require("beautylog"); // set up environment process.env.CI_BUILD_REPO = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git'; process.env.NPMCI_SSHKEY_1 = 'hostString|somePrivKey|##'; @@ -10,6 +9,7 @@ process.env.NPMTS_TEST = 'true'; process.cwd = () => { return path.join(__dirname, 'assets/'); }; +// require NPMCI files const NpmciBuildDocker = require("../dist/npmci.build.docker"); const NpmciPublish = require("../dist/npmci.publish"); const NpmciTest = require("../dist/npmci.test"); @@ -36,7 +36,6 @@ describe('NPMCI', function () { it('should sort an array of Dockerfiles', function (done) { NpmciBuildDocker.sortDockerfiles(sortableArray) .then(function (sortedArrayArg) { - beautylog.success('final result'); console.log(sortedArrayArg); done(); }); @@ -87,4 +86,4 @@ describe('NPMCI', function () { }); }); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFDaEMsNkJBQTZCO0FBQzdCLHVDQUFzQztBQUV0QyxxQkFBcUI7QUFDckIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEdBQUcsdURBQXVELENBQUE7QUFDbkYsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEdBQUcsMkJBQTJCLENBQUE7QUFDeEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEdBQUcsTUFBTSxDQUFBO0FBQy9CLE9BQU8sQ0FBQyxHQUFHLEdBQUc7SUFDVixNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsU0FBUyxDQUFDLENBQUE7QUFDekMsQ0FBQyxDQUFBO0FBSUQsK0RBQStEO0FBQy9ELHNEQUFzRDtBQUN0RCxnREFBZ0Q7QUFDaEQsOENBQThDO0FBRzlDLElBQUksV0FBd0MsQ0FBQTtBQUM1QyxJQUFJLFdBQXdDLENBQUE7QUFDNUMsSUFBSSxhQUE0QyxDQUFBO0FBRWhELFFBQVEsQ0FBQyxPQUFPLEVBQUM7SUFDYixRQUFRLENBQUMsY0FBYyxFQUFDO1FBQ3BCLEVBQUUsQ0FBQyxpQ0FBaUMsRUFBQztZQUNqQyxXQUFXLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsRUFBQyxRQUFRLEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUMsQ0FBQyxDQUFBO1lBQ3JGLFdBQVcsR0FBRyxJQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFDLFFBQVEsRUFBRSx1QkFBdUIsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFDLENBQUMsQ0FBQTtZQUM5RixNQUFNLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtZQUMzQyxNQUFNLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFD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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFDaEMsNkJBQTRCO0FBRTVCLHFCQUFxQjtBQUNyQixPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsR0FBRyx1REFBdUQsQ0FBQTtBQUNuRixPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsR0FBRywyQkFBMkIsQ0FBQTtBQUN4RCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUE7QUFDL0IsT0FBTyxDQUFDLEdBQUcsR0FBRztJQUNWLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxTQUFTLENBQUMsQ0FBQTtBQUN6QyxDQUFDLENBQUE7QUFFRCxzQkFBc0I7QUFDdEIsK0RBQStEO0FBQy9ELHNEQUFzRDtBQUN0RCxnREFBZ0Q7QUFDaEQsOENBQThDO0FBRzlDLElBQUksV0FBd0MsQ0FBQTtBQUM1QyxJQUFJLFdBQXdDLENBQUE7QUFDNUMsSUFBSSxhQUE0QyxDQUFBO0FBRWhELFFBQVEsQ0FBQyxPQUFPLEVBQUM7SUFDYixRQUFRLENBQUMsY0FBYyxFQUFDO1FBQ3BCLEVBQUUsQ0FBQyxpQ0FBaUMsRUFBQztZQUNqQyxXQUFXLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsRUFBQyxRQUFRLEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUMsQ0FBQyxDQUFBO1lBQ3JGLFdBQVcsR0FBRyxJQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFDLFFBQVEsRUFBRSx1QkFBdUIsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFDLENBQUMsQ0FBQTtZQUM5RixNQUFNLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtZQUMzQyxNQUFNLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFD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 \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 15114e9..cccc5e9 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,7 +1,6 @@ import 'typings-test' import * as should from 'should' -import path = require('path') -import * as beautylog from 'beautylog' +import * as path from 'path' // set up environment process.env.CI_BUILD_REPO = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git' @@ -12,7 +11,6 @@ process.cwd = () => { } // require NPMCI files -import npmci = require('../dist/index') import NpmciBuildDocker = require('../dist/npmci.build.docker') import NpmciPublish = require('../dist/npmci.publish') import NpmciTest = require('../dist/npmci.test') @@ -44,7 +42,6 @@ describe('NPMCI',function(){ it('should sort an array of Dockerfiles',function(done){ NpmciBuildDocker.sortDockerfiles(sortableArray) .then(function(sortedArrayArg: NpmciBuildDocker.Dockerfile[]){ - beautylog.success('final result') console.log(sortedArrayArg) done() }) diff --git a/ts/index.ts b/ts/index.ts index 3fe83d0..3ba3955 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,89 +1,88 @@ #!/usr/bin/env node -import "typings-global"; -import * as plugins from "./npmci.plugins"; -import * as paths from "./npmci.paths"; -let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot); -plugins.beautylog.log("npmci version: " + npmciInfo.version); +import 'typings-global' +import * as plugins from './npmci.plugins' +import * as paths from './npmci.paths' +let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot) +plugins.beautylog.log('npmci version: ' + npmciInfo.version) -import {build} from "./npmci.build" -import {clean} from "./npmci.clean"; -import {command} from "./npmci.command"; -import {install} from "./npmci.install"; -import {publish} from "./npmci.publish"; -import {prepare} from "./npmci.prepare"; -import {test} from "./npmci.test"; -import {trigger} from "./npmci.trigger"; -import * as NpmciEnv from "./npmci.env"; +import {build} from './npmci.build' +import {clean} from './npmci.clean' +import {command} from './npmci.command' +import {install} from './npmci.install' +import {publish} from './npmci.publish' +import {prepare} from './npmci.prepare' +import {test} from './npmci.test' +import {trigger} from './npmci.trigger' +import * as NpmciEnv from './npmci.env' -export {build} from "./npmci.build" -export {install} from "./npmci.install"; -export {publish} from "./npmci.publish"; +export {build} from './npmci.build' +export {install} from './npmci.install'; +export {publish} from './npmci.publish'; - -let smartcli = new plugins.smartcli.Smartcli(); -smartcli.addVersion(npmciInfo.version); +let smartcli = new plugins.smartcli.Smartcli() +smartcli.addVersion(npmciInfo.version) // build smartcli.addCommand({ - commandName:"build" + commandName: 'build' }).then((argv) => { build(argv._[1]) - .then(NpmciEnv.configStore); -}); + .then(NpmciEnv.configStore) +}) // clean smartcli.addCommand({ - commandName:"clean" + commandName: 'clean' }).then((argv) => { clean() - .then(NpmciEnv.configStore); -}); + .then(NpmciEnv.configStore) +}) // command smartcli.addCommand({ - commandName:"command" + commandName: 'command' }).then((argv) => { command() - .then(NpmciEnv.configStore); -}); + .then(NpmciEnv.configStore) +}) // install smartcli.addCommand({ - commandName:"install" + commandName: 'install' }).then((argv) => { install(argv._[1]) - .then(NpmciEnv.configStore); -}); + .then(NpmciEnv.configStore) +}) // prepare smartcli.addCommand({ - commandName:"prepare" + commandName: 'prepare' }).then((argv) => { prepare(argv._[1]) - .then(NpmciEnv.configStore); -}); + .then(NpmciEnv.configStore) +}) // publish smartcli.addCommand({ - commandName:"publish" + commandName: 'publish' }).then((argv) => { publish(argv._[1]) - .then(NpmciEnv.configStore); -}); + .then(NpmciEnv.configStore) +}) // test smartcli.addCommand({ - commandName:"test" + commandName: 'test' }).then((argv) => { test(argv._[1]) - .then(NpmciEnv.configStore); -}); + .then(NpmciEnv.configStore) +}) // trigger smartcli.addCommand({ - commandName:"trigger" + commandName: 'trigger' }).then((argv) => { - trigger(); -}); + trigger() +}) -smartcli.startParse(); \ No newline at end of file +smartcli.startParse() diff --git a/ts/npmci.bash.ts b/ts/npmci.bash.ts index a19f8d2..8ec5791 100644 --- a/ts/npmci.bash.ts +++ b/ts/npmci.bash.ts @@ -1,50 +1,49 @@ -import "typings-global"; -import * as plugins from "./npmci.plugins"; +import 'typings-global' +import * as plugins from './npmci.plugins' - -let nvmSourceString: string = ""; -export let nvmAvailable: boolean = false; +let nvmSourceString: string = '' +export let nvmAvailable: boolean = false let checkNvm = () => { - if (plugins.shelljs.exec(`bash -c "source /usr/local/nvm/nvm.sh"`,{silent:true}).code === 0) { + 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) { + nvmAvailable = true + } else if (plugins.shelljs.exec(`bash -c "source ~/.nvm/nvm.sh"`,{silent: true}).code === 0) { nvmSourceString = `source ~/.nvm/nvm.sh && ` - nvmAvailable = true; + nvmAvailable = true }; -}; -checkNvm(); +} +checkNvm() export let bash = (commandArg: string, retryArg = 2, bareArg = false) => { - let exitCode: number; - let stdOut: string; - let execResult; + let exitCode: number + let stdOut: string + let execResult if (!process.env.NPMTS_TEST) { // NPMTS_TEST is used during testing for (let i = 0; i <= retryArg; i++) { if (!bareArg) { execResult = plugins.shelljs.exec( `bash -c "${nvmSourceString} ${commandArg}"` - ); + ) } else { - execResult = plugins.shelljs.exec(commandArg); + execResult = plugins.shelljs.exec(commandArg) } - exitCode = execResult.code; - stdOut = execResult.stdout; - if (exitCode !== 0 && i == retryArg) { - process.exit(1); - } else if (exitCode == 0) { - i = retryArg + 1; // if everything works out ok retrials are not wanted + exitCode = execResult.code + stdOut = execResult.stdout + if (exitCode !== 0 && i === retryArg) { + process.exit(1) + } 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()); - plugins.beautylog.info("Retry " + (i + 1).toString() + " of " + retryArg.toString()); + plugins.beautylog.warn('Something went wrong! Exit Code: ' + exitCode.toString()) + plugins.beautylog.info('Retry ' + (i + 1).toString() + ' of ' + retryArg.toString()) } } } else { - plugins.beautylog.log("ShellExec would be: " + commandArg) + plugins.beautylog.log('ShellExec would be: ' + commandArg) } - return stdOut; + return stdOut } export let bashBare = (commandArg, retryArg = 2) => { - return bash(commandArg, retryArg, true); -} \ No newline at end of file + return bash(commandArg, retryArg, true) +} diff --git a/ts/npmci.build.docker.ts b/ts/npmci.build.docker.ts index 232d4ec..975f25b 100644 --- a/ts/npmci.build.docker.ts +++ b/ts/npmci.build.docker.ts @@ -1,43 +1,43 @@ -import * as plugins from "./npmci.plugins"; -import * as paths from "./npmci.paths"; -import * as NpmciEnv from "./npmci.env"; -import {bashBare} from "./npmci.bash"; +import * as plugins from './npmci.plugins' +import * as paths from './npmci.paths' +import * as NpmciEnv from './npmci.env' +import {bashBare} from './npmci.bash' /** * builds a cwd of Dockerfiles by triggering a promisechain */ export let build = function(){ - let done = plugins.q.defer(); + let done = plugins.q.defer() readDockerfiles() .then(sortDockerfiles) .then(mapDockerfiles) .then(buildDockerfiles) .then(pushDockerfiles) .then(() => { - done.resolve(); - }); - return done.promise; + done.resolve() + }) + return done.promise } /** * creates instance of class Dockerfile for all Dockerfiles in cwd * @returns Promise */ -export let readDockerfiles = function():plugins.q.Promise{ - let done = plugins.q.defer(); - let readDockerfilesArray:Dockerfile[] = [] - plugins.gulp.src("./Dockerfile*") +export let readDockerfiles = function(): plugins.q.Promise{ + let done = plugins.q.defer() + let readDockerfilesArray: Dockerfile[] = [] + plugins.gulp.src('./Dockerfile*') .pipe(plugins.through2.obj(function(file,enc,cb){ let myDockerfile = new Dockerfile({ - filePath:file.path, - read:true - }); - readDockerfilesArray.push(myDockerfile); - cb(null,file); + filePath: file.path, + read: true + }) + readDockerfilesArray.push(myDockerfile) + cb(null,file) },function(){ - done.resolve(readDockerfilesArray); - })); - return done.promise; + done.resolve(readDockerfilesArray) + })) + return done.promise } /** @@ -45,249 +45,249 @@ export let readDockerfiles = function():plugins.q.Promise{ * @param sortableArrayArg an array of instances of class Dockerfile * @returns Promise */ -export let sortDockerfiles = function(sortableArrayArg:Dockerfile[]):plugins.q.Promise{ - let done = plugins.q.defer(); - let sortedArray:Dockerfile[] = []; - let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg,sortedArray); - let sorterFunctionCounter:number = 0; +export let sortDockerfiles = function(sortableArrayArg: Dockerfile[]): plugins.q.Promise{ + let done = plugins.q.defer() + let sortedArray: Dockerfile[] = [] + let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg,sortedArray) + let sorterFunctionCounter: number = 0 let sorterFunction = function(){ - sortableArrayArg.forEach((dockerfileArg)=>{ - let cleanTags = cleanTagsArrayFunction(sortableArrayArg,sortedArray); - if(cleanTags.indexOf(dockerfileArg.baseImage) == -1 && sortedArray.indexOf(dockerfileArg) == -1){ - sortedArray.push(dockerfileArg); + sortableArrayArg.forEach((dockerfileArg) => { + let cleanTags = cleanTagsArrayFunction(sortableArrayArg,sortedArray) + if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) { + sortedArray.push(dockerfileArg) }; - if(cleanTagsOriginal.indexOf(dockerfileArg.baseImage) != -1){ - dockerfileArg.localBaseImageDependent = true; + if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) { + dockerfileArg.localBaseImageDependent = true }; - }); - if(sortableArrayArg.length == sortedArray.length){ - done.resolve(sortedArray); + }) + if (sortableArrayArg.length === sortedArray.length) { + done.resolve(sortedArray) } else if (sorterFunctionCounter < 10) { - sorterFunctionCounter++; - sorterFunction(); + sorterFunctionCounter++ + sorterFunction() }; } - sorterFunction(); - return done.promise; -}; + sorterFunction() + return done.promise +} /** * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances */ -export let mapDockerfiles = function(sortedArray:Dockerfile[]):plugins.q.Promise{ - let done = plugins.q.defer(); +export let mapDockerfiles = function(sortedArray: Dockerfile[]): plugins.q.Promise{ + let done = plugins.q.defer() sortedArray.forEach((dockerfileArg) => { - if(dockerfileArg.localBaseImageDependent){ - sortedArray.forEach((dockfile2:Dockerfile) => { - if(dockfile2.cleanTag == dockerfileArg.baseImage){ - dockerfileArg.localBaseDockerfile = dockfile2; + if (dockerfileArg.localBaseImageDependent) { + sortedArray.forEach((dockfile2: Dockerfile) => { + if (dockfile2.cleanTag === dockerfileArg.baseImage) { + dockerfileArg.localBaseDockerfile = dockfile2 } }) }; - }); - done.resolve(sortedArray); - return done.promise; + }) + done.resolve(sortedArray) + return done.promise } /** * builds the correspoding real docker image for each Dockerfile class instance */ -export let buildDockerfiles = (sortedArrayArg:Dockerfile[]) => { - let done = plugins.q.defer(); +export let buildDockerfiles = (sortedArrayArg: Dockerfile[]) => { + let done = plugins.q.defer() sortedArrayArg.forEach(function(dockerfileArg){ - dockerfileArg.build(); + dockerfileArg.build() }) - done.resolve(sortedArrayArg); - return done.promise; + done.resolve(sortedArrayArg) + return done.promise } /** * pushes the real Dockerfile images to a Docker registry */ -export let pushDockerfiles = function(sortedArrayArg:Dockerfile[]){ - let done = plugins.q.defer(); +export let pushDockerfiles = function(sortedArrayArg: Dockerfile[]){ + let done = plugins.q.defer() sortedArrayArg.forEach(function(dockerfileArg){ - dockerfileArg.push(NpmciEnv.buildStage); - }); - done.resolve(sortedArrayArg); - return done.promise; + dockerfileArg.push(NpmciEnv.buildStage) + }) + done.resolve(sortedArrayArg) + return done.promise } /** * pulls corresponding real Docker images for instances of Dockerfile from a registry. * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages. */ -export let pullDockerfileImages = (sortableArrayArg:Dockerfile[],registryArg = "registry.gitlab.com") => { - let done = plugins.q.defer(); +export let pullDockerfileImages = (sortableArrayArg: Dockerfile[],registryArg = 'registry.gitlab.com') => { + let done = plugins.q.defer() sortableArrayArg.forEach((dockerfileArg) => { - dockerfileArg.pull(registryArg); - }); - done.resolve(sortableArrayArg); - return done.promise; + dockerfileArg.pull(registryArg) + }) + done.resolve(sortableArrayArg) + return done.promise } /** * tests all Dockerfiles in by calling class Dockerfile.test(); * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd */ -export let testDockerfiles = (sortedArrayArg:Dockerfile[]) => { - let done = plugins.q.defer(); +export let testDockerfiles = (sortedArrayArg: Dockerfile[]) => { + let done = plugins.q.defer() sortedArrayArg.forEach(function(dockerfileArg){ - dockerfileArg.test(); - }); - done.resolve(sortedArrayArg); - return done.promise; -}; + dockerfileArg.test() + }) + done.resolve(sortedArrayArg) + return done.promise +} /** * class Dockerfile represents a Dockerfile on disk in npmci */ export class Dockerfile { - filePath:string; - repo:string; - version:string; - cleanTag:string; - buildTag:string; - testTag:string; - releaseTag:string; - containerName:string - content:string; - baseImage:string; - localBaseImageDependent:boolean; - localBaseDockerfile:Dockerfile; - constructor(options:{filePath?:string,fileContents?:string|Buffer,read?:boolean}){ - this.filePath = options.filePath; - this.repo = NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo; - this.version = dockerFileVersion(plugins.path.parse(options.filePath).base); - this.cleanTag = this.repo + ":" + this.version; - this.buildTag = this.cleanTag; - this.testTag = dockerTag("registry.gitlab.com",this.repo,this.version,"test"); - this.releaseTag = dockerTag(NpmciEnv.dockerRegistry,this.repo,this.version); - this.containerName = "dockerfile-" + this.version; - if(options.filePath && options.read){ - this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath)); + filePath: string + repo: string + version: string + cleanTag: string + buildTag: string + testTag: string + releaseTag: string + containerName: string + content: string + baseImage: string + localBaseImageDependent: boolean + localBaseDockerfile: Dockerfile + constructor(options: {filePath?: string,fileContents?: string|Buffer,read?: boolean}) { + this.filePath = options.filePath + this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo + this.version = dockerFileVersion(plugins.path.parse(options.filePath).base) + this.cleanTag = this.repo + ':' + this.version + this.buildTag = this.cleanTag + this.testTag = dockerTag('registry.gitlab.com',this.repo,this.version,'test') + this.releaseTag = dockerTag(NpmciEnv.dockerRegistry,this.repo,this.version) + this.containerName = 'dockerfile-' + this.version + if (options.filePath && options.read) { + this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath)) }; - this.baseImage = dockerBaseImage(this.content); - this.localBaseImageDependent = false; + this.baseImage = dockerBaseImage(this.content) + this.localBaseImageDependent = false }; /** * builds the Dockerfile */ - build(){ - let done = plugins.q.defer(); - plugins.beautylog.info("now building Dockerfile for " + this.cleanTag); - bashBare("docker build -t " + this.buildTag + " -f " + this.filePath + " ."); - NpmciEnv.dockerFilesBuilt.push(this); - done.resolve(); - return done.promise; + build() { + let done = plugins.q.defer() + plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag) + bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .') + NpmciEnv.dockerFilesBuilt.push(this) + done.resolve() + return done.promise }; /** * pushes the Dockerfile to a registry */ - push(stageArg){ - let done = plugins.q.defer(); - let pushTag; - switch (stageArg){ - case "release": - pushTag = this.releaseTag; - break; - case "test": + push(stageArg) { + let done = plugins.q.defer() + let pushTag + switch (stageArg) { + case 'release': + pushTag = this.releaseTag + break + case 'test': default: - pushTag = this.testTag; - break; + pushTag = this.testTag + break } - bashBare("docker tag " + this.buildTag + " " + pushTag); - bashBare("docker push " + pushTag); - done.resolve(); - return done.promise; + bashBare('docker tag ' + this.buildTag + ' ' + pushTag) + bashBare('docker push ' + pushTag) + done.resolve() + return done.promise }; /** * pulls the Dockerfile from a registry */ - pull(registryArg:string){ - let pullTag = this.testTag; - bashBare("docker pull " + pullTag); - bashBare("docker tag " + pullTag + " " + this.buildTag); + pull(registryArg: string) { + let pullTag = this.testTag + bashBare('docker pull ' + pullTag) + bashBare('docker tag ' + pullTag + ' ' + this.buildTag) }; /** * tests the Dockerfile; */ - test(){ - let testFile:string = plugins.path.join(paths.NpmciTestDir,"test_" + this.version + ".sh"); - let testFileExists:boolean = plugins.smartfile.fs.fileExistsSync(testFile); - if(testFileExists){ - bashBare("docker run --name npmci_test_container " + this.buildTag + " mkdir /npmci_test"); - bashBare("docker cp " + testFile + " npmci_test_container:/npmci_test/test.sh"); - bashBare("docker commit npmci_test_container npmci_test_image"); - bashBare("docker run npmci_test_image sh /npmci_test/test.sh"); - bashBare("docker rm npmci_test_container"); - bashBare("docker rmi --force npmci_test_image"); + test() { + let testFile: string = plugins.path.join(paths.NpmciTestDir,'test_' + this.version + '.sh') + let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile) + if (testFileExists) { + bashBare('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test') + bashBare('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh') + bashBare('docker commit npmci_test_container npmci_test_image') + bashBare('docker run npmci_test_image sh /npmci_test/test.sh') + bashBare('docker rm npmci_test_container') + bashBare('docker rmi --force npmci_test_image') } else { - plugins.beautylog.warn("skipping tests for " + this.cleanTag + " because no testfile was found!"); + plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!') } }; /** * gets the id of a Dockerfile */ - getId(){ - let containerId = bashBare("docker inspect --type=image --format=\"{{.Id}}\" " + this.buildTag); - return containerId; + getId() { + let containerId = bashBare('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag) + return containerId }; } /** * */ -export let dockerFileVersion = function(dockerfileNameArg:string):string{ - let versionString:string; - let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/; - let regexResultArray = versionRegex.exec(dockerfileNameArg); - if(regexResultArray && regexResultArray.length == 2){ - versionString = regexResultArray[1]; +export let dockerFileVersion = function(dockerfileNameArg: string): string{ + let versionString: string + let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/ + let regexResultArray = versionRegex.exec(dockerfileNameArg) + if (regexResultArray && regexResultArray.length === 2) { + versionString = regexResultArray[1] } else { - versionString = "latest"; + versionString = 'latest' } - return versionString; + return versionString } /** * */ -export let dockerBaseImage = function(dockerfileContentArg:string){ +export let dockerBaseImage = function(dockerfileContentArg: string){ let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/ let regexResultArray = baseImageRegex.exec(dockerfileContentArg) - return regexResultArray[1]; + return regexResultArray[1] } /** * */ -export let dockerTag = function(registryArg:string,repoArg:string,versionArg:string,suffixArg?:string):string{ - let tagString:string; - let registry = registryArg; - let repo = repoArg; - let version = versionArg; - if(suffixArg){ - version = versionArg + "_" + suffixArg; +export let dockerTag = function(registryArg: string,repoArg: string,versionArg: string,suffixArg?: string): string{ + let tagString: string + let registry = registryArg + let repo = repoArg + let version = versionArg + if (suffixArg) { + version = versionArg + '_' + suffixArg }; - tagString = registry + "/" + repo + ":" + version; - return tagString; -}; + tagString = registry + '/' + repo + ':' + version + return tagString +} /** * */ -export let cleanTagsArrayFunction = function(dockerfileArrayArg:Dockerfile[],trackingArrayArg:Dockerfile[]):string[]{ - let cleanTagsArray:string[] = []; +export let cleanTagsArrayFunction = function(dockerfileArrayArg: Dockerfile[],trackingArrayArg: Dockerfile[]): string[]{ + let cleanTagsArray: string[] = [] dockerfileArrayArg.forEach(function(dockerfileArg){ - if(trackingArrayArg.indexOf(dockerfileArg) == -1){ - cleanTagsArray.push(dockerfileArg.cleanTag); + if (trackingArrayArg.indexOf(dockerfileArg) === -1) { + cleanTagsArray.push(dockerfileArg.cleanTag) } - }); - return cleanTagsArray; -} \ No newline at end of file + }) + return cleanTagsArray +} diff --git a/ts/npmci.build.ts b/ts/npmci.build.ts index 451ad41..559e05d 100644 --- a/ts/npmci.build.ts +++ b/ts/npmci.build.ts @@ -1,26 +1,23 @@ -import "typings-global"; -import * as plugins from "./npmci.plugins"; -import {bash} from "./npmci.bash"; -import * as env from "./npmci.env"; -import * as buildDocker from "./npmci.build.docker" +import 'typings-global' +import * as plugins from './npmci.plugins' +import {bash} from './npmci.bash' +import * as env from './npmci.env' +import * as buildDocker from './npmci.build.docker' /** * defines possible build services */ -export type TBuildService = "docker"; +export type TBuildService = 'docker'; /** * builds for a specific service */ -export let build = function(commandArg):plugins.q.Promise { - switch(commandArg){ - case "docker": - return buildDocker.build(); +export let build = function(commandArg): plugins.q.Promise { + switch (commandArg) { + case 'docker': + return buildDocker.build() default: - plugins.beautylog.log("build target " + commandArg + " not recognised!"); + plugins.beautylog.log('build target ' + commandArg + ' not recognised!') }; - return; + return } - - - diff --git a/ts/npmci.config.ts b/ts/npmci.config.ts new file mode 100644 index 0000000..72ab66e --- /dev/null +++ b/ts/npmci.config.ts @@ -0,0 +1,20 @@ +import * as q from 'q' + +import * as plugins from './npmci.plugins' +import * as paths from './npmci.paths' + +export interface INpmciOptions { + globalNpmTools: string[] +} + +export let getConfig = () => { + console.log('getting config') + let done = q.defer() + let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd) + let defaultConfig: INpmciOptions = { + globalNpmTools: [] + } + let npmciConfig = npmciNpmextra.dataFor('npmci', defaultConfig) + done.resolve(npmciConfig) + return done.promise +} diff --git a/ts/npmci.install.ts b/ts/npmci.install.ts index 610fda6..b9e3a14 100644 --- a/ts/npmci.install.ts +++ b/ts/npmci.install.ts @@ -1,8 +1,8 @@ -import 'typings-global'; -import * as plugins from './npmci.plugins'; -import { bash } from './npmci.bash'; +import 'typings-global' +import * as plugins from './npmci.plugins' +import * as configModule from './npmci.config' +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 version ${versionArg}`) @@ -24,6 +24,15 @@ export let install = (versionArg) => { }; bash('node -v') bash('npm -v') - done.resolve() + + // lets look for further config + configModule.getConfig() + .then(config => { + for (let npmTool of config.globalNpmTools) { + plugins.beautylog.info(`globally installing ${npmTool} from npm`) + bash(`npm install --loglevel=silent -g ${npmTool}`) + } + done.resolve() + }) return done.promise -} \ No newline at end of file +} diff --git a/ts/npmci.paths.ts b/ts/npmci.paths.ts index 3efb837..bbfafe9 100644 --- a/ts/npmci.paths.ts +++ b/ts/npmci.paths.ts @@ -1,9 +1,9 @@ -import "typings-global"; -import * as plugins from "./npmci.plugins"; +import 'typings-global' +import * as plugins from './npmci.plugins' -export let cwd = process.cwd(); +export let cwd = process.cwd() -export let NpmciPackageRoot = plugins.path.join(__dirname,"../"); -export let NpmciPackageConfig = plugins.path.join(NpmciPackageRoot,"./config.json"); -export let NpmciProjectDir = cwd; -export let NpmciTestDir = plugins.path.join(cwd,"./test"); \ No newline at end of file +export let NpmciPackageRoot = plugins.path.join(__dirname,'../') +export let NpmciPackageConfig = plugins.path.join(NpmciPackageRoot,'./config.json') +export let NpmciProjectDir = cwd +export let NpmciTestDir = plugins.path.join(cwd,'./test') diff --git a/ts/npmci.plugins.ts b/ts/npmci.plugins.ts index f32d00d..c38e14c 100644 --- a/ts/npmci.plugins.ts +++ b/ts/npmci.plugins.ts @@ -1,17 +1,18 @@ -import "typings-global"; -export import beautylog = require("beautylog"); -export let gulp = require("gulp"); -export let gulpFunction = require("gulp-function"); -export let lodash = require("lodash"); -export import path = require("path"); -export import projectinfo = require("projectinfo"); -export import q = require("q"); -export let request = require("request"); -export import shelljs = require("shelljs"); -export import smartcli = require("smartcli"); -export import smartfile = require("smartfile"); -export import smartparam = require("smartparam"); -export import smartsocket = require("smartsocket"); -export import smartssh = require("smartssh"); -export import smartstring = require("smartstring"); -export let through2 = require("through2"); \ No newline at end of file +import 'typings-global' +export import beautylog = require('beautylog') +export let gulp = require('gulp') +export import gulpFunction = require('gulp-function') +export import lodash = require('lodash') +export import npmextra = require('npmextra') +export import path = require('path') +export import projectinfo = require('projectinfo') +export import q = require('q') +export let request = require('request') +export import shelljs = require('shelljs') +export import smartcli = require('smartcli') +export import smartfile = require('smartfile') +export import smartparam = require('smartparam') +export import smartsocket = require('smartsocket') +export import smartssh = require('smartssh') +export import smartstring = require('smartstring') +export import through2 = require('through2') diff --git a/ts/npmci.prepare.ts b/ts/npmci.prepare.ts index 4c67ab6..e0f270a 100644 --- a/ts/npmci.prepare.ts +++ b/ts/npmci.prepare.ts @@ -1,94 +1,94 @@ -import "typings-global"; -import * as plugins from "./npmci.plugins"; -import {bash} from "./npmci.bash"; -import * as env from "./npmci.env" -import * as sshModule from "./npmci.ssh" +import 'typings-global' +import * as plugins from './npmci.plugins' +import {bash} from './npmci.bash' +import * as env from './npmci.env' +import * as sshModule from './npmci.ssh' -//types +// types /** * defines possible prepare services */ -export type TPrepService = "npm" | "docker" | "docker-gitlab" | "ssh"; +export type TPrepService = 'npm' | 'docker' | 'docker-gitlab' | 'ssh'; /** * authenticates npm with token from env var */ let npm = function(){ - let done = plugins.q.defer(); - - let npmrcPrefix:string = "//registry.npmjs.org/:_authToken="; - let npmToken:string = process.env.NPMCI_TOKEN_NPM; - let npmrcFileString = npmrcPrefix + npmToken; - - if(npmToken){ - plugins.beautylog.info("found access token"); + let done = plugins.q.defer() + + let npmrcPrefix: string = '//registry.npmjs.org/:_authToken=' + let npmToken: string = process.env.NPMCI_TOKEN_NPM + let npmrcFileString = npmrcPrefix + npmToken + + if (npmToken) { + plugins.beautylog.info('found access token') } else { - plugins.beautylog.error("no access token found! Exiting!"); - process.exit(1); + plugins.beautylog.error('no access token found! Exiting!') + process.exit(1) } - plugins.smartfile.memory.toFsSync(npmrcFileString,"/root/.npmrc"); - done.resolve(); - return done.promise; -}; + plugins.smartfile.memory.toFsSync(npmrcFileString,'/root/.npmrc') + done.resolve() + return done.promise +} /** * logs in docker */ let docker = function(){ - let done = plugins.q.defer(); - env.setDockerRegistry("docker.io"); + let done = plugins.q.defer() + env.setDockerRegistry('docker.io') let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/ - if(!process.env.NPMCI_LOGIN_DOCKER){ - plugins.beautylog.error("You have to specify Login Data to the Docker Registry"); - process.exit(1); + if (!process.env.NPMCI_LOGIN_DOCKER) { + plugins.beautylog.error('You have to specify Login Data to the Docker Registry') + process.exit(1) } - plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + process.env.CI_BUILD_TOKEN + " " + "registry.gitlab.com"); // Always also login to GitLab Registry - let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER); - let username = dockerRegexResultArray[1]; - let password = dockerRegexResultArray[2]; - plugins.shelljs.exec("docker login -u " + username + " -p " + password); - done.resolve(); - return done.promise; + plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com') // Always also login to GitLab Registry + let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER) + let username = dockerRegexResultArray[1] + let password = dockerRegexResultArray[2] + plugins.shelljs.exec('docker login -u ' + username + ' -p ' + password) + done.resolve() + return done.promise } /** * prepare docker for gitlab registry */ let dockerGitlab = function(){ - let done = plugins.q.defer(); - env.setDockerRegistry("registry.gitlab.com"); - plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + process.env.CI_BUILD_TOKEN + " " + "registry.gitlab.com"); - done.resolve(); - return done.promise; + let done = plugins.q.defer() + env.setDockerRegistry('registry.gitlab.com') + plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com') + done.resolve() + return done.promise } /** * prepare ssh */ let ssh = function(){ - let done = plugins.q.defer(); + let done = plugins.q.defer() sshModule.ssh() - .then(done.resolve); - return done.promise; -}; + .then(done.resolve) + return done.promise +} /** * the main exported prepare function * @param servieArg describes the service to prepare */ -export let prepare = function(serviceArg:TPrepService){ +export let prepare = function(serviceArg: TPrepService){ switch (serviceArg) { - case "npm": - return npm(); - case "docker": - return docker(); - case "docker-gitlab": - return dockerGitlab(); - case "ssh": - return ssh(); + case 'npm': + return npm() + case 'docker': + return docker() + case 'docker-gitlab': + return dockerGitlab() + case 'ssh': + return ssh() default: - break; + break } -} \ No newline at end of file +} diff --git a/ts/npmci.publish.ts b/ts/npmci.publish.ts index ecc7614..c44ee2f 100644 --- a/ts/npmci.publish.ts +++ b/ts/npmci.publish.ts @@ -1,50 +1,50 @@ -import "typings-global"; -import * as plugins from "./npmci.plugins"; -import {prepare} from "./npmci.prepare"; -import {bash} from "./npmci.bash"; -import * as NpmciEnv from "./npmci.env"; -import * as NpmciBuildDocker from "./npmci.build.docker" +import 'typings-global' +import * as plugins from './npmci.plugins' +import {prepare} from './npmci.prepare' +import {bash} from './npmci.bash' +import * as NpmciEnv from './npmci.env' +import * as NpmciBuildDocker from './npmci.build.docker' /** * type of supported services */ -export type TPubService = "npm" | "docker"; +export type TPubService = 'npm' | 'docker'; /** * the main exported publish function. * @param pubServiceArg references targeted service to publish to */ -export let publish = (pubServiceArg:TPubService = "npm") => { - switch (pubServiceArg){ - case "npm": - return publishNpm(); - case "docker": - return publishDocker(); +export let publish = (pubServiceArg: TPubService = 'npm') => { + switch (pubServiceArg) { + case 'npm': + return publishNpm() + case 'docker': + return publishDocker() } -}; +} /** * tries to publish current cwd to NPM registry */ let publishNpm = function(){ - let done = plugins.q.defer(); - prepare("npm") + let done = plugins.q.defer() + prepare('npm') .then(function(){ - bash("npm publish"); - plugins.beautylog.ok("Done!") ; - done.resolve(); - }); - return done.promise; + bash('npm publish') + plugins.beautylog.ok('Done!') + done.resolve() + }) + return done.promise } /** * tries to pubish current cwd to Docker registry */ let publishDocker = function(){ - let done = plugins.q.defer(); + let done = plugins.q.defer() NpmciBuildDocker.readDockerfiles() .then(NpmciBuildDocker.pullDockerfileImages) .then(NpmciBuildDocker.pushDockerfiles) - .then(done.resolve); - return done.promise; -}; \ No newline at end of file + .then(done.resolve) + return done.promise +} diff --git a/ts/npmci.servezone.ts b/ts/npmci.servezone.ts index d681a81..99d5b69 100644 --- a/ts/npmci.servezone.ts +++ b/ts/npmci.servezone.ts @@ -1,26 +1,26 @@ -import * as plugins from "./npmci.plugins"; +import * as plugins from './npmci.plugins' /** * servezoneRegex is the regex that parses the servezone connection data * parses strings in the form of "servezone.example.com|3000|somepassword" */ -let servezoneRegex = /^(.*)\|(.*)\|(.*)/; +let servezoneRegex = /^(.*)\|(.*)\|(.*)/ /** * holds the results of the parsed servezone env string */ -let servezoneRegexResultArray = servezoneRegex.exec(process.env.NPMCI_SERVEZONE); +let servezoneRegexResultArray = servezoneRegex.exec(process.env.NPMCI_SERVEZONE) /** * the data object that is used for the smartsocket client object */ let smartsocketClientConstructorOptions = { - alias: "npmci", + alias: 'npmci', password: servezoneRegexResultArray[3], port: parseInt(servezoneRegexResultArray[2]), - role: "ci", + role: 'ci', url: servezoneRegexResultArray[1] -}; +} /** * the main run function to submit a service to a servezone @@ -28,5 +28,5 @@ let smartsocketClientConstructorOptions = { export let run = (configArg) => { new plugins.smartsocket.SmartsocketClient( smartsocketClientConstructorOptions - ); -}; \ No newline at end of file + ) +} diff --git a/ts/npmci.ssh.ts b/ts/npmci.ssh.ts index ad9f210..f276604 100644 --- a/ts/npmci.ssh.ts +++ b/ts/npmci.ssh.ts @@ -1,51 +1,51 @@ -import "typings-global"; -import * as plugins from "./npmci.plugins"; +import 'typings-global' +import * as plugins from './npmci.plugins' let sshRegex = /^(.*)\|(.*)\|(.*)/ -let sshInstance:plugins.smartssh.SshInstance; +let sshInstance: plugins.smartssh.SshInstance /** * checks for ENV vars in form of NPMCI_SSHKEY_* and deploys any found ones */ export let ssh = () => { - let done = plugins.q.defer(); - sshInstance = new plugins.smartssh.SshInstance(); // init ssh instance - plugins.smartparam.forEachMinimatch(process.env,"NPMCI_SSHKEY_*",evaluateSshEnv); - if(!process.env.NPMTS_TEST){ - sshInstance.writeToDisk(); + let done = plugins.q.defer() + sshInstance = new plugins.smartssh.SshInstance() // init ssh instance + plugins.smartparam.forEachMinimatch(process.env,'NPMCI_SSHKEY_*',evaluateSshEnv) + if (!process.env.NPMTS_TEST) { + sshInstance.writeToDisk() } else { - plugins.beautylog.log("In test mode, so not storing SSH keys to disk!"); + plugins.beautylog.log('In test mode, so not storing SSH keys to disk!') }; - done.resolve(); - return done.promise; -}; + done.resolve() + return done.promise +} /** * gets called for each found SSH ENV Var and deploys it */ let evaluateSshEnv = (sshkeyEnvVarArg) => { - let resultArray = sshRegex.exec(sshkeyEnvVarArg); - let sshKey = new plugins.smartssh.SshKey(); - plugins.beautylog.info("Found SSH identity for " + resultArray[1]); - if(notUndefined(resultArray[1])){ - plugins.beautylog.log("---> host defined!") - sshKey.host = resultArray[1]; + let resultArray = sshRegex.exec(sshkeyEnvVarArg) + let sshKey = new plugins.smartssh.SshKey() + plugins.beautylog.info('Found SSH identity for ' + resultArray[1]) + if (notUndefined(resultArray[1])) { + plugins.beautylog.log('---> host defined!') + sshKey.host = resultArray[1] } - if(notUndefined(resultArray[2])){ - plugins.beautylog.log("---> privKey defined!") - sshKey.privKeyBase64 = resultArray[2]; + if (notUndefined(resultArray[2])) { + plugins.beautylog.log('---> privKey defined!') + sshKey.privKeyBase64 = resultArray[2] }; - if(notUndefined(resultArray[3])){ - "---> pubKey defined!" - sshKey.pubKeyBase64 = resultArray[3]; + if (notUndefined(resultArray[3])) { + '---> pubKey defined!' + sshKey.pubKeyBase64 = resultArray[3] }; - - sshInstance.addKey(sshKey); -}; + + sshInstance.addKey(sshKey) +} /** * checks if not undefined */ -let notUndefined = (stringArg:string) => { - return (stringArg && stringArg != "undefined" && stringArg != "##"); -} \ No newline at end of file +let notUndefined = (stringArg: string) => { + return (stringArg && stringArg !== 'undefined' && stringArg !== '##') +} diff --git a/ts/npmci.test.ts b/ts/npmci.test.ts index 75d83b2..1439ef8 100644 --- a/ts/npmci.test.ts +++ b/ts/npmci.test.ts @@ -1,50 +1,50 @@ -import "typings-global"; -import * as plugins from "./npmci.plugins"; -import {bash} from "./npmci.bash"; -import {install} from "./npmci.install"; -import * as env from "./npmci.env"; -import * as NpmciBuildDocker from "./npmci.build.docker"; +import 'typings-global' +import * as plugins from './npmci.plugins' +import {bash} from './npmci.bash' +import {install} from './npmci.install' +import * as env from './npmci.env' +import * as NpmciBuildDocker from './npmci.build.docker' export let test = (versionArg) => { - let done = plugins.q.defer(); - if(versionArg == "docker"){ + let done = plugins.q.defer() + if (versionArg === 'docker') { testDocker() - .then(()=>{ - done.resolve(); - }); + .then(() => { + done.resolve() + }) } else { install(versionArg) .then(npmDependencies) .then(npmTest) - .then(()=>{ - done.resolve(); - }); + .then(() => { + done.resolve() + }) } - return done.promise; + return done.promise } let npmDependencies = function(){ - let done = plugins.q.defer(); - plugins.beautylog.info("now installing dependencies:"); - bash("npm install"); - done.resolve(); - return done.promise; + let done = plugins.q.defer() + plugins.beautylog.info('now installing dependencies:') + bash('npm install') + done.resolve() + return done.promise } let npmTest = () => { - let done = plugins.q.defer(); - plugins.beautylog.info("now starting tests:"); - bash("npm test"); - done.resolve(); - return done.promise; + let done = plugins.q.defer() + plugins.beautylog.info('now starting tests:') + bash('npm test') + done.resolve() + return done.promise } let testDocker = function(){ - let done = plugins.q.defer(); + let done = plugins.q.defer() NpmciBuildDocker.readDockerfiles() .then(NpmciBuildDocker.pullDockerfileImages) .then(NpmciBuildDocker.testDockerfiles) .then(done.resolve) - return done.promise; + return done.promise } diff --git a/ts/npmci.trigger.ts b/ts/npmci.trigger.ts index afa5a34..233eb31 100644 --- a/ts/npmci.trigger.ts +++ b/ts/npmci.trigger.ts @@ -1,32 +1,31 @@ -import "typings-global"; -import * as plugins from "./npmci.plugins"; -import {prepare} from "./npmci.prepare"; -import {bash} from "./npmci.bash"; +import 'typings-global' +import * as plugins from './npmci.plugins' +import { prepare } from './npmci.prepare' +import { bash } from './npmci.bash' - -let triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/; +let triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/ export let trigger = function () { - let done = plugins.q.defer(); - plugins.beautylog.info("now running triggers"); - plugins.smartparam.forEachMinimatch(process.env, "NPMCI_TRIGGER_*", evaluateTrigger); - done.resolve(); - return done.promise; + let done = plugins.q.defer() + plugins.beautylog.info('now running triggers') + plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger) + done.resolve() + return done.promise } let evaluateTrigger = (triggerEnvVarArg) => { - let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg); - let regexDomain = triggerRegexResultArray[1]; - let regexProjectId = triggerRegexResultArray[2]; - let regexProjectTriggerToken = triggerRegexResultArray[3]; - let regexRefName = triggerRegexResultArray[4]; - let regexTriggerName; - if (triggerRegexResultArray.length == 6) { - regexTriggerName = triggerRegexResultArray[5]; + let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg) + let regexDomain = triggerRegexResultArray[1] + let regexProjectId = triggerRegexResultArray[2] + let regexProjectTriggerToken = triggerRegexResultArray[3] + let regexRefName = triggerRegexResultArray[4] + let regexTriggerName + if (triggerRegexResultArray.length === 6) { + regexTriggerName = triggerRegexResultArray[5] } else { - regexTriggerName = "Unnamed Trigger"; + regexTriggerName = 'Unnamed Trigger' } - plugins.beautylog.info("Found Trigger!"); - plugins.beautylog.log("triggering build for ref " + regexRefName + " of " + regexTriggerName); - plugins.request.post("https://gitlab.com/api/v3/projects/" + regexProjectId + "/trigger/builds", { form: { token: regexProjectTriggerToken, ref: regexRefName } }); -} \ No newline at end of file + plugins.beautylog.info('Found Trigger!') + plugins.beautylog.log('triggering build for ref ' + regexRefName + ' of ' + regexTriggerName) + plugins.request.post('https://gitlab.com/api/v3/projects/' + regexProjectId + '/trigger/builds', { form: { token: regexProjectTriggerToken, ref: regexRefName } }) +}