diff --git a/dist/mod_node/index.js b/dist/mod_node/index.js index 5c64dd6..090fd7b 100644 --- a/dist/mod_node/index.js +++ b/dist/mod_node/index.js @@ -64,7 +64,7 @@ exports.install = (versionArg) => __awaiter(this, void 0, void 0, function* () { yield npmciConfig.getConfig() .then((configArg) => __awaiter(this, void 0, void 0, function* () { plugins.beautylog.log('Now checking for needed global npm tools...'); - for (let npmTool of configArg.globalNpmTools) { + for (let npmTool of configArg.npmGlobalTools) { plugins.beautylog.info(`Checking for global "${npmTool}"`); let whichOutput = yield npmci_bash_1.bashNoError(`which ${npmTool}`); let toolAvailable = !((/not\sfound/.test(whichOutput)) || whichOutput === ''); diff --git a/dist/npmci.config.d.ts b/dist/npmci.config.d.ts index bd43e4a..f2419e3 100644 --- a/dist/npmci.config.d.ts +++ b/dist/npmci.config.d.ts @@ -1,6 +1,7 @@ import { KeyValueStore } from 'npmextra'; export interface INpmciOptions { - globalNpmTools: string[]; + npmGlobalTools: string[]; + dockerRegistryRepoMap: any; } export declare let kvStorage: KeyValueStore; export declare let getConfig: () => Promise; diff --git a/dist/npmci.config.js b/dist/npmci.config.js index 1c8f33f..3111bf9 100644 --- a/dist/npmci.config.js +++ b/dist/npmci.config.js @@ -13,13 +13,14 @@ const paths = require("./npmci.paths"); const npmci_env_1 = require("./npmci.env"); const npmextra_1 = require("npmextra"); // instantiate a kvStorage for the current directory -exports.kvStorage = new npmextra_1.KeyValueStore('custom', npmci_env_1.repo.repo); +exports.kvStorage = new npmextra_1.KeyValueStore('custom', `${npmci_env_1.repo.user}_${npmci_env_1.repo.repo}`); exports.getConfig = () => __awaiter(this, void 0, void 0, function* () { let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd); let defaultConfig = { - globalNpmTools: [] + npmGlobalTools: [], + dockerRegistryRepoMap: {} }; let npmciConfig = npmciNpmextra.dataFor('npmci', defaultConfig); return npmciConfig; }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFFQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBRXRDLDJDQUFrQztBQUVsQyx1Q0FBd0M7QUFNeEMsb0RBQW9EO0FBQ3pDLFFBQUEsU0FBUyxHQUFHLElBQUksd0JBQWEsQ0FBQyxRQUFRLEVBQUUsZ0JBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtBQUVsRCxRQUFBLFNBQVMsR0FBRztJQUNyQixJQUFJLGFBQWEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUM1RCxJQUFJLGFBQWEsR0FBa0I7UUFDakMsY0FBYyxFQUFFLEVBQUU7S0FDbkIsQ0FBQTtJQUNELElBQUksV0FBVyxHQUFHLGFBQWEsQ0FBQyxPQUFPLENBQWdCLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQTtJQUM5RSxNQUFNLENBQUMsV0FBVyxDQUFBO0FBQ3BCLENBQUMsQ0FBQSxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFFQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBRXRDLDJDQUFrQztBQUVsQyx1Q0FBd0M7QUFPeEMsb0RBQW9EO0FBQ3pDLFFBQUEsU0FBUyxHQUFHLElBQUksd0JBQWEsQ0FBQyxRQUFRLEVBQUUsR0FBRyxnQkFBSSxDQUFDLElBQUksSUFBSSxnQkFBSSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUE7QUFFcEUsUUFBQSxTQUFTLEdBQUc7SUFDckIsSUFBSSxhQUFhLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDNUQsSUFBSSxhQUFhLEdBQWtCO1FBQ2pDLGNBQWMsRUFBRSxFQUFFO1FBQ2xCLHFCQUFxQixFQUFFLEVBQUU7S0FDMUIsQ0FBQTtJQUNELElBQUksV0FBVyxHQUFHLGFBQWEsQ0FBQyxPQUFPLENBQWdCLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQTtJQUM5RSxNQUFNLENBQUMsV0FBVyxDQUFBO0FBQ3BCLENBQUMsQ0FBQSxDQUFBIn0= \ No newline at end of file diff --git a/npmextra.json b/npmextra.json index 45d5ee2..a74e158 100644 --- a/npmextra.json +++ b/npmextra.json @@ -7,6 +7,9 @@ "npmci": { "globalNpmTools": [ "npmts" + ], + "npmGlobalTools": [ + "npmts" ] }, "npmdocker":{ diff --git a/ts/mod_node/index.ts b/ts/mod_node/index.ts index 2c268ee..e1c85ae 100644 --- a/ts/mod_node/index.ts +++ b/ts/mod_node/index.ts @@ -57,7 +57,7 @@ export let install = async (versionArg) => { await npmciConfig.getConfig() .then(async configArg => { plugins.beautylog.log('Now checking for needed global npm tools...') - for (let npmTool of configArg.globalNpmTools) { + for (let npmTool of configArg.npmGlobalTools) { plugins.beautylog.info(`Checking for global "${npmTool}"`) let whichOutput: string = await bashNoError(`which ${npmTool}`) let toolAvailable: boolean = !((/not\sfound/.test(whichOutput)) || whichOutput === '') diff --git a/ts/npmci.config.ts b/ts/npmci.config.ts index 2e9bbf9..f9116c2 100644 --- a/ts/npmci.config.ts +++ b/ts/npmci.config.ts @@ -8,16 +8,18 @@ import { repo } from './npmci.env' import { KeyValueStore } from 'npmextra' export interface INpmciOptions { - globalNpmTools: string[] + npmGlobalTools: string[] + dockerRegistryRepoMap: any } // instantiate a kvStorage for the current directory -export let kvStorage = new KeyValueStore('custom', repo.user + repo.repo) +export let kvStorage = new KeyValueStore('custom', `${repo.user}_${repo.repo}`) export let getConfig = async (): Promise => { let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd) let defaultConfig: INpmciOptions = { - globalNpmTools: [] + npmGlobalTools: [], + dockerRegistryRepoMap: {} } let npmciConfig = npmciNpmextra.dataFor('npmci', defaultConfig) return npmciConfig