avm 0.36.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7efc64412c406ca9b9575a704de3e3eaa48328ce07f95a9406f55edd323a6843
-  data.tar.gz: 82b77ad19908de1401ba655e7ec16ddc5c4a119b9d4c52b47baa259c40db77ea
+  metadata.gz: '04283409a229d111fd5dd3959c88cf29639d209a14632cbb770c1f151f12da7f'
+  data.tar.gz: b38fdf654a75b21da9bbd8f479fc323e4f157f51a04eca7f4a0c581a789dba5a
 SHA512:
-  metadata.gz: 37a7790ce5e98c0cfe0eca56d22fbbd44689ce63bb5796eacb5c762f0c8b9765972ac7c4666b401ecfa21f0feb2807e26361c9fe99a8c384732a29ece0943255
-  data.tar.gz: e85973d4cc9064ac60e34697cdca985ffcce20f300560e91b6d134000fb5b628e603750db44e2f184397fa806b6b87b6bb33d834e9119fc04fca04e28e3a1197
+  metadata.gz: fe0ca2eb191f577ed18619c06af5367d6f8885de4ab9c9a7f89790c0722d5f03f1575bed0e61e33865ee12b9ea35d44c0653566428946a8f62c8f6dd4cbff29f
+  data.tar.gz: 131dfd01487f969a5bcc2f8f63a2e34a254312055c4b154640783f50e43d58f20c1054a09ea1d99d5a76f1dcfd6b4f66825dba03be3cde028c74b3320b721d28

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/sources/base/application.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'avm/applications/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Application
+        APPLICATION_NAME_KEY = 'application'
+
+        # @return [Avm::Applications::Base]
+        def application
+          @application ||= ::Avm::Applications::Base.new(application_id)
+        end
+
+        # @return [String]
+        def application_id
+          application_id_by_configuration || application_id_by_directory
+        end
+
+        # @return [String, nil]
+        def application_id_by_configuration
+          configuration.entry(APPLICATION_NAME_KEY).value
+        end
+
+        # @return [String]
+        def application_id_by_directory
+          path.basename.to_path
+        end
+      end
+    end
+  end
+end

data/lib/avm/sources/base/configuration.rb

@@ -24,6 +24,8 @@ module Avm
 
         # @return [EacRubyUtils::Envs::Command, nil]
         def configuration_value_to_env_command(value)
+          return value if value.is_a?(::EacRubyUtils::Envs::Command)
+
           configuration_value_to_shell_words(value).if_present { |v| env.command(v).chdir(path) }
         end
 

data/lib/avm/sources/base/testing.rb

@@ -57,7 +57,7 @@ module Avm
 
         def configured_enumerable_value_as_test_commands(value)
           configured_hash_value_as_test_commands(
-            value.each_with_index.map { |v| ["test_#{v[1]}", v[0]] }.to_h
+            value.each_with_index.map { |v, i| ["test_#{i}", v] }.to_h
           )
         end
 

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.39.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: eac_docker
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,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 +83,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.101'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.98'
+        version: '0.101'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,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
@@ -290,6 +292,7 @@ files:
 - lib/avm/source_generators/runner.rb
 - lib/avm/sources.rb
 - lib/avm/sources/base.rb
+- lib/avm/sources/base/application.rb
 - lib/avm/sources/base/configuration.rb
 - lib/avm/sources/base/instance.rb
 - lib/avm/sources/base/locale.rb