aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarak <[email protected]>2016-02-08 03:25:32 +0530
committerMarak <[email protected]>2016-02-08 03:25:32 +0530
commit2fb25588a563e888c27d18945ec372e68cb41669 (patch)
tree57e4f0b959962e795e2eecc9a32cf245b8a70570
parente0212228c841791fe4000a3dc2b4510d97d01cb9 (diff)
parentc2217e3674b0b2400c238285710801df7081bb74 (diff)
downloadfaker-2fb25588a563e888c27d18945ec372e68cb41669.tar.xz
faker-2fb25588a563e888c27d18945ec372e68cb41669.zip
Merge pull request #330 from jory/remove-unused-Makefile-and-cruft
[dist] Remove Makefile
-rw-r--r--Makefile26
-rw-r--r--package.json5
2 files changed, 3 insertions, 28 deletions
diff --git a/Makefile b/Makefile
deleted file mode 100644
index bd0e51ab..00000000
--- 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 fd07bd87..e18a7533 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",