avm-tools 0.116.2 → 0.117.2

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.1'
 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.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -194,14 +194,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.4
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gems_utils
   requirement: !ruby/object:Gem::Requirement
@@ -354,12 +360,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 +463,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 +548,17 @@ 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/bundler.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile/add_or_replace_gem_line.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile/dependency.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 +772,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
@@ -795,7 +806,6 @@ files:
 - sub/eac_cli/lib/eac_cli/definition/base_option.rb
 - sub/eac_cli/lib/eac_cli/definition/base_option/initialize_args_parser.rb
 - sub/eac_cli/lib/eac_cli/definition/boolean_option.rb
-- sub/eac_cli/lib/eac_cli/definition/help_formatter.rb
 - sub/eac_cli/lib/eac_cli/definition/positional_argument.rb
 - sub/eac_cli/lib/eac_cli/enum.rb
 - sub/eac_cli/lib/eac_cli/old_configs.rb
@@ -821,6 +831,7 @@ files:
 - sub/eac_cli/lib/eac_cli/rspec/setup.rb
 - sub/eac_cli/lib/eac_cli/runner.rb
 - sub/eac_cli/lib/eac_cli/runner/after_class_methods.rb
+- sub/eac_cli/lib/eac_cli/runner/class_runner.rb
 - sub/eac_cli/lib/eac_cli/runner/context.rb
 - sub/eac_cli/lib/eac_cli/runner/exit.rb
 - sub/eac_cli/lib/eac_cli/runner/instance_methods.rb
@@ -1281,6 +1292,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 +1324,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 +1397,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 +1408,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__)

data/sub/eac_cli/lib/eac_cli/definition/help_formatter.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/runner_with/help/builder/alternative'
-require 'eac_ruby_utils/core_ext'
-
-module EacCli
-  class Definition
-    class HelpFormatter
-      SEP = ' '
-      IDENT = SEP * 2
-      OPTION_DESC_SEP = IDENT * 2
-
-      class << self
-        def option_long(option)
-          b = option.long
-          b += '=VALUE' if option.argument?
-          b
-        end
-
-        def option_short(option)
-          b = option.short
-          b += 'VALUE' if option.argument?
-          b
-        end
-      end
-
-      common_constructor :definition
-
-      def positional_argument(positional)
-        if positional.subcommand?
-          ::EacCli::RunnerWith::Help::Builder::Alternative::SUBCOMMANDS_MACRO
-        else
-          r = "<#{positional.name}>"
-          r += '...' if positional.repeat?
-          r = "[#{r}]" if positional.optional?
-          r
-        end
-      end
-
-      def section(header, include_header = true)
-        b = include_header ? "#{header.humanize}:\n" : ''
-        b += send("self_#{header}") + "\n"
-        # TO-DO: implement alternatives
-        b
-      end
-
-      def self_options
-        definition.options.map { |option| IDENT + option_definition(option) }.join("\n")
-      end
-
-      def self_usage
-        IDENT + self_usage_arguments.join(SEP)
-      end
-
-      def self_usage_arguments
-        [::EacCli::RunnerWith::Help::Builder::Alternative::PROGRAM_MACRO] +
-          definition.options_argument.if_present([]) { |_v| ['[options]'] } +
-          self_usage_arguments_options +
-          self_usage_arguments_positional
-      end
-
-      def self_usage_arguments_options
-        definition.options.select(&:show_on_usage?).map do |option|
-          self.class.option_long(option)
-        end
-      end
-
-      def self_usage_arguments_positional
-        definition.positional.map { |p| positional_argument(p) }
-      end
-
-      def to_banner
-        "#{definition.description}\n\n#{section('usage')}"
-      end
-    end
-  end
-end