build: use nyc for test coverage

Author: dougwilson

.gitignore

@@ -1,4 +1,4 @@
+.nyc_output
 coverage/
-lib-cov/
 node_modules/
 npm-debug.log

.travis.yml

@@ -38,8 +38,8 @@ cache:
 
 before_install:
   # Setup Node.js version-specific dependencies
-  - "test $TRAVIS_NODE_VERSION != '0.6' || npm rm --save-dev istanbul"
-  - "test $TRAVIS_NODE_VERSION != '0.8' || npm rm --save-dev istanbul"
+  - "test $TRAVIS_NODE_VERSION != '0.6' || npm rm --save-dev nyc"
+  - "test $TRAVIS_NODE_VERSION != '0.8' || npm rm --save-dev nyc"
   - "test $(echo $TRAVIS_NODE_VERSION | cut -d. -f1) -ge 4 || npm rm --save-dev eslint"
 
   # Update Node.js modules
@@ -60,10 +60,10 @@ before_script:
   - "docker exec mysql mysql -e 'select version()'"
 
 script:
-  # Run test script, depending on istanbul install
-  - "test ! -z $(npm -ps ls istanbul) || npm test"
-  - "test   -z $(npm -ps ls istanbul) || npm run-script test-ci"
+  # Run test script, depending on nyc install
+  - "test ! -z $(npm -ps ls nyc) || npm test"
+  - "test   -z $(npm -ps ls nyc) || npm run-script test-ci"
   - "test   -z $(npm -ps ls eslint) || npm run-script lint"
 
 after_script:
-  - "test -e ./coverage/lcov.info && npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"
+  - "test -d .nyc_output && npm install coveralls@2 && nyc report --reporter=text-lcov | coveralls"

appveyor.yml

@@ -25,7 +25,7 @@ cache:
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - if "%nodejs_version%" equ "0.8" npm rm --save-dev istanbul
+  - if "%nodejs_version%" equ "0.8" npm rm --save-dev nyc
   - npm rm --save-dev eslint
   - if exist node_modules npm prune
   - if exist node_modules npm rebuild
@@ -42,7 +42,7 @@ test_script:
   - node --version
   - npm --version
   - set npm_test_command=test
-  - for /f %%l in ('npm -ps ls istanbul') do set npm_test_command=test-ci
+  - for /f %%l in ('npm -ps ls nyc') do set npm_test_command=test-ci
   - npm run %npm_test_command%
 
 version: "{build}"

package.json

@@ -20,12 +20,9 @@
   "devDependencies": {
     "after": "0.8.2",
     "eslint": "3.19.0",
-    "istanbul": "0.4.5",
-    "require-all": "2.2.0",
-    "rimraf": "2.2.8",
+    "nyc": "10.2.0",
     "seedrandom": "2.4.3",
     "timezone-mock": "0.0.0",
-    "mkdirp": "0.5.1",
     "urun": "0.0.8",
     "utest": "0.0.8"
   },
@@ -42,7 +39,7 @@
   "scripts": {
     "lint": "eslint .",
     "test": "node test/run.js",
-    "test-ci": "node test/run-cov.js lcovonly",
-    "test-cov": "node test/run-cov.js"
+    "test-ci": "nyc --reporter=text npm test",
+    "test-cov": "nyc --reporter=html --reporter=text npm test"
   }
 }

test/common.js

@@ -1,9 +1,8 @@
 var common = exports;
 var fs     = require('fs');
-var mkdirp = require('mkdirp');
 var path   = require('path');
 
-common.lib      = path.resolve(__dirname, '..', (process.env.TEST_COVERAGE || ''), 'lib');
+common.lib      = path.resolve(__dirname, '..', 'lib');
 common.fixtures = path.resolve(__dirname, 'fixtures');
 
 // Useful for triggering ECONNREFUSED errors on connect()
@@ -32,13 +31,6 @@ common.PoolConnection   = require(common.lib + '/PoolConnection');
 common.SqlString        = require(common.lib + '/protocol/SqlString');
 common.Types            = require(common.lib + '/protocol/constants/types');
 
-// Setup coverage hook
-if (process.env.TEST_COVERAGE) {
-  process.on('exit', function () {
-    writeCoverage(global.__coverage__ || {});
-  });
-}
-
 var Mysql      = require(path.resolve(common.lib, '../index'));
 var FakeServer = require('./FakeServer');
 
@@ -165,14 +157,3 @@ function mergeTestConfig(config) {
 
   return config;
 }
-
-function writeCoverage(coverage) {
-  var test = path.relative(__dirname, path.resolve(process.argv[1]));
-  var ext  = path.extname(test);
-  var cov  = test.substr(0, test.length - ext.length) + '.json';
-  var out  = path.resolve(__dirname, '..', process.env.TEST_COVERAGE, 'test', cov);
-
-  mkdirp.sync(path.dirname(out));
-
-  fs.writeFileSync(out, JSON.stringify(coverage));
-}