avm 0.79.0 → 0.81.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e75e2e4044fb0c1e42d0d5cdc2f6abb2e1997084f3d5678988bf1dc8088aa23
-  data.tar.gz: 914822d073360376f74d24d38fe8deaf8632f8d881d5b3218142dc9607488f36
+  metadata.gz: c5aaacb2872fccfe58ccdafad10e0a1c431b2c86e020cdda80a9d352d6771451
+  data.tar.gz: cf56541de76d828f5fdfa7fb1bd192fee610614ca7b51c02941f6e5293c801c0
 SHA512:
-  metadata.gz: 8bd934e7f40740bedc0815ac12bdfb9ebdc6430c232f1f31181818b7ec4160f5afad568e256a61772eef3efb9e9d57757028918341a7558247360bef496b0d51
-  data.tar.gz: 040d13c6f269e1050053e750bc66af9c7d5ff4a8809450ece0d604a1a85223c9ababaca624db0d63b3368948ed726bd7603ebb242b6da428ea7161cff384827c
+  metadata.gz: dd31baa92bd54625915361d83eec55ecd425f241ecb216c3c01c13fa0f320dbc86e59d5e19509eeab0746911e48845881f880bd7e13382426fed44aab4b6ede0
+  data.tar.gz: c96a21e64aed4dd953128bee69bfb72107dc5abc6f7977154dd8e8495ad1ddc7daa93dbbdf829a4e8435547ff9da5d3153e8080c9d1e7a6c9497500bd8b347e5

data/lib/avm/application_scms/base.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module ApplicationScms
+    class Base
+      class << self
+        # @return [String]
+        def type_name
+          name.gsub(/#{Regexp.quote('::ApplicationScms::Base')}$/, '').demodulize
+        end
+      end
+
+      # !method initialize(url)
+      # @param url [Addressable::URI]
+      common_constructor :url do
+        self.url = url.to_uri
+      end
+      delegate :type_name, to: :class
+
+      # @return [String]
+      def to_s
+        "#{type_name}[#{url}]"
+      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/local_instance.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/instances/ids'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module LocalInstance
+        LOCAL_INSTANCE_SUFFIX = 'dev'
+
+        # @return [String]
+        def local_instance_id
+          ::Avm::Instances::Ids.build(id, local_instance_suffix)
+        end
+
+        # @return [String]
+        def local_instance_suffix
+          LOCAL_INSTANCE_SUFFIX
+        end
+
+        private
+
+        # @return [Avm::Instances::Base]
+        def local_instance_uncached
+          instance(local_instance_suffix)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_config/node'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module LocalSource
+        # @return [Pathname]
+        def local_source_path
+          local_source_path_entry.value!.to_pathname
+        end
+
+        # @return [EacConfig::Entry]
+        def local_source_path_entry
+          ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
+        end
+
+        private
+
+        # @return [Avm::Sources::Base]
+        def local_source_uncached
+          ::Avm::Registry.sources.detect(local_source_path)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module Naming
+        DEFAULT_NAME = '_Undefined_'
+
+        # @return [String]
+        def default_name
+          DEFAULT_NAME
+        end
+
+        # @return [String]
+        def name
+          name_from_configuration || default_name
+        end
+
+        # @return [String]
+        def name_from_configuration
+          entry(::Avm::Instances::EntryKeys::NAME).optional_value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+
+module Avm
+  module Applications
+    class Base
+      module Organization
+        DEFAULT_ORGANIZATION = '_undefined_'
+        ORGANIZATION_CONFIG_KEY = 'organization'
+
+        # @return [String]
+        def default_organization
+          DEFAULT_ORGANIZATION
+        end
+
+        # @return [String, nil]
+        def organization_by_configuration
+          entry(ORGANIZATION_CONFIG_KEY).optional_value
+        end
+
+        # @return [String]
+        def organization
+          organization_by_configuration || default_organization
+        end
+      end
+    end
+  end
+end

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 type]
+        end
+
+        # @return [Avm::ApplicationScms::Base]
+        def scm
+          @scm ||= ::Avm::Registry.application_scms.detect(scm_type, scm_url)
+        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

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
 require 'avm/entries/base'
-require 'avm/instances/ids'
-require 'avm/registry'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Applications
     class Base
       enable_simple_cache
-      require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
 
       AVM_TYPE = 'Application'
-      LOCAL_INSTANCE_SUFFIX = 'dev'
+
+      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
@@ -27,41 +31,7 @@ module Avm
         stereotype.instance_class.new(self, suffix)
       end
 
-      def name
-        entry(::Avm::Instances::EntryKeys::NAME).read
-      end
-
-      # @return [String]
-      def local_instance_id
-        ::Avm::Instances::Ids.build(id, local_instance_suffix)
-      end
-
-      # @return [Pathname]
-      def local_source_path
-        local_source_path_entry.value!.to_pathname
-      end
-
-      # @return [EacConfig::Entry]
-      def local_source_path_entry
-        ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
-      end
-
-      # @return [String]
-      def local_instance_suffix
-        LOCAL_INSTANCE_SUFFIX
-      end
-
-      private
-
-      # @return [Avm::Instances::Base]
-      def local_instance_uncached
-        instance(local_instance_suffix)
-      end
-
-      # @return [Avm::Sources::Base]
-      def local_source_uncached
-        ::Avm::Registry.sources.detect(local_source_path)
-      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/instances/base/auto_values/database.rb

@@ -8,6 +8,7 @@ module Avm
       module AutoValues
         module Database
           LOCAL_ADDRESS = '127.0.0.1'
+          LOCAL_ADDRESSES = [LOCAL_ADDRESS, '::1', 'localhost'].freeze
           DEFAULT_EXTRA = ''
           DEFAULT_HOSTNAME = LOCAL_ADDRESS
           DEFAULT_LIMIT = 5

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[0]
+
+        klass.new(*detect_args[1..-1])
+      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.79.0'
+  VERSION = '0.81.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.79.0
+  version: 0.81.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: eac_docker
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +113,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.119'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.119.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -120,6 +123,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.119'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.119.2
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -231,11 +237,18 @@ 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/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
@@ -334,8 +347,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