7.0.7

Switch to tap

Closes #16

See merge request !3

.gitlab-ci.yml

@@ -48,12 +48,15 @@ trigger:
     - docker
 
 pages:
-  image: hosttoday/ht-docker-node:npmpage
+  image: hosttoday/ht-docker-node:npmci
   stage: pages
   script:
-    - npmci command npmpage --publish gitlab
+    - npmci command yarn global add npmpage
+    - npmci command npmpage
   only:
     - tags
+  tags:
+    - docker
   artifacts:
     expire_in: 1 week
     paths:

CHANGELOG

@@ -3,3 +3,9 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 6.0.0 (released)
     - remove TypeDoc, please look at npmpage
     - check package.json
+
+v 7.0.0
+    - switch from mocha to tap
+    - run tests in SubProcesses with coverage
+    - improve ES6 handling
+    - add smartanalytics

README.md

@@ -2,43 +2,38 @@
 Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
 
 ## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/npmts)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/npmts)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/npmts/)
+[![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)
+[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmts)
+[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmts)
+[![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmts/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/npmts/badges/master/coverage.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
+[![build status](https://GitLab.com/gitzone/npmts/badges/master/build.svg)](https://GitLab.com/gitzone/npmts/commits/master)
+[![coverage report](https://GitLab.com/gitzone/npmts/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmts/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/npmts.svg)](https://www.npmjs.com/package/npmts)
-[![docker pulls](https://img.shields.io/docker/pulls/hosttoday/ht-docker-node.svg)](https://hub.docker.com/r/hosttoday/ht-docker-node/)
-[![Dependency Status](https://david-dm.org/pushrocks/npmts.svg)](https://david-dm.org/pushrocks/npmts)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/npmts/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/npmts/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/npmts/badges/code.svg)](https://www.bithound.io/github/pushrocks/npmts)
+[![Dependency Status](https://david-dm.org/gitzone/npmts.svg)](https://david-dm.org/gitzone/npmts)
+[![bitHound Dependencies](https://www.bithound.io/github/gitzone/npmts/badges/dependencies.svg)](https://www.bithound.io/github/gitzone/npmts/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/gitzone/npmts/badges/code.svg)](https://www.bithound.io/github/gitzone/npmts)
 [![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
-## Introduction
+## Usage
 NPMTS is your friend when writing, testing, publishing and documenting npm modules written in TypeScript.
 
 npmts will
     
-1. check your dependencies and package.json
+1. check your dependencies and package.json (unused, missing, updates, security)
 1. transpile your code with tsc,
-1. document your code with typedoc,
-1. test your code with mocha
-1. create coverage with istanbul
+1. test your code with tap (supports the fancy stuff like Promises, Generators, async/await, sourcemaps, parallel test execution in child processes)
+1. create coverage with istanbul (supports tracing of the originating TypeScript)
+
+For more information on how tests are run check out the [tapbuffer module](https://www.npmjs.com/package/tapbuffer).
 
 This works on your machine and in CI. There is a prebuild docker image available that includes npmts to make CI a breeze:  
 [hosttoday/ht-docker-node:npmts on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-node/)
 
-For further information read the docs:
-1. [Intro](https://pushrocks.gitlab.io/npmts/index.html)
-2. [Install](https://pushrocks.gitlab.io/npmts/install.html)
-3. [Default Behaviour](https://pushrocks.gitlab.io/npmts/default.html)
-4. [Configuration](https://pushrocks.gitlab.io/npmts/config.html)
-5. [Examples](https://pushrocks.gitlab.io/npmts/examples.html)
-6. [Info](https://pushrocks.gitlab.io/npmts/info.html)
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)

dist/index.js

@@ -3,6 +3,7 @@
     Fabulous TypeScript development
  * ================================================== */
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const early = require("early");
 early.start('NPMTS');
 const plugins = require("./npmts.plugins");

dist/mod00/index.js

@@ -1,16 +1,18 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /* ------------------------------------------
- * This module compiles TypeScript files
+ * This module compiles the module's TypeScript files
+ * Note: Test files are only compiled in memory
  * -------------------------------------------- */
 const q = require("smartq");
-const npmts_log_1 = require("../npmts.log");
+const plugins = require("./mod00.plugins");
 const NpmtsAssets = require("./mod00.assets");
 const NpmtsCheck = require("./mod00.check");
 const NpmtsClean = require("./mod00.clean");
 const NpmtsCompile = require("./mod00.compile");
 exports.run = function (configArg) {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('starting TypeScript Compilation');
+    plugins.beautylog.ora.text('starting TypeScript Compilation');
     NpmtsClean.run(configArg)
         .then(NpmtsCheck.run)
         .then(NpmtsCompile.run)

dist/mod00/mod00.assets.js

@@ -1,13 +1,13 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const paths = require("../npmts.paths");
-const npmts_log_1 = require("../npmts.log");
 const plugins = require("./mod00.plugins");
 const mod00_check_1 = require("../mod00/mod00.check");
 exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;
-    npmts_log_1.npmtsOra.text('now looking at ' + 'required assets'.yellow);
+    plugins.beautylog.ora.text('now looking at ' + 'required assets');
     if (config.cli === true) {
         let mainJsPath = mod00_check_1.projectInfo.packageJson.main;
         let cliJsString = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js'));

dist/mod00/mod00.check.js

@@ -1,12 +1,12 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const projectinfo_1 = require("projectinfo");
 const paths = require("../npmts.paths");
-const npmts_log_1 = require("../npmts.log");
 const plugins = require("./mod00.plugins");
 let checkProjectTypings = (configArg) => {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('Check Module: Check Project Typings...');
+    plugins.beautylog.ora.text('Check Module: Check Project Typings...');
     exports.projectInfo = new projectinfo_1.ProjectinfoNpm(paths.cwd);
     if (typeof exports.projectInfo.packageJson.typings === 'undefined') {
         plugins.beautylog.error(`please add typings field to package.json`);
@@ -32,7 +32,7 @@ const depcheckOptions = {
 };
 let checkDependencies = (configArg) => {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('Check Module: Check Dependencies...');
+    plugins.beautylog.ora.text('Check Module: Check Dependencies...');
     let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [
             'test',
@@ -56,11 +56,11 @@ let checkDependencies = (configArg) => {
             process.exit(1);
         }
         for (let item in unused.invalidFiles) {
-            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
+            plugins.beautylog.warn(`Watch out: could not parse file ${item}`);
         }
         ;
         for (let item in unused.invalidDirs) {
-            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item}`);
         }
         done.resolve(configArg);
     });
@@ -68,7 +68,7 @@ let checkDependencies = (configArg) => {
 };
 let checkDevDependencies = (configArg) => {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('Check Module: Check devDependencies...');
+    plugins.beautylog.ora.text('Check Module: Check devDependencies...');
     let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [
             'ts',
@@ -82,20 +82,20 @@ let checkDevDependencies = (configArg) => {
     });
     plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
         for (let item of unused.devDependencies) {
-            plugins.beautylog.log(`unused devDependency ${item.red}`);
+            plugins.beautylog.log(`unused devDependency ${item}`);
         }
         for (let item in unused.missing) {
-            plugins.beautylog.error(`unused devDependency ${item.red}`);
+            plugins.beautylog.error(`unused devDependency ${item}`);
         }
         if (unused.missing.length > 0) {
             plugins.beautylog.info('exiting due to missing dependencies in package.json');
             process.exit(1);
         }
         for (let item in unused.invalidFiles) {
-            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
+            plugins.beautylog.warn(`Watch out: could not parse file ${item}`);
         }
         for (let item in unused.invalidDirs) {
-            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item}`);
         }
         done.resolve(configArg);
     });
@@ -103,13 +103,13 @@ let checkDevDependencies = (configArg) => {
 };
 let checkNodeVersion = (configArg) => {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('checking node version');
+    plugins.beautylog.ora.text('checking node version');
     done.resolve(configArg);
     return done.promise;
 };
 exports.run = (configArg) => {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('Check Module: ...');
+    plugins.beautylog.ora.text('Check Module: ...');
     checkProjectTypings(configArg)
         .then(checkDependencies)
         .then(checkDevDependencies)

dist/mod00/mod00.clean.js

@@ -1,13 +1,13 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const paths = require("../npmts.paths");
-const npmts_log_1 = require("../npmts.log");
 const plugins = require("./mod00.plugins");
 /**
  * removes the  dist directory which will be entirely rebuild
  */
 let removeDist = function () {
-    npmts_log_1.npmtsOra.text('cleaning dist folder');
+    plugins.beautylog.ora.text('cleaning dist folder');
     return plugins.smartfile.fs.remove(paths.distDir);
 };
 /**
@@ -25,11 +25,11 @@ let removeTestDeclarations = function () {
  * remove old pages
  */
 let removePages = function () {
-    npmts_log_1.npmtsOra.text('cleaning pages folder');
+    plugins.beautylog.ora.text('cleaning pages folder');
     return plugins.smartfile.fs.remove(paths.pagesDir);
 };
 exports.run = function (configArg) {
-    npmts_log_1.npmtsOra.text('cleaning up from previous builds...');
+    plugins.beautylog.ora.text('cleaning up from previous builds...');
     let done = q.defer();
     removeDist()
         .then(removeTestDeclarations)

dist/mod00/mod00.compile.js

@@ -1,20 +1,15 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const paths = require("../npmts.paths");
-const npmts_log_1 = require("../npmts.log");
 const plugins = require("./mod00.plugins");
 exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;
-    npmts_log_1.npmtsOra.text('now compiling ' + 'TypeScript'.yellow);
+    plugins.beautylog.ora.text('now compiling ' + 'TypeScript');
     plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd)
         .then(() => {
-        plugins.beautylog.ok('compiled main TypeScript!');
-        plugins.beautylog.log('now compiling tests!');
-        return plugins.tsn.compileGlobStringObject(config.testTs, config.tsOptions, paths.cwd);
-    })
-        .then(function () {
-        plugins.beautylog.ok('compiled all TypeScript!');
+        plugins.beautylog.ok(`compiled the module's TypeScript!`);
         done.resolve(config);
     }).catch(err => { console.log(err); });
     return done.promise;

dist/mod00/mod00.plugins.d.ts

@@ -1,6 +1,5 @@
 export * from '../npmts.plugins';
 import * as tsn from 'tsn';
-import * as shelljs from 'shelljs';
 import * as smartchok from 'smartchok';
 import * as smartstream from 'smartstream';
-export { tsn, shelljs, smartchok, smartstream };
+export { tsn, smartchok, smartstream };

dist/mod00/mod00.plugins.js

@@ -2,11 +2,10 @@
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("../npmts.plugins"));
 const tsn = require("tsn");
 exports.tsn = tsn;
-const shelljs = require("shelljs");
-exports.shelljs = shelljs;
 const smartchok = require("smartchok");
 exports.smartchok = smartchok;
 const smartstream = require("smartstream");

dist/mod01/index.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /* ------------------------------------------
  * This module creates TypeScript documentation
  * -------------------------------------------- */

dist/mod01/mod01.plugins.js

@@ -2,4 +2,5 @@
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("../npmts.plugins"));

dist/mod02/index.js

@@ -7,62 +7,64 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 /* ------------------------------------------
  * This module tests the compiled TypeScript files
  * -------------------------------------------- */
 const plugins = require("./mod02.plugins");
 const paths = require("../npmts.paths");
 const q = require("smartq");
-const npmts_log_1 = require("../npmts.log");
 /**
  * runs mocha
  * @returns INpmtsConfig
  */
-let mocha = function (configArg) {
-    npmts_log_1.npmtsOra.text('Instrumentalizing and testing transpiled JS');
-    npmts_log_1.npmtsOra.end(); // end npmtsOra for tests.
+let tap = function (configArg) {
     let done = q.defer();
-    let coverageSmartstream = new plugins.smartstream.Smartstream([
+    /**
+     * the TabBuffer for npmts
+     */
+    let npmtsTapBuffer = new plugins.tapbuffer.TabBuffer();
+    /**
+     * handle the testable files
+     */
+    let testableFilesSmartstream = new plugins.smartstream.Smartstream([
         plugins.gulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
         plugins.gulpSourcemaps.init(),
         plugins.gulpTypeScript({
             target: 'ES5',
             emitDecoratorMetadata: true,
             experimentalDecorators: true,
-            lib: ['ES2015.Promise', 'ES5', 'ES2015.Generator', 'ES2015.Iterable']
+            lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
-        plugins.gulpIstanbul({}),
         plugins.gulpSourcemaps.write(),
         plugins.gulpFunction.forEach((file) => __awaiter(this, void 0, void 0, function* () {
             file.path = file.path.replace(paths.tsDir, paths.distDir);
         })),
-        plugins.gulpInjectModules(),
-        plugins.through2.obj((file, enc, cb) => {
-            cb();
-        }, (cb) => {
-            cb();
-        })
+        npmtsTapBuffer.pipeTestableFiles(),
+        plugins.smartstream.cleanPipe()
     ]);
-    let localSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.ts')]),
+    /**
+     * handle the test files
+     */
+    let testFilesSmartstream = new plugins.smartstream.Smartstream([
+        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/*.ts')]),
         plugins.gulpTypeScript({
             target: 'ES5',
             emitDecoratorMetadata: true,
             experimentalDecorators: true,
-            lib: ['ES2015.Promise', 'ES5', 'ES2015.Generator', 'ES2015.Iterable']
+            lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
-        plugins.gulpInjectModules(),
-        plugins.gulpMocha(),
-        plugins.gulpIstanbul.writeReports({
-            dir: plugins.path.join(paths.cwd, './coverage'),
-            reporters: ['lcovonly', 'json', 'text', 'text-summary']
-        })
+        npmtsTapBuffer.pipeTestFiles(),
+        plugins.smartstream.cleanPipe()
     ]);
-    coverageSmartstream.run()
-        .then(() => {
-        plugins.beautylog.info('code is now transpiled to ES5, instrumented with istanbul, and injected for mocha!');
-        return localSmartstream.run()
-            .then(() => { done.resolve(configArg); }, (err) => {
+    // lets run the smartstream
+    Promise.all([
+        testableFilesSmartstream.run(),
+        testFilesSmartstream.run()
+    ]).then(() => __awaiter(this, void 0, void 0, function* () {
+        configArg.runData.coverageLcovInfo = yield npmtsTapBuffer.runTests();
+        done.resolve(configArg);
+    }), (err) => {
         plugins.beautylog.error('Tests failed!');
         console.log(err);
         if (configArg.watch) {
@@ -72,22 +74,17 @@ let mocha = function (configArg) {
             process.exit(1);
         }
     });
-    }, (err) => {
-        console.log(err);
-    });
     return done.promise;
 };
-let coverage = function (configArg) {
-    let done = q.defer();
-    plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2)
-        .then(function (percentageArg) {
-        if (percentageArg >= configArg.coverageTreshold) {
-            plugins.beautylog.ok(`${percentageArg.toString()}% `
+let handleCoverageData = (configArg) => __awaiter(this, void 0, void 0, function* () {
+    let coverageResult = yield plugins.smartcov.get.percentageFromLcovString(configArg.runData.coverageLcovInfo, 2);
+    if (coverageResult >= configArg.coverageTreshold) {
+        plugins.beautylog.ok(`${(coverageResult).toString()}% `
             + `coverage exceeds your treshold of `
             + `${configArg.coverageTreshold.toString()}%`);
     }
     else {
-            plugins.beautylog.warn(`${percentageArg.toString()}% `
+        plugins.beautylog.warn(`${(coverageResult).toString()}% `
             + `coverage fails your treshold of `
             + `${configArg.coverageTreshold.toString()}%`);
         plugins.beautylog.error('exiting due to coverage failure');
@@ -95,26 +92,23 @@ let coverage = function (configArg) {
             process.exit(1);
         }
     }
-        done.resolve(configArg);
-    });
-    return done.promise;
-};
+    return configArg;
+});
 exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;
     if (config.test === true) {
-        npmts_log_1.npmtsOra.text('now starting tests');
-        plugins.beautylog.log('------------------------------------------------------\n' +
-            '*************************** TESTS: ***************************\n' +
-            '--------------------------------------------------------------');
-        mocha(config)
-            .then(coverage)
+        plugins.beautylog.ora.text('now starting tests');
+        plugins.beautylog.ora.end();
+        plugins.beautylog.log('ready for tapbuffer:');
+        tap(config)
+            .then(handleCoverageData)
             .then(() => {
             done.resolve(config);
         }).catch(err => { console.log(err); });
     }
     else {
-        npmts_log_1.npmtsOra.end();
+        plugins.beautylog.ora.end();
         done.resolve(config);
     }
     return done.promise;

dist/mod02/mod02.plugins.d.ts

@@ -1,9 +1,8 @@
 export * from '../npmts.plugins';
 import * as gulp from 'gulp';
 import * as gulpFunction from 'gulp-function';
-import * as gulpIstanbul from 'gulp-istanbul';
-declare let gulpInjectModules: any;
-import * as gulpMocha from 'gulp-mocha';
 import * as gulpSourcemaps from 'gulp-sourcemaps';
 import * as gulpTypeScript from 'gulp-typescript';
-export { gulp, gulpFunction, gulpIstanbul, gulpInjectModules, gulpMocha, gulpSourcemaps, gulpTypeScript };
+import * as smartcov from 'smartcov';
+import * as tapbuffer from 'tapbuffer';
+export { gulp, gulpFunction, gulpSourcemaps, gulpTypeScript, smartcov, tapbuffer };

dist/mod02/mod02.plugins.js

@@ -2,18 +2,17 @@
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("../npmts.plugins"));
 const gulp = require("gulp");
 exports.gulp = gulp;
 const gulpFunction = require("gulp-function");
 exports.gulpFunction = gulpFunction;
-const gulpIstanbul = require("gulp-istanbul");
-exports.gulpIstanbul = gulpIstanbul;
-let gulpInjectModules = require('gulp-inject-modules');
-exports.gulpInjectModules = gulpInjectModules;
-const gulpMocha = require("gulp-mocha");
-exports.gulpMocha = gulpMocha;
 const gulpSourcemaps = require("gulp-sourcemaps");
 exports.gulpSourcemaps = gulpSourcemaps;
 const gulpTypeScript = require("gulp-typescript");
 exports.gulpTypeScript = gulpTypeScript;
+const smartcov = require("smartcov");
+exports.smartcov = smartcov;
+const tapbuffer = require("tapbuffer");
+exports.tapbuffer = tapbuffer;

dist/npmts.cli.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const plugins = require("./npmts.plugins");
 const paths = require("./npmts.paths");
@@ -6,7 +7,19 @@ const NpmtsConfig = require("./npmts.config");
 const NpmtsMods = require("./npmts.mods");
 const NpmtsWatch = require("./npmts.watch");
 const NpmtsShip = require("./npmts.ship");
-const npmts_log_1 = require("./npmts.log");
+/**
+ * smartanalytics
+ * this data is fully anonymized (no Ips or any other personal information is tracked).
+ * It just keeps track which of our tools are really used...
+ * ... so we know where to spend our limited resources for improving them.
+ * Since yarn is out and there is heavy caching going on,
+ * pure download stats are just not reliable enough for us anymore
+ * Feel free to dig into the smartanalytics package, if you are interested in how it works.
+ * It is just an https call to Google Analytics.
+ * Our privacy policy can be found here: https://lossless.gmbh/privacy.html
+ */
+let npmtsAnalytics = new plugins.smartanalytics.AnalyticsAccount('npmts', 'UA-64087619-5');
+npmtsAnalytics.sendEvent('npm', 'exec', 'git.zone');
 exports.run = () => {
     let done = q.defer();
     let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
@@ -19,7 +32,7 @@ exports.run = () => {
     })
         .then((configArg) => {
         let done = q.defer();
-        npmts_log_1.npmtsOra.start('loading additional modules...');
+        plugins.beautylog.ora.start('loading additional modules...');
         NpmtsMods.mod00.load()
             .then((mod00) => {
             return mod00.run(configArg);

dist/npmts.config.d.ts

@@ -8,5 +8,9 @@ export interface INpmtsConfig {
     ts: any;
     tsOptions: any;
     watch: boolean;
+    runData: {
+        coverageLcovInfo?: string;
+        coverageResult?: number;
+    };
 }
 export declare let run: (argvArg: any) => Promise<{}>;

dist/npmts.config.js

@@ -1,8 +1,8 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmts.plugins");
 const paths = require("./npmts.paths");
 const q = require("smartq");
-const npmts_log_1 = require("./npmts.log");
 ;
 exports.run = function (argvArg) {
     let done = q.defer();
@@ -14,10 +14,11 @@ exports.run = function (argvArg) {
         testTs: {},
         ts: {},
         tsOptions: {},
-        watch: false
+        watch: false,
+        runData: {}
     };
     // mix with configfile
-    npmts_log_1.npmtsOra.text('running npmextra');
+    plugins.beautylog.ora.text('running npmextra');
     let localNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
     let config = localNpmextra.dataFor('npmts', defaultConfig);
     // add argv

dist/npmts.log.d.ts

@@ -1,2 +0,0 @@
-import { Ora } from 'beautylog';
-export declare let npmtsOra: Ora;

dist/npmts.log.js

@@ -1,3 +0,0 @@
-"use strict";
-const beautylog_1 = require("beautylog");
-exports.npmtsOra = new beautylog_1.Ora('setting up TaskChain', 'cyan');

dist/npmts.mods.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const smartsystem_1 = require("smartsystem");
 exports.mod00 = new smartsystem_1.LazyModule('./mod00/index', __dirname);
 exports.mod01 = new smartsystem_1.LazyModule('./mod01/index', __dirname);

dist/npmts.paths.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmts.plugins");
 // NPMTS Paths
 exports.npmtsPackageRoot = plugins.path.join(__dirname, '../');

dist/npmts.plugins.d.ts

@@ -5,8 +5,8 @@ import * as lodash from 'lodash';
 import * as npmextra from 'npmextra';
 import * as projectinfo from 'projectinfo';
 import * as path from 'path';
+import * as smartanalytics from 'smartanalytics';
 import * as smartcli from 'smartcli';
-import * as smartcov from 'smartcov';
 import * as smartenv from 'smartenv';
 import * as smartfile from 'smartfile';
 import * as smartpath from 'smartpath';
@@ -15,4 +15,4 @@ import * as smartstring from 'smartstring';
 import * as smartsystem from 'smartsystem';
 import * as through2 from 'through2';
 export declare let sourceMapSupport: any;
-export { beautylog, depcheck, lodash, npmextra, projectinfo, path, smartcli, smartcov, smartenv, smartfile, smartpath, smartstream, smartstring, smartsystem, through2 };
+export { beautylog, depcheck, lodash, npmextra, projectinfo, path, smartanalytics, smartcli, smartenv, smartfile, smartpath, smartstream, smartstring, smartsystem, through2 };

dist/npmts.plugins.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-global");
 const beautylog = require("beautylog");
 exports.beautylog = beautylog;
@@ -12,10 +13,10 @@ const projectinfo = require("projectinfo");
 exports.projectinfo = projectinfo;
 const path = require("path");
 exports.path = path;
+const smartanalytics = require("smartanalytics");
+exports.smartanalytics = smartanalytics;
 const smartcli = require("smartcli");
 exports.smartcli = smartcli;
-const smartcov = require("smartcov");
-exports.smartcov = smartcov;
 const smartenv = require("smartenv");
 exports.smartenv = smartenv;
 const smartfile = require("smartfile");

dist/npmts.ship.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const plugins = require("./npmts.plugins");
 exports.run = (configArg) => {

dist/npmts.watch.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const smartchok = require("smartchok");
 const plugins = require("./npmts.plugins");

docs/00footer.md

@@ -0,0 +1,9 @@
+[Legal Info](https://lossless.gmbh)
+[Privacy Policy](https://lossless.gmbh/privacy.html)
+///
+[Git.Zone](https://git.zone)
+<span>tools for a seamless dev workflow</span>
+
+[Lossless GmbH](https://push.rocks)
+<span>the company behind git.zone and npmts</span>
+///

docs/config.md

@@ -1,4 +1,9 @@
-# Configuration of NPMTS
+---
+name: config
+---
+# Configuration
+## of npmts
+
 npmts can be configured to your needs:
 
 ### npmextra.json

docs/default.md

@@ -1,7 +1,11 @@
-# Default task execution of npmts
+---
+name: Default Behaviour
+---
+# Default Behaviour
+## of npmts
 
 1. **Config:** Check config in ./npmextra.json (Check out [npmextra](https://www.npmjs.com/package/npmextra))
 1. **Clean:** Clean up from any previous builds (old js files)
 1. **Check:** Check project for typings declaration in package.json, unused dependencies and missing dependencies
 1. **Transpile:** Transpile TypeScript with **inline sourcemaps** and **declaration files** to ES target
-1. **Test:** Babelify ES6 to ES5 on the fly, instrumentalize ES5 JavaScript with istanbul and run tests with Mocha.
+1. **Test:** transpile TypeScript of module to ES5 for tests (so it can be instrumentalized) and pipe it to tapbuffer. All this happens in memory.

docs/examples.md

@@ -1,13 +1,19 @@
-# Examples for npmts
+---
+name: Examples
+---
+# Examples
+## of modules that use npmts
+
+Module Name | Description
+--- | ---
+[gulp-browser](https://www.npmjs.com/package/gulp-browser) | browserify for gulp
 
-## Example Usage in modules:
-* [gulp-browser](https://www.npmjs.com/package/gulp-browser)
 
 > We will add more options over time.
 
-## Tips and tricks:
+### Tips and tricks:
 
 * Use [npmts-g](https://www.npmjs.com/package/npmts-g) to use globally installed npmts and install npmts locally if no global npmts is available.
 * Use [npmpage](https://www.npmjs.com/package/npmpage) to create a webpage from coverage reports and TypeDoc for the module
-* Use [hosttoday/ht-docker-node:npmts](https://hub.docker.com/r/hosttoday/ht-docker-node/) for speedy CI builds
+* Use [hosttoday/ht-docker-node:npmci](https://hub.docker.com/r/hosttoday/ht-docker-node/) for speedy CI builds
 * Use [npmdocker](https://www.npmjs.com/package/npmdocker) for running tests consistently with docker.

docs/index.md

@@ -1,44 +1,42 @@
+---
+name: Start
+---
 # npmts
-Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
+## Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
 
 ## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/npmts)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/npmts)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/npmts/)
+[![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)
+[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmts)
+[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmts)
+[![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmts/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/npmts/badges/master/coverage.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
+[![build status](https://GitLab.com/gitzone/npmts/badges/master/build.svg)](https://GitLab.com/gitzone/npmts/commits/master)
+[![coverage report](https://GitLab.com/gitzone/npmts/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmts/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/npmts.svg)](https://www.npmjs.com/package/npmts)
-[![docker pulls](https://img.shields.io/docker/pulls/hosttoday/ht-docker-node.svg)](https://hub.docker.com/r/hosttoday/ht-docker-node/)
-[![Dependency Status](https://david-dm.org/pushrocks/npmts.svg)](https://david-dm.org/pushrocks/npmts)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/npmts/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/npmts/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/npmts/badges/code.svg)](https://www.bithound.io/github/pushrocks/npmts)
+[![Dependency Status](https://david-dm.org/gitzone/npmts.svg)](https://david-dm.org/gitzone/npmts)
+[![bitHound Dependencies](https://www.bithound.io/github/gitzone/npmts/badges/dependencies.svg)](https://www.bithound.io/github/gitzone/npmts/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/gitzone/npmts/badges/code.svg)](https://www.bithound.io/github/gitzone/npmts)
 [![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
-## Introduction
+## Usage
 NPMTS is your friend when writing, testing, publishing and documenting npm modules written in TypeScript.
 
 npmts will
     
-1. check your dependencies and package.json
+1. check your dependencies and package.json (unused, missing, updates, security)
 1. transpile your code with tsc,
-1. document your code with typedoc,
-1. test your code with mocha
-1. create coverage with istanbul
+1. test your code with tap (supports the fancy stuff like Promises, Generators, async/await, sourcemaps, parallel test execution in child processes)
+1. create coverage with istanbul (supports tracing of the originating TypeScript)
+
+For more information on how tests are run check out the [tapbuffer module](https://www.npmjs.com/package/tapbuffer).
 
 This works on your machine and in CI. There is a prebuild docker image available that includes npmts to make CI a breeze:  
 [hosttoday/ht-docker-node:npmts on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-node/)
 
-For further information read the docs:
-1. [Intro](https://pushrocks.gitlab.io/npmts/index.html)
-2. [Install](https://pushrocks.gitlab.io/npmts/install.html)
-3. [Default Behaviour](https://pushrocks.gitlab.io/npmts/default.html)
-4. [Configuration](https://pushrocks.gitlab.io/npmts/config.html)
-5. [Examples](https://pushrocks.gitlab.io/npmts/examples.html)
-6. [Info](https://pushrocks.gitlab.io/npmts/info.html)
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

docs/info.md

@@ -1,14 +0,0 @@
-# Info
-
-## Future Scope:
-* automatically manage badges in README
-* manage tslint to enforce code best practices
-* tear down any differences between local and CI environments by using brand new npmdocker
-
-## About the authors:
-[![Project Phase](https://mediaserve.lossless.digital/lossless.com/img/createdby_github.svg)](https://lossless.com/)
-
-[![PayPal](https://img.shields.io/badge/Support%20us-PayPal-blue.svg)](https://paypal.me/lossless)
-
-## Legal Info
-https://lossless.gmbh

docs/summary.md

@@ -1,8 +0,0 @@
-# Summary
-
-* [1. Intro](index.md)
-* [2. Install](install.md)
-* [3. Default Behaviour](default.md)
-* [4. Configuration](config.md)
-* [5. Examples](examples.md)
-* [6. Info](info.md)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "6.1.3",
+  "version": "7.0.7",
   "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
   "main": "dist/index.js",
   "bin": {
@@ -14,14 +14,14 @@
     "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
     "typedoc": "(typedoc --out ./pages/api --target ES6 ./ts/)",
     "npmpage": "(npmpage)",
-    "check": "(cd test && npm install && node ../dist/index.js)",
+    "check": "(cd test && yarn install && node ../dist/index.js)",
     "checkVersion": "(cd test/ && node ../dist/index.js -v)",
     "checkNoTest": "(cd test && node ../dist/index.js --notest)",
     "checkNoDocs": "(cd test && node ../dist/index.js --nodocs)"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/pushrocks/npmts.git"
+    "url": "git+https://gitlab.com/gitzone/npmts.git"
   },
   "keywords": [
     "TypeScript",
@@ -30,49 +30,41 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://gitlab.com/pushrocks/npmts/issues"
+    "url": "https://gitlab.com/gitzone/npmts/issues"
   },
-  "homepage": "https://gitlab.com/pushrocks/npmts#readme",
+  "homepage": "https://gitlab.com/gitzone/npmts#readme",
   "dependencies": {
-    "@types/gulp": "^3.8.32",
-    "@types/gulp-istanbul": "^0.9.30",
-    "@types/gulp-mocha": "0.0.29",
-    "@types/gulp-sourcemaps": "0.0.29",
+    "@types/gulp": "^4.0.2",
+    "@types/gulp-sourcemaps": "0.0.30",
     "@types/minimatch": "^2.0.29",
-    "@types/shelljs": "^0.3.33",
     "@types/through2": "^2.0.32",
-    "beautylog": "6.0.0",
+    "beautylog": "6.1.5",
     "depcheck": "^0.6.7",
-    "early": "^2.0.35",
+    "early": "^2.0.38",
     "gulp": "3.9.1",
     "gulp-function": "^2.2.3",
-    "gulp-inject-modules": "^1.0.0",
-    "gulp-istanbul": "^1.1.1",
-    "gulp-mocha": "^3.0.1",
-    "gulp-sourcemaps": "^2.4.0",
-    "gulp-typescript": "^3.1.4",
+    "gulp-sourcemaps": "^2.5.0",
+    "gulp-typescript": "^3.1.6",
     "lodash": "^4.17.4",
-    "npmextra": "^2.0.3",
-    "projectinfo": "3.0.1",
-    "shelljs": "^0.7.6",
-    "smartchok": "^1.0.4",
-    "smartcli": "2.0.1",
-    "smartcov": "1.0.0",
+    "npmextra": "^2.0.5",
+    "projectinfo": "^3.0.2",
+    "smartanalytics": "^1.0.3",
+    "smartchok": "^1.0.5",
+    "smartcli": "^2.0.1",
+    "smartcov": "^1.0.2",
     "smartenv": "2.0.0",
-    "smartfile": "4.1.2",
-    "smartpath": "3.2.7",
-    "smartq": "^1.0.2",
-    "smartstream": "^1.0.5",
-    "smartstring": "^2.0.22",
+    "smartfile": "^4.1.9",
+    "smartpath": "^3.2.8",
+    "smartq": "^1.1.1",
+    "smartstream": "^1.0.8",
+    "smartstring": "^2.0.24",
     "smartsystem": "^1.0.12",
-    "source-map-support": "^0.4.8",
+    "source-map-support": "^0.4.14",
+    "tapbuffer": "^1.0.10",
     "through2": "^2.0.3",
-    "tsn": "^2.0.14",
-    "typescript": "next",
+    "tsn": "^2.0.15",
+    "typescript": "^2.2.2",
     "typings-global": "^1.0.14"
   },
-  "devDependencies": {
-    "@types/should": "^8.1.30",
-    "should": "^11.1.2"
-  }
+  "devDependencies": {}
 }

ts/mod00/index.ts

@@ -1,9 +1,9 @@
 /* ------------------------------------------
- * This module compiles TypeScript files
+ * This module compiles the module's TypeScript files
+ * Note: Test files are only compiled in memory
  * -------------------------------------------- */
 import * as q from 'smartq'
 
-import { npmtsOra } from '../npmts.log'
 import { INpmtsConfig } from '../npmts.config'
 
 import * as plugins from './mod00.plugins'
@@ -15,7 +15,7 @@ import * as NpmtsCompile from './mod00.compile'
 
 export let run = function(configArg: INpmtsConfig): Promise<INpmtsConfig> {
     let done = q.defer<INpmtsConfig>()
-    npmtsOra.text('starting TypeScript Compilation')
+    plugins.beautylog.ora.text('starting TypeScript Compilation')
     NpmtsClean.run(configArg)
         .then(NpmtsCheck.run)
         .then(NpmtsCompile.run)

ts/mod00/mod00.assets.ts

@@ -1,7 +1,6 @@
 import * as q from 'smartq'
 
 import paths = require('../npmts.paths')
-import { npmtsOra } from '../npmts.log'
 
 import plugins = require('./mod00.plugins')
 import { projectInfo } from '../mod00/mod00.check'
@@ -9,7 +8,7 @@ import { projectInfo } from '../mod00/mod00.check'
 export let run = function(configArg){
     let done = q.defer()
     let config = configArg
-    npmtsOra.text('now looking at ' + 'required assets'.yellow)
+    plugins.beautylog.ora.text('now looking at ' + 'required assets')
     if (config.cli === true) {
         let mainJsPath = projectInfo.packageJson.main
         let cliJsString: string = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir,'cli.js'))

ts/mod00/mod00.check.ts

@@ -2,7 +2,6 @@ import * as q from 'smartq'
 import { ProjectinfoNpm } from 'projectinfo'
 
 import * as paths from '../npmts.paths'
-import { npmtsOra } from '../npmts.log'
 
 import * as plugins from './mod00.plugins'
 
@@ -10,7 +9,7 @@ export let projectInfo: ProjectinfoNpm
 
 let checkProjectTypings = (configArg) => {
     let done = q.defer()
-    npmtsOra.text('Check Module: Check Project Typings...')
+    plugins.beautylog.ora.text('Check Module: Check Project Typings...')
     projectInfo = new ProjectinfoNpm(paths.cwd)
     if (typeof projectInfo.packageJson.typings === 'undefined') {
         plugins.beautylog.error(`please add typings field to package.json`)
@@ -37,7 +36,7 @@ const depcheckOptions = {
 
 let checkDependencies = (configArg) => {
     let done = q.defer()
-    npmtsOra.text('Check Module: Check Dependencies...')
+    plugins.beautylog.ora.text('Check Module: Check Dependencies...')
     let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [ // folder with these names will be ignored
             'test',
@@ -61,10 +60,10 @@ let checkDependencies = (configArg) => {
             process.exit(1)
         }
         for (let item in unused.invalidFiles) {
-            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`)
+            plugins.beautylog.warn(`Watch out: could not parse file ${item}`)
         };
         for (let item in unused.invalidDirs) {
-            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`)
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item}`)
         }
         done.resolve(configArg)
     })
@@ -73,7 +72,7 @@ let checkDependencies = (configArg) => {
 
 let checkDevDependencies = (configArg) => {
     let done = q.defer()
-    npmtsOra.text('Check Module: Check devDependencies...')
+    plugins.beautylog.ora.text('Check Module: Check devDependencies...')
     let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [ // folder with these names will be ignored
             'ts',
@@ -87,20 +86,20 @@ let checkDevDependencies = (configArg) => {
     })
     plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
         for (let item of unused.devDependencies) {
-            plugins.beautylog.log(`unused devDependency ${item.red}`)
+            plugins.beautylog.log(`unused devDependency ${item}`)
         }
         for (let item in unused.missing) {
-            plugins.beautylog.error(`unused devDependency ${item.red}`)
+            plugins.beautylog.error(`unused devDependency ${item}`)
         }
         if (unused.missing.length > 0) {
             plugins.beautylog.info('exiting due to missing dependencies in package.json')
             process.exit(1)
         }
         for (let item in unused.invalidFiles) {
-            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`)
+            plugins.beautylog.warn(`Watch out: could not parse file ${item}`)
         }
         for (let item in unused.invalidDirs) {
-            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`)
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item}`)
         }
         done.resolve(configArg)
     })
@@ -109,14 +108,14 @@ let checkDevDependencies = (configArg) => {
 
 let checkNodeVersion = (configArg) => {
     let done = q.defer()
-    npmtsOra.text('checking node version')
+    plugins.beautylog.ora.text('checking node version')
     done.resolve(configArg)
     return done.promise
 }
 
 export let run = (configArg) => {
     let done = q.defer()
-    npmtsOra.text('Check Module: ...')
+    plugins.beautylog.ora.text('Check Module: ...')
     checkProjectTypings(configArg)
         .then(checkDependencies)
         .then(checkDevDependencies)

ts/mod00/mod00.clean.ts

@@ -1,15 +1,13 @@
 import * as q from 'smartq'
 import paths = require('../npmts.paths')
 
-import { npmtsOra } from '../npmts.log'
-
 import plugins = require('./mod00.plugins')
 
 /**
  * removes the  dist directory which will be entirely rebuild
  */
 let removeDist = function () {
-    npmtsOra.text('cleaning dist folder')
+    plugins.beautylog.ora.text('cleaning dist folder')
     return plugins.smartfile.fs.remove(paths.distDir)
 }
 
@@ -29,12 +27,12 @@ let removeTestDeclarations = function () {
  * remove old pages
  */
 let removePages = function () {
-    npmtsOra.text('cleaning pages folder')
+    plugins.beautylog.ora.text('cleaning pages folder')
     return plugins.smartfile.fs.remove(paths.pagesDir)
 }
 
 export let run = function (configArg) {
-    npmtsOra.text('cleaning up from previous builds...')
+    plugins.beautylog.ora.text('cleaning up from previous builds...')
     let done = q.defer()
     removeDist()
         .then(removeTestDeclarations)

ts/mod00/mod00.compile.ts

@@ -1,22 +1,16 @@
 import * as q from 'smartq'
 
 import * as paths from '../npmts.paths'
-import { npmtsOra } from '../npmts.log'
 
 import * as plugins from './mod00.plugins'
 
 export let run = function (configArg) {
   let done = q.defer()
   let config = configArg
-    npmtsOra.text('now compiling ' + 'TypeScript'.yellow)
-    plugins.tsn.compileGlobStringObject(config.ts,config.tsOptions,paths.cwd)
+  plugins.beautylog.ora.text('now compiling ' + 'TypeScript')
+  plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd)
     .then(() => {
-            plugins.beautylog.ok('compiled main TypeScript!')
-            plugins.beautylog.log('now compiling tests!')
-            return plugins.tsn.compileGlobStringObject(config.testTs,config.tsOptions,paths.cwd)
-        })
-        .then(function () {
-            plugins.beautylog.ok('compiled all TypeScript!')
+      plugins.beautylog.ok(`compiled the module's TypeScript!`)
       done.resolve(config)
     }).catch(err => { console.log(err) })
   return done.promise

ts/mod00/mod00.plugins.ts

@@ -1,13 +1,11 @@
 export * from '../npmts.plugins'
 
 import * as tsn from 'tsn'
-import * as shelljs from 'shelljs'
 import * as smartchok from 'smartchok'
 import * as smartstream from 'smartstream'
 
 export {
     tsn,
-    shelljs,
     smartchok,
     smartstream
 }

ts/mod01/index.ts

@@ -4,7 +4,6 @@
 import * as q from 'smartq'
 
 import * as paths from '../npmts.paths'
-import { npmtsOra } from '../npmts.log'
 import { INpmtsConfig } from '../npmts.config'
 
 import * as plugins from './mod01.plugins'

ts/mod02/index.ts

@@ -6,65 +6,64 @@ import paths = require('../npmts.paths')
 
 import * as q from 'smartq'
 
-import { npmtsOra } from '../npmts.log'
 import { INpmtsConfig } from '../npmts.config'
 
 /**
  * runs mocha
  * @returns INpmtsConfig
  */
-let mocha = function (configArg: INpmtsConfig) {
-    npmtsOra.text('Instrumentalizing and testing transpiled JS')
-    npmtsOra.end() // end npmtsOra for tests.
+let tap = function (configArg: INpmtsConfig) {
   let done = q.defer()
 
-    let coverageSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
+  /**
+   * the TabBuffer for npmts
+   */
+  let npmtsTapBuffer = new plugins.tapbuffer.TabBuffer()
+
+  /**
+   * handle the testable files
+   */
+  let testableFilesSmartstream = new plugins.smartstream.Smartstream([
+    plugins.gulp.src([ plugins.path.join(paths.cwd, './ts/**/*.ts') ]),
     plugins.gulpSourcemaps.init(),
     plugins.gulpTypeScript({
       target: 'ES5',
       emitDecoratorMetadata: true,
       experimentalDecorators: true,
-            lib: ['ES2015.Promise', 'ES5', 'ES2015.Generator', 'ES2015.Iterable']
-        }),
-        plugins.gulpIstanbul({
+      lib: [ 'DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable' ]
     }),
     plugins.gulpSourcemaps.write(),
     plugins.gulpFunction.forEach(async file => {
       file.path = file.path.replace(paths.tsDir, paths.distDir)
     }),
-        plugins.gulpInjectModules(),
-        plugins.through2.obj(
-            (file, enc, cb) => {
-                cb()
-            },
-            (cb) => {
-                cb()
-            }
-        )
+    npmtsTapBuffer.pipeTestableFiles(),
+    plugins.smartstream.cleanPipe()
   ])
 
-    let localSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.ts')]),
+  /**
+   * handle the test files
+   */
+  let testFilesSmartstream = new plugins.smartstream.Smartstream([
+    plugins.gulp.src([ plugins.path.join(paths.cwd, 'test/*.ts') ]),
     plugins.gulpTypeScript({
       target: 'ES5',
       emitDecoratorMetadata: true,
       experimentalDecorators: true,
-            lib: ['ES2015.Promise', 'ES5', 'ES2015.Generator', 'ES2015.Iterable']
+      lib: [ 'DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable' ]
     }),
-        plugins.gulpInjectModules(),
-        plugins.gulpMocha(),
-        plugins.gulpIstanbul.writeReports({
-            dir: plugins.path.join(paths.cwd, './coverage'),
-            reporters: ['lcovonly', 'json', 'text', 'text-summary']
-        })
+    npmtsTapBuffer.pipeTestFiles(),
+    plugins.smartstream.cleanPipe()
   ])
-    coverageSmartstream.run()
-        .then(
-        () => {
-            plugins.beautylog.info('code is now transpiled to ES5, instrumented with istanbul, and injected for mocha!')
-            return localSmartstream.run()
-                .then(() => { done.resolve(configArg) }, (err) => {
+
+  // lets run the smartstream
+  Promise.all([
+    testableFilesSmartstream.run(),
+    testFilesSmartstream.run()
+  ]).then(
+    async () => {
+      configArg.runData.coverageLcovInfo = await npmtsTapBuffer.runTests()
+      done.resolve(configArg)
+    }, (err) => {
       plugins.beautylog.error('Tests failed!')
       console.log(err)
       if (configArg.watch) {
@@ -73,55 +72,48 @@ let mocha = function (configArg: INpmtsConfig) {
         process.exit(1)
       }
     })
-        },
-        (err) => {
-            console.log(err)
-        })
+
   return done.promise
 }
 
-let coverage = function (configArg: INpmtsConfig) {
-    let done = q.defer()
-    plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2)
-        .then(function (percentageArg) {
-            if (percentageArg >= configArg.coverageTreshold) {
+let handleCoverageData = async (configArg: INpmtsConfig) => {
+  let coverageResult = await plugins.smartcov.get.percentageFromLcovString(
+    configArg.runData.coverageLcovInfo,
+    2
+  )
+  if (coverageResult >= configArg.coverageTreshold) {
     plugins.beautylog.ok(
-                    `${percentageArg.toString()}% `
+      `${(coverageResult).toString()}% `
       + `coverage exceeds your treshold of `
       + `${configArg.coverageTreshold.toString()}%`
     )
   } else {
     plugins.beautylog.warn(
-                    `${percentageArg.toString()}% `
+      `${(coverageResult).toString()}% `
       + `coverage fails your treshold of `
       + `${configArg.coverageTreshold.toString()}%`
     )
     plugins.beautylog.error('exiting due to coverage failure')
     if (!configArg.watch) { process.exit(1) }
   }
-            done.resolve(configArg)
-        })
-    return done.promise
+  return configArg
 }
 
 export let run = function (configArg: INpmtsConfig) {
   let done = q.defer<INpmtsConfig>()
   let config = configArg
   if (config.test === true) {
-        npmtsOra.text('now starting tests')
-        plugins.beautylog.log(
-            '------------------------------------------------------\n' +
-            '*************************** TESTS: ***************************\n' +
-            '--------------------------------------------------------------'
-        )
+    plugins.beautylog.ora.text('now starting tests')
+    plugins.beautylog.ora.end()
+    plugins.beautylog.log('ready for tapbuffer:')
 
-        mocha(config)
-            .then(coverage)
+    tap(config)
+      .then(handleCoverageData)
       .then(() => {
         done.resolve(config)
       }).catch(err => { console.log(err) })
   } else {
-        npmtsOra.end()
+    plugins.beautylog.ora.end()
     done.resolve(config)
   }
   return done.promise

ts/mod02/mod02.plugins.ts

@@ -2,18 +2,16 @@ export * from '../npmts.plugins'
 
 import * as gulp from 'gulp'
 import * as gulpFunction from 'gulp-function'
-import * as gulpIstanbul from 'gulp-istanbul'
-let gulpInjectModules = require('gulp-inject-modules')
-import * as gulpMocha from 'gulp-mocha'
 import * as gulpSourcemaps from 'gulp-sourcemaps'
 import * as gulpTypeScript from 'gulp-typescript'
+import * as smartcov from 'smartcov'
+import * as tapbuffer from 'tapbuffer'
 
 export {
     gulp,
     gulpFunction,
-    gulpIstanbul,
-    gulpInjectModules,
-    gulpMocha,
     gulpSourcemaps,
-    gulpTypeScript
+    gulpTypeScript,
+    smartcov,
+    tapbuffer
 }

ts/npmts.cli.ts

@@ -7,7 +7,19 @@ import * as NpmtsMods from './npmts.mods'
 import * as NpmtsWatch from './npmts.watch'
 import * as NpmtsShip from './npmts.ship'
 
-import { npmtsOra } from './npmts.log'
+/**
+ * smartanalytics
+ * this data is fully anonymized (no Ips or any other personal information is tracked).
+ * It just keeps track which of our tools are really used...
+ * ... so we know where to spend our limited resources for improving them.
+ * Since yarn is out and there is heavy caching going on,
+ * pure download stats are just not reliable enough for us anymore
+ * Feel free to dig into the smartanalytics package, if you are interested in how it works.
+ * It is just an https call to Google Analytics.
+ * Our privacy policy can be found here: https://lossless.gmbh/privacy.html
+ */
+let npmtsAnalytics = new plugins.smartanalytics.AnalyticsAccount('npmts','UA-64087619-5')
+npmtsAnalytics.sendEvent('npm','exec','git.zone')
 
 export let run = () => {
   let done = q.defer()
@@ -21,7 +33,7 @@ export let run = () => {
     })
     .then((configArg: NpmtsConfig.INpmtsConfig) => {
       let done = q.defer()
-            npmtsOra.start('loading additional modules...')
+      plugins.beautylog.ora.start('loading additional modules...')
       NpmtsMods.mod00.load()
         .then((mod00) => {
           return mod00.run(configArg)
@@ -53,7 +65,7 @@ export let run = () => {
 
       return done.promise
     })
-        .catch((err) => { if (err instanceof Error) { console.log(err) } } )
+    .catch((err) => { if (err instanceof Error) { console.log(err) } })
   npmtsCli.addVersion(npmtsProjectInfo.version)
   npmtsCli.startParse()
   return done.promise

ts/npmts.config.ts

@@ -3,8 +3,6 @@ import paths = require('./npmts.paths')
 
 import * as q from 'smartq'
 
-import { npmtsOra } from './npmts.log'
-
 export type npmtsMode = 'default' | 'custom'
 
 export interface INpmtsConfig {
@@ -16,7 +14,10 @@ export interface INpmtsConfig {
   ts: any,
   tsOptions: any,
   watch: boolean
-
+  runData: {
+    coverageLcovInfo?: string,
+    coverageResult?: number
+  }
 };
 
 export let run = function (argvArg) {
@@ -29,11 +30,12 @@ export let run = function (argvArg) {
     testTs: {},
     ts: {},
     tsOptions: {},
-        watch: false
+    watch: false,
+    runData: {}
   }
 
   // mix with configfile
-    npmtsOra.text('running npmextra')
+  plugins.beautylog.ora.text('running npmextra')
 
   let localNpmextra = new plugins.npmextra.Npmextra(paths.cwd)
   let config: INpmtsConfig = localNpmextra.dataFor<INpmtsConfig>(

ts/npmts.log.ts

@@ -1,2 +0,0 @@
-import {Ora} from 'beautylog'
-export let npmtsOra = new Ora('setting up TaskChain','cyan')

ts/npmts.plugins.ts

@@ -6,8 +6,8 @@ import * as lodash from 'lodash'
 import * as npmextra from 'npmextra'
 import * as projectinfo from 'projectinfo'
 import * as path from 'path'
+import * as smartanalytics from 'smartanalytics'
 import * as smartcli from 'smartcli'
-import * as smartcov from 'smartcov'
 import * as smartenv from 'smartenv'
 import * as smartfile from 'smartfile'
 import * as smartpath from 'smartpath'
@@ -24,8 +24,8 @@ export {
     npmextra,
     projectinfo,
     path,
+    smartanalytics,
     smartcli,
-    smartcov,
     smartenv,
     smartfile,
     smartpath,