3.0.55

.gitignore

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

.gitlab-ci.yml

@@ -10,9 +10,11 @@ stages:
 - security
 - test
 - release
-- trigger
+- metadata
-- pages
 
+# ====================
+# security stage
+# ====================
 mirror:
   stage: security
   script:
@@ -31,25 +33,9 @@ snyk:
   - docker
   - notpriv
 
-codequality:
+# ====================
-  stage: security
+# test stage
-  image: docker:stable
+# ====================
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
-  tags:
-  - docker
-  - priv
-
 testLEGACY:
   stage: test
   script:
@@ -88,7 +74,6 @@ release:
   stage: release
   script:
   - npmci node install stable
-  - npmci npm prepare
   - npmci npm publish
   only:
   - tags
@@ -96,8 +81,30 @@ release:
   - docker
   - notpriv
 
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
+  - priv
+
 trigger:
-  stage: trigger
+  stage: metadata
   script:
   - npmci trigger
   only:
@@ -108,7 +115,7 @@ trigger:
 
 pages:
   image: hosttoday/ht-docker-node:npmci
-  stage: pages
+  stage: metadata
   script:
     - npmci command yarn global add npmpage
     - npmci command npmpage

.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.45",
+  "version": "3.0.55",
   "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,31 +23,33 @@
   },
   "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"
-  }
+  },
+  "private": false
 }

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

@@ -1,6 +1,7 @@
 import * as plugins from '../npmci.plugins';
+import * as paths from '../npmci.paths';
 import * as npmciConfig from '../npmci.config';
-import { bash, bashNoError, nvmAvailable, yarnAvailable } from '../npmci.bash';
+import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
 
 /**
  * handle cli input
@@ -33,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;
   }
@@ -49,6 +50,7 @@ export let install = async versionArg => {
   }
   await bash('node -v');
   await bash('npm -v');
+  await bash(`npm config set cache ${paths.NpmciCacheDir}  --global `);
   // lets look for further config
   await npmciConfig.getConfig().then(async configArg => {
     plugins.beautylog.log('Now checking for needed global npm tools...');
@@ -60,11 +62,7 @@ export let install = async versionArg => {
         plugins.beautylog.log(`Tool ${npmTool} is available`);
       } else {
         plugins.beautylog.info(`globally installing ${npmTool} from npm`);
-        if (await yarnAvailable.promise) {
+        await bash(`npm install ${npmTool} -q -g`);
-          await bash(`yarn global add ${npmTool}`);
-        } else {
-          await bash(`npm install ${npmTool} -q -g`);
-        }
       }
     }
     plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!');

ts/mod_npm/index.ts

@@ -1,6 +1,6 @@
 import * as plugins from './mod.plugins';
 import * as configModule from '../npmci.config';
-import { bash, bashNoError, nvmAvailable, yarnAvailable } from '../npmci.bash';
+import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
 
 /**
  * handle cli input
@@ -72,14 +72,14 @@ let publish = async () => {
   await bash(`npm -v`);
 
   // -> build it
-  await bash(`yarn install`);
+  await bash(`npm install`);
-  await bash(`yarn run build`);
+  await bash(`npm run build`);
 
   plugins.beautylog.success(`Nice!!! The build for the publication was successfull!`);
   plugins.beautylog.log(`Lets clean up so we don't publish any packages that don't belong to us:`);
   // -> clean up before we publish stuff
-  await bash(`rm -r .yarn`);
+  await bashNoError(`rm -r ./.npmci_cache`);
-  await bash(`rm -r node_modules`);
+  await bash(`rm -r ./node_modules`);
 
   plugins.beautylog.success(`Cleaned up!:`);
 
@@ -91,14 +91,10 @@ let publish = async () => {
 
 let install = async (): Promise<void> => {
   plugins.beautylog.info('now installing dependencies:');
-  if (await yarnAvailable.promise) {
+  await bash('npm install');
-    await bash('yarn install');
-  } else {
-    await bash('npm install');
-  }
 };
 
 export let test = async (): Promise<void> => {
   plugins.beautylog.info('now starting tests:');
-  await bash('yarn test');
+  await bash('npm test');
 };

ts/npmci.bash.ts

@@ -1,13 +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>();
-export let yarnAvailable = smartq.defer<boolean>();
 /**
  * the smartshell instance for npmci
  */
@@ -35,22 +34,8 @@ let checkToolsAvailable = async () => {
     } else {
       nvmAvailable.resolve(false);
     }
-
-    // check for yarn
-    await plugins.smartshell.which('yarn').then(
-      async () => {
-        await plugins.smartshell.exec(
-          `yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`
-        );
-        yarnAvailable.resolve(true);
-      },
-      () => {
-        yarnAvailable.resolve(false);
-      }
-    );
   } else {
     nvmAvailable.resolve(true);
-    yarnAvailable.resolve(true);
   }
 };
 checkToolsAvailable();

ts/npmci.cli.ts

@@ -15,100 +15,109 @@ const npmciSmartcli = new plugins.smartcli.Smartcli();
 npmciSmartcli.addVersion(npmciInfo.version);
 
 // clean
-npmciSmartcli
+npmciSmartcli.addCommand('clean').subscribe(
-  .addCommand('clean')
+  async argv => {
-  .subscribe(async argv => {
     let modClean = await npmciMods.modClean.load();
     await modClean.clean();
-  }, err => {
+  },
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 // cloudflare
-npmciSmartcli
+npmciSmartcli.addCommand('cloudflare').subscribe(
-  .addCommand('cloudflare')
+  async argvArg => {
-  .subscribe(async argvArg => {
     let modPurge = await npmciMods.modCloudflare.load();
     await modPurge.handleCli(argvArg);
-  }, err => {
+  },
+  err => {
     console.log(err);
-  });
+  }
+);
 
 // command
-npmciSmartcli
+npmciSmartcli.addCommand('command').subscribe(
-  .addCommand('command')
+  async argv => {
-  .subscribe(async argv => {
     let modCommand = await npmciMods.modCommand.load();
     await modCommand.command();
-  }, err => {
+  },
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 // command
-npmciSmartcli
+npmciSmartcli.addCommand('git').subscribe(
-  .addCommand('git')
+  async argvArg => {
-  .subscribe(async argvArg => {
     let modGit = await npmciMods.modGit.load();
     await modGit.handleCli(argvArg);
-  }, err => {
+  },
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 // build
-npmciSmartcli
+npmciSmartcli.addCommand('docker').subscribe(
-  .addCommand('docker')
+  async argvArg => {
-  .subscribe(async argvArg => {
     let modDocker = await npmciMods.modDocker.load();
     await modDocker.handleCli(argvArg);
-  }, err => {
+  },
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 // node
-npmciSmartcli
+npmciSmartcli.addCommand('node').subscribe(
-  .addCommand('node')
+  async argvArg => {
-  .subscribe(async argvArg => {
     let modNode = await npmciMods.modNode.load();
     await modNode.handleCli(argvArg);
-  }, err => {
+  },
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 // npm
-npmciSmartcli
+npmciSmartcli.addCommand('npm').subscribe(
-  .addCommand('npm')
+  async argvArg => {
-  .subscribe(async argvArg => {
     let modNpm = await npmciMods.modNpm.load();
     await modNpm.handleCli(argvArg);
-  }, err => {
+  },
+  err => {
     console.log(err);
-  });
+  }
+);
 
 // trigger
-npmciSmartcli
+npmciSmartcli.addCommand('ssh').subscribe(
-  .addCommand('ssh')
+  async argvArg => {
-  .subscribe(async argvArg => {
     let modSsh = await npmciMods.modSsh.load();
     await modSsh.handleCli(argvArg);
-  }, err => {
+  },
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 // trigger
-npmciSmartcli
+npmciSmartcli.addCommand('trigger').subscribe(
-  .addCommand('trigger')
+  async argv => {
-  .subscribe(async argv => {
     let modTrigger = await npmciMods.modTrigger.load();
     await modTrigger.trigger();
-  }, err => {
+  },
+  err => {
     console.log(err);
     process.exit(1);
-  });
+  }
+);
 
 npmciSmartcli.startParse();

ts/npmci.paths.ts

@@ -6,3 +6,4 @@ export let NpmciPackageRoot = plugins.path.join(__dirname, '../');
 export let NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json');
 export let NpmciProjectDir = cwd;
 export let NpmciTestDir = plugins.path.join(cwd, './test');
+export let NpmciCacheDir = plugins.path.join(cwd, './.npmci_cache');

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