fix: CLI usage simplified

snyk · Aug 24, 2016 · 3ea82dd · 3ea82dd
1 parent d3219f0
commit 3ea82dd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/cli/exec.js b/cli/exec.js
@@ -6,9 +6,11 @@ module.exports = (args) => {
     throw new Error(`unknown command "${command}"`);
   }
 
-  if (args.logs) {
+  if (args.verbose) {
     require('debug').enable('broker*');
   }
 
-  require(`${__dirname}/../lib/${command}`)(args);
+  args.client = command === 'client';
+
+  require(`${__dirname}/../lib/index`).main(args);
 };
diff --git a/cli/index.js b/cli/index.js
@@ -6,7 +6,7 @@ clite({
     _: 'cli/exec',
   },
   options: ['env', 'port'],
-  alias: { V: 'verbose' },
+  alias: { V: 'verbose', 'v': 'version' },
   booleans: [
     'verbose',
   ],

diff --git a/lib/index.js b/lib/index.js
@@ -7,10 +7,13 @@ const app = module.exports = {
   main: main,
 };
 
-function main({ port } = {}) {
+function main({ port, client } = {}) {
   // note: the config is loaded in the main function to allow us to mock in tests
   const config = require('./config');
-  const client = !!config.brokerUrl;
+  if (client === undefined) {
+    client = !!config.brokerUrl;
+  }
+
   const method = client ? 'client' : 'server';
   process.env.BROKER_TYPE = method;