fix(help): add onlyOptions argument to configureOptions

Author: acburdine

lib/command.js

@@ -132,17 +132,21 @@ class Command {
      * @method configureOptions
      * @public
      */
-    static configureOptions(commandName, yargs) {
+    static configureOptions(commandName, yargs, extensions, onlyOptions) {
+        each(this.options || {}, (option, optionName) => {
+            yargs = yargs.option(kebabCase(optionName), option);
+        });
+
+        if (onlyOptions) {
+            return yargs;
+        }
+
         if (this.longDescription) {
             yargs.usage(this.longDescription);
         }
 
         yargs.epilogue('For more information, see our docs at https://docs.ghost.org/docs/ghost-cli');
 
-        each(this.options || {}, (option, optionName) => {
-            yargs = yargs.option(kebabCase(optionName), option);
-        });
-
         return yargs;
     }
 

lib/commands/install.js

@@ -19,7 +19,7 @@ const SetupCommand = require('./setup');
 class InstallCommand extends Command {
     static configureOptions(commandName, yargs, extensions) {
         yargs = super.configureOptions(commandName, yargs, extensions);
-        return SetupCommand.configureOptions('setup', yargs, extensions);
+        return SetupCommand.configureOptions('setup', yargs, extensions, true);
     }
 
     run(argv) {

lib/commands/setup.js

@@ -13,7 +13,7 @@ const StartCommand   = require('./start');
 const ConfigCommand  = require('./config');
 
 class SetupCommand extends Command {
-    static configureOptions(commandName, yargs, extensions) {
+    static configureOptions(commandName, yargs, extensions, onlyOptions) {
         extensions.forEach((extension) => {
             let options = get(extension, 'config.options.setup', false);
             if (!options) {
@@ -23,9 +23,9 @@ class SetupCommand extends Command {
             Object.assign(this.options, omit(options, Object.keys(this.options)));
         });
 
-        yargs = super.configureOptions(commandName, yargs, extensions);
-        yargs = ConfigCommand.configureOptions('config', yargs, extensions);
-        yargs = StartCommand.configureOptions('start', yargs, extensions);
+        yargs = super.configureOptions(commandName, yargs, extensions, onlyOptions);
+        yargs = ConfigCommand.configureOptions('config', yargs, extensions, true);
+        yargs = StartCommand.configureOptions('start', yargs, extensions, true);
     }
 
     constructor(ui, system) {

test/unit/command-spec.js

@@ -135,6 +135,31 @@ describe('Unit: Command', function () {
             expect(optionStub.args[1][1]).to.deep.equal({alias: 'c', description: 'test kebab-case'});
             expect(result).to.deep.equal(yargsStub);
         });
+
+        it('skips adding epilogue and usage if onlyOptions is true', function () {
+            let TestCommand = class extends Command {}
+            TestCommand.options = {
+                flag: {
+                    alias: 'f',
+                    description: 'a flag'
+                }
+            };
+            TestCommand.longDescription = 'LONG DESCRIPTION';
+            let yargsStub = {};
+            let optionStub = sinon.stub().returns(yargsStub);
+            let epilogueStub = sinon.stub();
+            let usageStub = sinon.stub();
+            yargsStub.option = optionStub;
+            yargsStub.epilogue = epilogueStub;
+
+            let result = TestCommand.configureOptions('test', yargsStub, [], true);
+
+            expect(epilogueStub.called).to.be.false;
+            expect(usageStub.called).to.be.false;
+            expect(optionStub.calledOnce).to.be.true;
+            expect(optionStub.args[0]).to.deep.equal(['flag', {alias: 'f', description: 'a flag'}]);
+            expect(result).to.deep.equal(yargsStub);
+        });
     });
 
     describe('_run', function () {