eac_ruby_utils 0.35.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3edd773afcebdd9c7f6af74230428101cfd4afc0e18c2311ace07c45764db8ce
-  data.tar.gz: fee5141ecfb6aa6d457d842b0cbafe42abbcb2da5a88cdc873dce82f647459e7
+  metadata.gz: f2a4b0d92b253248df0a2e7ec093f1056a822602cfcce7376d2b91e28b9f2d22
+  data.tar.gz: b0590f577360628d7f399981270a2a46914e3398ffb8af511a36ac40f67a9494
 SHA512:
-  metadata.gz: 94629883aff72c800948b4de4f102434a642771a18603971b689311eae89fba38c5729601a1075c8bdb949fd0c85540be846a6b1745fa7247092432e244b111d
-  data.tar.gz: 91b1694cde13eaa0621f0ccc847267d3ad7e6656d927cdcdd5b4f21673a1398f99929ed06e368d4b1e49e6d4738ab86139d032436e6bd6a706fcc821cbf27526
+  metadata.gz: c42cfcbfb7bcc6a0ed2d6df02959de8496e131cbe1d2448e1ebeffa8b2dab284dcb4cdc535605eeaff9efdae0134aa473458b570ab511db4e1e41b6fe9d6af5b
+  data.tar.gz: d989ccc189773585f71ad08f42f41400d3bddd8caf4914f452abffb28e0640f7bc64359c8374dfe20af115ecbbc48317ce623d3533ca1be947344d5b4c43db03

data/lib/eac_ruby_utils/envs/command.rb

@@ -54,6 +54,7 @@ module EacRubyUtils
       end
 
       def execute!(options = {})
+        options[:exit_outputs] = status_results.merge(options[:exit_outputs].presence || {})
         er = ExecuteResult.new(execute(options), options)
         return er.result if er.success?
 

data/lib/eac_ruby_utils/envs/command/extra_options.rb

@@ -16,6 +16,10 @@ module EacRubyUtils
           duplicate_by_extra_options(envvars: envvars.merge(name => value))
         end
 
+        def status_result(status_code, result)
+          duplicate_by_extra_options(status_results: status_results.merge(status_code => result))
+        end
+
         def pipe(other_command)
           duplicate_by_extra_options(pipe: other_command)
         end
@@ -28,6 +32,10 @@ module EacRubyUtils
           extra_options[:envvars] ||= {}.with_indifferent_access
         end
 
+        def status_results
+          extra_options[:status_results] ||= {}.with_indifferent_access
+        end
+
         def append_envvars(command)
           e = envvars.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(' ')
           e.present? ? "#{e} #{command}" : command

data/lib/eac_ruby_utils/listable/list.rb

@@ -12,6 +12,10 @@ module EacRubyUtils
         apply_constants
       end
 
+      def each_value(&block)
+        values.each(&block)
+      end
+
       def values
         @values.values.map(&:value)
       end

data/lib/eac_ruby_utils/listable/lists.rb

@@ -4,6 +4,7 @@ require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/string/inflections'
 require_relative 'integer_list'
 require_relative 'string_list'
+require_relative 'symbol_list'
 
 module EacRubyUtils
   module Listable
@@ -14,18 +15,10 @@ module EacRubyUtils
         @source = source
       end
 
-      def add_integer(item, *labels)
-        check_acts_as_listable_new_item(item)
-        acts_as_listable_items[item] = ::EacRubyUtils::Listable::IntegerList.new(
-          self, item, labels
-        )
-      end
-
-      def add_string(item, *labels)
-        check_acts_as_listable_new_item(item)
-        acts_as_listable_items[item] = ::EacRubyUtils::Listable::StringList.new(
-          self, item, labels
-        )
+      %w[integer string symbol].each do |list_type|
+        define_method "add_#{list_type}" do |item, *labels|
+          add(::EacRubyUtils::Listable.const_get("#{list_type}_list".camelize), item, labels)
+        end
       end
 
       def method_missing(name, *args, &block)
@@ -43,6 +36,11 @@ module EacRubyUtils
 
       private
 
+      def add(list_class, item, labels)
+        check_acts_as_listable_new_item(item)
+        acts_as_listable_items[item] = list_class.new(self, item, labels)
+      end
+
       def check_acts_as_listable_new_item(item)
         return unless acts_as_listable_items.key?(item)
 

data/lib/eac_ruby_utils/listable/symbol_list.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative 'list'
+
+module EacRubyUtils
+  module Listable
+    class SymbolList < ::EacRubyUtils::Listable::List
+      protected
+
+      def parse_labels(labels)
+        if labels.first.is_a?(Hash)
+          Hash[labels.first.map { |k, v| [k.to_sym, v.to_sym] }]
+        else
+          Hash[labels.map { |v| [v.to_sym, v.to_sym] }]
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/require_sub.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/inflector'
+
 module EacRubyUtils
   class << self
     def require_sub(file, options = {})
@@ -26,6 +28,23 @@ module EacRubyUtils
 
     private
 
+    def active_support_require(path)
+      return false unless options[REQUIRE_DEPENDENCY_OPTION_KEY]
+
+      ::Kernel.require_dependency(path)
+      true
+    end
+
+    def autoload_require(path)
+      return false unless base?
+
+      basename = ::File.basename(path, '.*')
+      return false if basename.start_with?('_')
+
+      base.autoload ::ActiveSupport::Inflector.camelize(basename), path
+      true
+    end
+
     def include_modules
       return unless options[INCLUDE_MODULES_OPTION_KEY]
 
@@ -41,14 +60,22 @@ module EacRubyUtils
       options[BASE_OPTION_KEY] || raise('Option :base not setted')
     end
 
+    def base?
+      options[BASE_OPTION_KEY] ? true : false
+    end
+
+    def kernel_require(path)
+      ::Kernel.require(path)
+    end
+
     def require_sub_files
       Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort.each do |path|
-        if options[REQUIRE_DEPENDENCY_OPTION_KEY]
-          require_dependency path
-        else
-          require path
-        end
+        require_sub_file(path)
       end
     end
+
+    def require_sub_file(path)
+      active_support_require(path) || autoload_require(path) || kernel_require(path)
+    end
   end
 end

data/lib/eac_ruby_utils/templates/directory.rb

@@ -10,7 +10,7 @@ module EacRubyUtils
       attr_reader :path
 
       def initialize(path)
-        @path = path
+        @path = path.is_a?(::Pathname) ? path : ::Pathname.new(path.to_s)
       end
 
       def apply(variables_source, directory)
@@ -25,6 +25,12 @@ module EacRubyUtils
         raise "Child \"#{subpath}\" from \"#{path}\" not found"
       end
 
+      def children
+        path.children.map do |path_child|
+          child(path_child.basename.to_path)
+        end
+      end
+
       private
 
       def apply_fs_object(source_relative, target)

data/lib/eac_ruby_utils/templates/file.rb

@@ -1,32 +1,29 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash/indifferent_access'
-require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/templates/variable_providers'
 
 module EacRubyUtils
   module Templates
     class File
-      include ::EacRubyUtils::SimpleCache
-
       VARIABLE_DELIMITER = ::Regexp.quote('%%')
       VARIABLE_PATTERN = /#{VARIABLE_DELIMITER}([a-z0-9\._]*)#{VARIABLE_DELIMITER}/i.freeze
 
-      attr_reader :path
-
-      def initialize(path)
-        @path = path
+      enable_simple_cache
+      common_constructor :path do
+        self.path = path.to_pathname
       end
 
       # +variables_provider+ A [Hash] or object which responds to +read_entry(entry_name)+.
       def apply(variables_source)
-        variables_provider = build_variables_provider(variables_source)
+        variables_provider = ::EacRubyUtils::Templates::VariableProviders.build(variables_source)
         variables.inject(content) do |a, e|
           a.gsub(variable_pattern(e), variables_provider.variable_value(e).to_s)
         end
       end
 
       def apply_to_file(variables_source, output_file_path)
-        ::File.write(output_file_path, apply(variables_source))
+        output_file_path.to_pathname.write(apply(variables_source))
       end
 
       private
@@ -38,64 +35,16 @@ module EacRubyUtils
       end
 
       def content_uncached
-        ::File.read(path)
+        path.read
       end
 
       def sanitize_variable_name(variable_name)
         variable_name.to_s.downcase
       end
 
-      def build_variables_provider(variables_source)
-        return HashVariablesProvider.new(variables_source) if variables_source.is_a?(::Hash)
-        return EntriesReaderVariablesProvider.new(variables_source) if
-        variables_source.respond_to?(:read_entry)
-
-        raise "Variables provider not found for #{variables_source}"
-      end
-
       def variable_pattern(name)
         /#{VARIABLE_DELIMITER}#{::Regexp.quote(name)}#{VARIABLE_DELIMITER}/i
       end
-
-      class BaseVariablesProvider
-        attr_reader :source
-
-        def initialize(source)
-          @source = source
-        end
-
-        def variable_value(name)
-          return variable_fetch(name) if variable_exist?(name)
-
-          raise VariableNotFoundError, "Variable \"#{name}\" not found in #{source}"
-        end
-      end
-
-      class HashVariablesProvider < BaseVariablesProvider
-        def initialize(source)
-          super(source.with_indifferent_access)
-        end
-
-        def variable_exist?(name)
-          source.key?(name)
-        end
-
-        def variable_fetch(name)
-          source.fetch(name)
-        end
-      end
-
-      class EntriesReaderVariablesProvider < BaseVariablesProvider
-        def variable_exist?(_name)
-          true
-        end
-
-        def variable_fetch(name)
-          source.read_entry(name)
-        end
-      end
-
-      class VariableNotFoundError < StandardError; end
     end
   end
 end

data/lib/eac_ruby_utils/templates/variable_not_found_error.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  module Templates
+    class VariableNotFoundError < StandardError; end
+  end
+end

data/lib/eac_ruby_utils/templates/variable_providers.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRubyUtils
+  module Templates
+    module VariableProviders
+      require_sub __FILE__
+
+      PROVIDERS = %w[entries_reader hash generic].map do |name|
+        "eac_ruby_utils/templates/variable_providers/#{name}".camelize.constantize
+      end
+
+      class << self
+        def build(variables_source)
+          PROVIDERS.each do |provider|
+            return provider.new(variables_source) if provider.accept?(variables_source)
+          end
+
+          raise "Variables provider not found for #{variables_source}"
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/templates/variable_providers/base.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/templates/variable_not_found_error'
+
+module EacRubyUtils
+  module Templates
+    module VariableProviders
+      class Base
+        attr_reader :source
+
+        def initialize(source)
+          @source = source
+        end
+
+        def variable_value(name)
+          return variable_fetch(name) if variable_exist?(name)
+
+          raise VariableNotFoundError, "Variable \"#{name}\" not found in #{source}"
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/templates/variable_providers/entries_reader.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/templates/variable_providers/base'
+
+module EacRubyUtils
+  module Templates
+    module VariableProviders
+      class EntriesReader < ::EacRubyUtils::Templates::VariableProviders::Base
+        class << self
+          def accept?(variables_source)
+            variables_source.respond_to?(:read_entry)
+          end
+        end
+
+        def variable_exist?(_name)
+          true
+        end
+
+        def variable_fetch(name)
+          source.read_entry(name)
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/templates/variable_providers/generic.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/templates/variable_providers/base'
+
+module EacRubyUtils
+  module Templates
+    module VariableProviders
+      class Generic < ::EacRubyUtils::Templates::VariableProviders::Base
+        class << self
+          def accept?(variables_source)
+            variables_source.is_a?(::Object)
+          end
+        end
+
+        def variable_exist?(name)
+          source.respond_to?(name)
+        end
+
+        def variable_fetch(name)
+          source.send(name)
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/templates/variable_providers/hash.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/templates/variable_providers/base'
+
+module EacRubyUtils
+  module Templates
+    module VariableProviders
+      class Hash < ::EacRubyUtils::Templates::VariableProviders::Base
+        class << self
+          def accept?(variables_source)
+            variables_source.is_a?(::Hash)
+          end
+        end
+
+        def initialize(source)
+          super(source.with_indifferent_access)
+        end
+
+        def variable_exist?(name)
+          source.key?(name)
+        end
+
+        def variable_fetch(name)
+          source.fetch(name)
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.39.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,6 +155,7 @@ files:
 - lib/eac_ruby_utils/listable/list.rb
 - lib/eac_ruby_utils/listable/lists.rb
 - 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/on_clean_ruby_environment.rb
 - lib/eac_ruby_utils/options_consumer.rb
@@ -200,6 +201,12 @@ files:
 - lib/eac_ruby_utils/templates/directory.rb
 - lib/eac_ruby_utils/templates/file.rb
 - lib/eac_ruby_utils/templates/searcher.rb
+- lib/eac_ruby_utils/templates/variable_not_found_error.rb
+- lib/eac_ruby_utils/templates/variable_providers.rb
+- lib/eac_ruby_utils/templates/variable_providers/base.rb
+- lib/eac_ruby_utils/templates/variable_providers/entries_reader.rb
+- lib/eac_ruby_utils/templates/variable_providers/generic.rb
+- lib/eac_ruby_utils/templates/variable_providers/hash.rb
 - lib/eac_ruby_utils/version.rb
 - lib/eac_ruby_utils/yaml.rb
 homepage: