eac_ruby_utils 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 745395714bcf0d3d8679fb92457c99b22583c42aa3e1808bad1b109f3a8934dc
-  data.tar.gz: 0a77a27b857495a4af57620b94ee65044bed25f642b2f3056410ef44466bbe07
+  metadata.gz: 36ad6529aeb2cd18a50fdd7ee4af8be6e3cd7157d41ff48352e5bc82b32fefc9
+  data.tar.gz: 32503898f9f75eebcd106a990ac11560b32ef0a6f6b2511e9a62e05bc0ce42e9
 SHA512:
-  metadata.gz: 051cd01d18d22646d4c8d1688f755c2a9a3360deb1d650a770aca52daab3e6c84045f6f3d8378602db1781a28aab27545f3b332dba812856fc04848d891f11b6
-  data.tar.gz: 01cc5a7fc5fbf3d0de63e24a7cc066c30ffa7b3bb0027f9469ecec8619196642e4809e7e531972e64cb3c6100ea494ddf2e223d0ad856ce1e59f9716de21cd2e
+  metadata.gz: b6e09038246c4300dc4c087cfbd8501f18e528bc988be179fd11ec7675a5dfa8ec0f04fb9e588265d46fa96fb76f5639b74eec4bb5e49f1f1b133213dfdd6841
+  data.tar.gz: cde052825e985ffb6be03b9aadae9344edf612536a248cb1cb5a57df8dc1226fee5df2c20e497d3913ed3ad33e39ff907155799a0b7303b5edc4e6cec500117e

data/lib/eac_ruby_utils/console/speaker/list.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'active_support/hash_with_indifferent_access'
+require 'ostruct'
+
+module EacRubyUtils
+  module Console
+    module Speaker
+      class List
+        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)
+            raise "Invalid list: #{list} (#{list.class})"
+          end
+
+          private
+
+          def hash_to_values(list)
+            list.map { |key, value| ::OpenStruct.new(key: key, label: key, value: value) }
+          end
+
+          def array_to_values(list)
+            list.map { |value| ::OpenStruct.new(key: value, label: value, value: value) }
+          end
+        end
+
+        attr_reader :values
+
+        def initialize(values)
+          @values = values.map do |v|
+            ::OpenStruct.new(key: to_key(v.key), label: to_label(v.label), value: v.value)
+          end
+        end
+
+        def valid_labels
+          values.map(&:label)
+        end
+
+        def valid_value?(value)
+          values.any? { |v| v.key == to_key(value) }
+        end
+
+        def to_key(value)
+          to_label(value).downcase
+        end
+
+        def to_label(value)
+          value.to_s.strip
+        end
+
+        def build_value(value)
+          key = to_key(value)
+          values.each do |v|
+            return v.value if v.key == key
+          end
+          raise "Value not found: \"#{value}\" (#{values})"
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/console/speaker.rb

@@ -2,6 +2,8 @@
 
 require 'colorize'
 require 'io/console'
+require 'eac_ruby_utils/options_consumer'
+require 'eac_ruby_utils/console/speaker/list'
 
 module EacRubyUtils
   module Console
@@ -41,13 +43,15 @@ module EacRubyUtils
       end
 
       def request_input(question, options = {})
-        STDERR.write "#{question}: ".to_s.yellow
-        if options[:noecho]
-          r = STDIN.noecho(&:gets).chomp.strip
-          STDERR.write("\n")
-          r
+        options = ::EacRubyUtils::OptionsConsumer.new(options)
+        bool, list, noecho = options.consume_all(:bool, :list, :noecho)
+        options.validate
+        if list
+          request_from_list(question, list, noecho)
+        elsif bool
+          request_from_bool(question, noecho)
         else
-          STDIN.gets.chomp.strip
+          request_string(question, noecho)
         end
       end
 
@@ -66,6 +70,46 @@ module EacRubyUtils
       def success(string)
         puts string.to_s.green
       end
+
+      private
+
+      def list_value(list, input)
+        values = list_values(list)
+        return input, true unless values
+        return input, false unless values.include?(input)
+      end
+
+      def list_values(list)
+        if list.is_a?(::Hash)
+          list.keys.map(&:to_s)
+        elsif list.is_a?(::Array)
+          list.map(&:to_s)
+        end
+      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 = ::EacRubyUtils::Console::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
+      end
+
+      def request_string(question, noecho)
+        STDERR.write "#{question}: ".to_s.yellow
+        if noecho
+          r = STDIN.noecho(&:gets).chomp.strip
+          STDERR.write("\n")
+          r
+        else
+          STDIN.gets.chomp.strip
+        end
+      end
     end
   end
 end

data/lib/eac_ruby_utils/options_consumer.rb

@@ -16,6 +16,10 @@ module EacRubyUtils
       value
     end
 
+    def consume_all(*keys)
+      keys.map { |key| consume(key) }
+    end
+
     def validate
       return if data.empty?
 

data/lib/eac_ruby_utils/patch.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class << self
+    def patch(target, patch)
+      return if target.included_modules.include?(patch)
+      target.send(:include, patch)
+    end
+  end
+end

data/lib/eac_ruby_utils/require_sub.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class << self
+    def require_sub(file)
+      Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].each do |path|
+        require path
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.10.1'
+  VERSION = '0.11.0'
 end

data/lib/eac_ruby_utils.rb

@@ -8,8 +8,10 @@ module EacRubyUtils
   require 'eac_ruby_utils/envs'
   require 'eac_ruby_utils/listable'
   require 'eac_ruby_utils/options_consumer'
+  require 'eac_ruby_utils/patch'
   require 'eac_ruby_utils/patches'
   require 'eac_ruby_utils/paths_hash'
+  require 'eac_ruby_utils/require_sub'
   require 'eac_ruby_utils/simple_cache'
   require 'eac_ruby_utils/yaml'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-11 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,6 +112,7 @@ files:
 - lib/eac_ruby_utils/console/docopt_runner/_settings.rb
 - lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb
 - lib/eac_ruby_utils/console/speaker.rb
+- lib/eac_ruby_utils/console/speaker/list.rb
 - lib/eac_ruby_utils/contextualizable.rb
 - lib/eac_ruby_utils/envs.rb
 - lib/eac_ruby_utils/envs/base_env.rb
@@ -129,6 +130,7 @@ files:
 - lib/eac_ruby_utils/listable/string_list.rb
 - lib/eac_ruby_utils/listable/value.rb
 - lib/eac_ruby_utils/options_consumer.rb
+- lib/eac_ruby_utils/patch.rb
 - lib/eac_ruby_utils/patches.rb
 - lib/eac_ruby_utils/patches/hash.rb
 - lib/eac_ruby_utils/patches/hash/options_consumer.rb
@@ -136,6 +138,7 @@ files:
 - lib/eac_ruby_utils/patches/object.rb
 - lib/eac_ruby_utils/patches/object/asserts.rb
 - lib/eac_ruby_utils/paths_hash.rb
+- lib/eac_ruby_utils/require_sub.rb
 - lib/eac_ruby_utils/simple_cache.rb
 - lib/eac_ruby_utils/version.rb
 - lib/eac_ruby_utils/yaml.rb