eac_ruby_utils 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0ddfde05215993f63e4489e1b54cb4434d0dce6f9c7d401d985c229461ca106
-  data.tar.gz: 7f06d22a45ed253237e0033da8e07f90a327858352bc1cd99ac8396127a094af
+  metadata.gz: 6c932e97f7a56a87ac479e6897edc7726b810e7031c88049bcdaa674e3a47d8c
+  data.tar.gz: cf4eb48992f065f1ba1bc0fbd5c76951679c30f8133b3f2c36f7d82e162e27fb
 SHA512:
-  metadata.gz: d28f2608835e09ce813974309bbb87742118f71d294e907699575d99ed422a33d87d0af0528c8bdc8f200141fee74db6a9b54799fa55dd52c21c37981995d103
-  data.tar.gz: 507b28c0c90e84105ab30b62038857ea01b4f8b46de4d012a41e58b8fb31f63dce03f22ce3cb0a7387b77b7c4bd7c74f96f8262df6185e7d13d8284d45e966e0
+  metadata.gz: dde3dde0b173519bc0fcd6d799cd6896895087cce78310bd733fde0848b137674d5d11ff4cda4cc523a917ce7a0ca4228727c8c7e3d660c68ecbee13da02c93c
+  data.tar.gz: 9f4e4f8f8a9f48d2817f0496be6617860256888fc2a50abb37306837872e3f23aef35eb1f4bf654667b352379d90cd6312f64177e700d06670439772dbfb643e

data/lib/eac_ruby_utils/common_constructor.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/callbacks'
+
 module EacRubyUtils
   class CommonConstructor
     attr_reader :args, :options
@@ -25,14 +27,18 @@ module EacRubyUtils
     end
 
     def setup_class_initialize(klass)
+      klass.include(::ActiveSupport::Callbacks)
+      klass.define_callbacks :initialize
       klass.class_eval initialize_method_code, __FILE__, __LINE__
     end
 
     def initialize_method_code
       b = "def initialize(#{initialize_method_args_code})\n"
+      b += "  run_callbacks :initialize do\n"
       initialize_method_args.each do |arg|
         b += "  self.#{arg} = #{arg}\n"
       end
+      b += "  end\n"
       b += "end\n"
       b
     end

data/lib/eac_ruby_utils/configs.rb

@@ -54,7 +54,7 @@ module EacRubyUtils
 
     def storage_path_uncached
       path = options[:storage_path] || default_storage_path
-      return path if ::File.exist?(path)
+      return path if ::File.exist?(path) && ::File.size(path).positive?
 
       ::FileUtils.mkdir_p(::File.dirname(path))
       ::File.write(path, {}.to_yaml)

data/lib/eac_ruby_utils/console/configs.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/common_constructor'
 require 'eac_ruby_utils/configs'
 require 'eac_ruby_utils/console/speaker'
+require 'eac_ruby_utils/options_consumer'
+require 'eac_ruby_utils/patches/object/asserts'
+require 'eac_ruby_utils/simple_cache'
 
 module EacRubyUtils
   module Console
@@ -24,8 +28,9 @@ module EacRubyUtils
 
       attr_reader :configs
 
-      def initialize(configs_key)
-        @configs = ::EacRubyUtils::Configs.new(configs_key, autosave: true)
+      def initialize(configs_key, options = {})
+        options.assert_argument(::Hash, 'options')
+        @configs = ::EacRubyUtils::Configs.new(configs_key, options.merge(autosave: true))
       end
 
       def read_password(entry_key, options = {})
@@ -38,6 +43,7 @@ module EacRubyUtils
       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?
@@ -46,7 +52,7 @@ module EacRubyUtils
         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}\""
+        raise "No value found for entry \"#{entry_key}\"" if options[:required]
       end
 
       def store_passwords?
@@ -87,10 +93,43 @@ module EacRubyUtils
       end
 
       def entry_value_from_input(entry_key, options)
-        entry_value = request_input("Value for entry \"#{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
+
+      class ReadEntryOptions
+        include ::EacRubyUtils::SimpleCache
+        ::EacRubyUtils::CommonConstructor.new(:options).setup_class(self)
+
+        DEFAULT_VALUES = {
+          before_input: nil, bool: false, list: false, noecho: false, noenv: false, noinput: false,
+          required: true, validator: nil
+        }.freeze
+
+        def [](key)
+          values.fetch(key.to_sym)
+        end
+
+        def request_input_options
+          values.slice(:bool, :list, :noecho)
+        end
+
+        private
+
+        def values_uncached
+          consumer = ::EacRubyUtils::OptionsConsumer.new(options)
+          r = {}
+          DEFAULT_VALUES.each do |key, default_value|
+            value = consumer.consume(key)
+            value = default_value if value.nil?
+            r[key] = value
+          end
+          consumer.validate
+          r
+        end
+      end
     end
   end
 end

data/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport