better error output

lib/highkick.js

@@ -1,6 +1,8 @@
 var colors = require('colors'),
     path   = require('path'),
-    tty    = require('tty');
+    tty    = require('tty'),
+    assert = require('assert'),
+    fs     = require('fs');
 
 delete require.cache[module.filename];
 
@@ -33,14 +35,15 @@ function logger(testsuite){
   };
 }
 
-function ok(test, testsuite){
+function ok(test, testsuite, callback){
   testsuite.printTestResult(test, format('OK', 'green'));
+  callback();
 }
 
-function fail(test, testsuite, error){
+function fail(test, testsuite, error, callback){
   testsuite.fail++;
   testsuite.printTestResult(test, format('FAIL', 'red'));
-  testsuite.log( format('ERROR: ','bold', 'red') + (error.message ? format(error.message, 'bold') : '') + '\n' + error.stack + ')' );
+  printErrorStack(test, testsuite, error, callback);
 }
 
 function childTestModule(options){
@@ -108,8 +111,7 @@ function genFinish(testsuite){
 
 function genTestCallback(testsuite, test, callback){
   return function testCallback(error){
-    callback();
-    (error ? fail : ok)(test, testsuite, error);
+    (error ? fail : ok)(test, testsuite, error || callback, callback);
   };
 }
 
@@ -157,6 +159,7 @@ function genTestCaller(testsuite, test){
 
     var args = [];
     var cb   = genTestCallback(testsuite, test, function(error){
+
       if(error){
         callback(error);
         return;
@@ -165,6 +168,9 @@ function genTestCaller(testsuite, test){
       testsuite.initArgs(function(error, initArgs){
 
         callAfterEach.call(undefined, args, function(error){
+          if(test.line == testsuite.len){
+            testsuite.finish();
+          }
           !testsuite.options.async && callback(error);
         });
 
@@ -256,13 +262,50 @@ function genPrintTestResult(testsuite){
                 + format(', ', 'grey')
                 + format(( duration + 's'), 'white', 'bold')
                 + format(') ', 'grey'));
-
-    if(test.line == testsuite.len){
-      testsuite.finish();
-    }
   };
 };
 
+function printErrorStack(test, testsuite, error, callback){
+  var line   = error.stack.match(/\(([^\(\)]+)\)/)[1].split(':'),
+      path   = line[0],
+      num    = Number(line[1]),
+
+      stack  = error.stack.split('\n'),
+      message = stack[0],
+      output = [ ' ', format('ERROR: ', 'bold', 'red') + message, '       ' + path + ':' + num ];
+
+  fs.readFile(path, function(error, buffer){
+
+    if(!error){
+
+      buffer.toString()
+        .split('\n')
+        .slice(num-2, num+1)
+        .forEach(function(el, ind){
+
+          if( ind == 1 ){
+            output.push( '       ' + format( num + '. ', 'bold', 'red') + format(el, 'bold') );
+          } else {
+            output.push( '       ' +  format( ( num + ind - 1) + '. ' + el) );
+          }
+
+        });
+
+    };
+
+    output.push('');
+    output.push.apply(output, stack);
+
+    output.forEach(function(line){
+      ( testsuite || console ).log(line);
+    });
+
+    callback && callback();
+
+  });
+
+}
+
 function kick(/* [path], [options], callback */){
 
   var filename, options,

package.json

@@ -1,6 +1,6 @@
 {
   "name":"highkick",
-  "version":"1.5.4",
+  "version":"1.6.0",
   "description":"Asynchronous, no-style, super simple testing tool.",
   "author":"Azer Koculu <azer@kodfabrik.com>",
   "keywords":["testing", "test"],