Switch to nyc for code coverage

Author: pascalduez

.gitignore

@@ -4,5 +4,6 @@
 /test/custom-sassdoc
 /sassdoc
 /coverage
+.nyc_output
 .DS_Store
 npm-debug.log

.travis.yml

@@ -13,7 +13,8 @@ sudo: false
 git:
   depth: 10
 
-script: make travis
+script: make lint dist test cover
+after_success: make coveralls
 
 notifications:
   slack:

Makefile

@@ -1,7 +1,7 @@
 BIN = $(PWD)/node_modules/.bin/
 SASSDOC = $(PWD)/bin/sassdoc
 
-all: dist lint test
+all: lint dist test
 
 # Compile ES6 from `src` to ES5 in `dist`
 # =======================================
@@ -28,19 +28,18 @@ test: test/data/expected.stream.json dist
 test/data/expected.stream.json: test/data/expected.json
 	test/data/stream $< > $@
 
-cover: dist
+cover:
 	rm -rf coverage
-	$(BIN)istanbul cover --report none --print detail $(BIN)_mocha test/**/*.test.js
+	$(BIN)nyc $(BIN)mocha test/**/*.test.js
 
 cover-browse: dist
 	rm -rf coverage
-	$(BIN)istanbul cover --report html $(BIN)_mocha test/**/*.test.js
-	open coverage/index.html
+	$(BIN)nyc --reporter=html $(BIN)mocha test/**/*.test.js
+	$(BIN)opn coverage/index.html
+
+coveralls:
+	($(BIN)nyc report --reporter=text-lcov | $(BIN)coveralls) || exit 0
 
-travis: lint cover
-	$(BIN)istanbul report lcovonly
-	(cat coverage/lcov.info | coveralls) || exit 0
-	rm -rf coverage
 
 # Development
 # ===========

package.json

@@ -73,6 +73,15 @@
     "LICENCE.md",
     "README.md"
   ],
+  "scripts": {
+    "test": "make"
+  },
+  "nyc": {
+    "exclude": [
+      "**/*.test.js",
+      "test"
+    ]
+  },
   "dependencies": {
     "babel-runtime": "^6.22.0",
     "chalk": "^1.0.0",
@@ -106,13 +115,11 @@
     "coveralls": "^2.11.2",
     "dateformat": "^1.0.11",
     "eslint": "^0.18.0",
-    "istanbul": "^0.3.13",
     "jsesc": "^0.5.0",
     "mocha": "^2.2.1",
+    "nyc": "^10.1.2",
+    "opn-cli": "^3.1.0",
     "sinon": "^1.14.1",
     "vinyl": "^0.4.6"
-  },
-  "scripts": {
-    "test": "make dist lint test"
   }
 }