some style fixes, avoid logging coverage if empty, inc version

Author: kof

lib/coverage.js

@@ -4,61 +4,72 @@ var path = require('path'),
 
 var istanbul, collector;
 
-try { istanbul = require('istanbul'); }
-catch (e) {}
+try {
+    istanbul = require('istanbul');
+} catch (e) {}
 
 exports.setup = function() {
     collector = new istanbul.Collector();
 };
 
 exports.add = function(coverage) {
-    collector && coverage && collector.add(coverage);
+    if (collector && coverage) collector.add(coverage);
 };
 
 exports.get = function() {
+    var summaries
     if (collector) {
-        var summaries = [];
-        collector.files().forEach(function (file) {
+        summaries = [];
+        collector.files().forEach(function(file) {
             summaries.push(istanbul.utils.summarizeFileCoverage(collector.fileCoverageFor(file)));
         });
         return istanbul.utils.mergeSummaryObjects.apply(null, summaries);
     }
 };
 
 exports.report = function() {
+    var opts, Report, reports;
+
     if (collector) {
-        var opts = { dir: path.resolve('coverage') },
-            Report = istanbul.Report,
-            reports = [ Report.create('lcov', opts), Report.create('json', opts) ];
-        reports.forEach(function (rep) {
+        opts = {dir: path.resolve('coverage')};
+        Report = istanbul.Report;
+        reports = [Report.create('lcov', opts), Report.create('json', opts)];
+        reports.forEach(function(rep) {
             rep.writeReport(collector, true);
         });
     }
 };
 
 function resolvePaths(files) {
-    if (Array.isArray(files)) return files.map(function (file) {
-        return file.path;
-    });
+    if (Array.isArray(files)) {
+        return files.map(function (file) {
+            return file.path;
+        });
+    }
     return [files.path];
 }
 
-exports.instrument = function(options, cb) {
+exports.instrument = function(options, callback) {
     istanbul.matcherFor({
         includes: resolvePaths(options.code),
         excludes: resolvePaths(options.tests)
     }, function (err, matcher) {
-        if (err) { throw err; }
-        var instrumenter = new istanbul.Instrumenter();
+        var instrumenter
+
+        if (err) {
+            return callback(err)
+        }
+
+        instrumenter = new istanbul.Instrumenter();
         istanbul.hook.hookRequire(matcher, instrumenter.instrumentSync.bind(instrumenter));
-        cb();
+        callback();
     });
 };
 
 if (!istanbul) {
     _.each(exports, function(fn, name) {
         exports[name] = function() {
-            util.error('Module "istanbul" is not installed.'.red);
+            util.error('\nModule "istanbul" is not installed.'.red);
             process.exit(1);
         };
     });

lib/log.js

@@ -11,11 +11,18 @@ data = {
     coverages: []
 };
 
-exports.add = function(t, d) {
-    if (d) {
-        data[t].push(d);
+/**
+ * Add data to the log report.
+ *
+ * @param {String} type
+ * @param {Object} obj
+ * @return {Array}
+ */
+exports.add = function(type, obj) {
+    if (obj) {
+        data[type].push(obj);
     }
-    return data[t];
+    return data[type];
 };
 
 /**
@@ -216,7 +223,11 @@ function getMet(metric) {
 }
 
 print.coverage = function() {
-    var table = new Table({
+    var table;
+
+    if (!data.coverages.length) return
+
+    table = new Table({
         head: ['File', 'Statements', 'Branches', 'Functions', 'Lines'],
         colWidths: [fileColWidth + 2, 14, 14, 14, 14]
     });
@@ -229,14 +240,23 @@ print.coverage = function() {
 };
 
 print.globalCoverage = function() {
-    var data = exports.stats().coverage;
+    var coverage, table;
 
-    var table = new Table({
+    if (!data.coverages.length) return
+
+    coverage = exports.stats().coverage
+    table = new Table({
         head: ['Files', 'Statements', 'Branches', 'Functions', 'Lines'],
         colWidths: [8, 14, 14, 14, 14]
     });
 
-    table.push([data.files, getMet(data.statements), getMet(data.branches), getMet(data.functions), getMet(data.lines)]);
+    table.push([
+        coverage.files,
+        getMet(coverage.statements),
+        getMet(coverage.branches),
+        getMet(coverage.functions),
+        getMet(coverage.lines)
+    ]);
 
     log('\nGlobal coverage:\n' + table.toString());
 };

lib/testrunner.js

@@ -150,7 +150,7 @@ exports.run = function(files, callback) {
         files = [files];
     }
 
-    options.coverage && coverage.setup();
+    if (options.coverage) coverage.setup();
 
     files.forEach(function(file) {
         var opts =  _.extend({}, options, file);
@@ -160,7 +160,7 @@ exports.run = function(files, callback) {
         opts.code = absPath(opts.code);
         opts.tests = absPaths(opts.tests);
 
-        function done(err, stat) {
+        runOne(opts, function(err, stat) {
             if (err) {
                 return callback(err, log.stats());
             }
@@ -173,12 +173,12 @@ exports.run = function(files, callback) {
                         log.print[name]();
                     }
                 });
-                // write coverage report(s)
-                coverage.report();
+
+                // Write coverage report.
+                if (opts.coverage) coverage.report();
                 callback(null, log.stats());
             }
-        }
-        runOne(opts, done);
+        });
     });
 };
 

package.json

@@ -1,11 +1,12 @@
 {
     "name": "qunit",
     "description": "QUnit testing framework for nodejs",
-    "version": "0.5.18",
+    "version": "0.6.0",
     "author": "Oleg Slobodskoi <oleg008@gmail.com>",
     "contributors": [
         {"name": "Jonathan Buchanan"},
-        {"name": "Ashar Voultoiz"}
+        {"name": "Ashar Voultoiz"},
+        {"name": "Drew Fyock"}
     ],
     "repository": {
         "type": "git",

readme.md

@@ -27,7 +27,7 @@ http://github.com/jquery/qunit
 #### The only exception
 
     // Separate tests into modules.
-    // Use `QUnit` namespace, because `module` is reserved
+    // Use `QUnit` namespace, because `module` is reserved for node.
     QUnit.module(name, lifecycle)
 
 ### Usage
@@ -239,4 +239,4 @@ Some tests examples
 
 ### Coverage
 
-Code coverage via Istanbul. To utilize, install `istanbul` and set `coverage: true`. Coverage calculations based on code and tests passed to `node-qunit`.
+Code coverage via Istanbul. To utilize, install `istanbul` and set option `coverage: true` or pass `--cov` parameter in the shell. Coverage calculations based on code and tests passed to `node-qunit`.