mixlib-cli 2.0.3 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 130454764f2b0ccdeb5b1418e54096ca158d3abf3848d9f94ee8da72890c5bba
-  data.tar.gz: 0e5b392d7cedc3c3531379f3fafa931c98a11ec74873e72d7808832020c7ed98
+  metadata.gz: 68387a8a44b1950e412ec9223768a222b4c1660aa020612acab1469d30ffb329
+  data.tar.gz: 5aca34f4245d223175b88531c14950652211defd8fbe39ebdbac73d79e33f59d
 SHA512:
-  metadata.gz: 77131a784602b7034c9951e3af0ebb96682022e12b74c6633fc642c4b4da2674c4e141e5cebcc1b65bc32ff6b573e3bf0086e01082475cd5616b74a6b404efdc
-  data.tar.gz: 62b29885776ccb91a9347d708ed6546c34614a784247f2b4b3ab83f850441f6d096813ff8ca764eb4764d22d2a1abfe602853940e8b72f863ca3a43dc98b2d50
+  metadata.gz: aaf246f2fbcadda3e6ad29cdd9b2e0b6bc5b68b4471dbad56828ef499f2cfbbee9c00ffe7ca9543ef7c38d8f260711766a759bd7117885f758edd387fa9fe8ef
+  data.tar.gz: 944784207d6b274ec01b87bec93c23a98cfd1357a6a3f5cdf2c38de6fb3e71caf8c7f9c020ad7fc5aa539c459622003529e8c964461ba11f12d35c07c5d07d8f

data/lib/mixlib/cli.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# 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 << " (included in ['#{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 "or"
+    def friendly_opt_list(opt_array)
+      opts = opt_array.map { |x| "'#{x}'" }
+      return opts.join(" or ") if opts.size < 3
+      opts[0..-2].join(", ") + ", or " + opts[-1]
+    end
+
     def self.included(receiver)
       receiver.extend(Mixlib::CLI::ClassMethods)
       receiver.extend(Mixlib::CLI::InheritMethods)

data/lib/mixlib/cli/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   module CLI
-    VERSION = "2.0.3".freeze
+    VERSION = "2.0.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.6
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies: []
 description: A simple mixin for CLI interfaces, including option parsing
 email: info@chef.io
@@ -39,7 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A simple mixin for CLI interfaces, including option parsing