eac_ruby_utils 0.51.0 → 0.51.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db10c1ceaf0bbf46f4d4bb60de583c5bd0e9dcb4d9e836919ba4cbb3da526583
-  data.tar.gz: 9f84d861c34de8496ff30bb5bc14bf376bfba47a81c7ace9e8e51e006d44f4de
+  metadata.gz: 247be76881888a818e9c8d0c5970ee9068b8fe1edade1d73855916581279b5fc
+  data.tar.gz: ca9aaf7f3c0c82f26a3a44b50844f0326c06855b0163b60c9238aaf450f235b9
 SHA512:
-  metadata.gz: c61d5b10f2981624324aaa7cee8f1c554e1521814fd158f43701d42391fcb4f29b8e2b55b799f887f1434ee47ea032108ae96136fd8200fde7fbe8181fe8efab
-  data.tar.gz: 3339282f35c34c843b500a0d37a025a6f53be072e495771d6262d08fda8c3957dad6feedbc82d0b6bfdb1eeebc1cc8a6f9c183f5071f1e90cd205a9c79404e71
+  metadata.gz: ccb0243f0fa95ae62218ffdb260a78e998d748fd879cf20424465c94389a91038ed704d4073fa9b1875622bd7d38a995de3110209d1c1bba32a58df4cd6ba74a
+  data.tar.gz: 65d8e17a1e7b2d10ddb49b0404c6e4a9176e227c31d70dd0e3af49254ecc6bc3a39052420e580bc5c70a18ad63e0a0d88c049c69f22bf76898b221efcda14a87

data/lib/eac_ruby_utils/console/configs.rb

@@ -11,18 +11,10 @@ module EacRubyUtils
 
       class << self
         def entry_key_to_envvar_name(entry_key)
-          path = if entry_key.is_a?(::Array)
-                   entry_key
-                 else
-                   ::EacRubyUtils::PathsHash.parse_entry_key(entry_key)
-                 end
-          path.join('_').gsub(/[^a-z0-9_]/i, '').gsub(/\A_+/, '').gsub(/_+\z/, '')
-              .gsub(/_{2,}/, '_').upcase
+          ::EacRubyUtils::Console::Configs::EntryReader.entry_key_to_envvar_name(entry_key)
         end
       end
 
-      STORE_PASSWORDS_KEY = 'core.store_passwords'
-
       attr_reader :configs
 
       def initialize(configs_key, options = {})
@@ -31,72 +23,15 @@ module EacRubyUtils
       end
 
       def read_password(entry_key, options = {})
-        options = ReadEntryOptions.new(options.merge(noecho: true))
-        if store_passwords?
-          read_entry(entry_key, options)
-        else
-          looped_entry_value_from_input(entry_key, options)
-        end
+        ::EacRubyUtils::Console::Configs::PasswordEntryReader.new(self, entry_key, options).read
       end
 
       def read_entry(entry_key, options = {})
-        options = ReadEntryOptions.new(options)
-        unless options[:noenv]
-          envvar_value = envvar_read_entry(entry_key)
-          return envvar_value if envvar_value.present?
-        end
-        stored_value = configs.read_entry(entry_key)
-        return stored_value if stored_value
-        return read_entry_from_console(entry_key, options) unless options[:noinput]
-
-        raise "No value found for entry \"#{entry_key}\"" if options[:required]
+        ::EacRubyUtils::Console::Configs::EntryReader.new(self, entry_key, options).read
       end
 
       def store_passwords?
-        read_entry(
-          STORE_PASSWORDS_KEY,
-          before_input: -> { store_password_banner },
-          validator: ->(entry_value) { %w[yes no].include?(entry_value) }
-        ) == 'yes'
-      end
-
-      protected
-
-      def envvar_read_entry(entry_key)
-        env_entry_key = self.class.entry_key_to_envvar_name(entry_key)
-        return nil unless ENV.key?(env_entry_key)
-
-        ENV.fetch(env_entry_key).if_present(::EacRubyUtils::BlankNotBlank.instance)
-      end
-
-      def read_entry_from_console(entry_key, options)
-        options[:before_input].call if options[:before_input].present?
-        entry_value = looped_entry_value_from_input(entry_key, options)
-        configs.write_entry(entry_key, entry_value)
-        entry_value
-      end
-
-      def store_password_banner
-        infom 'Do you wanna to store passwords?'
-        infom "Warning: the passwords will be store in clear text in \"#{configs.storage_path}\""
-        infom 'Enter "yes" or "no"'
-      end
-
-      def looped_entry_value_from_input(entry_key, options)
-        loop do
-          entry_value = entry_value_from_input(entry_key, options)
-          next if entry_value.blank?
-          next if options[:validator] && !options[:validator].call(entry_value)
-
-          return entry_value
-        end
-      end
-
-      def entry_value_from_input(entry_key, options)
-        entry_value = request_input("Value for entry \"#{entry_key}\"",
-                                    options.request_input_options)
-        warn('Entered value is blank') if entry_value.blank?
-        entry_value
+        ::EacRubyUtils::Console::Configs::StorePasswordsEntryReader.new(self) == 'yes'
       end
     end
   end

data/lib/eac_ruby_utils/console/configs/entry_reader.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/configs/read_entry_options'
+require 'eac_ruby_utils/core_ext'
+
+module EacRubyUtils
+  module Console
+    class Configs
+      class EntryReader
+        enable_console_speaker
+
+        class << self
+          def entry_key_to_envvar_name(entry_key)
+            path = if entry_key.is_a?(::Array)
+                     entry_key
+                   else
+                     ::EacRubyUtils::PathsHash.parse_entry_key(entry_key)
+                   end
+            path.join('_').gsub(/[^a-z0-9_]/i, '').gsub(/\A_+/, '').gsub(/_+\z/, '')
+                .gsub(/_{2,}/, '_').upcase
+          end
+        end
+
+        common_constructor :console_configs, :entry_key, :options do
+          self.options = ::EacRubyUtils::Console::Configs::ReadEntryOptions.new(options)
+        end
+
+        def read
+          %w[envvars storage console].each do |suffix|
+            value = send("read_from_#{suffix}")
+            return value if value.present?
+          end
+          return nil unless options[:required]
+
+          raise "No value found for entry \"#{entry_key}\""
+        end
+
+        def read_from_storage
+          console_configs.configs.read_entry(entry_key)
+        end
+
+        def read_from_envvars
+          return if options[:noenv]
+
+          env_entry_key = self.class.entry_key_to_envvar_name(entry_key)
+          return unless ENV.key?(env_entry_key)
+
+          ENV.fetch(env_entry_key).if_present(::EacRubyUtils::BlankNotBlank.instance)
+        end
+
+        def read_from_console
+          return if options[:noinput]
+
+          options[:before_input].if_present(&:call)
+          entry_value = looped_entry_value_from_input
+          console_configs.configs.write_entry(entry_key, entry_value) if options[:store]
+          entry_value
+        end
+
+        private
+
+        def looped_entry_value_from_input
+          loop do
+            entry_value = entry_value_from_input(entry_key, options)
+            next if entry_value.blank?
+            next if options[:validator] && !options[:validator].call(entry_value)
+
+            return entry_value
+          end
+        end
+
+        def entry_value_from_input(entry_key, options)
+          entry_value = request_input("Value for entry \"#{entry_key}\"",
+                                      options.request_input_options)
+          warn('Entered value is blank') if entry_value.blank?
+          entry_value
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/console/configs/password_entry_reader.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/configs/entry_reader'
+
+module EacRubyUtils
+  module Console
+    class Configs
+      class PasswordEntryReader < ::EacRubyUtils::Console::Configs::EntryReader
+        ENTRY_KEY = 'core.store_passwords'
+
+        def initialize(console_configs, entry_key, options = {})
+          super(console_configs, entry_key, options.merge(noecho: true,
+                                                          store: console_configs.store_passwords?))
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/console/configs/read_entry_options.rb

@@ -7,13 +7,18 @@ module EacRubyUtils
     class Configs
       class ReadEntryOptions
         enable_simple_cache
-        common_constructor :options
+        common_constructor :options do
+          self.options = options.to_h.symbolize_keys
+                                .assert_valid_keys(DEFAULT_VALUES.keys).freeze
+        end
 
         DEFAULT_VALUES = {
           before_input: nil, bool: false, list: false, noecho: false, noenv: false, noinput: false,
-          required: true, validator: nil
+          required: true, store: true, validator: nil
         }.freeze
 
+        delegate :to_h, to: :options
+
         def [](key)
           values.fetch(key.to_sym)
         end

data/lib/eac_ruby_utils/console/configs/store_passwords_entry_reader.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/configs/entry_reader'
+
+module EacRubyUtils
+  module Console
+    class Configs
+      class StorePasswordsEntryReader < ::EacRubyUtils::Console::Configs::EntryReader
+        ENTRY_KEY = 'core.store_passwords'
+
+        def initialize(console_configs)
+          super(console_configs, ENTRY_KEY,
+            before_input: -> { banner },
+            validator: ->(entry_value) { %w[yes no].include?(entry_value) }
+          )
+        end
+
+        def banner
+          infom 'Do you wanna to store passwords?'
+          infom 'Warning: the passwords will be store in clear text in ' \
+            "\"#{console_configs.configs.storage_path}\""
+          infom 'Enter "yes" or "no"'
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.51.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,7 +119,10 @@ files:
 - lib/eac_ruby_utils/configs/file.rb
 - lib/eac_ruby_utils/console.rb
 - lib/eac_ruby_utils/console/configs.rb
+- lib/eac_ruby_utils/console/configs/entry_reader.rb
+- lib/eac_ruby_utils/console/configs/password_entry_reader.rb
 - lib/eac_ruby_utils/console/configs/read_entry_options.rb
+- lib/eac_ruby_utils/console/configs/store_passwords_entry_reader.rb
 - lib/eac_ruby_utils/console/docopt_runner.rb
 - lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb
 - lib/eac_ruby_utils/console/docopt_runner/_doc.rb