cli: cleaning up --watch and --no-watch option

cssCheck · Dec 4, 2017 · d19417c · d19417c
1 parent d9e18e9
commit d19417c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/lib/cli.js b/lib/cli.js
@@ -27,7 +27,7 @@ module.exports = function broccoliCLI(args) {
     .option('--output-path <path>', 'the path to target output folder')
     .option('--no-watch', 'turn off the watcher')
     .action(options => {
-      const Watcher = options.watch ? broccoli.Watcher : broccoli.DummyWatcher;
+      const Watcher = getWatcher(options.watch);
       const outputDir = options.outputPath;
       const builder = getBuilder({ brocfilePath: options.brocfilePath });
       const watcher = new Watcher(builder);
@@ -52,7 +52,7 @@ module.exports = function broccoliCLI(args) {
     .option('--output-path <path>', 'the path to target output folder')
     .option('--watch', 'turn on the watcher')
     .action((outputDir, options) => {
-      const Watcher = options.watch ? broccoli.Watcher : broccoli.DummyWatcher;
+      const Watcher = getWatcher(options.watch);
 
       if (outputDir && options.outputPath) {
         console.error('option --output-path and [target] cannot be passed at same time');
@@ -117,6 +117,10 @@ function getBuilder(options) {
   return new broccoli.Builder(broccoli.loadBrocfile(options.brocfilePath));
 }
 
+function getWatcher(isWatching) {
+  return isWatching ? broccoli.Watcher : require('./dummy-watcher');
+}
+
 function guardOutputDir(outputDir) {
   if (fs.existsSync(outputDir)) {
     console.error(outputDir + '/ already exists; we cannot build into an existing directory');

diff --git a/lib/index.js b/lib/index.js
@@ -13,9 +13,6 @@ module.exports = {
   get getMiddleware() {
     return require('./middleware');
   },
-  get DummyWatcher() {
-    return require('./dummy-watcher');
-  },
   get Watcher() {
     return require('./watcher');
   },

diff --git a/test/cli_test.js b/test/cli_test.js
@@ -7,6 +7,7 @@ const sinon = require('sinon').createSandbox();
 const sinonChai = require('sinon-chai');
 
 const Builder = require('../lib/builder');
+const DummyWatcher = require('../lib/dummy-watcher');
 const broccoli = require('../lib/index');
 const cli = require('../lib/cli');
 const loadBrocfile = require('../lib/load_brocfile');
@@ -239,11 +240,7 @@ describe('cli', function() {
         server
           .expects('serve')
           .once()
-          .withArgs(
-            sinon.match.instanceOf(broccoli.DummyWatcher),
-            sinon.match.string,
-            sinon.match.number
-          );
+          .withArgs(sinon.match.instanceOf(DummyWatcher), sinon.match.string, sinon.match.number);
         cli(['node', 'broccoli', 'serve', '--no-watch']);
         server.verify();
       });