1.0.11

npmextra.json

@@ -1,9 +1,6 @@
 {
   "npmci": {
-    "npmGlobalTools": [
+    "npmGlobalTools": [],
-      "@gitzone/npmts",
-      "ts-node"
-    ],
     "npmAccessLevel": "public"
   }
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/tstest",
+  "name": "@gitzone/tstest",
-  "version": "1.0.3",
+  "version": "1.0.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -105,9 +105,9 @@
       }
     },
     "@pushrocks/smartshell": {
-      "version": "2.0.4",
+      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@pushrocks/smartshell/-/smartshell-2.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartshell/-/smartshell-2.0.5.tgz",
-      "integrity": "sha512-yGVfp0i474nBUL44ufx5AQchFs5gAYBHiVAupDcG5H0f0KmnR2RKK1EIqKmdfmK7CIqLf8IAvv9FlhetmSrUhw==",
+      "integrity": "sha512-bMmh46jfJxQ7F46bdujmBR8BqPeEFxBqdXab7885v0kaXASIf9+1BMPKfXiPsDrrR8z/2j2cG/Wgh/0+DDD9hQ==",
       "requires": {
         "@pushrocks/smartpromise": "^2.0.5",
         "@types/which": "^1.3.1",
@@ -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": "@pushrocks/tstest",
+  "name": "@gitzone/tstest",
-  "version": "1.0.3",
+  "version": "1.0.11",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
   "main": "dist/index.js",
@@ -12,7 +12,7 @@
   },
   "scripts": {
     "test": "(npm run prepareTest && npm run tstest && npm run cleanUp)",
-    "prepareTest": "git clone git@gitlab.com:sandboxzone/sandbox-npmts.git .nogit/sandbox-npmts && cd .nogit/sandbox-npmts && npm install",
+    "prepareTest": "git clone https://gitlab.com/sandboxzone/sandbox-npmts.git .nogit/sandbox-npmts && cd .nogit/sandbox-npmts && npm install",
     "tstest": "cd .nogit/sandbox-npmts && node ../../cli.ts.js test/",
     "cleanUp": "rm -rf .nogit/sandbox-npmts",
     "format": "(gitzone format)",
@@ -28,6 +28,8 @@
     "@pushrocks/smartfile": "^6.0.3",
     "@pushrocks/smartlog": "^2.0.1",
     "@pushrocks/smartpromise": "^2.0.5",
-    "@pushrocks/smartshell": "^2.0.4"
+    "@pushrocks/smartshell": "^2.0.5",
+    "@types/figures": "^2.0.0",
+    "figures": "^2.0.0"
   }
 }

ts/tstest.classes.tstest.ts

@@ -1,9 +1,10 @@
-import * as plugins from "./tstest.plugins";
+import * as plugins from './tstest.plugins';
+import * as paths from './tstest.paths';
 import { coloredString as cs } from '@pushrocks/consolecolor';
 
-import { TestDirectory } from "./tstest.classes.testdirectory";
+import { TestDirectory } from './tstest.classes.testdirectory';
-import { TapCombinator } from "./tstest.tap.combinator";
+import { TapCombinator } from './tstest.tap.combinator';
-import { TapParser } from "./tstest.tap.parser";
+import { TapParser } from './tstest.tap.parser';
 
 export class TsTest {
   testDir: TestDirectory;
@@ -16,22 +17,24 @@ export class TsTest {
     const fileNamesToRun: string[] = await this.testDir.getTestFilePathArray();
     console.log(`Found ${fileNamesToRun.length} Testfile(s):`);
     for (const fileName of fileNamesToRun) {
-      console.log(cs(fileName, "orange"));
+      console.log(cs(fileName, 'orange'));
     }
-    console.log("-".repeat(16));
+    console.log('-'.repeat(16));
+    console.log(''); // force new line
     const smartshellInstance = new plugins.smartshell.Smartshell({
-      executor: "bash",
+      executor: 'bash',
+      pathDirectories: [paths.binDirectory],
       sourceFilePaths: []
     });
     const tapCombinator = new TapCombinator(); // lets create the TapCombinator
     for (const fileName of fileNamesToRun) {
-      console.log(`${cs("=> ", "blue")} Running ${cs(fileName, "orange")}`);
+      console.log(`${cs('=> ', 'blue')} Running ${cs(fileName, 'orange')}`);
-      console.log(`=`.repeat(16));
+      console.log(cs(`=`.repeat(16), 'cyan'));
-      const tapParser = new TapParser();
+      const tapParser = new TapParser(fileName);
-      const execResultStreaming = await smartshellInstance.execStreamingSilent(
+      const execResultStreaming = await smartshellInstance.execStreamingSilent(`tsrun ${fileName}`);
-        `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.logprefixes.ts

@@ -1,7 +1,7 @@
 import * as plugins from './tstest.plugins';
+import { coloredString as cs } from '@pushrocks/consolecolor';
 
-export const TapPrefix = plugins.consolecolor.coloredString(
+export const TapPrefix = cs(`:::TAP:::`, 'pink', 'black');
-  `:::TAP:::`,
+export const TapErrorPrefix = cs(`!!!TAP PROTOCOL ERROR!!!`, 'red', 'black');
-  'green',
+
-  'black'
+export const TsTestPrefix = cs(`>>>TSTEST<<<`, 'pink', 'black');
-)

ts/tstest.paths.ts

@@ -2,3 +2,4 @@ import * as plugins from './tstest.plugins';
 
 export const cwd = process.cwd();
 export const testDir = plugins.path.join(cwd, './test/');
+export const binDirectory = plugins.path.join(cwd, 'node_modules/.bin');

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.combinator.ts

@@ -5,6 +5,7 @@ import * as plugins from './tstest.plugins';
 import { coloredString as cs } from '@pushrocks/consolecolor';
 
 import { TapParser } from './tstest.tap.parser';
+import * as logPrefixes from './tstest.logprefixes';
 
 export class TapCombinator {
   tapParserStore: TapParser[] = [];
@@ -13,9 +14,35 @@ export class TapCombinator {
   }
 
   evaluate() {
-    console.log(`Ran ${this.tapParserStore.length} Testfiles!`);
+    console.log(`${logPrefixes.TsTestPrefix} Ran ${this.tapParserStore.length} Testfiles!`);
+    console.log(`${logPrefixes.TsTestPrefix} Here are the overall results:`);
+    
+    let failGlobal = false; // determine wether tstest should fail
     for (const tapParser of this.tapParserStore) {
-
+      if(tapParser.getErrorTests().length === 0) {
+        console.log(
+          logPrefixes.TsTestPrefix +
+          cs(` ${tapParser.fileName} ${plugins.figures.tick}`, 'green') +
+          ' | ' +
+          cs(` all tests completed successfully!`, 'blue')
+        )
+      } else {
+        console.log(
+          logPrefixes.TsTestPrefix +
+          cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') +
+          ' | ' +
+          cs(` Errors ocurred, please check for the logs!`, 'blue')
+        );
+        failGlobal = true;
+      }
+    }
+    console.log(cs('-'.repeat(16), 'cyan'));
+    console.log(cs('*'.repeat(16), 'cyan'));
+    console.log(cs('-'.repeat(16), 'cyan'));
+    if(!failGlobal) {
+      console.log(cs('Ending with code 0: TESTS ARE PASSING!', 'green'));
+    } else {
+      console.log(cs('Ending with code 1: TESTS ARE FAILING!', 'red'));
     }
   }
 }

ts/tstest.tap.parser.ts

@@ -1,33 +1,39 @@
-import { ChildProcess } from "child_process";
+import { ChildProcess } from 'child_process';
 import { coloredString as cs } from '@pushrocks/consolecolor';
 
 // ============
 // combines different tap test files to an overall result
 // ============
-import * as plugins from "./tstest.plugins";
+import * as plugins from './tstest.plugins';
-import { TapTestResult } from "./tstest.tap.testresult";
+import { TapTestResult } from './tstest.tap.testresult';
+import * as logPrefixes from './tstest.logprefixes';
 
 export class TapParser {
-  resultStore: TapTestResult[] = [];
+  testStore: TapTestResult[] = [];
 
   expectedTestsRegex = /([0-9]*)\.\.([0-9]*)/;
   expectedTests: number;
+  receivedTests: 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 () {
+  /**
-    this.activeTapTestResult = new TapTestResult(
+   * the constructor for TapParser
-      this.resultStore.length + 1
+   */
-    );
+  constructor(public fileName: string) {}
+
+
+  private _getNewTapTestResult() {
+    this.activeTapTestResult = new TapTestResult(this.testStore.length + 1);
   }
 
   private _processLog(logChunk: Buffer | string) {
     if (Buffer.isBuffer(logChunk)) {
       logChunk = logChunk.toString();
     }
-    const logLineArray = logChunk.split("\n");
+    const logLineArray = logChunk.split('\n');
-    if (logLineArray[logLineArray.length - 1] === "") {
+    if (logLineArray[logLineArray.length - 1] === '') {
       logLineArray.pop();
     }
 
@@ -38,42 +44,53 @@ export class TapParser {
         logLineIsTapProtocol = true;
         const regexResult = this.expectedTestsRegex.exec(logLine);
         this.expectedTests = parseInt(regexResult[2]);
-        console.log(`:::TAP::: Expecting ${this.expectedTests} tests!`);
+        console.log(
+          `${logPrefixes.TapPrefix} ${cs(
+            `Expecting ${this.expectedTests} tests!`,
+            'blue'
+          )}`
+        );
 
         // initiating first TapResult
         this._getNewTapTestResult();
-        
       } else if (this.testStatusRegex.test(logLine)) {
         logLineIsTapProtocol = true;
         const regexResult = this.testStatusRegex.exec(logLine);
         const testId = parseInt(regexResult[2]);
         const testOk = (() => {
-          if (regexResult[1] === "ok") {
+          if (regexResult[1] === 'ok') {
             return true;
           }
           return false;
         })();
 
+        const testSubject = regexResult[3];
+        const testDuration = parseInt(regexResult[4]);
+
         // test for protocol error
-        if(testId !== this.activeTapTestResult.id) {
+        if (testId !== this.activeTapTestResult.id) {
-          console.log(`:::TAP PROTOCOL ERROR::: Something is strange! Test Ids are not equal!`)
+          console.log(
+            `${
+              logPrefixes.TapErrorPrefix
+            } Something is strange! Test Ids are not equal!`
+          );
         }
         this.activeTapTestResult.setTestResult(testOk);
 
-        if(testOk) {
+        if (testOk) {
           console.log(
-            cs(
+            logPrefixes.TapPrefix,
-              `:::TAP::: Success: Test ${testId} is ok!`,
+            `${cs(`T${testId} ${plugins.figures.tick}`, 'green')} | ` +
-              'green',
+              cs(testSubject, 'blue') +
-              'black'
+              ` | ${cs(`${testDuration} ms`, 'orange')}`
-          ));
+          );
         } else {
           console.log(
-            cs(
+            logPrefixes.TapPrefix,
-              `:::TAP::: Error: Test ${testId} is NOT ok!`,
+            `${cs(`T${testId} ${plugins.figures.cross}`, 'red')} | ` +
-              'green',
+              cs(testSubject, 'blue') +
-              'black'
+              ` | ${cs(`${testDuration} ms`, 'orange')}`
-          ));
+          );
         }
       }
 
@@ -84,22 +101,75 @@ export class TapParser {
         console.log(logLine);
       }
 
-      if(this.activeTapTestResult && this.activeTapTestResult.testSettled) {
+      if (this.activeTapTestResult && this.activeTapTestResult.testSettled) {
-        this.resultStore.push(this.activeTapTestResult);
+        this.testStore.push(this.activeTapTestResult);
         this._getNewTapTestResult();
       }
     }
   }
 
+  /**
+   * returns all tests that are not completed
+   */
+  getUncompletedTests() {
+    // TODO:
+  }
+
+  /**
+   * returns all tests that threw an error
+   */
+  getErrorTests() {
+    return this.testStore.filter(tapTestArg => {
+      return !tapTestArg.testOk;
+    });
+  }
+
   async handleTapProcess(childProcessArg: ChildProcess) {
     const done = plugins.smartpromise.defer();
-    childProcessArg.stdout.on("data", data => {
+    childProcessArg.stdout.on('data', data => {
       this._processLog(data);
     });
-    childProcessArg.stderr.on("data", data => {
+    childProcessArg.stderr.on('data', data => {
       this._processLog(data);
     });
-    childProcessArg.on("exit", () => {
+    childProcessArg.on('exit', () => {
+      this.receivedTests = this.testStore.length;
+
+      // check wether all tests ran
+      if (this.expectedTests === this.receivedTests) {
+        console.log(
+          `${logPrefixes.TapPrefix} ${cs(
+            `${this.receivedTests} out of ${
+              this.expectedTests
+            } Tests completed!`,
+            'green'
+          )}`
+        );
+      } else {
+        console.log(
+          `${logPrefixes.TapErrorPrefix} ${cs(
+            `Only ${this.receivedTests} out of ${
+              this.expectedTests
+            } completed!`,
+            'red'
+          )}`
+        );
+      }
+      if (this.getErrorTests().length === 0) {
+        console.log(
+          `${logPrefixes.TapPrefix} ${cs(
+            `All tests are successfull!!!`,
+            'green'
+          )}`
+        );
+      } else {
+        console.log(
+          `${logPrefixes.TapPrefix} ${cs(
+            `${this.getErrorTests().length} tests threw an error!!!`,
+            'red'
+          )}`
+        );
+      }
       done.resolve();
     });
     await done.promise;

ts/tstest.tap.testresult.ts

@@ -7,9 +7,7 @@ export class TapTestResult {
   testLogBuffer = Buffer.from('');
   testOk: boolean = false;
   testSettled: boolean = false;
-  constructor(public id: number) {
+  constructor(public id: number) {}
-    
-  }
 
   /**
    * adds a logLine to the log buffer of the test