Merge pull request #92 from fyockm/master

Allow cli-table to determine optimal column width

Author: kof

.jshintrc

@@ -1,4 +1,5 @@
 {
+    "eqnull": true,
     "expr": true,
     "jquery": true,
     "node": true

.travis.yml

@@ -1,4 +1,4 @@
 language: node_js
 node_js:
-  - '0.8'
   - '0.10'
+  - '0.11'

lib/log.js

@@ -90,8 +90,7 @@ print.assertions = function() {
         currentTest, test;
 
     table = new Table({
-        head: ['Module', 'Test', 'Assertion', 'Result'],
-        colWidths: [40, 40, 40, 8]
+        head: ['Module', 'Test', 'Assertion', 'Result']
     });
 
     data.assertions.forEach(function(data) {
@@ -109,7 +108,7 @@ print.assertions = function() {
             test = currentTest = data.test;
         }
 
-        table.push([module, test, data.message, data.result ? 'ok' : 'fail']);
+        table.push([module, test, data.message || '', data.result ? 'ok' : 'fail']);
     });
 
     log('\nAssertions:\n' + table.toString());
@@ -154,8 +153,7 @@ print.tests = function() {
         currentModule, module;
 
     table = new Table({
-        head: ['Module', 'Test', 'Failed', 'Passed', 'Total'],
-        colWidths: [40, 40, 8, 8, 8]
+        head: ['Module', 'Test', 'Failed', 'Passed', 'Total']
     });
 
     data.tests.forEach(function(data) {
@@ -173,21 +171,22 @@ print.tests = function() {
 };
 
 // truncate file name
-function truncfile(code) {
+function truncFile(code) {
     if (code && code.length > fileColWidth) {
         code = '...' + code.slice(code.length - fileColWidth + 3);
     }
     return code;
 }
 
 print.summary = function() {
-    var table = new Table({
-        head: ['File', 'Failed', 'Passed', 'Total', 'Runtime'],
-        colWidths: [fileColWidth + 2, 10, 10, 10, 10]
+    var table;
+
+    table = new Table({
+        head: ['File', 'Failed', 'Passed', 'Total', 'Runtime']
     });
 
     data.summaries.forEach(function(data) {
-        table.push([truncfile(data.code), data.failed, data.passed, data.total, data.runtime]);
+        table.push([truncFile(data.code), data.failed, data.passed, data.total, data.runtime]);
     });
 
     log('\nSummary:\n' + table.toString());
@@ -198,8 +197,7 @@ print.globalSummary = function() {
         data = exports.stats();
 
     table = new Table({
-        head: ['Files', 'Tests', 'Assertions', 'Failed', 'Passed', 'Runtime'],
-        colWidths: [12, 12, 12, 12, 12, 12]
+        head: ['Files', 'Tests', 'Assertions', 'Failed', 'Passed', 'Runtime']
     });
 
     table.push([data.files, data.tests, data.assertions, data.failed,
@@ -228,12 +226,16 @@ print.coverage = function() {
     if (!data.coverages.length) return;
 
     table = new Table({
-        head: ['File', 'Statements', 'Branches', 'Functions', 'Lines'],
-        colWidths: [fileColWidth + 2, 14, 14, 14, 14]
+        head: ['File', 'Statements', 'Branches', 'Functions', 'Lines']
     });
 
-    data.coverages.forEach(function(data) {
-        table.push([truncfile(data.code), getMet(data.statements), getMet(data.branches), getMet(data.functions), getMet(data.lines)]);
+    data.coverages.forEach(function(coverage) {
+        table.push([
+            truncFile(coverage.code),
+            getMet(coverage.statements),
+            getMet(coverage.branches),
+            getMet(coverage.functions),
+            getMet(coverage.lines)]);
     });
 
     log('\nCoverage:\n' + table.toString());
@@ -246,8 +248,7 @@ print.globalCoverage = function() {
 
     coverage = exports.stats().coverage;
     table = new Table({
-        head: ['Files', 'Statements', 'Branches', 'Functions', 'Lines'],
-        colWidths: [8, 14, 14, 14, 14]
+        head: ['Files', 'Statements', 'Branches', 'Functions', 'Lines']
     });
 
     table.push([

package.json

@@ -1,7 +1,7 @@
 {
     "name": "qunit",
     "description": "QUnit testing framework for nodejs",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "author": "Oleg Slobodskoi <oleg008@gmail.com>",
     "contributors": [
         {"name": "Jonathan Buchanan"},
@@ -18,18 +18,18 @@
     "scripts": {
         "test": "make test"
     },
-   "dependencies": {
-	"underscore": "1.3.3",
-	"argsparser": "0.0.6",
-	"cli-table": "0.0.2",
-	"tracejs": "0.1.4"
+    "dependencies": {
+        "underscore": "^1.6.0",
+        "argsparser": "^0.0.6",
+        "cli-table": "^0.3.0",
+        "tracejs": "^0.1.8"
     },
     "devDependencies": {
-        "chainer": "0.0.5",
-        "timekeeper": "0.0.2"
+        "chainer": "^0.0.5",
+        "timekeeper": "^0.0.4"
     },
     "optionalDependencies": {
-	"istanbul": "0.2.4"
+        "istanbul": "^0.2.4"
     },
     "licenses": [
         {

test/fixtures/async-test.js

@@ -1,5 +1,5 @@
 test('1', 1, function (){
-  ok(true, "tests intermixing sync and async tests #1");
+    ok(true, "tests intermixing sync and async tests #1");
 });
 
 test('a', 2, function(){
@@ -13,7 +13,7 @@ test('a', 2, function(){
 });
 
 test('2', 1, function (){
-  ok(true, "tests intermixing sync and async tests #2");
+    ok(true, "tests intermixing sync and async tests #2");
 });
 
 test('b', 2, function(){

test/fixtures/child-code-global.js

@@ -1,3 +1,3 @@
 exports.whereFrom = function() {
-  return "I was required as global";
+    return "I was required as global";
 };

test/fixtures/child-code-namespace.js

@@ -1,3 +1,3 @@
 exports.whereFrom = function() {
-  return "I was required as a namespace object";
-};
+    return "I was required as a namespace object";
+};

test/fixtures/child-tests-global.js

@@ -1,4 +1,3 @@
-
 test("Dependency file required as global", function() {
     equal(typeof whereFrom, "function");
     equal(whereFrom(), "I was required as global");

test/fixtures/coverage-code.js

@@ -4,10 +4,10 @@ exports.myMethod = function() {
 
 exports.myAsyncMethod = function(callback) {
     setTimeout(function() {
-	       callback(123);
+        callback(123);
     }, 10000);
 };
 
 exports.myOtherMethod = function(callback) {
-    return 321
+    return 321;
 };

test/fixtures/testrunner-code.js

@@ -6,4 +6,4 @@ exports.myAsyncMethod = function(callback) {
     setTimeout(function() {
         callback(123);
     }, 100);
-};
+};