1.0.9

package-lock.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/tstest",
-  "version": "1.0.7",
+  "name": "@gitzone/tstest",
+  "version": "1.0.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -151,6 +151,11 @@
         "@types/chai": "*"
       }
     },
+    "@types/figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha512-mcRgJ+ncKuNI+Dwac7omO18B8C8u+YBS+AU/oyLhEyjAnT3cUUThhHgZpbiIvu5ZqSvdD30BXtrqg9nxc3OKMg=="
+    },
     "@types/form-data": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
@@ -397,11 +402,24 @@
       "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
       "dev": true
     },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
     "first-chunk-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tstest",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
   "main": "dist/index.js",
@@ -28,6 +28,8 @@
     "@pushrocks/smartfile": "^6.0.3",
     "@pushrocks/smartlog": "^2.0.1",
     "@pushrocks/smartpromise": "^2.0.5",
-    "@pushrocks/smartshell": "^2.0.5"
+    "@pushrocks/smartshell": "^2.0.5",
+    "@types/figures": "^2.0.0",
+    "figures": "^2.0.0"
   }
 }

ts/tstest.classes.tstest.ts

@@ -20,6 +20,7 @@ export class TsTest {
       console.log(cs(fileName, 'orange'));
     }
     console.log('-'.repeat(16));
+    console.log(''); // force new line
     const smartshellInstance = new plugins.smartshell.Smartshell({
       executor: 'bash',
       pathDirectories: [paths.binDirectory],
@@ -28,10 +29,12 @@ export class TsTest {
     const tapCombinator = new TapCombinator(); // lets create the TapCombinator
     for (const fileName of fileNamesToRun) {
       console.log(`${cs('=> ', 'blue')} Running ${cs(fileName, 'orange')}`);
-      console.log(`=`.repeat(16));
+      console.log(cs(`=`.repeat(16), 'cyan'));
       const tapParser = new TapParser();
       const execResultStreaming = await smartshellInstance.execStreamingSilent(`tsrun ${fileName}`);
       await tapParser.handleTapProcess(execResultStreaming.childProcess);
+      console.log(cs(`^`.repeat(16), 'cyan'));
+      console.log(''); // force new line
       tapCombinator.addTapParser(tapParser);
     }
     tapCombinator.evaluate();

ts/tstest.plugins.ts

@@ -8,4 +8,7 @@ import * as smartlog from '@pushrocks/smartlog';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartshell from '@pushrocks/smartshell';
 
-export { consolecolor, path, smartfile, smartlog, smartpromise, smartshell };
+// sindresorhus
+import * as figures from 'figures';
+
+export { consolecolor, figures, path, smartfile, smartlog, smartpromise, smartshell };

ts/tstest.tap.parser.ts

@@ -6,6 +6,7 @@ import { coloredString as cs } from '@pushrocks/consolecolor';
 // ============
 import * as plugins from './tstest.plugins';
 import { TapTestResult } from './tstest.tap.testresult';
+import * as logPrefixes from './tstest.logprefixes';
 
 export class TapParser {
   resultStore: TapTestResult[] = [];
@@ -13,7 +14,7 @@ export class TapParser {
   expectedTestsRegex = /([0-9]*)\.\.([0-9]*)/;
   expectedTests: number;
 
-  testStatusRegex = /(ok|not\sok)\s([0-9]+)\s-\s/;
+  testStatusRegex = /(ok|not\sok)\s([0-9]+)\s-\s(.*)\s#\stime=(.*)ms$/;
   activeTapTestResult: TapTestResult;
 
   private _getNewTapTestResult() {
@@ -51,6 +52,9 @@ export class TapParser {
           return false;
         })();
 
+        const testSubject = regexResult[3];
+        const testDuration = parseInt(regexResult[4]);
+
         // test for protocol error
         if (testId !== this.activeTapTestResult.id) {
           console.log(`:::TAP PROTOCOL ERROR::: Something is strange! Test Ids are not equal!`);
@@ -58,9 +62,19 @@ export class TapParser {
         this.activeTapTestResult.setTestResult(testOk);
 
         if (testOk) {
-          console.log(cs(`:::TAP::: Success: Test ${testId} is ok!`, 'green', 'black'));
+          console.log(
+            logPrefixes.TapPrefix,
+            ` ${cs(`T${testId} ${plugins.figures.tick}`, 'green')} | ` +
+            cs(testSubject, 'blue') +
+            ` | ${cs(`${testDuration} milliseconds`, 'orange')}`
+          );
         } else {
-          console.log(cs(`:::TAP::: Error: Test ${testId} is NOT ok!`, 'green', 'black'));
+          console.log(
+            logPrefixes.TapPrefix,
+            ` ${cs(`T${testId} ${plugins.figures.cross}`, 'red')} | ` +
+            cs(testSubject, 'blue') +
+            ` | ${cs(`${testDuration} milliseconds`, 'orange')}`
+          );
         }
       }