From d76f128d462840a707b0941ee468ab09abfc6f74 Mon Sep 17 00:00:00 2001 From: Bryan McLellan Date: Mon, 13 May 2019 14:03:05 -0400 Subject: Improve the --help text output of 'in:' The automatic addition of the 'in' options to the --help output could be more clear about what the list is. Signed-off-by: Bryan McLellan --- lib/mixlib/cli.rb | 2 +- spec/mixlib/cli_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mixlib/cli.rb b/lib/mixlib/cli.rb index 0516926..cfc642d 100644 --- a/lib/mixlib/cli.rb +++ b/lib/mixlib/cli.rb @@ -313,7 +313,7 @@ module Mixlib if opt_setting.key?(:description) description = opt_setting[:description].dup description << " (required)" if opt_setting[:required] - description << " (included in ['#{opt_setting[:in].join("', '")}'])" if opt_setting[:in] + description << " (valid options are: ['#{opt_setting[:in].join("', '")}'])" if opt_setting[:in] opt_setting[:description] = description arguments << description end diff --git a/spec/mixlib/cli_spec.rb b/spec/mixlib/cli_spec.rb index aa08744..c9bc5e4 100644 --- a/spec/mixlib/cli_spec.rb +++ b/spec/mixlib/cli_spec.rb @@ -228,7 +228,7 @@ describe Mixlib::CLI do TestCLI.option(:inclusion, short: "-i val", in: %w{one two}, description: "desc", required: false) @cli = TestCLI.new @cli.parse_options(["-i", "one"]) - expect(@cli.options[:inclusion][:description]).to eql("desc (included in ['one', 'two'])") + expect(@cli.options[:inclusion][:description]).to eql("desc (valid options are: ['one', 'two'])") end it "doesn't exit if a required option is specified" do -- cgit v1.2.1