Merge branch 'release/1.0.8'

.gitignore

@@ -14,6 +14,9 @@ lib-cov
 # Coverage directory used by tools like istanbul
 coverage
 
+# Coverage directory used by tools like nyc
+.nyc_output
+
 # node-waf configuration
 .lock-wscript
 
@@ -44,4 +47,4 @@ jspm_packages
 ._*
 
 # Linux
-*.*~
+*.*~

.nycrc

@@ -0,0 +1,7 @@
+{
+  "check-coverage": true,
+  "branches": 83.33,
+  "lines": 100,
+  "functions": 100,
+  "statements": 100
+}

README.md

@@ -87,15 +87,15 @@ npm test
 
 ## Code Coverage
 
-To run the coverage scanner and generate coverage report use the following command. It fails if the threshold coverage has not passed. The threshold settings are stored in the file `test/.istanbul.yml`.
+To run the coverage scanner and generate coverage report use the following command. It fails if the threshold coverage has not passed. The threshold settings are stored in the file `.nycrc`. Please note that the thresholds configured are per-file.
 
 ```bash
 npm run cover
 ```
 
 ## Linting
 
-To run the linting checking run the following command.
+To run the linting check run the following command.
 
 ```bash
 npm run lint

package.json

@@ -1,35 +1,32 @@
 {
   "name": "@myob-oss/config",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "A simple, slightly opinionated, and predictable configuration module for Node.js applications.",
   "main": "lib/config-wrapper.js",
   "scripts": {
-    "test": "node_modules/.bin/gulp test",
-    "cover": "node_modules/.bin/istanbul cover _mocha --config test/.istanbul.yml -- -R dot --recursive && node_modules/.bin/istanbul check-coverage --config test/.istanbul.yml",
-    "lint": "node_modules/.bin/gulp lint"
+    "test": "node_modules/.bin/mocha test/lib/*_test.js",
+    "cover": "node_modules/.bin/nyc --per-file --reporter=html --reporter=text npm run test",
+    "lint": "node_modules/.bin/eslint lib/*.js test/**/*.js"
   },
   "author": "Damien Whaley <damien.whaley@myob.com>",
   "contributors": [
     "Damien Whaley <damien.whaley@myob.com>"
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/MYOB-Technology/node-config.git"
+    "url": "https://github.com/myob-oss/node-config.git"
   },
   "license": "MIT",
   "dependencies": {
-    "deepmerge": "^2.1.1",
-    "json5": "^2.0.1"
+    "deepmerge": "^3.3.0",
+    "json5": "^2.1.0"
   },
   "devDependencies": {
-    "eslint": "^5.4.0",
+    "eslint": "^5.16.0",
     "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.14.0",
-    "gulp": "^3.9.1",
-    "gulp-eslint": "^5.0.0",
-    "gulp-mocha": "^6.0.0",
-    "istanbul": "^0.4.5",
-    "mocha": "^5.2.0",
+    "eslint-plugin-import": "^2.18.0",
+    "mocha": "^6.1.4",
+    "nyc": "^14.1.1",
     "should": "^13.2.3"
   },
   "engines": {

test/lib/config-wrapper_test.js

@@ -2,6 +2,7 @@
 
 const config = require('../../lib/config-wrapper.js');
 const config2 = require('../../lib/config-wrapper.js');
+require('should');
 
 describe('ConfigWrapper class', () => {
   it('Should expose the configuration', (done) => {

test/lib/config_test.js

@@ -2,6 +2,7 @@
 
 const Config = require('../../lib/config.js');
 const fixtures = require('../fixtures/config_fixtures.js');
+require('should');
 
 describe('Config class', () => {
   let config;

test/lib/file_test.js

@@ -1,6 +1,7 @@
 /* global it:false, describe:false, beforeEach:false */
 
 const File = require('../../lib/file.js');
+require('should');
 
 describe('File class', () => {
   let file;