avm 0.60.0 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee7bf9c423e00a5bbd0e070ab0f1a191f338e80c794fde0609a3463c7307d78
-  data.tar.gz: cdb1a486aadcb408fee1123c133f54c5d46fa912be903f49ed547166027b62a2
+  metadata.gz: dbbec67d9fc5bb02ab4df825b7ab2d7a41d8f8beceb6d9615e4d24e60f6add09
+  data.tar.gz: 7201af31fe31837eb6723183b610f846f2e315226e5a3d3ccf5766f52519a0f6
 SHA512:
-  metadata.gz: d1a37030086636976394fe3392a2681c4065cb8dbabd32fc1f702193b581372372519ef099b254c7c126f3818cff4715dc1597f2ecab1c65a9953044a20362a0
-  data.tar.gz: 2a72c35e69480aabe07bc71a00ec8cfaf30854ced09da08b423f88c9229f59e42275a902d9797f12a23ec5305c4893803770425b439035a96e70d3f45be30060
+  metadata.gz: dbacefed0fe370148ac0e51e4d268fe135c1011c2645923acce1eec543140deec81933d1fb6b3464d62edc17349b0069e3dc14a023b3f141e620122a91b1d349
+  data.tar.gz: d9fce3973197919cc053f1b30cf26d1b98a407d43e290c2f0b3ac852ffab57359b9570839c188d73587a8721ae48b561a7fa5f43a2ba53eb3dc822c5ff1de2da

data/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.62.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -106,20 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.110'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.110.1
+        version: '0.111'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.110'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.110.1
+        version: '0.111'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -396,6 +390,7 @@ files:
 - lib/avm/scms/inflector.rb
 - lib/avm/scms/interval.rb
 - lib/avm/scms/null.rb
+- lib/avm/scms/null/commit.rb
 - lib/avm/self/docker_image.rb
 - lib/avm/self/instance.rb
 - lib/avm/self/instance/entry_keys.rb
@@ -405,16 +400,22 @@ files:
 - lib/avm/source_generators/option_list.rb
 - lib/avm/source_generators/runner.rb
 - lib/avm/sources.rb
+- lib/avm/sources/auto_commit.rb
+- lib/avm/sources/auto_commit/for_file.rb
 - lib/avm/sources/base.rb
 - lib/avm/sources/base/application.rb
 - lib/avm/sources/base/configuration.rb
 - lib/avm/sources/base/instance.rb
 - lib/avm/sources/base/locale.rb
+- lib/avm/sources/base/organizational.rb
 - lib/avm/sources/base/parent.rb
 - lib/avm/sources/base/stereotype.rb
 - lib/avm/sources/base/subs.rb
 - lib/avm/sources/base/subs_paths.rb
 - lib/avm/sources/base/testing.rb
+- lib/avm/sources/base/update.rb
+- lib/avm/sources/base/update_sub.rb
+- lib/avm/sources/base/version_bump.rb
 - lib/avm/sources/configuration.rb
 - lib/avm/sources/configuration/rubocop.rb
 - lib/avm/sources/runner.rb