eac_tools 0.53.0 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4292c7dafc8fea6004c6bd827f4bc17d03bf3c8027cb468f9484fa3a1410c0e8
-  data.tar.gz: f4c8f529510815f1eced983511935c96271332fb5bb64d9899037c8239b8970a
+  metadata.gz: ae856818c701f2192ec09610cac0d471e150e435c7700028e93f2b3e511e49f5
+  data.tar.gz: 9214f069183c0b48d954c883e3a1f2e0f59d7a3227c1089b4315c70464a9028f
 SHA512:
-  metadata.gz: 92c6761b6cf54fe18ac480e51e4acff82b581c81ce7fb9971e0dd4a3094edfa20e17c9172a48b9bede3a374b741a1fa3818e744fcc2134d59261ceff43761bd7
-  data.tar.gz: af5cefe3c7ee50134b44b63958412dbf23a4d2c76d5d6a354b5cbd544090e59aa578a1293bc3b508eb6ec5d053dc950097830c457a863ea158e67920f6b96eea
+  metadata.gz: b0b1c879ce8f91b853f1677f217c2e4c89f63a63de8a3525e9ce422a47a819a94cd83aee66d4edbc8d8a8ada4b7f153098eb2f365bd4a5e3e304d6bc7c4a1f45
+  data.tar.gz: 4b8ec43cea4942df3538d83fa40627d53e668066d6961d4b3bf1a26c2f2a0922890b3d846f56e501d64c0fb81e1e11e727b6f347a613886d442c52fcedd399c8

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.53.0)
-      avm (~> 0.60)
+    eac_tools (0.55.0)
+      avm (~> 0.62)
       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,11 +13,11 @@ 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)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
+      avm-tools (~> 0.145)
+      eac_ruby_utils (~> 0.111)
 
 PATH
   remote: sub/aranha-parsers
@@ -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,42 +163,42 @@ 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.145.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
-      avm (~> 0.59)
-      avm-eac_ruby_base1 (~> 0.27, >= 0.27.3)
+      avm (~> 0.62)
+      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.62.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
       eac_cli (~> 0.30)
       eac_config (~> 0.12)
       eac_docker (~> 0.5)
       eac_fs (~> 0.16)
       eac_git (~> 0.14)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
+      eac_ruby_utils (~> 0.111)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -253,7 +253,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.110.1)
+    eac_ruby_utils (0.111.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.1)
       bundler
@@ -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.55.0'
 end

data/sub/avm/avm.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_docker', '~> 0.5'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14'
-  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.111'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

data/sub/avm/lib/avm/scms/auto_commit/file_resource_name.rb

@@ -14,7 +14,7 @@ module Avm
         end
 
         def class_name
-          file_format.file_resource_name(path)
+          file_format.file_resource_name(relative_path)
         end
 
         def commit_message

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/auto_commit/for_file.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    module AutoCommit
+      class ForFile
+        common_constructor :source, :path, :rules
+
+        delegate :run, to: :scm_auto_commit
+
+        # @return [Pathname]
+        def path_for_auto_commit
+          path.relative_path_from(source_for_auto_commit.path)
+        end
+
+        # @return [Avm::Scms::AutoCommit::ForFile]
+        def scm_auto_commit
+          ::Avm::Scms::AutoCommit::ForFile.new(source_for_auto_commit.scm, path_for_auto_commit,
+                                               rules)
+        end
+
+        # @return [Avm::Sources::Base]
+        def source_for_auto_commit
+          source.sub_for_path(path) || source
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    module AutoCommit
+      require_sub __FILE__
+    end
+  end
+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/subs.rb

@@ -12,6 +12,11 @@ module Avm
         SUBS_EXCLUDE_PATHS_DEFAULT = [].freeze
         SUBS_INCLUDE_PATHS_DEFAULT = ['sub/*'].freeze
 
+        # @return [Avm::Sources::Base, nil]
+        def sub_for_path(path)
+          subs.lazy.map { |sub| path.expand_path.child_of?(sub.path) ? sub : nil }.find(&:present?)
+        end
+
         # @return [Enumerable<Avm::Sources::Base>]
         def subs
           subs_paths_to_search

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.62.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) }