From c2217e3674b0b2400c238285710801df7081bb74 Mon Sep 17 00:00:00 2001 From: Jory Graham Date: Wed, 30 Dec 2015 13:07:33 -0500 Subject: [PATCH] Remove Makefile Add lint and build tasks to package.json, remove 'istanbul' requirement as mocha is what's actually being used. --- Makefile | 26 -------------------------- package.json | 5 +++-- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index bd0e51abc..000000000 --- a/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -BASE = . - -ISTANBUL = ./node_modules/.bin/istanbul -COVERAGE_OPTS = --lines 95 --statements 95 --branches 95 --functions 95 - -main: lint test - -build: - cd BUILD && node BUILD.js - -cover: - $(ISTANBUL) cover test/run.js --root ./lib -- -T unit,functional - -check-coverage: - $(ISTANBUL) check-coverage $(COVERAGE_OPTS) - -test: cover check-coverage - -test-cov: cover check-coverage - open coverage/lcov-report/index.html - -lint: - ./node_modules/jshint/bin/hint ./lib --config $(BASE)/.jshintrc - - -.PHONY: test, build diff --git a/package.json b/package.json index fd07bd876..e18a75338 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,9 @@ "url": "http://github.com/Marak/Faker.js.git" }, "scripts": { - "test": "node_modules/.bin/mocha test/*.*.js" + "lint": "node_modules/.bin/jshint ./lib --config ./.jshintrc", + "test": "node_modules/.bin/mocha test/*.*.js", + "build": "cd build && ../node_modules/.bin/gulp && cd ../" }, "devDependencies": { "browserify": "5.11.1", @@ -19,7 +21,6 @@ "gulp-mustache": "0.4.0", "gulp-rename": "1.2.0", "gulp-uglify": "1.0.1", - "istanbul": "0.1.25", "jshint": "0.9.0", "lodash": "^2.4.1", "mocha": "1.8.x",