Merge pull request #1292 from apiaryio/honzajavorek/options

Require options where they're used
apiaryio · Apr 1, 2019 · a3d103c · a3d103c
2 parents e40f7c7 + 6617222
commit a3d103c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/CLI.js b/lib/CLI.js
@@ -13,8 +13,10 @@ const logger = require('./logger');
 const { applyLoggingOptions } = require('./configuration');
 const { spawn } = require('./childProcess');
 
+const dreddOptions = require('./options');
 const packageData = require('../package.json');
 
+
 class CLI {
   constructor(options = {}, cb) {
     this.cb = cb;
@@ -47,7 +49,7 @@ Or:
 Example:
   $ dredd ./api-description.apib http://127.0.0.1:3000 --dry-run\
 `)
-      .options(Dredd.options)
+      .options(dreddOptions)
       .wrap(80);
 
     this.argv = this.optimist.argv;

diff --git a/lib/Dredd.js b/lib/Dredd.js
@@ -13,7 +13,6 @@ const resolveLocations = require('./resolveLocations');
 const logger = require('./logger');
 const Runner = require('./TransactionRunner');
 const { applyConfiguration } = require('./configuration');
-const options = require('./options.json');
 
 
 const PROXY_ENV_VARIABLES = ['HTTP_PROXY', 'HTTPS_PROXY', 'NO_PROXY'];
@@ -251,5 +250,5 @@ Is the provided path correct?
   }
 }
 
+
 module.exports = Dredd;
-module.exports.options = options;