[Pkg-javascript-commits] [node-coveralls] 76/332: use blanket instead of jscoverage

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-coveralls.

commit 1f21d54dfb5e56c96b4592a259014bf49a6f021e
Author: Gabe Hayes <gabriel.hayes at gmail.com>
Date:   Sat Jul 27 11:55:50 2013 -0700

    use blanket instead of jscoverage
---
 Makefile     | 17 ++++++-----------
 index.js     |  3 ---
 package.json |  8 ++++++--
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index c2a3b99..938b2c0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,23 +2,18 @@ REPORTER = spec
 test:
 	$(MAKE) lint
 	echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID)
-	@NODE_ENV=test ./node_modules/.bin/mocha -b --reporter $(REPORTER)
+	@NODE_ENV=test ./node_modules/.bin/mocha -b --require blanket --reporter $(REPORTER)
 
 lint:
 	./node_modules/.bin/jshint ./lib ./test ./index.js
 
-lib-cov:
-	./node_modules/jscoverage/bin/jscoverage lib lib-cov
-
-test-cov:	lib-cov
-	echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID)
-	@COVERALLS_COVERAGE=1 $(MAKE) test REPORTER=html-cov 1> coverage.html
-	rm -rf lib-cov
+test-cov:
+	$(MAKE) test REPORTER=spec
+	$(MAKE) test REPORTER=html-cov 1> coverage.html
 
-test-coveralls:lib-cov
+test-coveralls:
 	$(MAKE) test REPORTER=spec
-	echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID)
-	@COVERALLS_COVERAGE=1 $(MAKE) test REPORTER=mocha-lcov-reporter | ./bin/coveralls.js --verbose
+	$(MAKE) test REPORTER=mocha-lcov-reporter | ./bin/coveralls.js --verbose
 	rm -rf lib-cov
 
 .PHONY: test
diff --git a/index.js b/index.js
index 3213209..fef5fd8 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,4 @@
 var dir = './lib/';
-if (process.env.COVERALLS_COVERAGE){
-    dir = './lib-cov/';
-}
 exports.convertLcovToCoveralls = require(dir + 'convertLcovToCoveralls');
 exports.sendToCoveralls = require(dir + 'sendToCoveralls');
 exports.getOptions = require(dir + 'getOptions');
diff --git a/package.json b/package.json
index 76b0a4b..32e9083 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,11 @@
     "url": "https://github.com/cainus/node-coveralls/issues"
   },
   "scripts": {
-    "test": "make test"
+    "test": "make test",
+    "blanket": {
+      "pattern": "lib",
+      "data-cover-never": "node_modules"
+    }
   },
   "bin": {
     "coveralls": "./bin/coveralls.js"
@@ -33,11 +37,11 @@
     "exec-sync": "~0.1.6"
   },
   "devDependencies": {
+    "blanket": "~1.1.5",
     "sinon-restore": "1.0.0",
     "mocha-lcov-reporter": "0.0.1",
     "mocha": "1.8.1",
     "should": "1.1.0",
-    "jscoverage": "0.3.7",
     "jshint": "2.1.3"
   },
   "engines": {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-coveralls.git