Compare commits

...

10 Commits

Author SHA1 Message Date
37589fb5e5 3.0.54 2018-07-15 23:58:43 +02:00
3dd115fe42 fix(ci): adjust to newer build system 2018-07-15 23:58:43 +02:00
01c88a6a6c 3.0.53 2018-07-15 23:49:38 +02:00
f5cacb7400 fix(core): update 2018-07-15 23:49:37 +02:00
887da51d78 3.0.52 2018-07-02 23:15:25 +02:00
585703fc55 fix(core): switch to @pushrocks/smartpromise 2018-07-02 23:15:24 +02:00
ec3e296d73 3.0.51 2018-07-02 23:09:52 +02:00
33f234cf73 fix(core): update to latest standards 2018-07-02 23:09:52 +02:00
e7ec765ed5 3.0.50 2018-05-27 15:43:50 +02:00
2f46197864 fix(structure): removed .npmignore 2018-05-27 15:43:50 +02:00
10 changed files with 2540 additions and 29 deletions

1
.gitignore vendored
View File

@@ -4,3 +4,4 @@ coverage/
public/
config.json
.yarn/
.npmci_cache

View File

@@ -1,3 +0,0 @@
node_modules/
test/
.yarn/

13
.snyk
View File

@@ -6,10 +6,23 @@ ignore:
- shelljs:
reason: None given
expires: '2018-06-02T22:48:10.660Z'
smartshell > shelljs:
reason: None given
expires: '2018-08-14T21:49:25.248Z'
- smartshell > shelljs:
reason: None given
expires: '2018-06-02T22:48:10.660Z'
smartssh > shelljs:
reason: None given
expires: '2018-08-14T21:49:25.248Z'
- smartssh > shelljs:
reason: None given
expires: '2018-06-02T22:48:10.660Z'
shelljs:
reason: None given
expires: '2018-08-14T21:49:25.248Z'
'npm:stringstream:20180511':
- request > stringstream:
reason: None given
expires: '2018-08-14T21:49:25.248Z'
patch: {}

2500
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "@shipzone/npmci",
"version": "3.0.49",
"version": "3.0.54",
"description": "node and docker in gitlab ci on steroids",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
@@ -8,7 +8,7 @@
"npmci": "dist/cli.js"
},
"scripts": {
"test": "(rm -f config.json) && (npmts) && (npm run testVersion)",
"test": "(rm -f config.json) && tsrun test/test.ts",
"build": "(rm -f config.json) && (npmts) && (npm run testVersion)",
"testVersion": "(cd test/assets/ && node ../../dist/cli.js -v)"
},
@@ -23,30 +23,31 @@
},
"homepage": "https://gitlab.com/gitzone/npmci#README",
"devDependencies": {
"tapbundle": "^2.0.0"
"@gitzone/tsrun": "^1.1.9",
"@pushrocks/tapbundle": "^3.0.1"
},
"dependencies": {
"@pushrocks/smartcli": "^3.0.1",
"@types/lodash": "^4.14.74",
"@types/shelljs": "^0.7.4",
"@pushrocks/smartcli": "^3.0.2",
"@pushrocks/smartdelay": "^2.0.1",
"@pushrocks/smartfile": "^6.0.3",
"@pushrocks/smartpromise": "^2.0.5",
"@types/lodash": "^4.14.112",
"@types/shelljs": "^0.8.0",
"@types/through2": "^2.0.33",
"beautylog": "^6.1.10",
"cflare": "^1.0.5",
"lik": "^2.0.5",
"lodash": "^4.17.4",
"lodash": "^4.17.10",
"npmextra": "^2.0.9",
"projectinfo": "^3.0.2",
"request": "^2.81.0",
"shelljs": "^0.8.1",
"projectinfo": "^3.0.4",
"request": "^2.87.0",
"shelljs": "^0.8.2",
"smartanalytics": "^2.0.9",
"smartdelay": "^1.0.3",
"smartfile": "^4.2.20",
"smartparam": "^1.0.2",
"smartq": "^1.1.6",
"smartshell": "^1.0.18",
"smartsocket": "^1.1.10",
"smartshell": "^1.0.19",
"smartsocket": "^1.1.19",
"smartssh": "^1.2.2",
"smartstring": "^2.0.24",
"smartstring": "^2.0.28",
"smartsystem": "^2.0.2",
"through2": "^2.0.3"
},

View File

@@ -1,4 +1,4 @@
import { tap, expect } from 'tapbundle';
import { tap, expect } from '@pushrocks/tapbundle';
import * as path from 'path';
// Setup test

View File

@@ -34,7 +34,7 @@ export let readDockerfiles = async (): Promise<Dockerfile[]> => {
* @returns Promise<Dockerfile[]>
*/
export let sortDockerfiles = (sortableArrayArg: Dockerfile[]): Promise<Dockerfile[]> => {
let done = plugins.q.defer<Dockerfile[]>();
let done = plugins.smartpromise.defer<Dockerfile[]>();
plugins.beautylog.info('sorting Dockerfiles:');
let sortedArray: Dockerfile[] = [];
let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg, sortedArray);

View File

@@ -34,11 +34,11 @@ export let install = async versionArg => {
plugins.beautylog.log(`now installing node version ${versionArg}`);
let version: string;
if (versionArg === 'stable') {
version = '9';
version = '10';
} else if (versionArg === 'lts') {
version = '8';
} else if (versionArg === 'legacy') {
version = '8';
version = '9';
} else {
version = versionArg;
}

View File

@@ -1,12 +1,12 @@
import * as plugins from './npmci.plugins';
import * as paths from './npmci.paths';
import * as smartq from 'smartq';
import * as smartpromise from '@pushrocks/smartpromise';
/**
* wether nvm is available or not
*/
export let nvmAvailable = smartq.defer<boolean>();
export let nvmAvailable = smartpromise.defer<boolean>();
/**
* the smartshell instance for npmci
*/

View File

@@ -3,14 +3,13 @@ export import lodash = require('lodash');
export import npmextra = require('npmextra');
export import path = require('path');
export import projectinfo = require('projectinfo');
export import q = require('smartq');
export let request = require('request');
export import smartcli = require('@pushrocks/smartcli');
export import smartdelay = require('smartdelay');
export import smartfile = require('smartfile');
export import smartdelay = require('@pushrocks/smartdelay');
export import smartfile = require('@pushrocks/smartfile');
export import shelljs = require('shelljs');
export import smartparam = require('smartparam');
export import smartq = require('smartq');
export import smartpromise = require('@pushrocks/smartpromise');
export import smartshell = require('smartshell');
export import smartsocket = require('smartsocket');
export import smartsystem = require('smartsystem');