eac_tools 0.53.0 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4292c7dafc8fea6004c6bd827f4bc17d03bf3c8027cb468f9484fa3a1410c0e8
-  data.tar.gz: f4c8f529510815f1eced983511935c96271332fb5bb64d9899037c8239b8970a
+  metadata.gz: fa6e9611db77983e7a2e2c85a80c76b1f862a1f1995a787396bb162819379e54
+  data.tar.gz: 11b3d60caf8f8cac1ada36e41cf280f01ea7ac6b37e79284193ff09f9a06bbf8
 SHA512:
-  metadata.gz: 92c6761b6cf54fe18ac480e51e4acff82b581c81ce7fb9971e0dd4a3094edfa20e17c9172a48b9bede3a374b741a1fa3818e744fcc2134d59261ceff43761bd7
-  data.tar.gz: af5cefe3c7ee50134b44b63958412dbf23a4d2c76d5d6a354b5cbd544090e59aa578a1293bc3b508eb6ec5d053dc950097830c457a863ea158e67920f6b96eea
+  metadata.gz: 073ba61cf82fc77a0676ea984e82840d661cd70ccac1faa1af088f1758ecfe9f895aefca5603ed107fe109d9aa3fbf2c0606b954e321994af7cc8d977169e8fb
+  data.tar.gz: 78cfcc7f331d552ec6e541d752d4d21e87c8eee70083f0257118564987d0dec0eb83849f3c5666439a1223baa2d012f85b2ace8fb751d4da32b8a80734c23e45

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.53.0)
-      avm (~> 0.60)
+    eac_tools (0.54.0)
+      avm (~> 0.61)
       avm-eac_asciidoctor_base0 (~> 0.15)
-      avm-eac_generic_base0 (~> 0.9)
+      avm-eac_generic_base0 (~> 0.10)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.4, >= 0.4.1)
       avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
@@ -13,10 +13,10 @@ PATH
       avm-eac_rails_base1 (~> 0.8)
       avm-eac_redmine_base0 (~> 0.18)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.28, >= 0.28.1)
+      avm-eac_ruby_base1 (~> 0.29)
       avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
       avm-eac_wordpress_base0 (~> 0.3)
-      avm-tools (~> 0.143)
+      avm-tools (~> 0.144)
       eac_ruby_utils (~> 0.110, >= 0.110.1)
 
 PATH
@@ -45,8 +45,8 @@ PATH
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.9.0)
-      avm (~> 0.60)
+    avm-eac_generic_base0 (0.10.0)
+      avm (~> 0.61)
       eac_ruby_utils (~> 0.110, >= 0.110.1)
 
 PATH
@@ -118,9 +118,9 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.28.1)
-      avm (~> 0.60)
-      avm-eac_generic_base0 (~> 0.9)
+    avm-eac_ruby_base1 (0.29.0)
+      avm (~> 0.61)
+      avm-eac_generic_base0 (~> 0.10)
       eac_ruby_utils (~> 0.110, >= 0.110.1)
 
 PATH
@@ -163,35 +163,35 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.11.0)
-      avm (~> 0.59)
+    avm-git (0.12.0)
+      avm (~> 0.61)
       avm-files (~> 0.6)
       eac_git (~> 0.14)
       eac_ruby_utils (~> 0.110, >= 0.110.1)
-      git (~> 1.13)
+      git (~> 1.13, >= 1.13.1)
 
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.143.0)
+    avm-tools (0.144.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
-      avm (~> 0.59)
-      avm-eac_ruby_base1 (~> 0.27, >= 0.27.3)
+      avm (~> 0.61)
+      avm-eac_ruby_base1 (~> 0.29)
       avm-eac_ubuntu_base0 (~> 0.4)
       avm-files (~> 0.6)
-      avm-git (~> 0.11)
+      avm-git (~> 0.12)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.14)
       eac_ruby_base0 (~> 0.17, >= 0.17.1)
       eac_templates (~> 0.3, >= 0.3.2)
-      git (~> 1.13)
+      git (~> 1.13, >= 1.13.1)
       ruby-progressbar (~> 1.11)
 
 PATH
   remote: sub/avm
   specs:
-    avm (0.60.0)
+    avm (0.61.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
       eac_cli (~> 0.30)
       eac_config (~> 0.12)
@@ -263,7 +263,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7)
+    activesupport (6.1.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -291,7 +291,7 @@ GEM
     eac_templates (0.3.2)
       eac_config (~> 0.11, >= 0.11.1)
       eac_ruby_utils (~> 0.102, >= 0.102.1)
-    faraday (1.10.2)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -320,7 +320,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     filesize (0.2.0)
-    git (1.13.0)
+    git (1.13.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     hpricot (0.8.6)
@@ -332,7 +332,7 @@ GEM
     minitest (5.17.0)
     multipart-post (2.2.3)
     net-ssh (4.2.0)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.0-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
@@ -344,7 +344,7 @@ GEM
     parslet (2.0.0)
     public_suffix (5.0.1)
     racc (1.6.2)
-    rack (3.0.3)
+    rack (3.0.4.1)
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)
@@ -358,7 +358,7 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.2)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.53.0'
+  VERSION = '0.54.0'
 end

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

@@ -16,6 +16,13 @@ module Avm
           raise_abstract_method __method__
         end
 
+        # @param commit_to_reset [Avm::Scms::Commit]
+        # @param commit_info [Avm::Scms::CommitInfo]
+        # @return [Avm::Scms::Commit]
+        def reset_and_commit(_commit_to_reset, _commit_info)
+          raise_abstract_method __method__
+        end
+
         # @param commit_info [Avm::Scms::CommitInfo]
         # @return [Avm::Scms::Commit]
         def run_commit(_commit_info)

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

@@ -5,6 +5,19 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Scms
     class CommitInfo
+      class << self
+        # @param source [Avm::Scms::CommitInfo, String]
+        # @return [Avm::Scms::CommitInfo]
+        def assert(source)
+          return source if source.is_a?(self)
+          return new if source.nil?
+          return new.message(source) if source.is_a?(::String)
+          return assert(source.call) if source.is_a?(::Proc)
+
+          raise "Unmapped assertion for #{source.to_debug}"
+        end
+      end
+
       enable_immutable
 
       immutable_accessor :fixup, :message

data/sub/avm/lib/avm/scms/null/commit.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/scms/base'
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Null < ::Avm::Scms::Base
+      class Commit < ::Avm::Scms::Commit
+        common_constructor :scm
+      end
+    end
+  end
+end

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

@@ -6,6 +6,13 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Scms
     class Null < ::Avm::Scms::Base
+      require_sub __FILE__
+
+      # @return [Avm::Scms::Null::Commit]
+      def head_commit
+        @head_commit ||= Avm::Scms::Null::Commit.new(self)
+      end
+
       def update
         # Do nothing
       end

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

@@ -22,6 +22,13 @@ module Avm
           configuration.entry(*entry_args)
         end
 
+        # The possible absolute paths for configuration files.
+        #
+        # @return [Array<Pathname>]
+        def configuration_paths
+          CONFIGURATION_FILENAMES.map { |filename| path.join(filename) }
+        end
+
         # @return [EacRubyUtils::Envs::Command, nil]
         def configuration_value_to_env_command(value)
           return value if value.is_a?(::EacRubyUtils::Envs::Command)
@@ -51,10 +58,10 @@ module Avm
 
         # @return [EacConfig::YamlFileNode]
         def configuration_uncached
-          CONFIGURATION_FILENAMES.each do |filename|
-            configuration_with_filename(filename, true)
+          configuration_paths.each do |config_path|
+            configuration_with_filename(config_path, true)
           end
-          configuration_with_filename(CONFIGURATION_FILENAMES.first, false)
+          configuration_with_filename(configuration_paths.first, false)
         end
 
         # @return [String]
@@ -68,9 +75,8 @@ module Avm
         end
 
         # @return [EacConfig::YamlFileNode, nil]
-        def configuration_with_filename(filename, needs_exist)
-          file_path = path.join(filename)
-          return ::EacConfig::YamlFileNode.new(file_path) if !needs_exist || file_path.exist?
+        def configuration_with_filename(config_path, needs_exist)
+          return ::EacConfig::YamlFileNode.new(config_path) if !needs_exist || config_path.exist?
 
           nil
         end

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

@@ -20,6 +20,13 @@ module Avm
         def default_locale
           ::I18n.default_locale
         end
+
+        # @param entry_suffix [String]
+        # @param values [Hash]
+        # @return [String]
+        def i18n_translate(entry_suffix, values = {})
+          self.class.i18n_translate(entry_suffix, values.merge(__locale: locale))
+        end
       end
     end
   end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Organizational
+        DEFAULT_ORGANIZATIONAL = false
+        ORGANIZATIONAL_KEY = 'organizational'
+
+        # @return [Boolean]
+        def organizational?
+          if organizational_entry.found?
+            organizational_entry.value.to_bool
+          else
+            default_organizational
+          end
+        end
+
+        def organizational_entry
+          configuration.entry(ORGANIZATIONAL_KEY)
+        end
+
+        # @return [Boolean]
+        def default_organizational
+          DEFAULT_ORGANIZATIONAL
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Update
+        # To override in subclasses.
+        def on_sub_updated
+          # Do nothing
+        end
+
+        def update
+          update_self
+          update_subs
+        end
+
+        def update_self
+          scm.commit_if_change(-> { update_self_commit_message }) do
+            update_self_content
+            parent.if_present(&:on_sub_updated)
+          end
+        end
+
+        # Update source self content.
+        #
+        # To override in subclasses.
+        def update_self_content
+          # Do nothing
+        end
+
+        def update_self_commit_message
+          i18n_translate(__method__)
+        end
+
+        def update_subs
+          subs.each { |sub| update_sub(sub) }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      class UpdateSub
+        enable_method_class
+
+        common_constructor :source, :sub
+
+        def result
+          update_version
+          return unless sub.organizational?
+
+          sub.update
+        end
+
+        private
+
+        def update_version
+          base_commit = source.scm.head_commit
+          sub.scm.update
+          on_update_version_commit_change(base_commit) unless base_commit == source.scm.head_commit
+        end
+
+        def on_update_version_commit_change(base_commit)
+          source.on_sub_updated if no_scm_updated?
+          source.scm.reset_and_commit(base_commit, update_version_commit_info)
+        end
+
+        def no_scm_updated?
+          source.scm.head_commit.no_scm_changed_files.any?
+        end
+
+        # @param commit_info [Avm::Scms::CommitInfo]
+        def update_version_commit_info
+          Avm::Scms::CommitInfo.new.message(
+            no_scm_updated? ? update_version_no_scm_message : update_version_scm_message
+          )
+        end
+
+        # @return [String]
+        def update_version_no_scm_message
+          source.i18n_translate(__method__, application_id: sub.application_id,
+                                            path: sub.relative_path, version: sub.version)
+        end
+
+        # @return [String]
+        def update_version_scm_message
+          sub.scm.i18n_translate(__method__)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module VersionBump
+        # @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(&:on_sub_updated)
+          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

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

@@ -23,7 +23,7 @@ module Avm
         self.options = ::Avm::Sources::Base.lists.option.hash_keys_validate!(options)
       end
 
-      abstract_methods :update, :valid?
+      abstract_methods :valid?
 
       # @return [EacRubyUtils::Envs::LocalEnv]
       def env

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.60.0'
+  VERSION = '0.61.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,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.60'
+  s.add_dependency 'avm', '~> 0.61'
   s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -10,12 +10,8 @@ module Avm
         require_sub __FILE__, include_modules: true
         enable_abstract_methods
 
-        def update
-          # Do nothing
-        end
-
         def valid?
-          ::Avm::Registry.scms.detect_optional(path).present?
+          configuration_paths.any?(&:exist?)
         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.9.0'
+    VERSION = '0.10.0'
   end
 end

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

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.60'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.9'
+  s.add_dependency 'avm', '~> 0.61'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.10'
   s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'

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

@@ -0,0 +1,22 @@
+# 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 Update
+          def on_sub_updated
+            update_self_content
+          end
+
+          def update_self_content
+            bundle_update.execute!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,10 +8,6 @@ module Avm
     module Sources
       class Base < ::Avm::EacGenericBase0::Sources::Base
         module VersionBump
-          def after_sub_version_bump_do_changes
-            bundle('install').chdir_root.execute!
-          end
-
           def version_bump_do_changes(target_version)
             self.version = target_version
             bundle('install').chdir_root.execute!

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

@@ -3,7 +3,6 @@
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/rubygems/version_file'
 require 'avm/eac_ruby_base1/sources/runners'
-require 'avm/eac_ruby_base1/sources/update'
 require 'avm/version_number'
 require 'eac_ruby_utils/core_ext'
 
@@ -57,10 +56,6 @@ module Avm
           gemfile_path.exist? || gemspec_path.present?
         end
 
-        def update
-          ::Avm::EacRubyBase1::Sources::Update.new(self)
-        end
-
         # @return [Avm::VersionNumber]
         def version
           version_file.value.if_present { |v| ::Avm::VersionNumber.new(v) }

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

@@ -36,9 +36,7 @@ module Avm
         end
 
         def parent_bundle
-          return unless source.parent.if_present { |v| v.is_a?(::Avm::EacRubyBase1::Sources::Base) }
-
-          source.parent.bundle_update.execute!
+          source.parent.if_present(&:on_sub_updated)
         end
 
         def update_code

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.28.1'
+    VERSION = '0.29.0'
   end
 end

data/sub/avm-eac_ruby_base1/locale/en.yml

@@ -2,9 +2,8 @@ en:
   avm:
     eac_ruby_base1:
       sources:
-        update:
-          no_scm_update_commit_message: "Gem \"%{name}\" (Local): update to '%{version}'."
-          scm_update_commit_message: '**/.gitrepo: fix/update.'
-          update_gemfile_lock_commit_message: 'All gems: update.'
+        base:
+          update_self_commit_message: 'All gems: update.'
+          update_version_no_scm_message: "Gem \"%{application_id}\" (Local): update to '%{version}'."
         update_dependency_requirements:
           commit_message: "Gem \"%{name}\": update to '%{requirements_list}'."

data/sub/avm-eac_ruby_base1/locale/pt-BR.yml

@@ -2,9 +2,8 @@ pt-BR:
   avm:
     eac_ruby_base1:
       sources:
-        update:
-          no_scm_update_commit_message: "Gem \"%{name}\" (Local): atualiza para '%{version}'."
-          scm_update_commit_message: '**/.gitrepo: conserta/atualiza.'
-          update_gemfile_lock_commit_message: 'Todas as gems: atualiza.'
+        base:
+          update_self_commit_message: 'Todas as gems: atualiza.'
+          update_version_no_scm_message: "Gem \"%{application_id}\" (Local): atualiza para '%{version}'."
         update_dependency_requirements:
           commit_message: "Gem \"%{name}\": atualiza para '%{requirements_list}'."

data/sub/avm-git/avm-git.gemspec

@@ -10,13 +10,13 @@ Gem::Specification.new do |s|
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib}/**/*']
+  s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.59'
+  s.add_dependency 'avm', '~> 0.61'
   s.add_dependency 'avm-files', '~> 0.6'
   s.add_dependency 'eac_git', '~> 0.14'
   s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
-  s.add_dependency 'git', '~> 1.13'
+  s.add_dependency 'git', '~> 1.13', '>= 1.13.1'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

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

@@ -7,7 +7,7 @@ module Avm
     module Scms
       class Git < ::Avm::Scms::Base
         class ChangeTracker
-          common_constructor :git_scm, :message
+          common_constructor :git_scm, :commit_info
           attr_reader :starting_commit
           delegate :git_repo, to: :git_scm
 
@@ -22,7 +22,7 @@ module Avm
             git_scm.commit_dirty
             return nil if starting_commit == git_repo.head
 
-            git_scm.reset_and_commit(starting_commit, message)
+            git_scm.reset_and_commit(starting_commit, commit_info)
           end
 
           private

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

@@ -20,21 +20,24 @@ module Avm
             end
           end
 
+          # @param commit_info [Avm::Scms::CommitInfo]
           # @return [Avm::Git::Scms::Git::Commit,nil]
-          def commit_dirty(message = nil)
+          def commit_dirty(commit_info = nil)
             return nil unless git_repo.dirty?
 
+            commit_info = ::Avm::Scms::CommitInfo.assert(commit_info)
+            commit_info = commit_info.message(COMMIT_DIRTY_DEFAULT_MESSAGE) if
+              commit_info.message.blank?
+
             git_repo.command('add', '.').execute!
-            git_repo.command(
-              'commit', '-m',
-              message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)
-            ).execute!
+            run_commit(commit_info)
             head_commit
           end
 
+          # @param commit_info [Avm::Scms::CommitInfo]
           # @return [Avm::Git::Scms::Git::Commit,nil]
-          def commit_if_change(message = nil)
-            tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, message)
+          def commit_if_change(commit_info = nil)
+            tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, commit_info)
             tracker.start
             yield
             tracker.stop
@@ -45,10 +48,11 @@ module Avm
             commit(git_repo.head)
           end
 
+          # @param commit_info [Avm::Scms::CommitInfo]
           # @return [Avm::Git::Scms::Git::Commit]
-          def reset_and_commit(commit_to_reset, message)
+          def reset_and_commit(commit_to_reset, commit_info)
             git_repo.command('reset', '--soft', commit(commit_to_reset).git_commit.id).execute!
-            commit_dirty(message)
+            commit_dirty(commit_info)
           end
         end
       end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/scms/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubBase < ::Avm::Scms::Base
+        enable_abstract_methods
+
+        delegate :changed_files, :commit_if_change, :current_milestone_base_commit, :interval,
+                 :head_commit, :reset_and_commit, :run_commit, to: :parent_scm
+      end
+    end
+  end
+end

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

@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/scms/base'
+require 'avm/git/scms/git_sub_base'
 require 'eac_git/local'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Git
     module Scms
-      class GitSubrepo < ::Avm::Scms::Base
-        delegate :changed_files, :commit_if_change, :current_milestone_base_commit, :interval,
-                 :head_commit, :run_commit, to: :parent_scm
-
+      class GitSubrepo < ::Avm::Git::Scms::GitSubBase
         def update
           git_subrepo.command('clean').execute!
           git_subrepo.command('pull').execute!

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/provider'
+require 'avm/git/scms/git_sub_base'
+require 'avm/scms/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubtree < ::Avm::Git::Scms::GitSubBase
+        def update
+          # Do nothing
+        end
+
+        def valid?
+          return false unless ::Avm::Git::Scms::Provider
+                              .new.all.any? { |scm_class| parent_scm.is_a?(scm_class) }
+
+          (::Avm::Git::Scms::Provider.new.all - [self.class])
+            .lazy.map { |scm_class| scm_class.new(path) }.none?(&:valid?)
+        end
+      end
+    end
+  end
+end

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

@@ -2,13 +2,15 @@
 
 require 'avm/git/scms/git'
 require 'avm/git/scms/git_subrepo'
+require 'avm/git/scms/git_subtree'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Git
     module Scms
       class Provider
-        SCMS = [::Avm::Git::Scms::Git, ::Avm::Git::Scms::GitSubrepo].freeze
+        SCMS = [::Avm::Git::Scms::Git, ::Avm::Git::Scms::GitSubrepo,
+                ::Avm::Git::Scms::GitSubtree].freeze
 
         def all
           SCMS

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.11.0'
+    VERSION = '0.12.0'
   end
 end

data/sub/avm-git/locale/en.yml

@@ -0,0 +1,6 @@
+en:
+  avm:
+    git:
+      scms:
+        git_subrepo:
+          update_version_scm_message: '**/.gitrepo: fix/update.'

data/sub/avm-git/locale/pt-BR.yml

@@ -0,0 +1,6 @@
+pt-BR:
+  avm:
+    git:
+      scms:
+        git_subrepo:
+          update_version_scm_message: '**/.gitrepo: conserta/atualiza.'

data/sub/avm-tools/avm-tools.gemspec

@@ -15,17 +15,17 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
-  s.add_dependency 'avm', '~> 0.59'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.3'
+  s.add_dependency 'avm', '~> 0.61'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.29'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'avm-git', '~> 0.11'
+  s.add_dependency 'avm-git', '~> 0.12'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_git', '~> 0.14'
   s.add_dependency 'eac_ruby_base0', '~> 0.17', '>= 0.17.1'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
-  s.add_dependency 'git', '~> 1.13'
+  s.add_dependency 'git', '~> 1.13', '>= 1.13.1'
   s.add_dependency 'ruby-progressbar', '~> 1.11'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-tools/lib/avm/tools/runner/source/subs.rb

@@ -39,7 +39,8 @@ module Avm
             return '' unless parsed.info?
 
             ' [' + {
-              'CLASS' => sub.class.name
+              'CLASS' => sub.class.name,
+              'SCM' => sub.scm.class.name
             }.map { |k, v| "#{k}: #{v}" }.join(', ') + ']'
           end
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.143.0'
+    VERSION = '0.144.0'
   end
 end

data/sub/avm-tools/spec/lib/avm/tools/runner/source/issue/complete_spec.rb

@@ -17,6 +17,7 @@ require 'fileutils'
       eac_local_repos.assert_remote_url(remote_name, remote_repos.root_path.to_path)
       local_repos.command('checkout', '-b', issue_ref).execute!
       local_repos.file('myfile1.txt').touch
+      local_repos.file(::Avm::Sources::Base::Configuration::CONFIGURATION_FILENAMES.first).touch
       local_repos.command('add', '.').execute!
       local_repos.command('commit', '-m', 'myfile1.txt').execute!
       local_repos.command('push', 'origin', issue_ref).execute!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.54.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-10 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '0.61'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '0.61'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: avm-eac_latex_base0
   requirement: !ruby/object:Gem::Requirement
@@ -188,20 +188,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: '0.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: '0.29'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -242,14 +236,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.143'
+        version: '0.144'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.143'
+        version: '0.144'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -392,7 +386,6 @@ files:
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/instances/base.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/docker.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/docker/runner.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/version.rb
@@ -671,6 +664,7 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/bundler.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rake.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rubygems.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/update.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/bundle_update.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/namespace_replacer.rb
@@ -688,7 +682,6 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/tests/multiple/decorated_gem.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/tests/multiple/result.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/tests/rspec.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
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb
@@ -921,7 +914,9 @@ files:
 - sub/avm-git/lib/avm/git/scms/git/interval.rb
 - sub/avm-git/lib/avm/git/scms/git/milestones.rb
 - sub/avm-git/lib/avm/git/scms/git/run_commit.rb
+- sub/avm-git/lib/avm/git/scms/git_sub_base.rb
 - sub/avm-git/lib/avm/git/scms/git_subrepo.rb
+- sub/avm-git/lib/avm/git/scms/git_subtree.rb
 - sub/avm-git/lib/avm/git/scms/provider.rb
 - sub/avm-git/lib/avm/git/subrepo_check.rb
 - sub/avm-git/lib/avm/git/subrepo_check/parent.rb
@@ -931,6 +926,8 @@ files:
 - sub/avm-git/lib/avm/git/vendor.rb
 - sub/avm-git/lib/avm/git/vendor/github.rb
 - sub/avm-git/lib/avm/git/version.rb
+- sub/avm-git/locale/en.yml
+- sub/avm-git/locale/pt-BR.yml
 - sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec.rb
 - sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.source.out
 - sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.target.yaml
@@ -1169,6 +1166,7 @@ files:
 - sub/avm/lib/avm/scms/inflector.rb
 - sub/avm/lib/avm/scms/interval.rb
 - sub/avm/lib/avm/scms/null.rb
+- sub/avm/lib/avm/scms/null/commit.rb
 - sub/avm/lib/avm/self/docker_image.rb
 - sub/avm/lib/avm/self/instance.rb
 - sub/avm/lib/avm/self/instance/entry_keys.rb
@@ -1183,11 +1181,15 @@ files:
 - sub/avm/lib/avm/sources/base/configuration.rb
 - sub/avm/lib/avm/sources/base/instance.rb
 - sub/avm/lib/avm/sources/base/locale.rb
+- sub/avm/lib/avm/sources/base/organizational.rb
 - sub/avm/lib/avm/sources/base/parent.rb
 - sub/avm/lib/avm/sources/base/stereotype.rb
 - sub/avm/lib/avm/sources/base/subs.rb
 - sub/avm/lib/avm/sources/base/subs_paths.rb
 - sub/avm/lib/avm/sources/base/testing.rb
+- sub/avm/lib/avm/sources/base/update.rb
+- sub/avm/lib/avm/sources/base/update_sub.rb
+- sub/avm/lib/avm/sources/base/version_bump.rb
 - sub/avm/lib/avm/sources/configuration.rb
 - sub/avm/lib/avm/sources/configuration/rubocop.rb
 - sub/avm/lib/avm/sources/runner.rb

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

@@ -1,35 +0,0 @@
-# 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_ruby_base1/lib/avm/eac_ruby_base1/sources/update.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRubyBase1
-    module Sources
-      class Update
-        require_sub __FILE__
-        enable_simple_cache
-        enable_speaker
-        common_constructor :source do
-          perform
-        end
-
-        def bundle_update
-          infom 'Running "bundle update && bundle install"...'
-          source.bundle_update.execute!
-        end
-
-        protected
-
-        def perform
-          update_gemfile_lock
-          update_subs
-        end
-
-        def update_gemfile_lock
-          source.scm.commit_if_change(-> { update_gemfile_lock_commit_message }) do
-            bundle_update
-          end
-        end
-
-        def update_gemfile_lock_commit_message
-          i18n_translate(__method__, __locale: source.locale)
-        end
-
-        def update_subs
-          source.subs.each do |sub|
-            ::Avm::EacRubyBase1::Sources::Update::SubUpdate.new(self, sub)
-          end
-        end
-      end
-    end
-  end
-end