implement istanbul, based on @gotwarlost PR

Author: fyockm

lib/child.js

@@ -55,13 +55,6 @@ function _require(res, addToGlobal) {
     QUnit.start();
 }
 
-/**
- * Calculate coverage stats using bunker
- */
-function calcCoverage() {
-
-}
-
 /**
  * Callback for each started test.
  * @param {Object} test
@@ -105,9 +98,7 @@ QUnit.testDone(function(data) {
  * @param {Object} res
  */
 QUnit.done(_.debounce(function(data) {
-    if (options.coverage) {
-        data.coverage = calcCoverage();
-    }
+    data.coverage = global.__coverage__;
 
     process.send({
         event: 'done',
@@ -128,15 +119,19 @@ console.error = function(obj) {
     return error.apply(this, arguments);
 };
 
-// require deps
-options.deps.forEach(function(dep) {
-    _require(dep, true);
-});
+function run() {
+    // require deps
+    options.deps.forEach(function(dep) {
+        _require(dep, true);
+    });
 
-// require code
-_require(options.code, true);
+    // require code
+    _require(options.code, true);
 
-// require tests
-options.tests.forEach(function(res) {
-    _require(res, false);
-});
+    // require tests
+    options.tests.forEach(function(res) {
+        _require(res, false);
+    });
+}
+
+options.coverage ? require('./coverage').cover(options, run) : run();

lib/coverage.js

@@ -1,34 +1,54 @@
-var fs = require('fs'),
+var path = require('path'),
     util = require('util'),
-    _ = require('underscore'),
-    bunker;
+    _ = require('underscore');
 
-try {
-    bunker = require('bunker');
-} catch (err) {}
+var istanbul, collector;
 
-exports.instrument = function(path) {
-    var src = fs.readFileSync(path, 'utf-8'),
-        newSrc = bunker(src).compile();
+try { istanbul = require('istanbul'); }
+catch (e) {}
 
-    fs.renameSync(src, '__' + src);
-    fs.writeFileSync(path, newSrc, 'utf-8');
+exports.setup = function() {
+    collector = new istanbul.Collector();
 };
 
+exports.append = function(coverage) {
+    collector && coverage && collector.add(coverage);
+};
 
-exports.restore = function(path) {
-    // do it only if the original file exist
-    if (fs.statSync('__' + path).isFile()) {
-        fs.unlinkSync(path);
-        fs.renameSync('__' + path, path);
+exports.report = function() {
+    if (collector) {
+        var opts = { dir: path.resolve('coverage') },
+            Report = istanbul.Report,
+            reports = [ Report.create('lcov', opts), Report.create('json', opts), Report.create('text-summary', opts) ];
+        reports.forEach(function (rep) {
+            rep.writeReport(collector, true);
+        });
     }
+};
+
+function resolvePaths(files) {
+    if (Array.isArray(files)) return files.map(function (file) {
+        return file.path;
+    });
+    return [files.path];
+}
 
+exports.cover = function(options, run) {
+    istanbul.matcherFor({
+        includes: resolvePaths(options.code),
+        excludes: resolvePaths(options.tests)
+    }, function (err, matcher) {
+        if (err) { throw err; }
+        var instrumenter = new istanbul.Instrumenter();
+        istanbul.hook.hookRequire(matcher, instrumenter.instrumentSync.bind(instrumenter));
+        run();
+    });
 };
 
-if (!bunker) {
+if (!istanbul) {
     _.each(exports, function(fn, name) {
         exports[name] = function() {
-            util.error('Module "bunker" is not installed.'.red);
+            util.error('Module "istanbul" is not installed.'.red);
             process.exit(1);
         };
     });

lib/testrunner.js

@@ -138,6 +138,8 @@ exports.run = function(files, callback) {
         files = [files];
     }
 
+    options.coverage && coverage.setup();
+
     files.forEach(function(file) {
         var opts =  _.extend({}, options, file);
 
@@ -150,6 +152,7 @@ exports.run = function(files, callback) {
             if (err) {
                 return callback(err, log.stats());
             }
+            stat && coverage.append(stat.coverage);
 
             filesCount++;
 
@@ -158,17 +161,13 @@ exports.run = function(files, callback) {
                     if (val && log.print[name]) {
                         log.print[name]();
                     }
-                })
+                });
 
+                coverage.report();
                 callback(null, log.stats());
             }
         }
-
-        if (opts.coverage) {
-            coverage.instrument(opts.code);
-        } else {
-            runOne(opts, done);
-        }
+        runOne(opts, done);
     });
 };
 

package.json

@@ -28,7 +28,7 @@
         "timekeeper": "0.0.2"
     },
     "optionalDependencies": {
-       "bunker": "0.1.2"
+      "istanbul": "0.2.4"
     },
     "licenses": [
         {

readme.md

@@ -233,5 +233,4 @@ Some tests examples
 
 ### Coverage
 
-Jscoverage is removed due to a lot of installation problems and bad api,
-node-bunker is planned to use but not implemented yet.
+Code coverage via Istanbul. To utilize, install `istanbul` and set `coverage: true`. Coverage based on code and tests passed to `node-qunit`.