eac_tools 0.24.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6548064142eb8ef0905dfc0c1705229f1554f3adb631fa0ec171888c32e8f0fa
-  data.tar.gz: 0c76aefc07d8a02763ffbcdd551a07b0f0a019f5b1fa626ce727ca4ce5eec0da
+  metadata.gz: 01ef491263c804f929167ab7067054cfd5341598cf5c7855915f187d8206727c
+  data.tar.gz: 6dfc25b5ee4e38978a80a50980cdbb15a992f6a7fd8a695d7298e481f176f839
 SHA512:
-  metadata.gz: 18a95cc1eb6a32ec6f0273fb07be9c9217cba540033166b95007ebcfa73f53e29619fd4d5bfde46d57c7085c8af8834be5f7a2ad945fb06350d4621b9f7e8227
-  data.tar.gz: cb554e78ef18fe33ff56de3cf1f9e75f0da77b07a7a37e5dabfb569cfc20123ba140913da82f271ae6245499982c3f1a62291fdde931cf5b9ece6e737c6da98e
+  metadata.gz: ddd276d51b2eccb1b53ef335d58000de09c32d2d8d86283a8a0723e1a9ea2edb854f6603f37ffdb0a4ec8df9ed23a073ec5a9fcdfc5c95d3f7966fcdd93f9eb8
+  data.tar.gz: c4b5df3fe0a896e24cbeabbb27aa573e6a814460cbadc1fb3941c6490a5e2f129c9c747135085dc064f7cfd6d201cd6e2cbc4fcf246cd304bc64d282b59708cd

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.24.0)
-      avm (~> 0.37)
+    eac_tools (0.24.1)
+      avm (~> 0.38)
       avm-eac_asciidoctor_base0 (~> 0.5)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.1, >= 0.1.2)
@@ -14,7 +14,7 @@ PATH
       avm-eac_webapp_base0 (~> 0.4)
       avm-eac_wordpress_base0 (~> 0.1, >= 0.1.2)
       avm-tools (~> 0.133)
-      eac_ruby_utils (~> 0.98)
+      eac_ruby_utils (~> 0.100)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -124,12 +124,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.37.0)
+    avm (0.38.0)
       eac_cli (~> 0.27, >= 0.27.8)
-      eac_config (~> 0.10)
+      eac_config (~> 0.11)
       eac_docker (~> 0.4, >= 0.4.2)
-      eac_git (~> 0.12, >= 0.12.1)
-      eac_ruby_utils (~> 0.98)
+      eac_git (~> 0.12, >= 0.12.2)
+      eac_ruby_utils (~> 0.100)
       eac_templates (~> 0.3, >= 0.3.1)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -146,9 +146,9 @@ PATH
 PATH
   remote: sub/eac_config
   specs:
-    eac_config (0.10.0)
-      addressable
-      eac_ruby_utils (~> 0.97)
+    eac_config (0.11.0)
+      addressable (~> 2.8)
+      eac_ruby_utils (~> 0.100)
 
 PATH
   remote: sub/eac_docker

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.24.0'
+  VERSION = '0.24.1'
 end

data/sub/avm/avm.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.8'
-  s.add_dependency 'eac_config', '~> 0.10'
+  s.add_dependency 'eac_config', '~> 0.11'
   s.add_dependency 'eac_docker', '~> 0.4', '>= 0.4.2'
-  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.100'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

data/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/lib/avm/version.rb

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

data/sub/avm/spec/lib/avm/instances/base_spec.rb

@@ -57,6 +57,22 @@ RSpec.describe ::Avm::Instances::Base do
         ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'group4',
         ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://user4@host4.net'
       },
+      'app_5' => {
+        ::Avm::Instances::EntryKeys::INSTALL_SCHEME => 'ssh',
+        ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'host5.net',
+        ::Avm::Instances::EntryKeys::INSTALL_PORT => '2222',
+        ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'user5',
+        ::Avm::Instances::EntryKeys::INSTALL_PASSWORD => 'passwd5',
+        ::Avm::Instances::EntryKeys::INSTALL_PATH => '/path/to/app5'
+      },
+      'app_6' => {
+        ::Avm::Instances::EntryKeys::INSTALL_SCHEME => 'ssh',
+        ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'host5.net',
+        ::Avm::Instances::EntryKeys::INSTALL_PORT => '2222',
+        ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'user5',
+        ::Avm::Instances::EntryKeys::INSTALL_PASSWORD => 'passwd5',
+        ::Avm::Instances::EntryKeys::INSTALL_PATH => '/path/to/app5'
+      },
       'mailer_0' => {
         ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
         ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => '',

data/sub/avm/spec/lib/avm/instances/base_spec_configs_storage.yml

@@ -28,6 +28,12 @@ app_4:
     username: user4
     hostname: host4.net
     groupname: group4
+app_5:
+  install:
+    url: ssh://user5:passwd5@host5.net:2222/path/to/app5
+app_6:
+  install:
+    id: app_5
 mailer_0:
   mailer:
     from: 'noreply@example.net'

data/sub/eac_config/eac_config.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'addressable'
-  s.add_dependency 'eac_ruby_utils', '~> 0.97'
+  s.add_dependency 'addressable', '~> 2.8'
+  s.add_dependency 'eac_ruby_utils', '~> 0.100'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_config/lib/eac_config/entry_path.rb

@@ -51,7 +51,12 @@ module EacConfig
     end
 
     def to_s
-      "#{self.class}[#{parts.join(PART_SEPARATOR)}]"
+      "#{self.class}[#{to_string}]"
+    end
+
+    # @return [String]
+    def to_string
+      parts.join(PART_SEPARATOR)
     end
   end
 end

data/sub/eac_config/lib/eac_config/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacConfig
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-14 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -202,14 +202,14 @@ dependencies:
     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_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -772,6 +772,7 @@ files:
 - sub/avm/lib/avm/entries/auto_values/entry.rb
 - sub/avm/lib/avm/entries/auto_values/uri_entry.rb
 - sub/avm/lib/avm/entries/base.rb
+- sub/avm/lib/avm/entries/base/uri_component_entry_value.rb
 - sub/avm/lib/avm/entries/entry.rb
 - sub/avm/lib/avm/entries/uri_builder.rb
 - sub/avm/lib/avm/executables.rb