From 552319d566b65f63fd2f11267ad4d177930a69e0 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Mon, 13 May 2019 19:16:50 -0700 Subject: Print out human readable lists of allowed CLI options Give a nice friendly sentence and not an array. This uses the code we nuked from chef/chef that did the same. Signed-off-by: Tim Smith --- lib/mixlib/cli.rb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/mixlib/cli.rb b/lib/mixlib/cli.rb index cfc642d..4141e4a 100644 --- a/lib/mixlib/cli.rb +++ b/lib/mixlib/cli.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob () -# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. +# Copyright:: Copyright (c) 2008-2019 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -243,7 +243,7 @@ module Mixlib end if config[opt_key] && !opt_value[:in].include?(config[opt_key]) reqarg = opt_value[:short] || opt_value[:long] - puts "#{reqarg}: #{config[opt_key]} is not included in the list ['#{opt_value[:in].join("', '")}'] " + puts "#{reqarg}: #{config[opt_key]} is not one of the allowed values: #{friendly_opt_list(opt_value[:in])}" puts @opt_parser exit 2 end @@ -313,7 +313,7 @@ module Mixlib if opt_setting.key?(:description) description = opt_setting[:description].dup description << " (required)" if opt_setting[:required] - description << " (valid options are: ['#{opt_setting[:in].join("', '")}'])" if opt_setting[:in] + description << " (valid options: #{friendly_opt_list(opt_setting[:in])})" if opt_setting[:in] opt_setting[:description] = description arguments << description end @@ -321,6 +321,16 @@ module Mixlib arguments end + # @private + # @param opt_arry [Array] + # + # @return [String] a friendly quoted list of items complete with "and" + 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] + end + def self.included(receiver) receiver.extend(Mixlib::CLI::ClassMethods) receiver.extend(Mixlib::CLI::InheritMethods) -- cgit v1.2.1