Switch to using config module

Author: Dom Harrington

cli.js

@@ -1,10 +1,9 @@
 require('colors');
 
 const path = require('path');
+const config = require('config');
 
-const utils = require('./utils');
-
-function load(config, command = 'help') {
+function load(command = 'help') {
   const file = path.join(__dirname, 'lib', `${command}.js`);
   try {
     // eslint-disable-next-line global-require, import/no-dynamic-require
@@ -15,14 +14,12 @@ function load(config, command = 'help') {
     process.exitCode = 1;
     return undefined;
   }
-};
+}
 
 module.exports = function(args, opts = {}) {
-  const config = utils.config(opts.env);
-
-  const command = load(config, args[0]);
+  const command = load(args[0]);
 
   if (!command) return;
 
-  command.run(config, { args, opts });
+  command.run({ args, opts });
 };

config/config.json

@@ -0,0 +1,5 @@
+module.exports = {
+  // eslint-disable-next-line global-require
+  cli: require('../package.json').name,
+  host: 'https://dash.readme.io',
+};

config/default.js

@@ -0,0 +1,3 @@
+{
+  "host": "http://dash.readme.local:3000"
+}

config/development.json

@@ -0,0 +1 @@
+{}

config/test.json

@@ -1,6 +1,7 @@
 const request = require('request');
 const fs = require('fs');
 const path = require('path');
+const config = require('config');
 
 exports.desc = 'Upload your swagger file to ReadMe';
 exports.category = 'services';
@@ -14,7 +15,7 @@ function defaultCallback(err) {
   return process.exit();
 }
 
-exports.run = function(config, info, cb = defaultCallback) {
+exports.run = function(info, cb = defaultCallback) {
   const [apiKey, id] = info.opts.token.split('-');
 
   function callback(err, response, data) {
@@ -39,8 +40,8 @@ exports.run = function(config, info, cb = defaultCallback) {
   };
 
   if (!id) {
-    request.post(`${config.host.url}/api/v1/swagger`, options, callback);
+    request.post(`${config.host}/api/v1/swagger`, options, callback);
   } else {
-    request.put(`${config.host.url}/api/v1/swagger/${id}`, options, callback);
+    request.put(`${config.host}/api/v1/swagger/${id}`, options, callback);
   }
 };

config/testing.json

@@ -28,6 +28,7 @@
   "main": "index.js",
   "dependencies": {
     "colors": "^1.1.2",
+    "config": "^1.30.0",
     "minimist": "^1.2.0",
     "request": "^2.81.0"
   },
@@ -47,12 +48,15 @@
     "test": "jest --coverage"
   },
   "jest": {
+    "setupFiles": [
+      "./test/set-node-env"
+    ],
     "coverageThreshold": {
       "global": {
-        "branches": 15,
-        "functions": 20,
-        "lines": 40,
-        "statements": 40
+        "branches": 40,
+        "functions": 80,
+        "lines": 80,
+        "statements": 75
       }
     }
   }

lib/swagger.js

@@ -0,0 +1 @@
+process.env.NODE_ENV = 'testing';