avm 0.35.1 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ebc7e5eed486245f3a85a5dba5ecaa430af32cc398b9ef8fffd7c111cab8dd6
-  data.tar.gz: bfc1ad0135ec283b838820e3e002e465a2f2770ab848909d7c04cb3ed2ebc92f
+  metadata.gz: dc4f65ada3e6c902df6d77b491ac3a043e6ebb7fc93812873fb6d2d7b0d50624
+  data.tar.gz: 5dfb61ddeed3edb2c55f98133e281a18aa28f7024e69f2e1942b3fccc03453a1
 SHA512:
-  metadata.gz: 1059898047cbf217a4b7e21f9e18d18ba9a6a8f81216803c27cab4b87654ce4fbeffb044aeebb7a1b92931add5e69264fa9fcdbb7683aa75837e38464d3fe80f
-  data.tar.gz: 3998adffe3154008f6b0fd14234d1d400a1efe437e132ecd032076b665054d27b26dde8fe62d5f058f507cf9b5470d46d88470bcbbd2a4a557859ccb295f35b4
+  metadata.gz: 142224b13cfcf3129c0fb24650724af9e66d892247668fb249e526fb9b050df749f0da51c1d0de95106ef85bceae03f563ca93adcf41f2464327cae6153341a0
+  data.tar.gz: 8968321777cca2c10902856df6bb9654f98d7e4b84a9c5781c741ef2483e9b1ca5283d281288c9351f34de83bb7e22992894c611059985d8359fcf42b1fd92a7

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

@@ -0,0 +1,55 @@
+# 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
+        common_constructor :entries_provider, :component_entry_path do
+          self.component_entry_path = ::EacConfig::EntryPath.assert(component_entry_path)
+        end
+
+        def inherited_result
+          entries_provider.inherited_entry_value(
+            id_entry_path.to_string,
+            component_entry_path.to_string
+          )
+        end
+
+        # @return [EacConfig::EntryPath]
+        def id_entry_path
+          root_entry_path + %w[id]
+        end
+
+        # @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
+        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
+
+        # @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

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/entries/uri_builder'
 require 'avm/instances/entry_keys'
 
 module Avm
@@ -13,19 +14,10 @@ module Avm
               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)
-          end
-
-          def auto_install_port
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_PORT) || 22
-          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|
+            define_method "auto_install_#{component}" do
+              uri_component_entry_value("install.#{component}")
+            end
           end
 
           def auto_install_url

data/lib/avm/instances/base.rb

@@ -53,7 +53,7 @@ module Avm
       def host_env_uncached
         install_uri = entry(::Avm::Instances::EntryKeys::INSTALL_URL).value.to_uri
         case install_uri.scheme
-        when 'local' then ::EacRubyUtils::Envs.local
+        when 'file' then ::EacRubyUtils::Envs.local
         when 'ssh' then ::EacRubyUtils::Envs.ssh(install_uri)
         else raise("Unmapped access value: \"#{install_uri}\"")
         end

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

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.35.1'
+  VERSION = '0.38.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.38.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-16 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.100'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.98'
+        version: '0.100'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,7 @@ 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/uri_component_entry_value.rb
 - lib/avm/entries/entry.rb
 - lib/avm/entries/uri_builder.rb
 - lib/avm/executables.rb
@@ -290,6 +291,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