cli-mastermind 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e6d02e18aa42a0c2c627dcdc76f2989b30a89c222bfd183a177a186f54c9953
-  data.tar.gz: 92541c8f669b777e89ba6c273b31f05ab3c51831653e4a2eacedd262d013ca10
+  metadata.gz: 6985ac774ff704f996e8e581b726bd5f04526040ea42b0d3e8a6b874d034c15e
+  data.tar.gz: d1b21815bf02e3c2466fd8ab946a4eb2470b9ea81b0e1ba3cd1e879614ae21c4
 SHA512:
-  metadata.gz: fbea7750593009ed092d09055dd5ee120a1ea3ee442a9576adff043d0d7214bee30f825956c99645e0eac2df177d739d505fc4efbf42a9c8ce7105f158be19ca
-  data.tar.gz: cc50ce47da3cc8aee137b85ae0c7bb04ca8060759a6e2a22999316ef3ee14e2a98ab5a36a41e354304158fad38c3651f642d425b912b765c525b70d689d06a7f
+  metadata.gz: 0e7b7f32271c7a7c309de2638b80197166e03519ccdda2a7779b86ab05c5be2e63d9e518993d178e6eeb190a5dbdb7ea52850aaa056ffcddc00a66fb034cb4ed
+  data.tar.gz: feccf940db4e9558056b6dc0afd5851c21051d72c7f4acf7ab167a128971b77285636f7aa14adc7c2078086be5054c72575e982d601357817a87765c5195562d

data/lib/cli/mastermind.rb

@@ -55,8 +55,8 @@ module CLI
       #
       # @see ArgParse.add_option
       #
-      # @param args arguments passed directly to OptionParser#on
-      # @param block [Proc] block passed as the handler for the above arguments
+      # @param args (see ArgParse.add_option)
+      # @param block (see ArgParse.add_option)
       # @return [Void]
       def add_argument(*args, &block)
         ArgParse.add_option(*args, &block)

data/lib/cli/mastermind/arg_parse.rb

@@ -13,7 +13,9 @@ module CLI::Mastermind
     class << self
       # @see ArgParse.add_option
       # @return [Array] a set of extra options added to the argument parser
-      attr_reader :extra_options
+      def extra_options
+        @extra_options ||= []
+      end
 
       # Adds arbitrary options to the argument parser.
       #

data/lib/cli/mastermind/user_interface.rb

@@ -70,9 +70,12 @@ module CLI::Mastermind::UserInterface
   #
   # @param question [String] the question to ask the user
   # @param default [String] the default answer
+  # @params opts [Hash] Additional options passed to CLI::UI.ask
+  # @option opts [Boolean] :is_file (nil) Use file autocompletion (tab completion)
+  # @option opts [Boolean] :allow_empty (true) Allow the answer to be empty
   # @return [String] the user's answer
-  def ask(question, default: nil)
-    CLI::UI.ask(question, default: default)
+  def ask(question, default: nil, **opts)
+    CLI::UI.ask(question, default: default, **opts)
   end
 
   # Ask the user a yes/no +question+
@@ -86,13 +89,16 @@ module CLI::Mastermind::UserInterface
 
   # Display an interactive list of options for the user to select.
   # If less than 2 options would be displayed, the default value is automatically
-  # returned.
+  # returned unless +multiple:+ is +true+.
   #
   # @param question [String] The question to ask the user
-  # @param options [Array<String>,Hash] the options to display
+  # @param options [Array<#to_s>,Hash<#to_s>] the options to display
   # @param default [String] The default value for this question.  Assumed to exist
   #   within the given options.
   # @param opts [Hash] additional options passed into +CLI::UI::Prompt.ask+.
+  # @option opts [Boolean] :multiple (false) Whether multiple selections should be made.
+  # @option opts [Boolean] :filter_ui (true) Enable option filtering
+  # @option opts [Boolean] :select_ui (true) Enable long-form option selection
   #
   # @see https://github.com/Shopify/cli-ui#interactive-prompts
   def select(question, options:, default: options.first, **opts)
@@ -112,14 +118,32 @@ module CLI::Mastermind::UserInterface
                   default_text = options.invert[default]
                 end
 
+                default_text = default_text
+
                 # dup so that we don't change whatever was passed in
                 options.dup.tap { |o| o.delete(default_text) }
               end
 
+    # Ensure all keys are strings for CLI::UI
+    default_text = default_text.to_s
+    options.transform_keys!(&:to_s)
+
+    # work around a bug in CLI::UI with multi-select and block invocation
+    if opts[:multiple]
+      # Put default at the beginning so it shows in the expected order
+      keys = [default_text] + options.keys
+
+      # Put default back into the options so it can be pulled out
+      options[default_text] = default
+
+      response = Array(CLI::UI::Prompt.ask(question, options: keys, **opts))
+      return response.map { |resp| options[resp] }
+    end
+
     return default unless options.count > 0
 
     CLI::UI::Prompt.ask(question, **opts) do |handler|
-      handler.option(default_text.to_s) { default }
+      handler.option(default_text) { default }
 
       options.each do |(text, value)|
         handler.option(text) { value }

data/lib/cli/mastermind/version.rb

@@ -8,7 +8,7 @@ module CLI
     module VERSION
       RELEASE = 1
       MAJOR = 3
-      MINOR = 0
+      MINOR = 1
       PATCH = nil
 
       STRING = [RELEASE, MAJOR, MINOR, PATCH].compact.join('.').freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cli-mastermind
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Chris Hall