From a8571827b9111f3a3578e9a819ba1fff2bb45a86 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Thu, 27 Jul 2017 14:20:56 +0200 Subject: [PATCH] update to use better command recognition --- dist/mod_build/index.js | 3 +- dist/mod_docker/mod.builddocker.d.ts | 6 ++-- dist/mod_docker/mod.builddocker.js | 20 ++++--------- dist/mod_publish/index.d.ts | 2 +- dist/mod_publish/index.js | 17 ++++++----- dist/mod_test/index.d.ts | 2 +- dist/mod_test/index.js | 15 +++++----- dist/npmci.cli.js | 8 ++--- test/test.ts | 44 ++++++++++++++++++++-------- ts/mod_build/index.ts | 2 +- ts/mod_docker/mod.builddocker.ts | 27 +++++++++-------- ts/mod_publish/index.ts | 15 +++++----- ts/mod_test/index.ts | 13 ++++---- ts/npmci.cli.ts | 6 ++-- 14 files changed, 98 insertions(+), 82 deletions(-) diff --git a/dist/mod_build/index.js b/dist/mod_build/index.js index b971992..3e35102 100644 --- a/dist/mod_build/index.js +++ b/dist/mod_build/index.js @@ -23,7 +23,6 @@ exports.build = (argvArg) => __awaiter(this, void 0, void 0, function* () { default: plugins.beautylog.log('build target ' + whatToPublish + ' not recognised!'); } - ; return; }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfYnVpbGQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLHlDQUF3QztBQUd4QywyQ0FBMEM7QUFPMUM7O0dBRUc7QUFDUSxRQUFBLEtBQUssR0FBRyxDQUFPLE9BQU87SUFDL0IsSUFBSSxhQUFhLEdBQVcsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4QyxNQUFNLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQ3RCLEtBQUssUUFBUTtZQUNYLElBQUksU0FBUyxHQUFHLE1BQU0sU0FBUyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtZQUNoRCxNQUFNLFNBQVMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUE7WUFDOUIsS0FBSyxDQUFBO1FBQ1A7WUFDRSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEdBQUcsYUFBYSxHQUFHLGtCQUFrQixDQUFDLENBQUE7SUFDL0UsQ0FBQztJQUFBLENBQUM7SUFDRixNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfYnVpbGQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLHlDQUF3QztBQUd4QywyQ0FBMEM7QUFPMUM7O0dBRUc7QUFDUSxRQUFBLEtBQUssR0FBRyxDQUFPLE9BQU87SUFDL0IsSUFBSSxhQUFhLEdBQVcsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4QyxNQUFNLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQ3RCLEtBQUssUUFBUTtZQUNYLElBQUksU0FBUyxHQUFHLE1BQU0sU0FBUyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtZQUNoRCxNQUFNLFNBQVMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUE7WUFDOUIsS0FBSyxDQUFBO1FBQ1A7WUFDRSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEdBQUcsYUFBYSxHQUFHLGtCQUFrQixDQUFDLENBQUE7SUFDL0UsQ0FBQztJQUNELE1BQU0sQ0FBQTtBQUNSLENBQUMsQ0FBQSxDQUFBIn0= \ No newline at end of file diff --git a/dist/mod_docker/mod.builddocker.d.ts b/dist/mod_docker/mod.builddocker.d.ts index 1850e0a..22079c9 100644 --- a/dist/mod_docker/mod.builddocker.d.ts +++ b/dist/mod_docker/mod.builddocker.d.ts @@ -7,7 +7,7 @@ export declare let build: (argvArg: any) => Promise; * creates instance of class Dockerfile for all Dockerfiles in cwd * @returns Promise */ -export declare let readDockerfiles: () => Promise; +export declare let readDockerfiles: (argvArg: any) => Promise; /** * sorts Dockerfiles into a dependency chain * @param sortableArrayArg an array of instances of class Dockerfile @@ -85,11 +85,11 @@ export declare class Dockerfile { */ export declare let dockerFileVersion: (dockerfileNameArg: string) => string; /** - * + * returns the docker base image for a Dockerfile */ export declare let dockerBaseImage: (dockerfileContentArg: string) => string; /** - * + * returns the docker tag */ export declare let dockerTag: (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string) => string; /** diff --git a/dist/mod_docker/mod.builddocker.js b/dist/mod_docker/mod.builddocker.js index c44147f..a76eac7 100644 --- a/dist/mod_docker/mod.builddocker.js +++ b/dist/mod_docker/mod.builddocker.js @@ -19,7 +19,7 @@ let modArgvArg; // will be set through the build command exports.build = (argvArg) => __awaiter(this, void 0, void 0, function* () { modArgvArg = argvArg; plugins.beautylog.log('now building Dockerfiles...'); - yield exports.readDockerfiles() + yield exports.readDockerfiles(argvArg) .then(exports.sortDockerfiles) .then(exports.mapDockerfiles) .then(exports.buildDockerfiles) @@ -29,7 +29,8 @@ exports.build = (argvArg) => __awaiter(this, void 0, void 0, function* () { * creates instance of class Dockerfile for all Dockerfiles in cwd * @returns Promise */ -exports.readDockerfiles = () => __awaiter(this, void 0, void 0, function* () { +exports.readDockerfiles = (argvArg) => __awaiter(this, void 0, void 0, function* () { + modArgvArg = argvArg; let fileTree = yield plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*'); // create the Dockerfile array let readDockerfilesArray = []; @@ -93,7 +94,6 @@ exports.mapDockerfiles = (sortedArray) => __awaiter(this, void 0, void 0, functi } }); } - ; }); return sortedArray; }); @@ -160,11 +160,9 @@ class Dockerfile { if (options.filePath && options.read) { this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath)); } - ; this.baseImage = exports.dockerBaseImage(this.content); this.localBaseImageDependent = false; } - ; /** * builds the Dockerfile */ @@ -177,7 +175,6 @@ class Dockerfile { return; }); } - ; /** * pushes the Dockerfile to a registry */ @@ -201,7 +198,6 @@ class Dockerfile { } }); } - ; /** * pulls the Dockerfile from a registry */ @@ -212,7 +208,6 @@ class Dockerfile { yield npmci_bash_1.bash('docker tag ' + pullTag + ' ' + this.buildTag); }); } - ; /** * tests the Dockerfile; */ @@ -234,7 +229,6 @@ class Dockerfile { } }); } - ; /** * gets the id of a Dockerfile */ @@ -244,7 +238,6 @@ class Dockerfile { return containerId; }); } - ; } exports.Dockerfile = Dockerfile; /** @@ -264,7 +257,7 @@ exports.dockerFileVersion = (dockerfileNameArg) => { return versionString; }; /** - * + * returns the docker base image for a Dockerfile */ exports.dockerBaseImage = function (dockerfileContentArg) { let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/; @@ -272,7 +265,7 @@ exports.dockerBaseImage = function (dockerfileContentArg) { return regexResultArray[1]; }; /** - * + * returns the docker tag */ exports.dockerTag = function (registryArg, repoArg, versionArg, suffixArg) { let tagString; @@ -282,7 +275,6 @@ exports.dockerTag = function (registryArg, repoArg, versionArg, suffixArg) { if (suffixArg) { version = versionArg + '_' + suffixArg; } - ; tagString = registry + '/' + repo + ':' + version; return tagString; }; @@ -298,4 +290,4 @@ exports.cleanTagsArrayFunction = function (dockerfileArrayArg, trackingArrayArg) }); return cleanTagsArray; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mod.builddocker.js","sourceRoot":"","sources":["../../ts/mod_docker/mod.builddocker.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mod.builddocker.js","sourceRoot":"","sources":["../../ts/mod_docker/mod.builddocker.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,yCAAwC;AACxC,wCAAuC;AACvC,yCAAwC;AACxC,8CAAoC;AAEpC,IAAI,UAAU,CAAA,CAAC,wCAAwC;AAEvD;;GAEG;AACQ,QAAA,KAAK,GAAG,CAAO,OAAY;IACpC,UAAU,GAAG,OAAO,CAAA;IACpB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;IACpD,MAAM,uBAAe,CAAC,OAAO,CAAC;SAC3B,IAAI,CAAC,uBAAe,CAAC;SACrB,IAAI,CAAC,sBAAc,CAAC;SACpB,IAAI,CAAC,wBAAgB,CAAC;SACtB,IAAI,CAAC,uBAAe,CAAC,CAAA;AAC1B,CAAC,CAAA,CAAA;AAED;;;GAGG;AACQ,QAAA,eAAe,GAAG,CAAO,OAAO;IACzC,UAAU,GAAG,OAAO,CAAA;IACpB,IAAI,QAAQ,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;IAEhF,8BAA8B;IAC9B,IAAI,oBAAoB,GAAiB,EAAE,CAAA;IAC3C,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,eAAe,CAAC,CAAA;IAC/D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACrB,GAAG,CAAC,CAAC,IAAI,cAAc,IAAI,QAAQ,CAAC,CAAC,CAAC;QACpC,IAAI,YAAY,GAAG,IAAI,UAAU,CAAC;YAChC,QAAQ,EAAE,cAAc;YACxB,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;QACF,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACzC,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAA;AAE7B,CAAC,CAAA,CAAA;AAED;;;;GAIG;AACQ,QAAA,eAAe,GAAG,CAAC,gBAA8B;IAC1D,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAgB,CAAA;IAC1C,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;IAC9C,IAAI,WAAW,GAAiB,EAAE,CAAA;IAClC,IAAI,iBAAiB,GAAG,8BAAsB,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAA;IAC7E,IAAI,qBAAqB,GAAW,CAAC,CAAA;IACrC,IAAI,cAAc,GAAG;QACnB,gBAAgB,CAAC,OAAO,CAAC,CAAC,aAAa;YACrC,IAAI,SAAS,GAAG,8BAAsB,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAA;YACrE,EAAE,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnG,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;YACjC,CAAC;YACD,EAAE,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9D,aAAa,CAAC,uBAAuB,GAAG,IAAI,CAAA;YAC9C,CAAC;QACH,CAAC,CAAC,CAAA;QACF,EAAE,CAAC,CAAC,gBAAgB,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YACnD,IAAI,OAAO,GAAG,CAAC,CAAA;YACf,GAAG,CAAC,CAAC,IAAI,UAAU,IAAI,WAAW,CAAC,CAAC,CAAC;gBACnC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,OAAO,QAAQ,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;gBAClE,OAAO,EAAE,CAAA;YACX,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC3B,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC,CAAC;YACtC,qBAAqB,EAAE,CAAA;YACvB,cAAc,EAAE,CAAA;QAClB,CAAC;IACH,CAAC,CAAA;IACD,cAAc,EAAE,CAAA;IAChB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;AACrB,CAAC,CAAA;AAED;;GAEG;AACQ,QAAA,cAAc,GAAG,CAAO,WAAyB;IAC1D,WAAW,CAAC,OAAO,CAAC,CAAC,aAAa;QAChC,EAAE,CAAC,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC,CAAC;YAC1C,WAAW,CAAC,OAAO,CAAC,CAAC,SAAqB;gBACxC,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,KAAK,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;oBACnD,aAAa,CAAC,mBAAmB,GAAG,SAAS,CAAA;gBAC/C,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,WAAW,CAAA;AACpB,CAAC,CAAA,CAAA;AAED;;GAEG;AACQ,QAAA,gBAAgB,GAAG,CAAO,cAA4B;IAC/D,GAAG,CAAC,CAAC,IAAI,aAAa,IAAI,cAAc,CAAC,CAAC,CAAC;QACzC,MAAM,aAAa,CAAC,KAAK,EAAE,CAAA;IAC7B,CAAC;IACD,MAAM,CAAC,cAAc,CAAA;AACvB,CAAC,CAAA,CAAA;AAED;;GAEG;AACQ,QAAA,eAAe,GAAG,CAAO,cAA4B;IAC9D,IAAI,QAAQ,GAAG,CAAC;QACd,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7C,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACxB,CAAC;QAAC,IAAI,CAAC,CAAC;YACN,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAA;QAC5B,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;IACJ,GAAG,CAAC,CAAC,IAAI,aAAa,IAAI,cAAc,CAAC,CAAC,CAAC;QACzC,MAAM,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACpC,CAAC;IACD,MAAM,CAAC,cAAc,CAAA;AACvB,CAAC,CAAA,CAAA;AAED;;;GAGG;AACQ,QAAA,oBAAoB,GAAG,CAAO,gBAA8B,EAAE,WAAW,GAAG,qBAAqB;IAC1G,GAAG,CAAC,CAAC,IAAI,aAAa,IAAI,gBAAgB,CAAC,CAAC,CAAC;QAC3C,MAAM,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACvC,CAAC;IACD,MAAM,CAAC,gBAAgB,CAAA;AACzB,CAAC,CAAA,CAAA;AAED;;;GAGG;AACQ,QAAA,eAAe,GAAG,CAAO,cAA4B;IAC9D,GAAG,CAAC,CAAC,IAAI,aAAa,IAAI,cAAc,CAAC,CAAC,CAAC;QACzC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;IAC5B,CAAC;IACD,MAAM,CAAC,cAAc,CAAA;AACvB,CAAC,CAAA,CAAA;AAED;;GAEG;AACH;IAcE,YAAY,OAA8E;QACxF,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;QAChC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAA;QACzD,IAAI,CAAC,OAAO,GAAG,yBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAA;QAC3E,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAA;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC7B,IAAI,CAAC,aAAa,GAAG,iBAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QACtF,IAAI,CAAC,gBAAgB,GAAG,iBAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACjF,IAAI,CAAC,UAAU,GAAG,iBAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7E,IAAI,CAAC,aAAa,GAAG,aAAa,GAAG,IAAI,CAAC,OAAO,CAAA;QACjD,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC1F,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,uBAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC9C,IAAI,CAAC,uBAAuB,GAAG,KAAK,CAAA;IACtC,CAAC;IAED;;OAEG;IACG,KAAK;;YACT,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,8BAA8B,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;YACtE,IAAI,YAAY,GAAG,mBAAmB,IAAI,CAAC,QAAQ,OAAO,IAAI,CAAC,QAAQ,IAAI,CAAA;YAC3E,MAAM,iBAAI,CAAC,YAAY,CAAC,CAAA;YACxB,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACpC,MAAM,CAAA;QACR,CAAC;KAAA;IAED;;OAEG;IACG,IAAI,CAAE,QAAQ;;YAClB,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACjB,KAAK,SAAS;oBACZ,MAAM,iBAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;oBAC5D,MAAM,iBAAI,CAAC,eAAe,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;oBAE5C,+CAA+C;oBAC/C,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc,KAAK,qBAAqB,CAAC,CAAC,CAAC;wBACtD,MAAM,iBAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAA;wBAClE,MAAM,iBAAI,CAAC,eAAe,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAA;oBACpD,CAAC;oBACD,KAAK,CAAA;gBACP,KAAK,MAAM,CAAC;gBACZ;oBACE,MAAM,iBAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;oBAC/D,MAAM,iBAAI,CAAC,eAAe,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;oBAC/C,KAAK,CAAA;YACT,CAAC;QACH,CAAC;KAAA;IAED;;OAEG;IACG,IAAI,CAAE,WAAmB;;YAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,aAAa,CAAA;YAChC,MAAM,iBAAI,CAAC,cAAc,GAAG,OAAO,CAAC,CAAA;YACpC,MAAM,iBAAI,CAAC,aAAa,GAAG,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC3D,CAAC;KAAA;IAED;;OAEG;IACG,IAAI;;YACR,IAAI,QAAQ,GAAW,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,GAAG,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,CAAA;YAC5F,IAAI,cAAc,GAAY,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;YAC3E,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;gBACnB,YAAY;gBACZ,MAAM,iBAAI,CAAC,yCAAyC,GAAG,IAAI,CAAC,QAAQ,GAAG,oBAAoB,CAAC,CAAA;gBAC5F,MAAM,iBAAI,CAAC,YAAY,GAAG,QAAQ,GAAG,2CAA2C,CAAC,CAAA;gBACjF,MAAM,iBAAI,CAAC,qDAAqD,CAAC,CAAA;gBACjE,MAAM,iBAAI,CAAC,oDAAoD,CAAC,CAAA;gBAChE,MAAM,iBAAI,CAAC,gCAAgC,CAAC,CAAA;gBAC5C,MAAM,iBAAI,CAAC,qCAAqC,CAAC,CAAA;YACnD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,QAAQ,GAAG,iCAAiC,CAAC,CAAA;YACnG,CAAC;QACH,CAAC;KAAA;IAED;;OAEG;IACG,KAAK;;YACT,IAAI,WAAW,GAAG,MAAM,iBAAI,CAAC,mDAAmD,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;YACjG,MAAM,CAAC,WAAW,CAAA;QACpB,CAAC;KAAA;CACF;AApGD,gCAoGC;AAED;;;GAGG;AACQ,QAAA,iBAAiB,GAAG,CAAC,iBAAyB;IACvD,IAAI,aAAqB,CAAA;IACzB,IAAI,YAAY,GAAG,8BAA8B,CAAA;IACjD,IAAI,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC3D,EAAE,CAAC,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;QACtD,aAAa,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAA;IACrC,CAAC;IAAC,IAAI,CAAC,CAAC;QACN,aAAa,GAAG,QAAQ,CAAA;IAC1B,CAAC;IACD,MAAM,CAAC,aAAa,CAAA;AACtB,CAAC,CAAA;AAED;;GAEG;AACQ,QAAA,eAAe,GAAG,UAAU,oBAA4B;IACjE,IAAI,cAAc,GAAG,+BAA+B,CAAA;IACpD,IAAI,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAChE,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAA;AAC5B,CAAC,CAAA;AAED;;GAEG;AACQ,QAAA,SAAS,GAAG,UAAU,WAAmB,EAAE,OAAe,EAAE,UAAkB,EAAE,SAAkB;IAC3G,IAAI,SAAiB,CAAA;IACrB,IAAI,QAAQ,GAAG,WAAW,CAAA;IAC1B,IAAI,IAAI,GAAG,OAAO,CAAA;IAClB,IAAI,OAAO,GAAG,UAAU,CAAA;IACxB,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACd,OAAO,GAAG,UAAU,GAAG,GAAG,GAAG,SAAS,CAAA;IACxC,CAAC;IACD,SAAS,GAAG,QAAQ,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,OAAO,CAAA;IACjD,MAAM,CAAC,SAAS,CAAA;AAClB,CAAC,CAAA;AAED;;GAEG;AACQ,QAAA,sBAAsB,GAAG,UAAU,kBAAgC,EAAE,gBAA8B;IAC5G,IAAI,cAAc,GAAa,EAAE,CAAA;IACjC,kBAAkB,CAAC,OAAO,CAAC,UAAU,aAAa;QAChD,EAAE,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACnD,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,cAAc,CAAA;AACvB,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/mod_publish/index.d.ts b/dist/mod_publish/index.d.ts index a832aa8..35a0cd6 100644 --- a/dist/mod_publish/index.d.ts +++ b/dist/mod_publish/index.d.ts @@ -7,4 +7,4 @@ export declare type TPubService = 'npm' | 'docker'; * the main exported publish function. * @param pubServiceArg references targeted service to publish to */ -export declare let publish: (pubServiceArg?: TPubService) => Promise; +export declare let publish: (argvArg: any) => Promise; diff --git a/dist/mod_publish/index.js b/dist/mod_publish/index.js index f4aa5df..f85a3ff 100644 --- a/dist/mod_publish/index.js +++ b/dist/mod_publish/index.js @@ -15,18 +15,19 @@ const npmciMods = require("../npmci.mods"); * the main exported publish function. * @param pubServiceArg references targeted service to publish to */ -exports.publish = (pubServiceArg = 'npm') => __awaiter(this, void 0, void 0, function* () { - switch (pubServiceArg) { +exports.publish = (argvArg) => __awaiter(this, void 0, void 0, function* () { + let whatToPublish = argvArg._[1]; + switch (whatToPublish) { case 'npm': - return yield publishNpm(); + return yield publishNpm(argvArg); case 'docker': - return yield publishDocker(); + return yield publishDocker(argvArg); } }); /** * tries to publish current cwd to NPM registry */ -let publishNpm = () => __awaiter(this, void 0, void 0, function* () { +let publishNpm = (argvArg) => __awaiter(this, void 0, void 0, function* () { let modPrepare = yield npmciMods.modPrepare.load(); yield modPrepare.prepare('npm'); yield npmci_bash_1.bash('npm publish'); @@ -35,13 +36,13 @@ let publishNpm = () => __awaiter(this, void 0, void 0, function* () { /** * tries to publish current cwd to Docker registry */ -let publishDocker = () => __awaiter(this, void 0, void 0, function* () { +let publishDocker = (argvArg) => __awaiter(this, void 0, void 0, function* () { let modDocker = yield npmciMods.modDocker.load(); - return yield modDocker.readDockerfiles() + return yield modDocker.readDockerfiles(argvArg) .then(modDocker.pullDockerfileImages) .then(modDocker.pushDockerfiles) .then(dockerfileArray => { return dockerfileArray; }); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfcHVibGlzaC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLDhDQUFvQztBQUdwQywyQ0FBMEM7QUFXMUM7OztHQUdHO0FBQ1EsUUFBQSxPQUFPLEdBQUcsQ0FBTyxnQkFBNkIsS0FBSztJQUM1RCxNQUFNLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQ3RCLEtBQUssS0FBSztZQUNSLE1BQU0sQ0FBQyxNQUFNLFVBQVUsRUFBRSxDQUFBO1FBQzNCLEtBQUssUUFBUTtZQUNYLE1BQU0sQ0FBQyxNQUFNLGFBQWEsRUFBRSxDQUFBO0lBQ2hDLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxVQUFVLEdBQUc7SUFDZixJQUFJLFVBQVUsR0FBRyxNQUFNLFNBQVMsQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDbEQsTUFBTSxVQUFVLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQy9CLE1BQU0saUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUN6QixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxhQUFhLEdBQUc7SUFDbEIsSUFBSSxTQUFTLEdBQUcsTUFBTSxTQUFTLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2hELE1BQU0sQ0FBQyxNQUFNLFNBQVMsQ0FBQyxlQUFlLEVBQUU7U0FDckMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxvQkFBb0IsQ0FBQztTQUNwQyxJQUFJLENBQUMsU0FBUyxDQUFDLGVBQWUsQ0FBQztTQUMvQixJQUFJLENBQUMsZUFBZTtRQUNuQixNQUFNLENBQUMsZUFBZSxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfcHVibGlzaC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLDhDQUFvQztBQUdwQywyQ0FBMEM7QUFXMUM7OztHQUdHO0FBQ1EsUUFBQSxPQUFPLEdBQUcsQ0FBTyxPQUFZO0lBQ3RDLElBQUksYUFBYSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDaEMsTUFBTSxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUN0QixLQUFLLEtBQUs7WUFDUixNQUFNLENBQUMsTUFBTSxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDbEMsS0FBSyxRQUFRO1lBQ1gsTUFBTSxDQUFDLE1BQU0sYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3ZDLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxVQUFVLEdBQUcsQ0FBTyxPQUFPO0lBQzdCLElBQUksVUFBVSxHQUFHLE1BQU0sU0FBUyxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUNsRCxNQUFNLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDL0IsTUFBTSxpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0lBQ3pCLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBQy9CLENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLGFBQWEsR0FBRyxDQUFPLE9BQU87SUFDaEMsSUFBSSxTQUFTLEdBQUcsTUFBTSxTQUFTLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2hELE1BQU0sQ0FBQyxNQUFNLFNBQVMsQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDO1NBQzVDLElBQUksQ0FBQyxTQUFTLENBQUMsb0JBQW9CLENBQUM7U0FDcEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxlQUFlLENBQUM7U0FDL0IsSUFBSSxDQUFDLGVBQWU7UUFDbkIsTUFBTSxDQUFDLGVBQWUsQ0FBQTtJQUN4QixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQSxDQUFBIn0= \ No newline at end of file diff --git a/dist/mod_test/index.d.ts b/dist/mod_test/index.d.ts index abd7196..9a6a81f 100644 --- a/dist/mod_test/index.d.ts +++ b/dist/mod_test/index.d.ts @@ -2,4 +2,4 @@ * the main test function * @param versionArg */ -export declare let test: (versionArg: any) => Promise; +export declare let test: (argvArg: any) => Promise; diff --git a/dist/mod_test/index.js b/dist/mod_test/index.js index 3f17417..ea3e68b 100644 --- a/dist/mod_test/index.js +++ b/dist/mod_test/index.js @@ -24,9 +24,9 @@ let npmTest = () => __awaiter(this, void 0, void 0, function* () { plugins.beautylog.info('now starting tests:'); yield npmci_bash_1.bash('npm test'); }); -let testDocker = () => __awaiter(this, void 0, void 0, function* () { +let testDocker = (argvArg) => __awaiter(this, void 0, void 0, function* () { let modDocker = yield npmciMods.modDocker.load(); - return yield modDocker.readDockerfiles() + return yield modDocker.readDockerfiles(argvArg) .then(modDocker.pullDockerfileImages) .then(modDocker.testDockerfiles); }); @@ -34,15 +34,16 @@ let testDocker = () => __awaiter(this, void 0, void 0, function* () { * the main test function * @param versionArg */ -exports.test = (versionArg) => __awaiter(this, void 0, void 0, function* () { - if (versionArg === 'docker') { - yield testDocker(); +exports.test = (argvArg) => __awaiter(this, void 0, void 0, function* () { + let whatToTest = argvArg._[1]; + if (whatToTest === 'docker') { + yield testDocker(argvArg); } else { let modInstall = yield npmciMods.modInstall.load(); - yield modInstall.install(versionArg) + yield modInstall.install(whatToTest) .then(npmDependencies) .then(npmTest); } }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLDhDQUFtRDtBQUVuRCwyQ0FBMEM7QUFLMUMsSUFBSSxlQUFlLEdBQUc7SUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsOEJBQThCLENBQUMsQ0FBQTtJQUN0RCxFQUFFLENBQUMsQ0FBQyxNQUFNLDBCQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUNoQyxNQUFNLGlCQUFJLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDNUIsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sTUFBTSxpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0lBQzNCLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQTtBQUVELElBQUksT0FBTyxHQUFHO0lBQ1osT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM3QyxNQUFNLGlCQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7QUFDeEIsQ0FBQyxDQUFBLENBQUE7QUFFRCxJQUFJLFVBQVUsR0FBRztJQUNmLElBQUksU0FBUyxHQUFHLE1BQU0sU0FBUyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUNoRCxNQUFNLENBQUMsTUFBTSxTQUFTLENBQUMsZUFBZSxFQUFFO1NBQ3JDLElBQUksQ0FBQyxTQUFTLENBQUMsb0JBQW9CLENBQUM7U0FDcEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUNwQyxDQUFDLENBQUEsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsSUFBSSxHQUFHLENBQU8sVUFBVTtJQUNqQyxFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUM1QixNQUFNLFVBQVUsRUFBRSxDQUFBO0lBQ3BCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLElBQUksVUFBVSxHQUFHLE1BQU0sU0FBUyxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUNsRCxNQUFNLFVBQVUsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDO2FBQ2pDLElBQUksQ0FBQyxlQUFlLENBQUM7YUFDckIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ2xCLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLDhDQUFtRDtBQUVuRCwyQ0FBMEM7QUFLMUMsSUFBSSxlQUFlLEdBQUc7SUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsOEJBQThCLENBQUMsQ0FBQTtJQUN0RCxFQUFFLENBQUMsQ0FBQyxNQUFNLDBCQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUNoQyxNQUFNLGlCQUFJLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDNUIsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sTUFBTSxpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0lBQzNCLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQTtBQUVELElBQUksT0FBTyxHQUFHO0lBQ1osT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM3QyxNQUFNLGlCQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7QUFDeEIsQ0FBQyxDQUFBLENBQUE7QUFFRCxJQUFJLFVBQVUsR0FBRyxDQUFPLE9BQU87SUFDN0IsSUFBSSxTQUFTLEdBQUcsTUFBTSxTQUFTLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2hELE1BQU0sQ0FBQyxNQUFNLFNBQVMsQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDO1NBQzVDLElBQUksQ0FBQyxTQUFTLENBQUMsb0JBQW9CLENBQUM7U0FDcEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUNwQyxDQUFDLENBQUEsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsSUFBSSxHQUFHLENBQU8sT0FBTztJQUM5QixJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzdCLEVBQUUsQ0FBQyxDQUFDLFVBQVUsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQzVCLE1BQU0sVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQzNCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLElBQUksVUFBVSxHQUFHLE1BQU0sU0FBUyxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUNsRCxNQUFNLFVBQVUsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDO2FBQ2pDLElBQUksQ0FBQyxlQUFlLENBQUM7YUFDckIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ2xCLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQSJ9 \ No newline at end of file diff --git a/dist/npmci.cli.js b/dist/npmci.cli.js index d6d6d6d..2ff9d33 100644 --- a/dist/npmci.cli.js +++ b/dist/npmci.cli.js @@ -18,9 +18,9 @@ let smartcli = new plugins.smartcli.Smartcli(); smartcli.addVersion(npmciInfo.version); // build smartcli.addCommand('build') - .then((argv) => __awaiter(this, void 0, void 0, function* () { + .then((argvArg) => __awaiter(this, void 0, void 0, function* () { let modBuild = yield npmciMods.modBuild.load(); - yield modBuild.build(argv._[1]); + yield modBuild.build(argvArg); NpmciEnv.configStore(); })).catch(err => { console.log(err); @@ -88,7 +88,7 @@ smartcli.addCommand('publish') smartcli.addCommand('test') .then((argv) => __awaiter(this, void 0, void 0, function* () { let modTest = yield npmciMods.modTest.load(); - yield modTest.test(argv._[1]); + yield modTest.test(argv); yield NpmciEnv.configStore(); })).catch(err => { console.log(err); @@ -105,4 +105,4 @@ smartcli.addCommand('trigger') process.exit(1); }); smartcli.startParse(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY2xpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBQ3RDLElBQUksU0FBUyxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUE7QUFDOUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRTVELHdDQUF1QztBQUV2QywwQ0FBeUM7QUFFekMsSUFBSSxRQUFRLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFBO0FBQzlDLFFBQVEsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRXRDLFFBQVE7QUFDUixRQUFRLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztLQUN6QixJQUFJLENBQUMsQ0FBTyxJQUFJO0lBQ2YsSUFBSSxRQUFRLEdBQUcsTUFBTSxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzlDLE1BQU0sUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDL0IsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFBO0FBQ3hCLENBQUMsQ0FBQSxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7SUFDVixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ2hCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDakIsQ0FBQyxDQUFDLENBQUE7QUFFSixRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUM7S0FDekIsSUFBSSxDQUFDLENBQU8sSUFBSTtJQUNmLElBQUksUUFBUSxH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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY2xpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBQ3RDLElBQUksU0FBUyxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUE7QUFDOUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRTVELHdDQUF1QztBQUV2QywwQ0FBeUM7QUFFekMsSUFBSSxRQUFRLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFBO0FBQzlDLFFBQVEsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRXRDLFFBQVE7QUFDUixRQUFRLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztLQUN6QixJQUFJLENBQUMsQ0FBTyxPQUFPO0lBQ2xCLElBQUksUUFBUSxHQUFHLE1BQU0sU0FBUyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUM5QyxNQUFNLFFBQVEsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDN0IsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFBO0FBQ3hCLENBQUMsQ0FBQSxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7SUFDVixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ2hCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDakIsQ0FBQyxDQUFDLENBQUE7QUFFSixRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUM7S0FDekIsSUFBSSxDQUFDLENBQU8sSUFBSTtJQUNmLElBQUksUUFBUSxHQUFHLE1BQU0sU0FBUyxDQUFDLFFBQVEs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 \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 3ff44fa..8701576 100644 --- a/test/test.ts +++ b/test/test.ts @@ -21,7 +21,6 @@ let dockerfile1: NpmciBuildDocker.Dockerfile let dockerfile2: NpmciBuildDocker.Dockerfile let sortableArray: NpmciBuildDocker.Dockerfile[] - tap.test('should return valid Dockerfiles', async () => { dockerfile1 = new NpmciBuildDocker.Dockerfile({ filePath: './Dockerfile', read: true }) dockerfile2 = new NpmciBuildDocker.Dockerfile({ filePath: './Dockerfile_sometag1', read: true }) @@ -30,10 +29,10 @@ tap.test('should return valid Dockerfiles', async () => { }) tap.test('should read a directory of Dockerfiles', async () => { - return NpmciBuildDocker.readDockerfiles() + return NpmciBuildDocker.readDockerfiles({}) .then(async (readDockerfilesArrayArg: NpmciBuildDocker.Dockerfile[]) => { sortableArray = readDockerfilesArrayArg - return expect(readDockerfilesArrayArg[ 1 ].version).to.equal('sometag1') + return expect(readDockerfilesArrayArg[1].version).to.equal('sometag1') }) }) @@ -49,21 +48,42 @@ tap.test('should correctly chain Dockerfile handling', async () => { }) tap.test('should publish all built Dockerfiles', async () => { - return NpmciPublish.publish('docker') + return NpmciPublish.publish({ + _: [ + 'test', + 'docker' + ] + }) }) tap.test('should source nvm using bash and install a specific node version, then test it', async () => { - return NpmciTest.test('legacy') - .then(() => { - return NpmciTest.test('lts') - }) - .then(() => { - return NpmciTest.test('stable') - }) + await NpmciTest.test({ + _: [ + 'test', + 'legacy' + ] + }) + await NpmciTest.test({ + _: [ + 'test', + 'lts' + ] + }) + await NpmciTest.test({ + _: [ + 'test', + 'stable' + ] + }) }) tap.test('should test dockerfiles', async () => { - return NpmciTest.test('docker') + return NpmciTest.test({ + _: [ + 'test', + 'docker' + ] + }) }) tap.test('should pick up SSH keys', async () => { diff --git a/ts/mod_build/index.ts b/ts/mod_build/index.ts index 965ad73..ededf13 100644 --- a/ts/mod_build/index.ts +++ b/ts/mod_build/index.ts @@ -20,6 +20,6 @@ export let build = async (argvArg): Promise => { break default: plugins.beautylog.log('build target ' + whatToPublish + ' not recognised!') - }; + } return } diff --git a/ts/mod_docker/mod.builddocker.ts b/ts/mod_docker/mod.builddocker.ts index 000e237..813250f 100644 --- a/ts/mod_docker/mod.builddocker.ts +++ b/ts/mod_docker/mod.builddocker.ts @@ -11,7 +11,7 @@ let modArgvArg // will be set through the build command export let build = async (argvArg: any) => { modArgvArg = argvArg plugins.beautylog.log('now building Dockerfiles...') - await readDockerfiles() + await readDockerfiles(argvArg) .then(sortDockerfiles) .then(mapDockerfiles) .then(buildDockerfiles) @@ -22,7 +22,8 @@ export let build = async (argvArg: any) => { * creates instance of class Dockerfile for all Dockerfiles in cwd * @returns Promise */ -export let readDockerfiles = async (): Promise => { +export let readDockerfiles = async (argvArg): Promise => { + modArgvArg = argvArg let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*') // create the Dockerfile array @@ -89,7 +90,7 @@ export let mapDockerfiles = async (sortedArray: Dockerfile[]): Promise { } /** - * + * returns the docker base image for a Dockerfile */ export let dockerBaseImage = function (dockerfileContentArg: string) { let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/ @@ -274,7 +275,7 @@ export let dockerBaseImage = function (dockerfileContentArg: string) { } /** - * + * returns the docker tag */ export let dockerTag = function (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string): string { let tagString: string @@ -283,7 +284,7 @@ export let dockerTag = function (registryArg: string, repoArg: string, versionAr let version = versionArg if (suffixArg) { version = versionArg + '_' + suffixArg - }; + } tagString = registry + '/' + repo + ':' + version return tagString } diff --git a/ts/mod_publish/index.ts b/ts/mod_publish/index.ts index c2f6f59..81955ef 100644 --- a/ts/mod_publish/index.ts +++ b/ts/mod_publish/index.ts @@ -17,19 +17,20 @@ export type TPubService = 'npm' | 'docker' * the main exported publish function. * @param pubServiceArg references targeted service to publish to */ -export let publish = async (pubServiceArg: TPubService = 'npm') => { - switch (pubServiceArg) { +export let publish = async (argvArg: any) => { + let whatToPublish = argvArg._[1] + switch (whatToPublish) { case 'npm': - return await publishNpm() + return await publishNpm(argvArg) case 'docker': - return await publishDocker() + return await publishDocker(argvArg) } } /** * tries to publish current cwd to NPM registry */ -let publishNpm = async () => { +let publishNpm = async (argvArg) => { let modPrepare = await npmciMods.modPrepare.load() await modPrepare.prepare('npm') await bash('npm publish') @@ -39,9 +40,9 @@ let publishNpm = async () => { /** * tries to publish current cwd to Docker registry */ -let publishDocker = async () => { +let publishDocker = async (argvArg) => { let modDocker = await npmciMods.modDocker.load() - return await modDocker.readDockerfiles() + return await modDocker.readDockerfiles(argvArg) .then(modDocker.pullDockerfileImages) .then(modDocker.pushDockerfiles) .then(dockerfileArray => { diff --git a/ts/mod_test/index.ts b/ts/mod_test/index.ts index c821374..e4efaa5 100644 --- a/ts/mod_test/index.ts +++ b/ts/mod_test/index.ts @@ -20,9 +20,9 @@ let npmTest = async (): Promise => { await bash('npm test') } -let testDocker = async (): Promise => { +let testDocker = async (argvArg): Promise => { let modDocker = await npmciMods.modDocker.load() - return await modDocker.readDockerfiles() + return await modDocker.readDockerfiles(argvArg) .then(modDocker.pullDockerfileImages) .then(modDocker.testDockerfiles) } @@ -31,12 +31,13 @@ let testDocker = async (): Promise => { * the main test function * @param versionArg */ -export let test = async (versionArg): Promise => { - if (versionArg === 'docker') { - await testDocker() +export let test = async (argvArg): Promise => { + let whatToTest = argvArg._[1] + if (whatToTest === 'docker') { + await testDocker(argvArg) } else { let modInstall = await npmciMods.modInstall.load() - await modInstall.install(versionArg) + await modInstall.install(whatToTest) .then(npmDependencies) .then(npmTest) } diff --git a/ts/npmci.cli.ts b/ts/npmci.cli.ts index 95d56fb..ed35815 100644 --- a/ts/npmci.cli.ts +++ b/ts/npmci.cli.ts @@ -12,9 +12,9 @@ smartcli.addVersion(npmciInfo.version) // build smartcli.addCommand('build') - .then(async (argv) => { + .then(async (argvArg) => { let modBuild = await npmciMods.modBuild.load() - await modBuild.build(argv._[1]) + await modBuild.build(argvArg) NpmciEnv.configStore() }).catch(err => { console.log(err) @@ -90,7 +90,7 @@ smartcli.addCommand('publish') smartcli.addCommand('test') .then(async (argv) => { let modTest = await npmciMods.modTest.load() - await modTest.test(argv._[1]) + await modTest.test(argv) await NpmciEnv.configStore() }).catch(err => { console.log(err)