avm 0.37.0 → 0.39.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0821a30efc137201d1e73d98cf31b741458bacc8a297495e1d88a6a150d988d3'
-  data.tar.gz: da4de9f1f24f9638ee5158411a05494c5007ffad292f26c3f19a4c5665389b1c
+  metadata.gz: 77d9c5ea0df6745cf1b9e1ee3d47ef031b2bc6caf956de84804dc32490d21776
+  data.tar.gz: f564b3b00470ab6643083ac1ec6fbd63c56dd5b65539049520f2aaac0f59a47b
 SHA512:
-  metadata.gz: afad52fb0a1801a83d5d295b9e220d7040a8ed09205d9fafd783393abc08bafe750a882e4ce4a28c6bbb5d23d3039a97e843818ef6e75437f4f7b5b5d87f1458
-  data.tar.gz: b450f642ef1c8692264dd21d60195f669a1d58291cff3256f3c379b5f529bdd589b8b66537f10e19acafa796ec1eb0e4600bb788e31ca6e3712392534dd32b00
+  metadata.gz: c31937f1858e5de2462d76a6880358fe8bdfb35faac91ead3d7e52eb881c53f6f2db2dcca071435b0a9aa4034a43fb7468258e52fb25025ce7fbff5131c0d480
+  data.tar.gz: 16eb08fcbef7cc5a905b3118af0f690bad53283f63623b7f0662009bb92c70d86098669da89f00124d46f94cd679cd6dcb98a6506ffca93dba23211a507b2790

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.rb

@@ -0,0 +1,71 @@
+# 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
+        enable_method_class
+
+        enable_listable
+        lists.add_symbol :option, :default_value, :inherited_value_block
+
+        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
+
+        def default_value
+          options[OPTION_DEFAULT_VALUE].call_if_proc
+        end
+
+        def inherited_result
+          entries_provider.inherited_entry_value(
+            id_entry_path.to_string,
+            component_entry_path.to_string,
+            &inherited_value_block
+          )
+        end
+
+        def inherited_value_block
+          options[OPTION_INHERITED_VALUE_BLOCK]
+        end
+
+        # @return [EacConfig::EntryPath]
+        def id_entry_path
+          root_entry_path + %w[id]
+        end
+
+        # @return [String, nil]
+        def result
+          url_entry_value || inherited_result || default_value
+        end
+
+        # @return [EacConfig::EntryPath]
+        def root_entry_path
+          component_entry_path[0..-2]
+        end
+
+        # @return [Avm::Entries::Entry]
+        def url_entry
+          entries_provider.entry((root_entry_path + %w[url]).to_string)
+        end
+
+        def url_entry_value
+          return unless url_entry.context_found?
+
+          ::Avm::Entries::UriBuilder.from_source(url_entry.value.to_uri)
+            .avm_field_get(component)
+        end
+
+        # @return [String]
+        def component
+          component_entry_path.last
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base.rb

@@ -6,6 +6,8 @@ require 'avm/entries/entry'
 module Avm
   module Entries
     module Base
+      require_sub __FILE__, require_dependency: true
+
       def entries_provider_id
         id
       end
@@ -32,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/entries/entry.rb

@@ -10,7 +10,16 @@ module Avm
       common_constructor :parent, :suffix, :options
 
       def auto_value
-        ::Avm::Entries::AutoValues::Entry.new(parent, suffix).value
+        auto_value_entry.value
+      end
+
+      def auto_value_entry
+        @auto_value_entry ||= ::Avm::Entries::AutoValues::Entry.new(parent, suffix)
+      end
+
+      # @return [Boolean]
+      def context_found?
+        context_entry.found?
       end
 
       def full_path

data/lib/avm/entries/uri_builder.rb

@@ -42,6 +42,10 @@ module Avm
 
       common_constructor :data, default: [{}]
 
+      def avm_field_get(avm_field)
+        field_get(translate_field(avm_field))
+      end
+
       def field_get(name)
         data[name.to_sym].if_present(&:to_s)
       end

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

@@ -12,11 +12,6 @@ module Avm
                                   ::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

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/entries/uri_builder'
 require 'avm/instances/entry_keys'
 
 module Avm
@@ -7,25 +8,29 @@ 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
-
-          def auto_install_hostname
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME)
+          def auto_install_data_path
+            uri_component_entry_value(
+              ::Avm::Instances::EntryKeys::INSTALL_DATA_PATH,
+              inherited_value_block: ->(v) { v + '/' + id }
+            )
           end
 
-          def auto_install_port
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_PORT) || 22
+          def auto_install_groupname
+            uri_component_entry_value(
+              ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME,
+              default_value: lambda do
+                read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+              end
+            )
           end
 
-          def auto_install_username
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+          ::Avm::Entries::UriBuilder::ENTRIES_FIELDS.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
 
           def auto_install_url

data/lib/avm/instances/entry_keys.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+require 'avm/entries/uri_builder'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Instances
     module EntryKeys
-      URI_FIELDS = %i[fragment hostname password path port query scheme url username].freeze
+      URI_FIELDS = ::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[url]
 
       class << self
         def all
@@ -44,12 +45,12 @@ 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.37.0'
+  VERSION = '0.39.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.39.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-14 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -36,14 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: eac_docker
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +79,7 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,21 +89,21 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.98'
+        version: '0.102'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.98'
+        version: '0.102'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +236,8 @@ 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/entry.rb
 - lib/avm/entries/uri_builder.rb
 - lib/avm/executables.rb