diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | package-lock.json | 70 | ||||
| -rw-r--r-- | package.json | 10 |
4 files changed, 79 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml index 3bd9c80..e65cb8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,5 @@ node_js: - "node" - "8" - "6" -script: make test-coveralls +script: npm run test-coveralls sudo: false diff --git a/Makefile b/Makefile deleted file mode 100644 index 68fbad5..0000000 --- a/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -REPORTER = spec -test: - @$(MAKE) lint - @echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID) - @NODE_ENV=test ./node_modules/.bin/mocha -b --reporter $(REPORTER) - -lint: - ./node_modules/.bin/jshint ./lib ./test ./index.js - -test-cov: - $(MAKE) lint - @NODE_ENV=test ./node_modules/.bin/istanbul cover \ - ./node_modules/mocha/bin/_mocha -- -R spec - -test-coveralls: - @NODE_ENV=test ./node_modules/.bin/istanbul cover \ - ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && \ - cat ./coverage/lcov.info | ./bin/coveralls.js --verbose - -.PHONY: test diff --git a/package-lock.json b/package-lock.json index 7e5dcaa..72a2468 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "coveralls", - "version": "3.0.4", + "version": "3.0.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -455,6 +455,15 @@ "capture-stack-trace": "^1.0.0" } }, + "cross-env": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz", + "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5" + } + }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -694,6 +703,12 @@ "is-symbol": "^1.0.2" } }, + "es6-object-assign": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", + "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=", + "dev": true + }, "es6-promise": { "version": "4.2.6", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz", @@ -1252,6 +1267,12 @@ "through": "^2.3.6" } }, + "interpret": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", + "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", + "dev": true + }, "invert-kv": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", @@ -2483,6 +2504,15 @@ "string_decoder": "~0.10.x" } }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "^1.1.6" + } + }, "recursive-readdir": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", @@ -2737,6 +2767,44 @@ "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=", "dev": true }, + "shx": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/shx/-/shx-0.3.2.tgz", + "integrity": "sha512-aS0mWtW3T2sHAenrSrip2XGv39O9dXIFUqxAEWHEOS1ePtGIBavdPJY1kE2IHl14V/4iCbUiNDPGdyYTtmhSoA==", + "dev": true, + "requires": { + "es6-object-assign": "^1.0.3", + "minimist": "^1.2.0", + "shelljs": "^0.8.1" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "shelljs": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz", + "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", + "dev": true, + "requires": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } + } + } + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", diff --git a/package.json b/package.json index 3388b95..edf0ced 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,13 @@ "url": "https://github.com/nickmerwin/node-coveralls/issues" }, "scripts": { - "test": "snyk test && make test" + "lint": "jshint ./lib ./test ./index.js", + "mocha": "_mocha -b -R spec", + "test-cov": "istanbul cover npm run mocha", + "pretest-coveralls": "npm run pretest", + "test-coveralls": "istanbul cover npm run mocha -- --report lcovonly && shx cat ./coverage/lcov.info | node ./bin/coveralls.js --verbose", + "pretest": "cross-env-shell \"echo TRAVIS_JOB_ID $TRAVIS_JOB_ID\"", + "test": "snyk test && npm run lint && npm run mocha" }, "bin": { "coveralls": "./bin/coveralls.js" @@ -38,11 +44,13 @@ "request": "^2.86.0" }, "devDependencies": { + "cross-env": "^5.2.1", "istanbul": "^0.4.5", "jshint": "^2.10.1", "mocha": "^6.1.4", "mocha-lcov-reporter": "^1.2.0", "should": "^9.0.2", + "shx": "^0.3.2", "sinon-restore": "^1.0.1", "snyk": "^1.134.2" }, |