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

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2021-10-19 03:09:50 +02:00
parent 52af1d5188
commit 9eb232da39
8 changed files with 18637 additions and 3057 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21614
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

22
package.json
View File

@ -24,30 +24,30 @@
}, },
"homepage": "https://gitlab.com/gitzone/npmci#README", "homepage": "https://gitlab.com/gitzone/npmci#README",
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.25", "@gitzone/tsbuild": "^2.1.28",
"@gitzone/tsrun": "^1.2.12", "@gitzone/tsrun": "^1.2.18",
"@gitzone/tstest": "^1.0.54", "@gitzone/tstest": "^1.0.59",
"@pushrocks/tapbundle": "^3.2.14", "@pushrocks/tapbundle": "^3.2.14",
"@types/node": "^15.0.3", "@types/node": "^16.11.1",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0" "tslint-config-prettier": "^1.18.0"
}, },
"dependencies": { "dependencies": {
"@apiglobal/typedrequest": "^1.0.56", "@apiglobal/typedrequest": "^1.0.58",
"@pushrocks/lik": "^4.0.20", "@pushrocks/lik": "^5.0.0",
"@pushrocks/npmextra": "^3.0.9", "@pushrocks/npmextra": "^3.0.9",
"@pushrocks/projectinfo": "^4.0.5", "@pushrocks/projectinfo": "^4.0.5",
"@pushrocks/qenv": "^4.0.10", "@pushrocks/qenv": "^4.0.10",
"@pushrocks/smartanalytics": "^2.0.15", "@pushrocks/smartanalytics": "^2.0.15",
"@pushrocks/smartcli": "^3.0.14", "@pushrocks/smartcli": "^3.0.14",
"@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartdelay": "^2.0.13",
"@pushrocks/smartfile": "^8.0.10", "@pushrocks/smartfile": "^8.0.10",
"@pushrocks/smartlog": "^2.0.39", "@pushrocks/smartlog": "^2.0.44",
"@pushrocks/smartlog-destination-local": "^8.0.8", "@pushrocks/smartlog-destination-local": "^8.0.8",
"@pushrocks/smartparam": "^1.1.6", "@pushrocks/smartparam": "^1.1.6",
"@pushrocks/smartpromise": "^3.1.5", "@pushrocks/smartpromise": "^3.1.6",
"@pushrocks/smartrequest": "^1.1.51", "@pushrocks/smartrequest": "^1.1.52",
"@pushrocks/smartshell": "^2.0.26", "@pushrocks/smartshell": "^2.0.28",
"@pushrocks/smartsocket": "^1.2.8", "@pushrocks/smartsocket": "^1.2.8",
"@pushrocks/smartssh": "^1.2.3", "@pushrocks/smartssh": "^1.2.3",
"@pushrocks/smartstring": "^3.0.24", "@pushrocks/smartstring": "^3.0.24",

12
ts/manager.docker/index.ts
View File

@ -21,7 +21,7 @@ export class NpmciDockerManager {
* handle cli input * handle cli input
* @param argvArg * @param argvArg
*/ */
public handleCli = async (argvArg) => { public handleCli = async (argvArg: any) => {
if (argvArg._.length >= 2) { if (argvArg._.length >= 2) {
const action: string = argvArg._[1]; const action: string = argvArg._[1];
switch (action) { switch (action) {
@ -93,7 +93,7 @@ export class NpmciDockerManager {
await plugins.smartparam.forEachMinimatch( await plugins.smartparam.forEachMinimatch(
process.env, process.env,
'NPMCI_LOGIN_DOCKER*', 'NPMCI_LOGIN_DOCKER*',
async (envString) => { async (envString: string) => {
this.npmciRegistryStorage.addRegistry(DockerRegistry.fromEnvString(envString)); this.npmciRegistryStorage.addRegistry(DockerRegistry.fromEnvString(envString));
} }
); );
@ -104,7 +104,7 @@ export class NpmciDockerManager {
* pushes an image towards a registry * pushes an image towards a registry
* @param argvArg * @param argvArg
*/ */
public push = async (argvArg) => { public push = async (argvArg: any) => {
await this.prepare(); await this.prepare();
let dockerRegistryUrls: string[] = []; let dockerRegistryUrls: string[] = [];
@ -134,7 +134,7 @@ export class NpmciDockerManager {
const dockerfileArray = await Dockerfile.readDockerfiles(this) const dockerfileArray = await Dockerfile.readDockerfiles(this)
.then(Dockerfile.sortDockerfiles) .then(Dockerfile.sortDockerfiles)
.then(Dockerfile.mapDockerfiles); .then(Dockerfile.mapDockerfiles);
const dockerRegistryToPushTo = this.npmciRegistryStorage.getRegistryByUrl(dockerRegistryUrl); const dockerRegistryToPushTo = await this.npmciRegistryStorage.getRegistryByUrl(dockerRegistryUrl);
if (!dockerRegistryToPushTo) { if (!dockerRegistryToPushTo) {
logger.log( logger.log(
'error', 'error',
@ -151,14 +151,14 @@ export class NpmciDockerManager {
/** /**
* pulls an image * pulls an image
*/ */
public pull = async (argvArg) => { public pull = async (argvArg: any) => {
await this.prepare(); await this.prepare();
const registryUrlArg = argvArg._[2]; const registryUrlArg = argvArg._[2];
let suffix = null; let suffix = null;
if (argvArg._.length >= 4) { if (argvArg._.length >= 4) {
suffix = argvArg._[3]; suffix = argvArg._[3];
} }
const localDockerRegistry = this.npmciRegistryStorage.getRegistryByUrl(registryUrlArg); const localDockerRegistry = await this.npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
const dockerfileArray = await Dockerfile.readDockerfiles(this) const dockerfileArray = await Dockerfile.readDockerfiles(this)
.then(Dockerfile.sortDockerfiles) .then(Dockerfile.sortDockerfiles)
.then(Dockerfile.mapDockerfiles); .then(Dockerfile.mapDockerfiles);

2
ts/manager.docker/mod.classes.registrystorage.ts
View File

@ -15,7 +15,7 @@ export class RegistryStorage {
} }
getRegistryByUrl(registryUrlArg: string) { getRegistryByUrl(registryUrlArg: string) {
return this.objectMap.find((registryArg) => { return this.objectMap.findSync((registryArg) => {
return registryArg.registryUrl === registryUrlArg; return registryArg.registryUrl === registryUrlArg;
}); });
} }

2
ts/manager.git/index.ts
View File

@ -14,7 +14,7 @@ export class NpmciGitManager {
* handle cli input * handle cli input
* @param argvArg * @param argvArg
*/ */
public handleCli = async (argvArg) => { public handleCli = async (argvArg: any) => {
if (argvArg._.length >= 2) { if (argvArg._.length >= 2) {
const action: string = argvArg._[1]; const action: string = argvArg._[1];
switch (action) { switch (action) {

10
ts/manager.nodejs/index.ts
View File

@ -16,7 +16,7 @@ export class NpmciNodeJsManager {
* handle cli input * handle cli input
* @param argvArg * @param argvArg
*/ */
public async handleCli(argvArg) { public async handleCli(argvArg: any) {
if (argvArg._.length >= 3) { if (argvArg._.length >= 3) {
const action: string = argvArg._[1]; const action: string = argvArg._[1];
switch (action) { switch (action) {
@ -40,15 +40,15 @@ export class NpmciNodeJsManager {
* Install a specific version of node * Install a specific version of node
* @param versionArg * @param versionArg
*/ */
public async install(versionArg) { public async install(versionArg: any) {
logger.log('info', `now installing node version ${versionArg}`); logger.log('info', `now installing node version ${versionArg}`);
let version: string; let version: string;
if (versionArg === 'stable') { if (versionArg === 'stable') {
version = '12'; version = '16';
} else if (versionArg === 'lts') { } else if (versionArg === 'lts') {
version = '10'; version = '14';
} else if (versionArg === 'legacy') { } else if (versionArg === 'legacy') {
version = '8'; version = '12';
} else { } else {
version = versionArg; version = versionArg;
} }

8
ts/manager.npm/index.ts
View File

@ -8,7 +8,7 @@ import { Npmci } from '../npmci.classes.npmci';
export class NpmciNpmManager { export class NpmciNpmManager {
public npmciRef: Npmci; public npmciRef: Npmci;
constructor(npmciRefArg) { constructor(npmciRefArg: Npmci) {
this.npmciRef = npmciRefArg; this.npmciRef = npmciRefArg;
} }
@ -16,7 +16,7 @@ export class NpmciNpmManager {
* handle cli input * handle cli input
* @param argvArg * @param argvArg
*/ */
public async handleCli(argvArg) { public async handleCli(argvArg: any) {
if (argvArg._.length >= 2) { if (argvArg._.length >= 2) {
const action: string = argvArg._[1]; const action: string = argvArg._[1];
switch (action) { switch (action) {
@ -54,7 +54,7 @@ export class NpmciNpmManager {
public async prepare() { public async prepare() {
const config = this.npmciRef.npmciConfig.getConfig(); const config = this.npmciRef.npmciConfig.getConfig();
let npmrcFileString: string = ''; let npmrcFileString: string = '';
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg) => { await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg: string) => {
const npmRegistryUrl = npmEnvArg.split('|')[0]; const npmRegistryUrl = npmEnvArg.split('|')[0];
let npmToken = npmEnvArg.split('|')[1]; let npmToken = npmEnvArg.split('|')[1];
if (npmEnvArg.split('|')[2] && npmEnvArg.split('|')[2] === 'plain') { if (npmEnvArg.split('|')[2] && npmEnvArg.split('|')[2] === 'plain') {
@ -95,7 +95,7 @@ export class NpmciNpmManager {
let publishVerdaccioAsWell = false; let publishVerdaccioAsWell = false;
const config = this.npmciRef.npmciConfig.getConfig(); const config = this.npmciRef.npmciConfig.getConfig();
const availableRegistries: string[] = []; const availableRegistries: string[] = [];
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg) => { await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg: string) => {
availableRegistries.push(npmEnvArg.split('|')[0]); availableRegistries.push(npmEnvArg.split('|')[0]);
}); });

2
ts/mod_ssh/index.ts
View File

@ -2,7 +2,7 @@ import { logger } from '../npmci.logging';
import * as plugins from './mod.plugins'; import * as plugins from './mod.plugins';
let sshInstance: plugins.smartssh.SshInstance; let sshInstance: plugins.smartssh.SshInstance;
export let handleCli = async (argvArg) => { export let handleCli = async (argvArg: any) => {
if (argvArg._.length >= 2) { if (argvArg._.length >= 2) {
const action: string = argvArg._[1]; const action: string = argvArg._[1];
switch (action) { switch (action) {