avm 0.80.0 → 0.82.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07288db64613db9f7542a592edf18a5ef9c23319b0e89dd14fa475c90c76429d'
-  data.tar.gz: 20510a4b8aea2c182c067ec62be6faba8e45f268e3a7830a8af0358543881151
+  metadata.gz: ba7de7fb51ef4cb64b226e0f9797ceee1253fd91aec2db6dc97d51fa9ea1d9a0
+  data.tar.gz: f6d75846fd246eba14ebb2b20dd0075c3c83d4177b4d017f806763bf1f9bf5df
 SHA512:
-  metadata.gz: a2cf4806ecc92f0e7aff8793e9e9157f06564396770df043cbafbc7ee164dd0f86d1bf547b3b5ddd42d7f113fd9d73884725506bf7369394964d66fdd1450c75
-  data.tar.gz: 26611244b005c70d57d1625de6a55b1332a397769906fd0958aac6a931a61b7ddc18041471b14b5f2365e09b872311bfcf5455d254754956d6f4568488705208
+  metadata.gz: 79c47096a1c10051bfa2c1371f8417a65375c386c81be0dc85998e95a3f11e4fba147760571a3f1e8506ab6e16dcfebcbb45307ab64bef6695c00c283cf2802f
+  data.tar.gz: 9e92f65585c980504fc39eb098728c8be153a9cf70d7e0ba9656e0572cf6a9db593d20e829ba94bbbbc71480b6afeca16a6d0cb01069f6f7e378e9dd96f6ed74

data/lib/avm/application_scms/base.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module ApplicationScms
+    class Base
+      acts_as_abstract
+
+      class << self
+        # @return [String]
+        def type_name
+          name.gsub(/#{Regexp.quote('::ApplicationScms::Base')}$/, '').demodulize
+        end
+      end
+
+      # !method initialize(application)
+      # @param application [Avm::Application::Base]
+      common_constructor :application
+      delegate :type_name, to: :class
+
+      # @param path [Pathname]
+      # @return [Pathname]
+      def assert_main_at(path) # rubocop:disable Lint/UnusedMethodArgument
+        raise_abstract_method __method__
+      end
+
+      # @return [String]
+      def to_s
+        "#{type_name}[#{to_s_type_specific}]"
+      end
+
+      # @return [String]
+      def to_s_type_specific
+        ''
+      end
+    end
+  end
+end

data/lib/avm/application_scms.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module ApplicationScms
+    require_sub __FILE__
+  end
+end

data/lib/avm/applications/base/auto_local_source_path.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_fs/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      class AutoLocalSourcePath
+        acts_as_instance_method
+        common_constructor :application
+
+        # @return [Pathname]
+        def result
+          application.scm.assert_main_at(fs_cache.path.to_pathname)
+        end
+
+        # @return [String]
+        def fs_object_id
+          application.id.to_s.parameterize
+        end
+      end
+    end
+  end
+end

data/lib/avm/applications/base/local_source.rb

@@ -10,7 +10,7 @@ module Avm
       module LocalSource
         # @return [Pathname]
         def local_source_path
-          local_source_path_entry.value!.to_pathname
+          (local_source_path_entry.value || auto_local_source_path).to_pathname
         end
 
         # @return [EacConfig::Entry]

data/lib/avm/applications/base/scm.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module Scm
+        common_concern do
+          uri_components_entries_values 'scm', %w[repos_path ssh_username type]
+        end
+
+        # @return [Avm::ApplicationScms::Base]
+        def scm
+          @scm ||= ::Avm::Registry.application_scms.detect(self)
+        end
+
+        # @param value [String]
+        # @return [String]
+        def scm_repos_path_inherited_value_proc(value)
+          value.to_pathname.join(id).to_path
+        end
+      end
+    end
+  end
+end

data/lib/avm/applications/base.rb

@@ -7,11 +7,18 @@ module Avm
   module Applications
     class Base
       enable_simple_cache
-      require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
 
       AVM_TYPE = 'Application'
 
+      class << self
+        # @param id [String]
+        # @return [Avm::Applications::Base]
+        def by_id(id)
+          new(id)
+        end
+      end
+
       common_constructor :id do
         self.id = id.to_s
       end
@@ -23,6 +30,8 @@ module Avm
       def instance(suffix)
         stereotype.instance_class.new(self, suffix)
       end
+
+      require_sub __FILE__, include_modules: true
     end
   end
 end

data/lib/avm/entries/base/inherited_entry_value.rb

@@ -18,8 +18,23 @@ module Avm
           end
         end
 
+        # @param provider_id [String]
+        # @return [Avm::Entries::Base]
+        def other_entries_provider(provider_id)
+          other_entries_provider_class.by_id(provider_id)
+        end
+
+        # @return [Class]
+        def other_entries_provider_class
+          [::Avm::Instances::Base, ::Avm::Applications::Base].each do |klass|
+            return klass if entries_provider.is_a?(klass)
+          end
+
+          raise "No provider class found for \"#{entries_provider}\""
+        end
+
         def other_entry_value(instance_id)
-          ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(target_entry_suffix)
+          other_entries_provider(instance_id).read_entry_optional(target_entry_suffix)
         end
 
         def self_entry_value

data/lib/avm/entries/base/uri_component_entry_value/default_value.rb

@@ -13,8 +13,9 @@ module Avm
           common_constructor :uri_component_entry_value
           delegate :component_entry_path, :entries_provider, to: :uri_component_entry_value
 
+          # @return [Symbol]
           def default_value_method_name
-            "#{component_entry_path.parts.join('_').variableize}_default_value"
+            component_entry_path.default_method_name
           end
 
           def result

data/lib/avm/entries/base/uri_component_entry_value/inherited_value.rb

@@ -28,8 +28,9 @@ module Avm
             ->(value) { entries_provider.send(inherited_value_block_method_name, value) }
           end
 
+          # @return [Symbol]
           def inherited_value_block_method_name
-            "#{component_entry_path.parts.join('_').variableize}_inherited_value_proc".to_sym
+            component_entry_path.inherited_block_method_name
           end
         end
       end

data/lib/avm/entries/base/uri_components_entries_values/generic_component.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/entries/uri_builder'
+require 'avm/patches/eac_config/entry_path'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -10,14 +11,8 @@ module Avm
         class GenericComponent
           common_constructor :owner, :component
           delegate :entries_provider_class, :prefix, to: :owner
-
-          def auto_method_name
-            ['auto', component_method_name].join('_')
-          end
-
-          def component_method_name
-            [prefix, component].join('_')
-          end
+          delegate :auto_method_name, :get_method_name, :get_optional_method_name,
+                   to: :entry_key_path
 
           def define_auto_method
             outer_self = self
@@ -48,22 +43,12 @@ module Avm
             ::EacConfig::EntryPath.assert([prefix, component])
           end
 
-          # @return [String]
-          def get_method_name # rubocop:disable Naming/AccessorMethodName
-            component_method_name
-          end
-
-          # @return [String]
-          def get_optional_method_name # rubocop:disable Naming/AccessorMethodName
-            get_method_name + '_optional'
-          end
-
           def id_component
             @id_component ||= owner.component_factory('id')
           end
 
           def inherited_value_proc_name
-            [component_method_name, 'inherited_value_proc'].join('_')
+            entry_key_path.inherited_block_method_name
           end
 
           def setup

data/lib/avm/patches/eac_config/entry_path.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_config/entry_path'
+
+module EacConfig
+  class EntryPath
+    # @return [Symbol]
+    def auto_method_name
+      method_name('auto_', '')
+    end
+
+    # @return [Symbol]
+    def default_method_name
+      method_name('', '_default_value')
+    end
+
+    # @return [Symbol]
+    def get_method_name # rubocop:disable Naming/AccessorMethodName
+      method_name('', '')
+    end
+
+    # @return [Symbol]
+    def get_optional_method_name # rubocop:disable Naming/AccessorMethodName
+      method_name('', '_optional')
+    end
+
+    # @return [Symbol]
+    def inherited_block_method_name
+      method_name('', '_inherited_value_proc')
+    end
+
+    # @return [String]
+    def variableize
+      parts.join('_')
+    end
+
+    private
+
+    # @param before [String]
+    # @param after [String]
+    # @return [Symbol]
+    def method_name(before, after)
+      "#{before}#{variableize}#{after}".to_sym
+    end
+  end
+end

data/lib/avm/registry/application_scms.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/registry/from_gems'
+
+module Avm
+  module Registry
+    class ApplicationScms < ::Avm::Registry::FromGems
+      def class_detect(klass, detect_args)
+        return nil unless klass.type_name == detect_args.fetch(0).scm_type
+
+        klass.new(*detect_args)
+      end
+    end
+  end
+end

data/lib/avm/registry.rb

@@ -7,9 +7,9 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :applications, :application_stereotypes, :config_objects,
-                     :file_formats, :instances, :launcher_stereotypes, :runners, :scms,
-                     :source_generators, :sources
+    lists.add_symbol :category, :applications, :application_scms, :application_stereotypes,
+                     :config_objects, :file_formats, :instances, :launcher_stereotypes, :runners,
+                     :scms, :source_generators, :sources
 
     class << self
       enable_simple_cache

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

@@ -13,8 +13,8 @@ require 'eac_ruby_utils/core_ext'
         context "when a auto value is requested for \"#{instance_id}.#{input}\"" do
           let(:instance) { described_class.by_id(instance_id) }
 
-          it ".read_entry should return \"#{expected}\"" do
-            expect(instance.read_entry(input)).to eq(expected)
+          it ".entry('#{input}').value should return \"#{expected}\"" do
+            expect(instance.entry(input).value).to eq(expected)
           end
         end
       end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.80.0
+  version: 0.82.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -237,15 +237,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/avm.rb
+- lib/avm/application_scms.rb
+- lib/avm/application_scms/base.rb
 - lib/avm/application_stereotypes.rb
 - lib/avm/application_stereotypes/base.rb
 - lib/avm/applications.rb
 - lib/avm/applications/base.rb
+- lib/avm/applications/base/auto_local_source_path.rb
 - lib/avm/applications/base/local_instance.rb
 - lib/avm/applications/base/local_source.rb
 - lib/avm/applications/base/naming.rb
 - lib/avm/applications/base/organization.rb
 - lib/avm/applications/base/publishing.rb
+- lib/avm/applications/base/scm.rb
 - lib/avm/applications/base/stereotype.rb
 - lib/avm/data/callbacks.rb
 - lib/avm/data/clearer.rb
@@ -344,8 +348,10 @@ files:
 - lib/avm/launcher/publish/check_result.rb
 - lib/avm/launcher/stereotype.rb
 - lib/avm/launcher_stereotypes.rb
+- lib/avm/patches/eac_config/entry_path.rb
 - lib/avm/path_string.rb
 - lib/avm/registry.rb
+- lib/avm/registry/application_scms.rb
 - lib/avm/registry/application_stereotypes.rb
 - lib/avm/registry/application_stereotypes/build_available.rb
 - lib/avm/registry/application_stereotypes/stereotype_builder.rb