3.0.56

.gitlab-ci.yml

@@ -3,7 +3,7 @@ image: hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .yarn/
+  - .npmci_cache/
   key: "$CI_BUILD_STAGE"
 
 stages:
@@ -26,8 +26,8 @@ mirror:
 snyk:
   stage: security
   script:
-    - npmci command yarn global add snyk
+    - npmci command npm install -g snyk
-    - npmci command yarn install --ignore-scripts
+    - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
   - docker
@@ -117,8 +117,9 @@ pages:
   image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command yarn global add npmpage
+    - npmci command npm install -g typedoc typescript
-    - npmci command npmpage
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
   tags:
     - docker
     - notpriv
@@ -128,3 +129,14 @@ pages:
     expire_in: 1 week
     paths:
     - public
+  allow_failure: true
+
+windowsCompatibility:
+  image: stefanscherer/node-windows:10-build-tools
+  stage: metadata
+  script:
+  - npm install & npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - windows
+  allow_failure: true

.snyk

@@ -12,4 +12,17 @@ ignore:
     - smartssh > shelljs:
         reason: None given
         expires: '2018-06-02T22:48:10.660Z'
+    - smartshell > shelljs:
+        reason: None given
+        expires: '2018-08-14T21:49:25.248Z'
+    - smartssh > shelljs:
+        reason: None given
+        expires: '2018-08-14T21:49:25.248Z'
+    - 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: {}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.0.50",
+  "version": "3.0.56",
   "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",
+    "@pushrocks/smartcli": "^3.0.2",
-    "@types/lodash": "^4.14.74",
+    "@pushrocks/smartdelay": "^2.0.1",
-    "@types/shelljs": "^0.7.4",
+    "@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",
+    "projectinfo": "^3.0.4",
-    "request": "^2.81.0",
+    "request": "^2.87.0",
-    "shelljs": "^0.8.1",
+    "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.19",
-    "smartshell": "^1.0.18",
+    "smartsocket": "^1.1.19",
-    "smartsocket": "^1.1.10",
     "smartssh": "^1.2.2",
-    "smartstring": "^2.0.24",
+    "smartstring": "^2.0.28",
     "smartsystem": "^2.0.2",
     "through2": "^2.0.3"
   },

readme.md

@@ -29,9 +29,9 @@ npmci is designed to work in docker CI environments. The following docker images
 
 Docker Hub:
 
-* [hosttoday/ht-docker-node:npmci](https://hub.docker.com/r/hosttoday/ht-docker-node/)  
+- [hosttoday/ht-docker-node:npmci](https://hub.docker.com/r/hosttoday/ht-docker-node/)  
   has LTS node version and npmci preinstalled.
-* [hosttoday/ht-docker-dbase](https://hub.docker.com/r/hosttoday/ht-docker-dbase/)  
+- [hosttoday/ht-docker-dbase](https://hub.docker.com/r/hosttoday/ht-docker-dbase/)  
   based on docker:git, can be used to build docker images in conjunction with docker:dind
 
 npmci can be called from commandline and handle a lot of tasks durug ci:

test/test.ts

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

ts/mod_docker/mod.helpers.ts

@@ -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);

ts/mod_node/index.ts

@@ -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;
   }

ts/npmci.bash.ts

@@ -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
  */

ts/npmci.plugins.ts

@@ -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 smartdelay = require('@pushrocks/smartdelay');
-export import smartfile = require('smartfile');
+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');