From 32ee9105705e3484ddcb2953ed8675c50d5035e7 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Mon, 13 May 2019 19:23:59 -0700 Subject: Add more specs and use or not and This seems to make more sense Signed-off-by: Tim Smith --- lib/mixlib/cli.rb | 6 +++--- spec/mixlib/cli_spec.rb | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/mixlib/cli.rb b/lib/mixlib/cli.rb index 4141e4a..f3598e6 100644 --- a/lib/mixlib/cli.rb +++ b/lib/mixlib/cli.rb @@ -324,11 +324,11 @@ module Mixlib # @private # @param opt_arry [Array] # - # @return [String] a friendly quoted list of items complete with "and" + # @return [String] a friendly quoted list of items complete with "or" def friendly_opt_list(opt_array) opts = opt_array.map { |x| "'#{x}'" } - return opts.join(" and ") if opts.size < 3 - opts[0..-2].join(", ") + " and " + opts[-1] + return opts.join(" or ") if opts.size < 3 + opts[0..-2].join(", ") + ", or " + opts[-1] end def self.included(receiver) diff --git a/spec/mixlib/cli_spec.rb b/spec/mixlib/cli_spec.rb index 3adda52..4088f20 100644 --- a/spec/mixlib/cli_spec.rb +++ b/spec/mixlib/cli_spec.rb @@ -224,17 +224,25 @@ describe Mixlib::CLI do expect(@cli.config[:inclusion]).to eql("one") end - it "changes description if :in key is specified" do - TestCLI.option(:inclusion, short: "-i val", in: %w{one two}, description: "desc", required: false) + it "changes description if :in key is specified with a single value" do + TestCLI.option(:inclusion, short: "-i val", in: %w{one}, description: "desc", required: false) @cli = TestCLI.new @cli.parse_options(["-i", "one"]) - expect(@cli.options[:inclusion][:description]).to eql("desc (valid options: 'one' and 'two')") + expect(@cli.options[:inclusion][:description]).to eql("desc (valid options: 'one')") end - it "Raises SystemExit when the provided value is not a member of the :in array" do + it "changes description if :in key is specified with 2 values" do TestCLI.option(:inclusion, short: "-i val", in: %w{one two}, description: "desc", required: false) @cli = TestCLI.new - expect(lambda { @cli.parse_options(["-i", "three"]) }).to raise_error(SystemExit) + @cli.parse_options(["-i", "one"]) + expect(@cli.options[:inclusion][:description]).to eql("desc (valid options: 'one' or 'two')") + end + + it "changes description if :in key is specified with 3 values" do + TestCLI.option(:inclusion, short: "-i val", in: %w{one two three}, description: "desc", required: false) + @cli = TestCLI.new + @cli.parse_options(["-i", "one"]) + expect(@cli.options[:inclusion][:description]).to eql("desc (valid options: 'one', 'two', or 'three')") end it "doesn't exit if a required option is specified" do -- cgit v1.2.1