diff options
author | Tim Smith <tsmith@chef.io> | 2019-05-13 18:20:14 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-13 18:20:14 -0700 |
commit | b896e1f6d9a57dbef28ac798d03465d8224969c5 (patch) | |
tree | 8b2c93b709e6d199c98d575aa4ab11c6e240048f | |
parent | 5f0e3706dfc00c5175669720e04c4bff38a7d96f (diff) | |
parent | d76f128d462840a707b0941ee468ab09abfc6f74 (diff) | |
download | mixlib-cli-b896e1f6d9a57dbef28ac798d03465d8224969c5.tar.gz |
Merge pull request #59 from chef/btm/included_text
Improve the --help text output of 'in:'
-rw-r--r-- | lib/mixlib/cli.rb | 2 | ||||
-rw-r--r-- | 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 |