avm 0.38.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4f65ada3e6c902df6d77b491ac3a043e6ebb7fc93812873fb6d2d7b0d50624
-  data.tar.gz: 5dfb61ddeed3edb2c55f98133e281a18aa28f7024e69f2e1942b3fccc03453a1
+  metadata.gz: 29538404e81ca5b9e3c7043a5b665b9a73f4bb662b7e5d6d1de891154c3bdddf
+  data.tar.gz: a2e2216c1cbdaf94044f3b59ee1c0aec69e193720d3f6312c25a6aad59865ea0
 SHA512:
-  metadata.gz: 142224b13cfcf3129c0fb24650724af9e66d892247668fb249e526fb9b050df749f0da51c1d0de95106ef85bceae03f563ca93adcf41f2464327cae6153341a0
-  data.tar.gz: 8968321777cca2c10902856df6bb9654f98d7e4b84a9c5781c741ef2483e9b1ca5283d281288c9351f34de83bb7e22992894c611059985d8359fcf42b1fd92a7
+  metadata.gz: c4e2ac1e34e6d64bc030183c414507b5ca15e82039ff16728727786357b5922c8a193cd58ffd2b51d40b0055531ce94b111135e1ff0589e198099b40b3421f3d
+  data.tar.gz: f430f917bd972158fdfbef76de2f72ecfa4a514df8d333dc360cdaaf6adcc6bbc4dabce9f37371c07b00fde76bc8eda1162787c20ab2a2e1edc80c736a70a98f

data/lib/avm/entries/auto_values/uri_entry.rb

@@ -15,7 +15,7 @@ module Avm
 
         def value
           ::Avm::Entries::UriBuilder.from_all_fields do |field_name|
-            entries_provider.entry([suffix, field_name]).value
+            entries_provider.entry([suffix, field_name]).optional_value
           end.to_uri.to_s
         end
       end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class InheritedEntryValue
+        enable_method_class
+        common_constructor :entries_provider, :source_entry_suffix, :target_entry_suffix, :block,
+                           block_arg: true
+
+        def result
+          self_entry_value.if_present do |instance_id|
+            other_entry_value(instance_id).if_present(&block)
+          end
+        end
+
+        def other_entry_value(instance_id)
+          ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(target_entry_suffix)
+        end
+
+        def self_entry_value
+          entries_provider.read_entry_optional(source_entry_suffix)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentEntryValue
+        class DefaultValue
+          enable_method_class
+          common_constructor :uri_component_entry_value
+          delegate :component, :entries_provider, to: :uri_component_entry_value
+
+          def default_value_method_name
+            "#{component}_default_value"
+          end
+
+          def result
+            entries_provider.if_respond(default_value_method_name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentEntryValue
+        class InheritedValue
+          enable_method_class
+          common_constructor :uri_component_entry_value
+          delegate :component, :entries_provider, :id_entry_path, :component_entry_path,
+                   to: :uri_component_entry_value
+
+          def result
+            entries_provider.inherited_entry_value(
+              id_entry_path.to_string,
+              component_entry_path.to_string,
+              &inherited_value_block
+            )
+          end
+
+          def inherited_value_block
+            return nil unless entries_provider.respond_to?(inherited_value_block_method_name)
+
+            ->(value) { entries_provider.send(inherited_value_block_method_name, value) }
+          end
+
+          def inherited_value_block_method_name
+            "#{component}_inherited_value_proc".to_sym
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentEntryValue
+        class UrlEntryValue
+          enable_method_class
+          common_constructor :uri_component_entry_value
+          delegate :component, :entries_provider, :root_entry_path, to: :uri_component_entry_value
+
+          def result
+            return unless url_entry.context_found?
+
+            ::Avm::Entries::UriBuilder.from_source(url_entry.value.to_uri)
+              .avm_field_get(component)
+          end
+
+          # @return [Avm::Entries::Entry]
+          def url_entry
+            entries_provider.entry((root_entry_path + %w[url]).to_string)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,15 +9,14 @@ module Avm
     module Base
       class UriComponentEntryValue
         enable_method_class
-        common_constructor :entries_provider, :component_entry_path do
-          self.component_entry_path = ::EacConfig::EntryPath.assert(component_entry_path)
-        end
+        require_sub __FILE__, require_dependency: true
 
-        def inherited_result
-          entries_provider.inherited_entry_value(
-            id_entry_path.to_string,
-            component_entry_path.to_string
-          )
+        enable_listable
+        lists.add_symbol :option
+
+        common_constructor :entries_provider, :component_entry_path, :options, default: [{}] do
+          self.component_entry_path = ::EacConfig::EntryPath.assert(component_entry_path)
+          self.options = self.class.lists.option.hash_keys_validate!(options)
         end
 
         # @return [EacConfig::EntryPath]
@@ -27,12 +26,7 @@ module Avm
 
         # @return [String, nil]
         def result
-          if url_entry.context_found?
-            return ::Avm::Entries::UriBuilder.from_source(url_entry.value.to_uri)
-                     .avm_field_get(component)
-          end
-
-          inherited_result
+          url_entry_value || inherited_value || default_value
         end
 
         # @return [EacConfig::EntryPath]
@@ -40,11 +34,6 @@ module Avm
           component_entry_path[0..-2]
         end
 
-        # @return [Avm::Entries::Entry]
-        def url_entry
-          entries_provider.entry((root_entry_path + %w[url]).to_string)
-        end
-
         # @return [String]
         def component
           component_entry_path.last

data/lib/avm/entries/base.rb

@@ -34,16 +34,6 @@ module Avm
         end
         (path_prefix + entry_suffix).join('.')
       end
-
-      def inherited_entry_value(source_entry_suffix, target_entry_suffix, &block)
-        read_entry_optional(source_entry_suffix).if_present do |instance_id|
-          other_entry_value(instance_id, target_entry_suffix).if_present(&block)
-        end
-      end
-
-      def other_entry_value(instance_id, entry_suffix)
-        ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(entry_suffix)
-      end
     end
   end
 end

data/lib/avm/instances/base/auto_values/filesystem.rb

@@ -11,32 +11,6 @@ module Avm
             inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
           end
-
-          def auto_data_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::DATA_FS_PATH) { |v| v + '/' + id }
-          end
-
-          def auto_fs_url
-            auto_fs_url_with_install || auto_fs_url_without_install
-          end
-
-          def auto_fs_url_with_install
-            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL)
-              .if_present do |install_url|
-              read_entry_optional('fs_path').if_present do |fs_path|
-                "#{install_url}#{fs_path}"
-              end
-            end
-          end
-
-          def auto_fs_url_without_install
-            return nil if read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL).present?
-
-            read_entry_optional('fs_path').if_present do |fs_path|
-              "file://#{fs_path}"
-            end
-          end
         end
       end
     end

data/lib/avm/instances/base/auto_values/install.rb

@@ -8,15 +8,12 @@ module Avm
     class Base
       module AutoValues
         module Install
-          def auto_install_groupname
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME) ||
-              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
-          end
-
-          ::Avm::Entries::UriBuilder::ENTRIES_FIELDS.each do |component|
-            define_method "auto_install_#{component}" do
-              uri_component_entry_value("install.#{component}")
+          (::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[data_path groupname]).each do |component|
+            method_suffix = "install_#{component}"
+            define_method "auto_#{method_suffix}" do
+              uri_component_entry_value(
+                ::Avm::Instances::EntryKeys.const_get(method_suffix.underscore.upcase)
+              )
             end
           end
 
@@ -30,6 +27,14 @@ module Avm
             require 'avm/entries/auto_values/uri_entry'
             ::Avm::Entries::AutoValues::UriEntry.new(self, 'install').value
           end
+
+          def data_path_inherited_value_proc(value)
+            value + '/' + id
+          end
+
+          def groupname_default_value
+            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+          end
         end
       end
     end

data/lib/avm/instances/entry_keys.rb

@@ -45,12 +45,11 @@ module Avm
       end
 
       {
-        '' => %w[data_fs_path fs_path name source_instance_id],
+        '' => %w[fs_path name source_instance_id],
         admin: URI_FIELDS + %w[api_key],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
-        fs: %w[url],
-        install: URI_FIELDS + %w[id groupname],
+        install: URI_FIELDS + %w[id data_path groupname],
         mailer: {
           '' => %w[id from reply_to],
           smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.38.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -37,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: eac_docker
   requirement: !ruby/object:Gem::Requirement
@@ -90,14 +96,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.100'
+        version: '0.102'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.100'
+        version: '0.102'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +236,11 @@ files:
 - lib/avm/entries/auto_values/entry.rb
 - lib/avm/entries/auto_values/uri_entry.rb
 - lib/avm/entries/base.rb
+- lib/avm/entries/base/inherited_entry_value.rb
 - lib/avm/entries/base/uri_component_entry_value.rb
+- lib/avm/entries/base/uri_component_entry_value/default_value.rb
+- lib/avm/entries/base/uri_component_entry_value/inherited_value.rb
+- lib/avm/entries/base/uri_component_entry_value/url_entry_value.rb
 - lib/avm/entries/entry.rb
 - lib/avm/entries/uri_builder.rb
 - lib/avm/executables.rb