eac_cli 0.40.1 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c774c31dedbbb2c69f387f8b31ae0f38e90687b077a32efdabf5a4a657a12353
-  data.tar.gz: 87217fc7028a27c12a13045c87a5bd12c13f3acb183cf707b4c780dde8171ec4
+  metadata.gz: e47dbd4933f71d029f4fd1f19d84db730ecd3040c866c89725c6d02b81571fb3
+  data.tar.gz: 1b5093e85452bb32a228b94d4a71bc35fc0fd9c2f036d23d2c9f52e76b05047a
 SHA512:
-  metadata.gz: 5feea87d16a816c2a4e886c34ff756e68d611df4637e4bb7deea35b95f7e800c08964d7369c40832368f1cfb583ab80a1f49c626b52ac81eb5807ee5a13ceff5
-  data.tar.gz: 62153058635b53cd3fdda5406cf0d9e5c337fe8089c08232b1ee22672ceae3fa279e4ce95d370133f9bbc9d4d3bb5fa197c0232dad5ad701d362e2eb41c2d0d5
+  metadata.gz: 5eb9b2c2faa3b1e6beb70f09e16caaedf0061fbbd565c72d18228061896e0996d18f0375d3f569ca1ef3dc0ec5d333ea9157f44192c10a8981fa6e2ffaf8e086
+  data.tar.gz: b0120fe12a7dd9599a00f8288e7be2a6adde51796c4012f0a12b3df5f294c4bccd9bfb9e81becb8d562882b821e291906c9bbe010a076ee7d56fee57cf2ccb92

data/lib/eac_cli/runner_with/confirmation/input_result.rb

@@ -23,7 +23,13 @@ module EacCli
           # @param message [String]
           # @return [EacCli::RunnerWith::Confirmation::InputResult]
           def by_message(message)
-            new(input(message, list: INPUT_LIST))
+            new(input_value_by_speaker(message))
+          end
+
+          # @param message [String]
+          # @return [String]
+          def input_value_by_speaker(message)
+            input(message, list: INPUT_LIST, ignore_case: false)
           end
         end
 

data/lib/eac_cli/runner_with/confirmation.rb

@@ -18,14 +18,14 @@ module EacCli
         end
       end
 
+      # @param message [String, nil]
+      # @return [Boolean]
       def confirm?(message = nil)
         return for_all_answers.fetch(message) if for_all_answers.key?(message)
         return false if parsed.no?
         return true if parsed.yes?
 
-        r = confirm_input(message)
-        for_all_answers[message] = r.for_all?
-        r.confirm?
+        confirm_input_and_register(message)
       rescue ::EacCli::Speaker::InputRequested => e
         fatal_error e.message
       end
@@ -48,6 +48,14 @@ module EacCli
         )
       end
 
+      # @param message [String, nil]
+      # @return [Boolean]
+      def confirm_input_and_register(message)
+        r = confirm_input(message)
+        for_all_answers[message] = r.confirm? if r.for_all?
+        r.confirm?
+      end
+
       # @return [Hash<String, Boolean>]
       def for_all_answers_uncached
         {}

data/lib/eac_cli/speaker/list.rb

@@ -6,10 +6,14 @@ require 'ostruct'
 module EacCli
   class Speaker
     class List
+      VALUE_STRUCT = ::Struct.new(:key, :label, :value)
+
       class << self
-        def build(list)
-          return List.new(hash_to_values(list)) if list.is_a?(::Hash)
-          return List.new(array_to_values(list)) if list.is_a?(::Array)
+        # @param list [Array, Hash]
+        # @param options [Hash]
+        def build(list, options = {})
+          return List.new(hash_to_values(list), options) if list.is_a?(::Hash)
+          return List.new(array_to_values(list), options) if list.is_a?(::Array)
 
           raise "Invalid list: #{list} (#{list.class})"
         end
@@ -17,22 +21,38 @@ module EacCli
         private
 
         def hash_to_values(list)
-          list.map { |key, value| ::OpenStruct.new(key: key, label: key, value: value) } # rubocop:disable Style/OpenStructUse
+          list.map { |key, value| VALUE_STRUCT.new(key, key, value) }
         end
 
         def array_to_values(list)
-          list.map { |value| ::OpenStruct.new(key: value, label: value, value: value) }  # rubocop:disable Style/OpenStructUse
+          list.map { |value| VALUE_STRUCT.new(value, value, value) }
         end
       end
 
-      attr_reader :values
+      DEFAULT_IGNORE_CASE = true
+
+      enable_listable
+      lists.add_symbol :option, :ignore_case
 
-      def initialize(values)
-        @values = values.map do |v|
-          ::OpenStruct.new(key: to_key(v.key), label: to_label(v.label), value: v.value) # rubocop:disable Style/OpenStructUse
+      # @!attribute [r] values
+      #   @return [Array<VALUE_STRUCT>]
+      #   # @!attribute [r] options
+      #   @return [Hash]
+      # @!method initialize(values)
+      #   @param values [Array<VALUE_STRUCT>]
+      #   @param options [Hash]
+      common_constructor :values, :options, default: [{}] do
+        self.options = self.class.lists.option.hash_keys_validate!(options)
+        self.values = values.map do |v|
+          VALUE_STRUCT.new(to_key(v.key), to_label(v.label), v.value)
         end
       end
 
+      # @return [Boolean]
+      def ignore_case?
+        options.if_key(OPTION_IGNORE_CASE, DEFAULT_IGNORE_CASE, &:to_bool)
+      end
+
       def valid_labels
         values.map(&:label)
       end
@@ -41,8 +61,11 @@ module EacCli
         values.any? { |v| v.key == to_key(value) }
       end
 
+      # @param value [Object]
+      # @return [String]
       def to_key(value)
-        to_label(value).downcase
+        r = to_label(value)
+        ignore_case? ? r.downcase : r
       end
 
       def to_label(value)

data/lib/eac_cli/speaker/options.rb

@@ -7,7 +7,8 @@ module EacCli
     module Options
       common_concern do
         enable_listable
-        lists.add_symbol :option, :out_out, :err_out, :in_in, :parent, :err_line_prefix
+        lists.add_symbol :option, :out_out, :err_out, :in_in, :parent, :err_line_prefix,
+                         :ignore_case
       end
 
       def err_out
@@ -22,6 +23,11 @@ module EacCli
         option(OPTION_IN_IN, $stdin)
       end
 
+      # @return [Boolean]
+      def ignore_case
+        option(OPTION_IGNORE_CASE, nil)
+      end
+
       def err_line_prefix
         option(OPTION_ERR_LINE_PREFIX, '')
       end

data/lib/eac_cli/speaker/request_from_list.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_cli/speaker/list'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Speaker
+    class RequestFromList
+      acts_as_instance_method
+      enable_simple_cache
+      common_constructor :speaker, :question, :list_values, :noecho,
+                         :ignore_case
+
+      # @return [String]
+      def result
+        loop do
+          return list.build_value(input) if list.valid_value?(input)
+
+          speaker.warn "Invalid input: \"#{input}\" (Valid: #{list.valid_labels.join(', ')})"
+        end
+      end
+
+      protected
+
+      # @return [String]
+      def input_uncached
+        speaker.send(
+          :request_string,
+          "#{question} [#{list.valid_labels.join('/')}]",
+          noecho
+        )
+      end
+
+      # @return [EacCli::Speaker::List]
+      def list_uncached
+        list_options = {}
+        list_options[::EacCli::Speaker::List::OPTION_IGNORE_CASE] = ignore_case unless
+          ignore_case.nil?
+        ::EacCli::Speaker::List.build(list_values, list_options)
+      end
+    end
+  end
+end

data/lib/eac_cli/speaker.rb

@@ -52,9 +52,10 @@ module EacCli
     #   +list+ ([Hash] or [Array], default: +nil+): requires a answer from a list.
     #   +noecho+ ([Boolean], default: +false+): does not output answer.
     def input(question, options = {})
-      bool, list, noecho = options.to_options_consumer.consume_all(:bool, :list, :noecho)
+      bool, list, noecho, ignore_case =
+        options.to_options_consumer.consume_all(:bool, :list, :noecho, :ignore_case)
       if list
-        request_from_list(question, list, noecho)
+        request_from_list(question, list, noecho, ignore_case)
       elsif bool
         request_from_bool(question, noecho)
       else
@@ -96,17 +97,7 @@ module EacCli
     end
 
     def request_from_bool(question, noecho)
-      request_from_list(question, { yes: true, y: true, no: false, n: false }, noecho)
-    end
-
-    def request_from_list(question, list, noecho)
-      list = ::EacCli::Speaker::List.build(list)
-      loop do
-        input = request_string("#{question} [#{list.valid_labels.join('/')}]", noecho)
-        return list.build_value(input) if list.valid_value?(input)
-
-        warn "Invalid input: \"#{input}\" (Valid: #{list.valid_labels.join(', ')})"
-      end
+      request_from_list(question, { yes: true, y: true, no: false, n: false }, noecho, true)
     end
 
     def request_string(question, noecho)

data/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.40.1'
+  VERSION = '0.41.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.40.1
+  version: 0.41.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-17 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -178,6 +178,7 @@ files:
 - lib/eac_cli/speaker/input_requested.rb
 - lib/eac_cli/speaker/list.rb
 - lib/eac_cli/speaker/options.rb
+- lib/eac_cli/speaker/request_from_list.rb
 - lib/eac_cli/version.rb
 homepage: 
 licenses: []