Merge pull request #503 from kevva/coverage

Move coverage script to Makefile

.editorconfig

@@ -10,3 +10,6 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 2
+
+[Makefile]
+indent_style = tab

.gitignore

-lib-cov
-*.seed
 *.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-
-pids
-logs
-results
-
-node_modules
-npm-debug.log
-
-build
-vagrant
-.lock-wscript
 .DS_Store
 .sass-cache
-
-bin/*-v8-*
-
-lib-coverage/
-sass-coverage.js
-**/fixtures/**/build.*
+bin
+!bin/node-sass
+build
+lib-cov
+node_modules

Makefile

+BIN = ./node_modules/.bin
+REPORTER = spec
+
+clean:
+	@rm -rf lib-cov test/fixtures/*/build.css
+
+lint:
+	@$(BIN)/jshint bin lib test
+
+node_modules: package.json
+	@npm install
+	@touch node_modules
+
+test: clean lint node_modules
+	@$(BIN)/_mocha \
+	  --reporter $(REPORTER)
+
+test-cov: clean lint node_modules
+	@$(BIN)/jscoverage lib lib-cov
+	@NODESASS_COV=1 $(BIN)/_mocha \
+	  --reporter mocha-lcov-reporter | $(BIN)/coveralls
+
+.PHONY: test clean

package.json

@@ -19,7 +19,7 @@
   },
   "gypfile": true,
   "scripts": {
-    "coverage": "node scripts/coverage",
+    "coverage": "make test-cov",
     "install": "node lib/build.js",
     "prepublish": "node scripts/prepublish",
     "pretest": "node_modules/.bin/jshint bin lib test",

scripts/coverage

-#!/usr/bin/env node
-/*jshint shelljs:true */
-
-"use strict";
-
-require("shelljs/make");
-var path = require("path");
-
-var JSCOVERAGE_BIN = ["node_modules", ".bin", "jscoverage"].join(path.sep);
-var COVERALLS_BIN = ["node_modules", ".bin", "coveralls"].join(path.sep);
-var MOCHA_BIN = ["node_modules", ".bin", "mocha"].join(path.sep);
-
-echo("Creating coverage files");
-exec(JSCOVERAGE_BIN + " lib lib-coverage");
-
-echo("Piping mocha to coveralls");
-
-env["NODESASS_COVERAGE"] = 1;
-
-exec(MOCHA_BIN + " test -R mocha-lcov-reporter | " + COVERALLS_BIN, {async: false}, function(code, output) {
-	console.log('Exit code:', code);
-	console.log('Program output:', output);
-
-	echo("Cleanup coverage files");
-	rm("-R", "lib-coverage");
-});

test/api.js

@@ -2,7 +2,7 @@ var assert = require('assert'),
     fs = require('fs'),
     path = require('path'),
     read = fs.readFileSync,
-    sass = require('../lib'),
+    sass = process.env.NODESASS_COV ? require('../lib-cov') : require('../lib'),
     fixture = path.join.bind(null, __dirname, 'fixtures'),
     resolveFixture = path.resolve.bind(null, __dirname, 'fixtures');