avm-tools 0.116.2 → 0.117.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ade74f1c59b191c0af317c03f8acb00fffc0e2bcac3120b56a604ab72a31ac1
-  data.tar.gz: 9d9967c47a11500142f7843b53ac7430f40fb191e441ce177ce583a58f46fffc
+  metadata.gz: aae509f1d4971fd8a6d39a9f20cc4a3dab9fd28267c333ffe521cba9252f20bb
+  data.tar.gz: f27d6bd59c10b9638f1f42b173d38a53a677b1d8de4b1a01c63e170ed1ed362f
 SHA512:
-  metadata.gz: dae95c3e50159a7cd7a9c77745a106d462c2d5c8445a43f92f35cadeb42545509d83b53f2085a339b9dac930610a6cc68cb4551a2dd35e0a2566a1d07f932ce1
-  data.tar.gz: 7dc23f20f7430e88fd0a75582a899df38a81eb6a102f948611c96d810d766032656c730395ef66f4a3f89a11ad4b84d429252dcbf8e58082777b632f5e2ad188
+  metadata.gz: ea73fcc793b05f0265396c36a592969b9f60c6ccb8a0e7526f7f5e12f5c7b58688489c11cda94b7e17ab8a0430029dccca11d3a0b799a49e6c65d11c5f200b8a
+  data.tar.gz: bf13a36e7cdf500a7538c75531b108b7f09ef76dfd1b5a4ceb102cc32f2c2b76026df875c593de2fa6c240b3b5fccc43b9d7a989941dab6b15e61a8b142ee503

data/lib/avm/tools/runner/app_src/version_bump.rb

@@ -8,14 +8,13 @@ module Avm
     class Runner
       class AppSrc
         class VersionBump
-          runner_with :help do
+          runner_with :help, :confirmation do
             desc 'Bump version of a local project.'
             arg_opt '-n', '--new', 'Set new version.'
             arg_opt '-s', '--segment', 'Increment de <segment>-th segment (Left-most is 0)'
             bool_opt '-M', '--major', 'Same as --segment=0.'
             bool_opt '-m', '--minor', 'Same as --segment=1.'
             bool_opt '-p', '--patch', 'Same as --segment=2.'
-            bool_opt '-y', '--yes', 'Bump without confirmation.'
           end
 
           def run
@@ -26,7 +25,7 @@ module Avm
           def run_version_changed
             infom 'Version changed'
             if confirm?
-              runner_context.call(:instance).run_job(:version_bump, target_version)
+              runner_context.call(:subject).version_bump(target_version)
               success 'Bumped'
             else
               fatal_error 'Bump unconfirmed'
@@ -38,17 +37,13 @@ module Avm
           end
 
           def start_banner
-            runner_context.call(:instance_banner)
+            infov 'Instance', runner_context.call(:subject)
             infov 'Current version', current_version.if_present('-')
             infov 'Target version', target_version.if_present('-')
           end
 
-          def confirm?
-            parsed.yes? || input('Confirm version bump?', bool: true)
-          end
-
           def current_version_uncached
-            runner_context.call(:instance).if_respond('version')
+            runner_context.call(:subject).if_respond('version')
           end
 
           def target_version_uncached

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.116.2'
+    VERSION = '0.117.0'
   end
 end

data/sub/avm/avm.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_cli', '~> 0.23', '>= 0.23.1'
   s.add_dependency 'eac_docker', '~> 0.3'
   s.add_dependency 'eac_git', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.80'
+  s.add_dependency 'eac_ruby_utils', '~> 0.95'
   s.add_dependency 'eac_templates', '~> 0.1', '>= 0.1.1'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.3', '>= 1.3.1'

data/sub/avm/lib/avm/scms/base.rb

@@ -6,6 +6,7 @@ module Avm
   module Scms
     class Base
       enable_abstract_methods
+      enable_simple_cache
       abstract_methods :update, :valid?
       common_constructor :path do
         self.path = path.to_pathname
@@ -28,6 +29,18 @@ module Avm
       def to_s
         name
       end
+
+      private
+
+      # @return [Avm::Scms::Base]
+      def parent_scm
+        parent_path = path.parent
+        until parent_path.root?
+          ::Avm::Registry.scms.detect_optional(parent_path).if_present { |v| return v }
+          parent_path = parent_path.parent
+        end
+        nil
+      end
     end
   end
 end

data/sub/avm/lib/avm/sources/base/configuration.rb

@@ -29,7 +29,8 @@ module Avm
 
         # @return [Avm::Sources::Configuration]
         def old_configuration_uncached
-          ::Avm::Sources::Configuration.find_in_path(path)
+          ::Avm::Sources::Configuration.find_in_path(path) ||
+            ::Avm::Sources::Configuration.temp_instance
         end
       end
     end

data/sub/avm/lib/avm/sources/base/parent.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Parent
+        # @return [Avm::Sources::Base]
+        def parent
+          parent_by_option || parent_by_search
+        end
+
+        # @return [Avm::Sources::Base]
+        def parent_by_option
+          options[OPTION_PARENT]
+        end
+
+        # @return [Avm::Sources::Base]
+        def parent_by_search
+          parent_path = path.parent
+          until parent_path.root?
+            ::Avm::Registry.sources.detect_optional(parent_path).if_present { |v| return v }
+            parent_path = parent_path.parent
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base.rb

@@ -21,12 +21,6 @@ module Avm
       abstract_methods :update, :valid?
 
       delegate :locale, to: :old_configuration
-      delegate :to_s, to: :path
-
-      # @return [Avm::Sources::Base]
-      def parent
-        options[OPTION_PARENT]
-      end
 
       # @return [Pathname]
       def relative_path
@@ -35,6 +29,10 @@ module Avm
         path.relative_path_from(parent.path)
       end
 
+      def to_s
+        "#{self.class}[#{path}]"
+      end
+
       # @return [Enumerable<Avm::Sources::Base>]
       def subs
         scm.subs.map { |subrepo| ::Avm::Registry.sources.detect(subrepo.path, parent: self) }

data/sub/avm/lib/avm/sources/configuration/{_locale.rb → locale.rb}

@@ -6,10 +6,12 @@ require 'i18n'
 module Avm
   module Sources
     class Configuration < ::EacConfig::OldConfigs
-      LOCALE_KEY = :locale
+      module Locale
+        LOCALE_KEY = :locale
 
-      def locale
-        read_entry(LOCALE_KEY) || ::I18n.default_locale
+        def locale
+          read_entry(LOCALE_KEY) || ::I18n.default_locale
+        end
       end
     end
   end

data/sub/avm/lib/avm/sources/configuration/rubocop.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Avm
+  module Sources
+    class Configuration < ::EacConfig::OldConfigs
+      module Rubocop
+        RUBOCOP_COMMAND_KEY = 'ruby.rubocop.command'
+        RUBOCOP_GEMFILE_KEY = 'ruby.rubocop.gemfile'
+
+        def rubocop_command
+          read_command(RUBOCOP_COMMAND_KEY)
+        end
+
+        def rubocop_gemfile
+          gemfile_path = read_entry(RUBOCOP_GEMFILE_KEY)
+          return nil if gemfile_path.blank?
+
+          gemfile_path = gemfile_path.to_pathname.expand_path(storage_path.parent)
+          return gemfile_path if gemfile_path.file?
+
+          raise "Gemfile path \"#{gemfile_path}\" does not exist or is not a file"
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/configuration/tests.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/patches/eac_ruby_gems_utils/gem'
+
+module Avm
+  module Sources
+    class Configuration < ::EacConfig::OldConfigs
+      module Tests
+        BUNDLE_TEST_COMMAND_KEY = 'test.bundle_command'
+        TEST_COMMAND_KEY = 'test.command'
+
+        def any_test_command
+          bundle_test_command || test_command
+        end
+
+        def test_command
+          read_command(TEST_COMMAND_KEY)
+        end
+
+        def bundle_test_command
+          read_entry(BUNDLE_TEST_COMMAND_KEY).if_present do |v|
+            args = v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v)
+            ::EacRubyGemsUtils::Gem.new(::File.dirname(storage_path)).bundle(*args).chdir_root
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/configuration.rb

@@ -7,7 +7,7 @@ require 'yaml'
 module Avm
   module Sources
     class Configuration < ::EacConfig::OldConfigs
-      require_sub __FILE__
+      require_sub __FILE__, include_modules: true
 
       FILENAMES = %w[.avm.yml .avm.yaml].freeze
 
@@ -28,6 +28,10 @@ module Avm
           nil
         end
 
+        def temp_instance
+          new(::Tempfile.new(['.avm', '.yaml']))
+        end
+
         private
 
         def internal_find_path(absolute_pathname)

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.18.1'
+  VERSION = '0.19.0'
 end

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.10'
+  s.add_dependency 'avm', '~> 0.19'
   s.add_dependency 'eac_ruby_utils', '~> 0.80'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/base/version_bump.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacGenericBase0
+    module Sources
+      class Base < ::Avm::Sources::Base
+        module VersionBump
+          def after_sub_version_bump_do_changes
+            # Do nothing
+          end
+
+          # @return [Avm::Scms::Commit, nil]
+          def version_bump(target_version)
+            scm.commit_if_change(version_bump_commit_message(target_version)) do
+              version_bump_do_changes(target_version)
+              parent.if_present(&:after_sub_version_bump_do_changes)
+            end
+          end
+
+          # @return [String]
+          def version_bump_commit_message(target_version)
+            i18n_translate(__method__, version: target_version, __locale: locale)
+          end
+
+          def version_bump_do_changes(_target_version)
+            raise_abstract_method(__METHOD__)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/base.rb

@@ -8,13 +8,16 @@ module Avm
   module EacGenericBase0
     module Sources
       class Base < ::Avm::Sources::Base
+        require_sub __FILE__, include_modules: true
+        enable_abstract_methods
+
         # @return [Avm::EacGenericBase0::Sources::Tester]
         def tester_class
           Avm::EacGenericBase0::Sources::Tester
         end
 
         def valid?
-          path.directory?
+          ::Avm::Registry.scms.detect_optional(path).present?
         end
       end
     end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_generic_base0/locale/en.yaml

@@ -0,0 +1,6 @@
+en:
+  avm:
+    eac_generic_base0:
+      sources:
+        base:
+          version_bump_commit_message: Bump to '%{version}'.

data/sub/avm-eac_generic_base0/locale/pt-BR.yaml

@@ -0,0 +1,6 @@
+pt-BR:
+  avm:
+    eac_generic_base0:
+      sources:
+        base:
+          version_bump_commit_message: Versão para '%{version}'.

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,locale}/**/*']
 
   s.add_dependency 'avm', '~> 0.9'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.2'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '>= 0.9.8'
   s.add_dependency 'eac_ruby_utils', '~> 0.80'
 

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/version_bump.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        module VersionBump
+          def after_sub_version_bump_do_changes
+            the_gem.bundle('install').chdir_root.execute!
+          end
+
+          def version_bump_do_changes(target_version)
+            self.version = target_version
+            the_gem.bundle('install').chdir_root.execute!
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base.rb

@@ -3,6 +3,7 @@
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/sources/update'
 require 'avm/eac_ruby_base1/sources/tester'
+require 'avm/version_number'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 
@@ -10,6 +11,7 @@ module Avm
   module EacRubyBase1
     module Sources
       class Base < ::Avm::EacGenericBase0::Sources::Base
+        require_sub __FILE__, include_modules: :prepend, require_dependency: true
         delegate :gemspec_path, to: :the_gem
 
         def gemfile_path
@@ -33,6 +35,15 @@ module Avm
         def update
           ::Avm::EacRubyBase1::Sources::Update.new(self)
         end
+
+        # @return [Avm::VersionNumber]
+        def version
+          the_gem.version.if_present { |v| ::Avm::VersionNumber.new(v) }
+        end
+
+        def version=(value)
+          the_gem.version_file.value = value
+        end
       end
     end
   end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_ruby_base1/patches/i18n'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/sub/avm-git/lib/avm/git/scms/git_subrepo.rb

@@ -8,9 +8,7 @@ module Avm
   module Git
     module Scms
       class GitSubrepo < ::Avm::Scms::Base
-        def commit_if_change(_message)
-          nyi
-        end
+        delegate :commit_if_change, to: :parent_scm
 
         def update
           git_subrepo.command('clean').execute!

data/sub/avm-git/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.3.2'
+    VERSION = '0.4.0'
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/core_ext.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/locales/from_all_gems'
 require 'eac_ruby_utils/patches'
 require 'active_support/dependencies/autoload'
 require 'active_support/core_ext'

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales/from_all_gems.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/locales/from_gem'
+::EacRubyUtils::Locales::FromGem.include_all

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales/from_gem.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'i18n'
+require 'eac_ruby_utils/patches/class/common_constructor'
+require 'eac_ruby_utils/patches/object/to_pathname'
+
+module EacRubyUtils
+  module Locales
+    class FromGem
+      class << self
+        def include_all(i18n_obj = nil)
+          ::Gem::Specification.each { |gemspec| new(gemspec, i18n_obj).include }
+        end
+      end
+
+      LOCALES_DIR_SUBPATH = 'locale'
+      LOCALES_FILES_GLOB_PATTERNS = %w[*.yaml *.yml].freeze
+
+      common_constructor :gemspec, :i18n_obj, default: [nil] do
+        self.i18n_obj ||= ::I18n
+      end
+
+      # @return [Boolean]
+      delegate :exist?, to: :path
+
+      # @return [Pathname, nil]
+      def include
+        return nil unless exist?
+
+        ::I18n.load_path += paths_to_load.map(&:to_path)
+        path
+      end
+
+      # @return [Pathname]
+      def path
+        gemspec.gem_dir.to_pathname.join(LOCALES_DIR_SUBPATH)
+      end
+
+      # @return [Pathname]
+      def paths_to_load
+        return [] unless exist?
+
+        LOCALES_FILES_GLOB_PATTERNS.inject([]) { |a, e| a + path.glob(e) }
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales/module_i18n_translate.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/common_constructor'
+require 'i18n'
+
+module EacRubyUtils
+  module Locales
+    class ModuleI18nTranslate
+      TRANSLATE_LOCALE_KEY = :__locale
+
+      common_constructor :the_module, :entry_suffix, :values, default: [{}]
+
+      def ancestor_i18n_translate(ancestor)
+        t = self.class.new(ancestor, entry_suffix, values)
+        t.exists? ? t.i18n_translate : nil
+      end
+
+      def ancestors_i18n_translate
+        the_module.ancestors.lazy.map { |v| ancestor_i18n_translate(v) }.find(&:present?)
+      end
+
+      def exists?
+        ::I18n.exists?(i18n_key)
+      end
+
+      def i18n_key
+        "#{module_entry_prefix}.#{entry_suffix}"
+      end
+
+      def i18n_options
+        values.except(TRANSLATE_LOCALE_KEY)
+      end
+
+      def i18n_translate
+        ::I18n.translate(i18n_key, i18n_options)
+      end
+
+      def locale
+        values[TRANSLATE_LOCALE_KEY]
+      end
+
+      def module_entry_prefix
+        the_module.name.underscore.gsub('/', '.')
+      end
+
+      def on_locale(&block)
+        if locale.present?
+          on_present_locale(&block)
+        else
+          block.call
+        end
+      end
+
+      def result
+        on_locale do
+          ancestors_i18n_translate || i18n_translate
+        end
+      end
+
+      private
+
+      def on_present_locale(&block)
+        old_locale = ::I18n.locale
+        begin
+          ::I18n.locale = locale
+          block.call
+        ensure
+          ::I18n.locale = old_locale
+        end
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
+module EacRubyUtils
+  module Locales
+    ::EacRubyUtils.require_sub __FILE__
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/method_class.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/introspection'
+require 'eac_ruby_utils/patches/class/common_constructor'
+require 'eac_ruby_utils/patches/module/common_concern'
+require 'eac_ruby_utils/patches/string/inflector'
+
+module EacRubyUtils
+  module MethodClass
+    common_concern do
+      ::EacRubyUtils::MethodClass::Setup.new(self)
+    end
+
+    class Setup
+      common_constructor :method_class do
+        perform
+      end
+
+      def perform
+        the_setup = self
+        sender_module.define_method(method_name) do |*args, &block|
+          the_setup.method_class.new(self, *args, &block).result
+        end
+      end
+
+      def method_name
+        method_class.name.demodulize.underscore.variableize
+      end
+
+      def sender_module
+        method_class.module_parent
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/i18n_translate.rb

@@ -1,32 +1,9 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'i18n'
+require 'eac_ruby_utils/locales/module_i18n_translate'
 
 class Module
-  TRANSLATE_LOCALE_KEY = :__locale
-
   def i18n_translate(entry_suffix, values = {})
-    on_i18n_locale(values.delete(TRANSLATE_LOCALE_KEY)) do
-      ::I18n.translate(i18n_translate_entry_full(entry_suffix), values)
-    end
-  end
-
-  def i18n_translate_entry_full(entry_suffix)
-    "#{i18n_translate_entry_self_prefix}.#{entry_suffix}"
-  end
-
-  def i18n_translate_entry_self_prefix
-    name.underscore.gsub('/', '.')
-  end
-
-  def on_i18n_locale(locale)
-    old_locale = ::I18n.locale
-    begin
-      ::I18n.locale = locale
-      yield
-    ensure
-      ::I18n.locale = old_locale
-    end
+    ::EacRubyUtils::Locales::ModuleI18nTranslate.new(self, entry_suffix, values).result
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/method_class.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/method_class'
+
+class Module
+  def enable_method_class
+    ::EacRubyUtils.patch(self, ::EacRubyUtils::MethodClass)
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/inflector'
+require 'active_support/dependencies'
 require 'eac_ruby_utils/listable'
 
 module EacRubyUtils
@@ -11,6 +12,14 @@ module EacRubyUtils
   end
 
   class RequireSub
+    INCLUDE_MODULES_MAP = {
+      nil => nil,
+      false => nil,
+      true => :include,
+      include: :include,
+      prepend: :prepend
+    }.freeze
+
     include ::EacRubyUtils::Listable
     lists.add_symbol :option, :base, :include_modules, :require_dependency
 
@@ -26,56 +35,100 @@ module EacRubyUtils
       include_modules
     end
 
-    private
+    def base
+      options[OPTION_BASE] || raise('Option :base not setted')
+    end
 
-    def active_support_require(path)
-      return false unless options[OPTION_REQUIRE_DEPENDENCY]
+    def base?
+      options[OPTION_BASE] ? true : false
+    end
 
-      ::Kernel.require_dependency(path)
-      true
+    def include_modules
+      sub_files.each(&:include_module)
     end
 
-    def autoload_require(path)
-      return false unless base?
+    def include_or_prepend_method
+      return INCLUDE_MODULES_MAP.fetch(options[OPTION_INCLUDE_MODULES]) if
+        INCLUDE_MODULES_MAP.key?(options[OPTION_INCLUDE_MODULES])
 
-      basename = ::File.basename(path, '.*')
-      return false if basename.start_with?('_')
+      raise ::ArgumentError, "Invalid value for 'options[OPTION_INCLUDE_MODULES]':" \
+         " \"#{options[OPTION_INCLUDE_MODULES]}\""
+    end
 
-      base.autoload ::ActiveSupport::Inflector.camelize(basename), path
-      true
+    def require_sub_files
+      sub_files.each(&:require_file)
     end
 
-    def include_modules
-      return unless options[OPTION_INCLUDE_MODULES]
+    def sub_files
+      @sub_files ||= Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort
+                       .map { |path| SubFile.new(self, path) }
+    end
 
-      base.constants.each do |constant_name|
-        constant = base.const_get(constant_name)
-        next unless constant.is_a?(::Module) && !constant.is_a?(::Class)
+    class SubFile
+      attr_reader :owner, :path
 
-        base.include(constant)
+      def initialize(owner, path)
+        @owner = owner
+        @path = path
       end
-    end
 
-    def base
-      options[OPTION_BASE] || raise('Option :base not setted')
-    end
+      def base_constant
+        return nil unless owner.base?
 
-    def base?
-      options[OPTION_BASE] ? true : false
-    end
+        owner.base.const_get(constant_name)
+      rescue ::NameError
+        nil
+      end
 
-    def kernel_require(path)
-      ::Kernel.require(path)
-    end
+      def constant_name
+        ::ActiveSupport::Inflector.camelize(::File.basename(path, '.rb'))
+      end
 
-    def require_sub_files
-      Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort.each do |path|
-        require_sub_file(path)
+      def include_module
+        return unless module?
+
+        owner.include_or_prepend_method.if_present do |v|
+          owner.base.send(v, base_constant)
+        end
+      end
+
+      def include_or_prepend_method
+        return :include if owner.options[OPTION_INCLUDE_MODULES]
+        return :prepend if owner.options[OPTION_PREPEND_MODULES]
+
+        nil
+      end
+
+      def module?
+        base_constant.is_a?(::Module) && !base_constant.is_a?(::Class)
+      end
+
+      def require_file
+        active_support_require || autoload_require || kernel_require
+      end
+
+      private
+
+      def active_support_require
+        return false unless owner.options[OPTION_REQUIRE_DEPENDENCY]
+
+        ::Kernel.require_dependency(path)
+        true
       end
-    end
 
-    def require_sub_file(path)
-      active_support_require(path) || autoload_require(path) || kernel_require(path)
+      def autoload_require
+        return false unless owner.base?
+
+        basename = ::File.basename(path, '.*')
+        return false if basename.start_with?('_')
+
+        owner.base.autoload ::ActiveSupport::Inflector.camelize(basename), path
+        true
+      end
+
+      def kernel_require
+        ::Kernel.require(path)
+      end
     end
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

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

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/method_class_spec.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/method_class'
+
+::RSpec.describe ::EacRubyUtils::MethodClass do
+  let(:sender_class) do
+    ::Class.new do
+      attr_accessor :sender_value
+
+      def initialize(sender_value)
+        self.sender_value = sender_value
+      end
+    end
+  end
+
+  let(:method_class) do
+    the_described_class = described_class
+    ::Class.new do
+      def self.name
+        'TheSender::PerformX'
+      end
+
+      include the_described_class
+      attr_accessor :sender, :method_param
+
+      def initialize(sender, method_param)
+        self.sender = sender
+        self.method_param = method_param
+      end
+
+      def result
+        "#{sender.sender_value},#{method_param}"
+      end
+    end
+  end
+
+  let(:sender_instance) { sender_class.new('AAA') }
+
+  before do
+    ::Object.const_set('TheSender', sender_class)
+    sender_class.const_set('PerformX', method_class)
+  end
+
+  it { expect(sender_instance).to respond_to(:perform_x) }
+  it { expect(sender_instance.perform_x('BBB')).to eq('AAA,BBB') }
+end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/method_class_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/method_class'
+require 'eac_ruby_utils/patches/module/method_class'
+
+RSpec.describe ::Class do
+  let(:stub_method_class) do
+    described_class.new do
+      def self.name
+        'StubMethodClass'
+      end
+
+      enable_method_class
+    end
+  end
+
+  describe '#enable_simple_cache' do
+    it { expect(stub_method_class.included_modules).to include(::EacRubyUtils::MethodClass) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.116.2
+  version: 0.117.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -354,12 +354,10 @@ files:
 - lib/avm/projects/stereotypes/git_subtree/warp.rb
 - lib/avm/projects/stereotypes/rails_application.rb
 - lib/avm/projects/stereotypes/rails_application/local_project_mixin.rb
-- lib/avm/projects/stereotypes/rails_application/update.rb
 - lib/avm/projects/stereotypes/redmine_plugin.rb
 - lib/avm/projects/stereotypes/ruby_gem.rb
 - lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb
 - lib/avm/projects/stereotypes/ruby_gem/publish.rb
-- lib/avm/projects/stereotypes/ruby_gem/version_bump.rb
 - lib/avm/rails.rb
 - lib/avm/ruby.rb
 - lib/avm/ruby/bundler.rb
@@ -459,8 +457,11 @@ files:
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/base.rb
+- sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/base/version_bump.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/tester.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/version.rb
+- sub/avm-eac_generic_base0/locale/en.yaml
+- sub/avm-eac_generic_base0/locale/pt-BR.yaml
 - sub/avm-eac_generic_base0/spec/lib/avm/eac_generic_base0/sources/base_spec.rb
 - sub/avm-eac_generic_base0/spec/rubocop_spec.rb
 - sub/avm-eac_generic_base0/spec/spec_helper.rb
@@ -541,14 +542,13 @@ files:
 - sub/avm-eac_ruby_base1/Gemfile
 - sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1.rb
-- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/patches.rb
-- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/patches/i18n.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/configured.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/envvar.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/gemfile.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/version_bump.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/tester.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update/sub_update.rb
@@ -762,11 +762,12 @@ files:
 - sub/avm/lib/avm/sources/base.rb
 - sub/avm/lib/avm/sources/base/configuration.rb
 - sub/avm/lib/avm/sources/base/instance.rb
+- sub/avm/lib/avm/sources/base/parent.rb
 - sub/avm/lib/avm/sources/base/testing.rb
 - sub/avm/lib/avm/sources/configuration.rb
-- sub/avm/lib/avm/sources/configuration/_locale.rb
-- sub/avm/lib/avm/sources/configuration/_rubocop.rb
-- sub/avm/lib/avm/sources/configuration/_tests.rb
+- sub/avm/lib/avm/sources/configuration/locale.rb
+- sub/avm/lib/avm/sources/configuration/rubocop.rb
+- sub/avm/lib/avm/sources/configuration/tests.rb
 - sub/avm/lib/avm/sources/tester.rb
 - sub/avm/lib/avm/sources/tests.rb
 - sub/avm/lib/avm/sources/tests/builder.rb
@@ -1281,6 +1282,11 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/listable/symbol_list.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/listable/value.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/local_time_zone.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/locales.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/locales/from_all_gems.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/locales/from_gem.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/locales/module_i18n_translate.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/method_class.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/options_consumer.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patch.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches.rb
@@ -1308,6 +1314,7 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/i18n_translate.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/immutable.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/listable.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/method_class.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/patch.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/require_sub.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/simple_cache.rb
@@ -1380,6 +1387,7 @@ files:
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/inflector_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/listable_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/local_time_zone_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/method_class_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/options_consumer_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/class/abstract_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/class/self_included_modules_spec.rb
@@ -1390,6 +1398,7 @@ files:
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/hash/sym_keys_hash_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/compare_by_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/listable_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/method_class_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/simple_cache_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/speaker_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/call_if_proc_spec.rb

data/lib/avm/projects/stereotypes/rails_application/update.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/projects/stereotypes/ruby_gem/update'
-
-module Avm
-  module Projects
-    module Stereotypes
-      class RailsApplication
-        class Update < ::Avm::Projects::Stereotypes::RubyGem::Update
-        end
-      end
-    end
-  end
-end

data/lib/avm/projects/stereotypes/ruby_gem/version_bump.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/patches/i18n'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Projects
-    module Stereotypes
-      class RubyGem
-        class VersionBump
-          enable_speaker
-          common_constructor :instance, :target_version
-
-          def run
-            git_checkout
-            change_version
-            bundle_run
-            git_commit
-          end
-
-          private
-
-          def bundle_run
-            infom 'Running "bundle install"...'
-            instance.ruby_gem.bundle('install').execute!
-          end
-
-          def change_version
-            infom 'Setting project version...'
-            instance.version = target_version
-          end
-
-          def git_checkout
-            return unless instance.respond_to?(:git_repo)
-
-            infom "Checkouting #{changing_files.map(&:to_path).join(', ')}..."
-            instance.git_repo.command('checkout', '--',
-                                      *changing_files.map(&:to_path)).execute!
-          end
-
-          def git_commit
-            return unless instance.respond_to?(:git_repo)
-
-            infom "Commiting #{changing_files.map(&:to_path).join(', ')}..."
-            instance.git_repo.command('commit', '-m', git_commit_message, '--',
-                                      *changing_files.map(&:to_path)).execute!
-          end
-
-          def git_commit_message
-            i18n_translate(__method__, version: target_version, __locale: instance.locale)
-          end
-
-          def changing_files
-            [instance.ruby_gem.gemfile_lock_path, instance.ruby_gem.version_file_path]
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm/lib/avm/sources/configuration/_rubocop.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Sources
-    class Configuration < ::EacConfig::OldConfigs
-      RUBOCOP_COMMAND_KEY = 'ruby.rubocop.command'
-      RUBOCOP_GEMFILE_KEY = 'ruby.rubocop.gemfile'
-
-      def rubocop_command
-        read_command(RUBOCOP_COMMAND_KEY)
-      end
-
-      def rubocop_gemfile
-        gemfile_path = read_entry(RUBOCOP_GEMFILE_KEY)
-        return nil if gemfile_path.blank?
-
-        gemfile_path = gemfile_path.to_pathname.expand_path(storage_path.parent)
-        return gemfile_path if gemfile_path.file?
-
-        raise "Gemfile path \"#{gemfile_path}\" does not exist or is not a file"
-      end
-    end
-  end
-end

data/sub/avm/lib/avm/sources/configuration/_tests.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/patches/eac_ruby_gems_utils/gem'
-
-module Avm
-  module Sources
-    class Configuration < ::EacConfig::OldConfigs
-      BUNDLE_TEST_COMMAND_KEY = 'test.bundle_command'
-      TEST_COMMAND_KEY = 'test.command'
-
-      def any_test_command
-        bundle_test_command || test_command
-      end
-
-      def test_command
-        read_command(TEST_COMMAND_KEY)
-      end
-
-      def bundle_test_command
-        read_entry(BUNDLE_TEST_COMMAND_KEY).if_present do |v|
-          args = v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v)
-          ::EacRubyGemsUtils::Gem.new(::File.dirname(storage_path)).bundle(*args).chdir_root
-        end
-      end
-    end
-  end
-end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/patches/i18n.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'i18n'
-
-::I18n.load_path += __dir__.to_pathname.expand_path.parent_n(4).join('locale').glob('*.yaml')
-                      .map(&:to_path)

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/patches.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)