eac_ruby_utils 0.56.0 → 0.57.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9359fc40aed41fdc0eb2b7570bff084403a0a1aec9803d3581e2cc1b27f5318c
-  data.tar.gz: '0749a1a5ec6ec7e31701f8cf18af86a8fd0a8cf6f3e7d62df1d41a568e91394c'
+  metadata.gz: e9a5ba0cb4987def93f005feb8c7d109afe4f5e202939d9a5db9e64eb8d08194
+  data.tar.gz: 9c7632467e434195994afdf69ada8ea8820e5df639709e79cae7cb8543169129
 SHA512:
-  metadata.gz: c87bcbfdbc771869f7654eb28e2cf77e48e0ef70e2981be895c228332608c2aa05f90fd4cadcee926749870da742fa6f9061ad4c1424bdeba3cc5eb06fbabaf0
-  data.tar.gz: df6e1db72f930687085bde679b38d141edc7cea9de95d9126cb2d87d155d402ccce0581dad5e8abf1bbd5831633dec6c896b2c143cb354ab5c8c44b05401d7cb
+  metadata.gz: 92cfc25fcb83ec39aff6136acd20fc30a5a9eacb493765ba034f6fa9291e022c931b55d80350fefe605a126a7f9c61b75e6e2b78e6d24b0b627912fde7a4c0fc
+  data.tar.gz: bedc1cd2d75146ca942894d9105e4c6ce02283996c7b1192cd26f93024895feb3a3b02c5dcab0e2f50d0ef5c273c3cdd494d576f55078aa1d5c27712a1679a0a

data/lib/eac_ruby_utils/common_concern/module_setup.rb

@@ -17,15 +17,25 @@ module EacRubyUtils
       end
 
       def run
-        setup = self
         a_module.extend(::ActiveSupport::Concern)
-        a_module.included do
-          ::EacRubyUtils::CommonConcern::ClassSetup.new(setup, self, :include).run
-        end
-        a_module.prepended do
-          ::EacRubyUtils::CommonConcern::ClassSetup.new(setup, self, :prepend).run
+        include_or_prepend(:included, :include)
+        include_or_prepend(:prepended, :prepend)
+      end
+
+      private
+
+      def include_or_prepend(module_method, class_setup_method)
+        setup = self
+        a_module.send(module_method, *a_module_method_args(module_method)) do
+          ::EacRubyUtils::CommonConcern::ClassSetup.new(setup, self, class_setup_method).run
         end
       end
+
+      def a_module_method_args(module_method)
+        method_arity = a_module.method(module_method).arity
+        method_arity = -method_arity - 1 if method_arity.negative?
+        method_arity.times.map { |_n| a_module }
+      end
     end
   end
 end

data/lib/eac_ruby_utils/common_constructor.rb

@@ -2,6 +2,7 @@
 
 require 'active_support/callbacks'
 require 'eac_ruby_utils/arguments_consumer'
+require 'eac_ruby_utils/common_constructor/class_initialize'
 require 'ostruct'
 
 module EacRubyUtils
@@ -76,111 +77,13 @@ module EacRubyUtils
     end
 
     def setup_class_initialize(klass)
-      common_constructor = self
       klass.include(::ActiveSupport::Callbacks)
       klass.define_callbacks :initialize
-      klass.send(:define_method, :initialize) do |*args|
-        Initialize.new(common_constructor, args, self).run
-        super(*SuperArgs.new(common_constructor, args, self).result)
-      end
+      ::EacRubyUtils::CommonConstructor::ClassInitialize.new(self, klass).run
     end
 
     def super_args
       options[:super_args]
     end
-
-    class Initialize
-      attr_reader :common_constructor, :args, :object
-
-      def initialize(common_constructor, args, object)
-        @common_constructor = common_constructor
-        @args = args
-        @object = object
-      end
-
-      def run
-        validate_args_count
-        object.run_callbacks :initialize do
-          object_attributes_set
-          object_after_callback
-        end
-      end
-
-      private
-
-      def arg_value(arg_name)
-        arg_index = common_constructor.args.index(arg_name)
-        if arg_index < args.count
-          args[arg_index]
-        else
-          common_constructor.default_values[arg_index - common_constructor.args_count_min]
-        end
-      end
-
-      def object_after_callback
-        return unless common_constructor.after_set_block
-
-        object.instance_eval(&common_constructor.after_set_block)
-      end
-
-      def object_attributes_set
-        common_constructor.args.each do |arg_name|
-          object.send("#{arg_name}=", arg_value(arg_name))
-        end
-      end
-
-      def validate_args_count
-        return if common_constructor.args_count.include?(args.count)
-
-        raise ArgumentError, "#{object.class}.initialize: wrong number of arguments" \
-          " (given #{args.count}, expected #{common_constructor.args_count})"
-      end
-    end
-
-    class SuperArgs
-      attr_reader :common_constructor, :args, :object
-
-      def initialize(common_constructor, args, object)
-        @common_constructor = common_constructor
-        @args = args
-        @object = object
-      end
-
-      def auto_result
-        r = []
-        sub_args.each do |name, value|
-          i = super_arg_index(name)
-          r[i] = value if i
-        end
-        r
-      end
-
-      def result
-        result_from_options || auto_result
-      end
-
-      def result_from_options
-        return unless common_constructor.super_args
-
-        object.instance_exec(&common_constructor.super_args)
-      end
-
-      def sub_args
-        common_constructor.args.each_with_index.map do |name, index|
-          [name, args[index]]
-        end.to_h
-      end
-
-      def super_arg_index(name)
-        super_method.parameters.each_with_index do |arg, index|
-          return index if arg[1] == name
-        end
-        nil
-      end
-
-      def super_method
-        object.class.superclass ? object.class.superclass.instance_method(:initialize) : nil
-      end
-    end
   end
 end

data/lib/eac_ruby_utils/common_constructor/class_initialize.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/common_constructor/instance_initialize'
+require 'eac_ruby_utils/common_constructor/super_args'
+
+module EacRubyUtils
+  class CommonConstructor
+    class ClassInitialize
+      attr_reader :common_constructor, :klass
+
+      def initialize(common_constructor, klass)
+        @common_constructor = common_constructor
+        @klass = klass
+      end
+
+      def run
+        class_initialize = self
+        klass.send(:define_method, :initialize) do |*args|
+          ::EacRubyUtils::CommonConstructor::InstanceInitialize.new(
+            class_initialize.common_constructor, args, self
+          ).run
+          super(*::EacRubyUtils::CommonConstructor::SuperArgs.new(
+            class_initialize, args, self
+          ).result)
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/common_constructor/instance_initialize.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class CommonConstructor
+    class InstanceInitialize
+      attr_reader :common_constructor, :args, :object
+
+      def initialize(common_constructor, args, object)
+        @common_constructor = common_constructor
+        @args = args
+        @object = object
+      end
+
+      def run
+        validate_args_count
+        object.run_callbacks :initialize do
+          object_attributes_set
+          object_after_callback
+        end
+      end
+
+      private
+
+      def arg_value(arg_name)
+        arg_index = common_constructor.args.index(arg_name)
+        if arg_index < args.count
+          args[arg_index]
+        else
+          common_constructor.default_values[arg_index - common_constructor.args_count_min]
+        end
+      end
+
+      def object_after_callback
+        return unless common_constructor.after_set_block
+
+        object.instance_eval(&common_constructor.after_set_block)
+      end
+
+      def object_attributes_set
+        common_constructor.args.each do |arg_name|
+          object.send("#{arg_name}=", arg_value(arg_name))
+        end
+      end
+
+      def validate_args_count
+        return if common_constructor.args_count.include?(args.count)
+
+        raise ArgumentError, "#{object.class}.initialize: wrong number of arguments" \
+          " (given #{args.count}, expected #{common_constructor.args_count})"
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/common_constructor/super_args.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/delegation'
+
+module EacRubyUtils
+  class CommonConstructor
+    class SuperArgs
+      attr_reader :class_initialize, :args, :object
+      delegate :common_constructor, to: :class_initialize
+
+      def initialize(class_initialize, args, object)
+        @class_initialize = class_initialize
+        @args = args
+        @object = object
+      end
+
+      def auto_result
+        r = []
+        sub_args.each do |name, value|
+          i = super_arg_index(name)
+          r[i] = value if i
+        end
+        r
+      end
+
+      def result
+        result_from_options || auto_result
+      end
+
+      def result_from_options
+        return unless common_constructor.super_args
+
+        object.instance_exec(&common_constructor.super_args)
+      end
+
+      def sub_args
+        common_constructor.args.each_with_index.map do |name, index|
+          [name, args[index]]
+        end.to_h
+      end
+
+      def super_arg_index(name)
+        super_method.parameters.each_with_index do |arg, index|
+          return index if arg[1] == name
+        end
+        nil
+      end
+
+      def super_method
+        class_initialize.klass.superclass&.instance_method(:initialize)
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb

@@ -38,7 +38,7 @@ module EacRubyUtils
         def run_with_subcommand
           if subcommand_name
             check_valid_subcommand
-            subcommand.run
+            subcommand_run
           else
             run_without_subcommand
           end
@@ -52,6 +52,15 @@ module EacRubyUtils
           )
         end
 
+        def subcommand_run
+          if !subcommand.is_a?(::EacRubyUtils::Console::DocoptRunner) &&
+             subcommand.respond_to?(:run_run)
+            subcommand.run_run
+          else
+            subcommand.run
+          end
+        end
+
         def target_doc
           super.gsub(SUBCOMMANDS_MACRO,
                      "#{target_doc_subcommand_arg} [#{SUBCOMMAND_ARGS_ARG}...]") +

data/lib/eac_ruby_utils/fs/traverser.rb

@@ -57,8 +57,6 @@ module EacRubyUtils
           user_check_file(path)
         elsif path.directory?
           inner_check_directory(path, level)
-        else
-          raise "Unknown filesystem object: #{path}"
         end
       end
 

data/lib/eac_ruby_utils/inflector.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require 'active_support/inflector'
+
 module EacRubyUtils
   class Inflector
     class << self
       VARIABLE_NAME_PATTERN = /[_a-z][_a-z0-9]*/i.freeze
 
       def variableize(string)
-        r = string.gsub(/[^_a-z0-9]/i, '_').gsub(/_+/, '_').gsub(/_\z/, '').gsub(/\A_/, '').downcase
+        r = ::ActiveSupport::Inflector.transliterate(string).gsub(/[^_a-z0-9]/i, '_')
+                                      .gsub(/_+/, '_').gsub(/_\z/, '').gsub(/\A_/, '').downcase
         m = VARIABLE_NAME_PATTERN.match(r)
         return r if m
 

data/lib/eac_ruby_utils/local_time_zone.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object/blank'
+require 'active_support/values/time_zone'
+
+module EacRubyUtils
+  module LocalTimeZone
+    DEBIAN_CONFIG_PATH = '/etc/timezone'
+
+    class << self
+      TIMEDATECTL_TIMEZONE_LINE_PATTERN = %r{\s*Time zone:\s*(\S+/\S+)\s}.freeze
+
+      def auto
+        %w[tz_env debian_config offset].lazy.map { |s| send("by_#{s}") }.find(&:present?)
+      end
+
+      def by_debian_config
+        path = ::Pathname.new(DEBIAN_CONFIG_PATH)
+        path.exist? ? path.read.strip.presence : nil
+      end
+
+      def by_offset
+        ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset].name
+      end
+
+      def by_timedatectl
+        executable = ::EacRubyUtils::Envs.local.executable('timedatectl', '--version')
+        return nil unless executable.exist?
+
+        TIMEDATECTL_TIMEZONE_LINE_PATTERN.if_match(executable.command.execute!) { |m| m[1] }
+      end
+
+      def by_tz_env
+        ENV['TZ'].presence
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/patches/module/template.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/templates/searcher'
+
+class Module
+  def template
+    @template ||= ::EacRubyUtils::Templates::Searcher.default.template(name.underscore)
+  end
+end

data/lib/eac_ruby_utils/patches/object/template.rb

@@ -1,15 +1,8 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'eac_ruby_utils/templates/searcher'
+require 'eac_ruby_utils/patches/module/template'
 
 class Object
-  class << self
-    def template
-      @template ||= ::EacRubyUtils::Templates::Searcher.default.template(name.underscore)
-    end
-  end
-
   def template
     self.class.template
   end

data/lib/eac_ruby_utils/patches/time/default_time_zone_set.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/patches/time/local_time_zone'
+require 'active_support/core_ext/time/zones'
+require 'eac_ruby_utils/local_time_zone'
 
-::Time.zone = ::Time.local_time_zone
+::Time.zone = ::EacRubyUtils::LocalTimeZone.auto

data/lib/eac_ruby_utils/version.rb

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

data/lib/eac_ruby_utils/yaml.rb

@@ -14,10 +14,18 @@ module EacRubyUtils
         ::YAML.dump(sanitize(object))
       end
 
+      def dump_file(path, object)
+        ::File.write(path.to_s, dump(object))
+      end
+
       def load(string)
         ::YAML.safe_load(string, permitted_classes)
       end
 
+      def load_file(path)
+        load(::File.read(path.to_s))
+      end
+
       def permitted_classes
         DEFAULT_PERMITTED_CLASSES
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.57.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -117,6 +117,9 @@ files:
 - lib/eac_ruby_utils/common_concern/class_setup.rb
 - lib/eac_ruby_utils/common_concern/module_setup.rb
 - lib/eac_ruby_utils/common_constructor.rb
+- lib/eac_ruby_utils/common_constructor/class_initialize.rb
+- lib/eac_ruby_utils/common_constructor/instance_initialize.rb
+- lib/eac_ruby_utils/common_constructor/super_args.rb
 - lib/eac_ruby_utils/configs.rb
 - lib/eac_ruby_utils/configs/base.rb
 - lib/eac_ruby_utils/configs/file.rb
@@ -183,6 +186,7 @@ files:
 - lib/eac_ruby_utils/listable/string_list.rb
 - lib/eac_ruby_utils/listable/symbol_list.rb
 - lib/eac_ruby_utils/listable/value.rb
+- lib/eac_ruby_utils/local_time_zone.rb
 - lib/eac_ruby_utils/on_clean_ruby_environment.rb
 - lib/eac_ruby_utils/options_consumer.rb
 - lib/eac_ruby_utils/patch.rb
@@ -206,6 +210,7 @@ files:
 - lib/eac_ruby_utils/patches/module/patch.rb
 - lib/eac_ruby_utils/patches/module/require_sub.rb
 - lib/eac_ruby_utils/patches/module/simple_cache.rb
+- lib/eac_ruby_utils/patches/module/template.rb
 - lib/eac_ruby_utils/patches/object.rb
 - lib/eac_ruby_utils/patches/object/asserts.rb
 - lib/eac_ruby_utils/patches/object/debug.rb
@@ -221,7 +226,6 @@ files:
 - lib/eac_ruby_utils/patches/string/inflector.rb
 - lib/eac_ruby_utils/patches/time.rb
 - lib/eac_ruby_utils/patches/time/default_time_zone_set.rb
-- lib/eac_ruby_utils/patches/time/local_time_zone.rb
 - lib/eac_ruby_utils/paths_hash.rb
 - lib/eac_ruby_utils/paths_hash/entry_key_error.rb
 - lib/eac_ruby_utils/paths_hash/node.rb

data/lib/eac_ruby_utils/patches/time/local_time_zone.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/time/zones'
-require 'eac_ruby_utils/envs'
-
-class Time
-  class << self
-    TIMEDATECTL_TIMEZONE_LINE_PATTERN = %r{\s*Time zone:\s*(\S+/\S+)\s}.freeze
-
-    def local_time_zone
-      local_time_zone_by_timedatectl || local_time_zone_by_offset
-    end
-
-    def local_time_zone_by_timedatectl
-      executable = ::EacRubyUtils::Envs.local.executable('timedatectl', '--version')
-      return nil unless executable.exist?
-
-      TIMEDATECTL_TIMEZONE_LINE_PATTERN.if_match(executable.command.execute!) { |m| m[1] }
-    end
-
-    def local_time_zone_by_offset
-      ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset].name
-    end
-  end
-end