eac_tools 0.25.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd36587fe5621b65a2fd826e04b44f9c941b848a9e5d3bb82f0e40375ec679b
-  data.tar.gz: '0880b563b0f3b7f367ddc299a385a76c626260937d779f4cd92f1884ad0ecc3d'
+  metadata.gz: 6de32a35373e92c90852a1d3d432b16112da4a908cd94bda757d64ca31647e93
+  data.tar.gz: 2b9c7aa3b2d163f2d5427c3f1d6de0da7e938d58ee79c4bc22418efce16ce1a6
 SHA512:
-  metadata.gz: 8edc33b2af676aaa9ba92138791e4e13fea951c028acd1efc6988a2d4922efd03bad2bb39ff15391110f070c63872ae17bb6a2831421095b62768f8a64c63864
-  data.tar.gz: 68360fc6669359864fbebeab00cf8a858bd341ffc849ed6855a4f5783efa5ee319c4c5a861a5752b0c55894be786b9a7230c0af5c5624cf99ef14bc354ccb064
+  metadata.gz: 5e26f055dd1a4d7f617ebd982f820e25b3a81d10ef81d2e0d93648fcfed43a483e9dee6ce6b3a56c7546688aeb19a65edd4d8ae87e5a4dd6850555326cad9535
+  data.tar.gz: e5da4638216094a63e821b2aef2cb9a346c90cb952a41e8e408295e78628a9c0ff26c55922f4ad7dd7f3f5a5908a16d1dc681dfda3e4482fd9b9229d691a6181

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.25.1)
-      avm (~> 0.39, >= 0.39.1)
+    eac_tools (0.26.0)
+      avm (~> 0.40)
       avm-eac_asciidoctor_base0 (~> 0.5)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.1, >= 0.1.2)
@@ -13,7 +13,7 @@ PATH
       avm-eac_ruby_base1 (~> 0.20)
       avm-eac_webapp_base0 (~> 0.5)
       avm-eac_wordpress_base0 (~> 0.1, >= 0.1.2)
-      avm-tools (~> 0.133)
+      avm-tools (~> 0.134)
       eac_ruby_utils (~> 0.102)
 
 PATH
@@ -106,10 +106,10 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.133.0)
+    avm-tools (0.134.0)
       aranha-parsers (~> 0.14, >= 0.14.1)
-      avm (~> 0.37)
-      avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
+      avm (~> 0.40)
+      avm-eac_ruby_base1 (~> 0.20)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.3, >= 0.3.2)
       avm-git (~> 0.4)
@@ -124,7 +124,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.39.1)
+    avm (0.40.0)
       eac_cli (~> 0.27, >= 0.27.8)
       eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.4, >= 0.4.2)
@@ -272,7 +272,8 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     filesize (0.2.0)
-    git (1.11.0)
+    git (1.12.0)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.4.2)

data/lib/eac_tools/version.rb

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

data/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/lib/avm/entries/base/uri_component_entry_value.rb

@@ -9,31 +9,16 @@ module Avm
     module Base
       class UriComponentEntryValue
         enable_method_class
+        require_sub __FILE__, require_dependency: true
 
         enable_listable
-        lists.add_symbol :option, :default_value, :inherited_value_block
+        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
 
-        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]
@@ -41,7 +26,7 @@ module Avm
 
         # @return [String, nil]
         def result
-          url_entry_value || inherited_result || default_value
+          url_entry_value || inherited_value || default_value
         end
 
         # @return [EacConfig::EntryPath]
@@ -49,18 +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
-
-        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

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

@@ -11,27 +11,6 @@ module Avm
             inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::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/sub/avm/lib/avm/instances/base/auto_values/install.rb

@@ -8,23 +8,7 @@ module Avm
     class Base
       module AutoValues
         module Install
-          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_groupname
-            uri_component_entry_value(
-              ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME,
-              default_value: lambda do
-                read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
-              end
-            )
-          end
-
-          ::Avm::Entries::UriBuilder::ENTRIES_FIELDS.each do |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(
@@ -43,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/sub/avm/lib/avm/instances/entry_keys.rb

@@ -49,7 +49,6 @@ module Avm
         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 data_path groupname],
         mailer: {
           '' => %w[id from reply_to],

data/sub/avm/lib/avm/version.rb

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

data/sub/avm-tools/avm-tools.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'avm', '~> 0.37'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.19', '>= 0.19.1'
+  s.add_dependency 'avm', '~> 0.40'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.20'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'avm-git', '~> 0.4'

data/sub/avm-tools/lib/avm/tools/runner/git/deploy.rb

@@ -86,7 +86,7 @@ module Avm
 
           def target_url
             parsed.target_url.if_present { |v| return v }
-            instance.if_present { |v| return v.read_entry(::Avm::Instances::EntryKeys::FS_URL) }
+            instance.if_present { |v| return v.install_url }
             nil
           end
 

data/sub/avm-tools/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.133.0'
+    VERSION = '0.134.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.26.0
 platform: ruby
 authors:
 - Put here the authors
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.39.1
+        version: '0.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.39.1
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -188,14 +182,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.133'
+        version: '0.134'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.133'
+        version: '0.134'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -774,6 +768,9 @@ files:
 - sub/avm/lib/avm/entries/base.rb
 - sub/avm/lib/avm/entries/base/inherited_entry_value.rb
 - sub/avm/lib/avm/entries/base/uri_component_entry_value.rb
+- sub/avm/lib/avm/entries/base/uri_component_entry_value/default_value.rb
+- sub/avm/lib/avm/entries/base/uri_component_entry_value/inherited_value.rb
+- sub/avm/lib/avm/entries/base/uri_component_entry_value/url_entry_value.rb
 - sub/avm/lib/avm/entries/entry.rb
 - sub/avm/lib/avm/entries/uri_builder.rb
 - sub/avm/lib/avm/executables.rb