avm 0.59.0 → 0.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e515ae3c2a7c5ce6fa8d620589e359aeb2568edd75b554932adb0a666f0ff8f
-  data.tar.gz: 0ca8ac3456a4f99106d7e91d9429936365707b9ff68e20c0f8f36ba19074fc39
+  metadata.gz: fbd9a676670802e3c3904a555bc7255ab8637a1b474131e6f39190192d47d64d
+  data.tar.gz: 8f743999b2b25fe740cd813356e9104d9b29dcf03968c7a300afb31385babe83
 SHA512:
-  metadata.gz: c3afecc85ab9c116a136758af1a0e8dbf889665eb09a6348f6be0c0e62da42bbd1073c64c19b4c3cece99bc57aae1d40faf645810c2f00fa9d2b9256ffc9d815
-  data.tar.gz: 9771384b7caf46ad06478e2dc6d3d6a1a1f525baf66fdef65fb4e49e22fa4be258bc786372208e9ed8b572bb978c33ad11b9a8f8ae605522c0dbc1deab194213
+  metadata.gz: 1a96c7da39855abf2991b203b697ff69e61d4bdb4b322bebccf06066df2e59ab843d3bc5ecefc2e3a3011d7c514ec1854635d98e8d116089a55075bd7d07e166
+  data.tar.gz: a066bec86aed66c6f2d8bd6f849534551c684340bc61fa67da7a94dd4fdcffc4ffc43b33cb237f184f20a418232587f762bea578f743095fd2eeb2155527c83e

data/lib/avm/file_formats/base.rb

@@ -8,6 +8,7 @@ module Avm
   module FileFormats
     class Base
       enable_abstract_methods
+      compare_by :class
 
       def apply(files)
         old_content = Hash[files.map { |f| [f, File.read(f)] }]
@@ -15,6 +16,12 @@ module Avm
         files.map { |f| build_file_result(f, old_content[f]) }
       end
 
+      # @param path [Pathname]
+      # @return [Avm::FileFormats::FileWith]
+      def file_resource_name(path)
+        path.to_pathname.to_path
+      end
+
       def name
         self.class.name.demodulize
       end

data/lib/avm/file_formats/search_formatter.rb

@@ -50,19 +50,9 @@ module Avm
         @result = []
       end
 
+      # @return [Avm::FileFormats::Base, nil]
       def find_format(file)
-        formats.each do |c|
-          return c if c.match?(file)
-        end
-        nil
-      end
-
-      def formats_uncached
-        formats_from_registry
-      end
-
-      def formats_from_registry
-        ::Avm::Registry.file_formats.available.reverse.map(&:new)
+        ::Avm::Registry.file_formats.detect_optional(file)
       end
 
       def search_files

data/lib/avm/registry/file_formats.rb

@@ -5,6 +5,10 @@ require 'avm/registry/from_gems'
 module Avm
   module Registry
     class FileFormats < ::Avm::Registry::FromGems
+      # @return [Avm::FileFormats::Base]
+      def class_detect(klass, detect_args)
+        klass.new if klass.new.match?(detect_args.first)
+      end
     end
   end
 end

data/lib/avm/rspec/setup.rb

@@ -7,8 +7,8 @@ module Avm
   module Rspec
     module Setup
       require_sub __FILE__
-      EXAMPLES = %w[avm_file_formats_with_fixtures avm_source_generated entries_values
-                    in_avm_registry not_in_avm_registry].freeze
+      EXAMPLES = %w[avm_file_formats_with_fixtures avm_file_format_file_resource_name
+                    avm_source_generated entries_values in_avm_registry not_in_avm_registry].freeze
 
       def self.extended(obj)
         obj.setup_examples

data/lib/avm/rspec/shared_examples/avm_file_format_file_resource_name.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+::RSpec.shared_examples 'avm_file_format_file_resource_name' do |input_expected|
+  describe '#file_resource_name' do
+    input_expected.each do |path, expected_resource_name|
+      context "when path is \"#{path}\"" do
+        let(:instance) { described_class.new }
+
+        it { expect(instance.file_resource_name(path)).to eq(expected_resource_name) }
+      end
+    end
+  end
+end

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

@@ -7,13 +7,14 @@ module Avm
     module AutoCommit
       class FileResourceName
         require_sub __FILE__, include_modules: true
+        enable_simple_cache
         common_constructor :source_root, :path do
           self.source_root = source_root.to_pathname
           self.path = path.to_pathname
         end
 
         def class_name
-          ruby_class_name || relative_path.to_path
+          file_format.file_resource_name(path)
         end
 
         def commit_message
@@ -25,6 +26,13 @@ module Avm
         def relative_path
           path.expand_path.relative_path_from(source_root.expand_path)
         end
+
+        private
+
+        # @return [Avm::FileFormats::Base]
+        def file_format_uncached
+          ::Avm::Registry.file_formats.detect(path)
+        end
       end
     end
   end

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/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/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.59.0'
+  VERSION = '0.61.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.61.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -369,6 +369,7 @@ files:
 - lib/avm/rspec/setup.rb
 - lib/avm/rspec/setup/launcher.rb
 - lib/avm/rspec/setup/source_generator.rb
+- lib/avm/rspec/shared_examples/avm_file_format_file_resource_name.rb
 - lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb
 - lib/avm/rspec/shared_examples/avm_source_generated.rb
 - lib/avm/rspec/shared_examples/entries_values.rb
@@ -378,7 +379,6 @@ files:
 - lib/avm/scms.rb
 - lib/avm/scms/auto_commit.rb
 - lib/avm/scms/auto_commit/file_resource_name.rb
-- lib/avm/scms/auto_commit/file_resource_name/ruby.rb
 - lib/avm/scms/auto_commit/for_file.rb
 - lib/avm/scms/auto_commit/rules.rb
 - lib/avm/scms/auto_commit/rules/base.rb
@@ -396,6 +396,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
@@ -410,11 +411,15 @@ files:
 - 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

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

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Scms
-    module AutoCommit
-      class FileResourceName
-        module Ruby
-          RUBY_CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z},
-                                      %r{app/[^/]+/(.+)\.rb\z}].freeze
-
-          def ruby_class_name
-            RUBY_CLASS_NAME_PATTERNS.each do |pattern|
-              pattern.if_match(relative_path.to_path, false) { |m| return m[1].camelize }
-            end
-            nil
-          end
-        end
-      end
-    end
-  end
-end