eac_tools 0.25.1 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd36587fe5621b65a2fd826e04b44f9c941b848a9e5d3bb82f0e40375ec679b
-  data.tar.gz: '0880b563b0f3b7f367ddc299a385a76c626260937d779f4cd92f1884ad0ecc3d'
+  metadata.gz: 9d82c3af95c9557b468c66d1dc9350761681371b0236d3ff7d75543826783cab
+  data.tar.gz: 723c617438aef950f3c7ded58f1b400a0d099b086fc24bab135d811ee04f12eb
 SHA512:
-  metadata.gz: 8edc33b2af676aaa9ba92138791e4e13fea951c028acd1efc6988a2d4922efd03bad2bb39ff15391110f070c63872ae17bb6a2831421095b62768f8a64c63864
-  data.tar.gz: 68360fc6669359864fbebeab00cf8a858bd341ffc849ed6855a4f5783efa5ee319c4c5a861a5752b0c55894be786b9a7230c0af5c5624cf99ef14bc354ccb064
+  metadata.gz: ce00bfc15184e1a9a587745ad05300d8cca1c5c74227c2537c0bd6348c7c75dd919f2b504d2467c271ce0c53713eee1932e3bb2c40ba9a8bede0b0e5e7660220
+  data.tar.gz: eff2f281c687c0c72932854ec0292b6cc32f3ea9d4ef7ce6386b69da89d13886fced53b92ff1bd6c62b520df01064dc7cb8442cb9834225da5f54f0f9475e959

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.25.1)
-      avm (~> 0.39, >= 0.39.1)
-      avm-eac_asciidoctor_base0 (~> 0.5)
+    eac_tools (0.27.1)
+      avm (~> 0.41, >= 0.41.1)
+      avm-eac_asciidoctor_base0 (~> 0.6)
       avm-eac_generic_base0 (~> 0.5)
-      avm-eac_latex_base0 (~> 0.1, >= 0.1.2)
-      avm-eac_rails_base0 (~> 0.7)
-      avm-eac_rails_base1 (~> 0.5)
-      avm-eac_redmine_base0 (~> 0.13)
+      avm-eac_latex_base0 (~> 0.2)
+      avm-eac_rails_base0 (~> 0.8)
+      avm-eac_rails_base1 (~> 0.6)
+      avm-eac_redmine_base0 (~> 0.14)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       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-eac_webapp_base0 (~> 0.6, >= 0.6.1)
+      avm-eac_wordpress_base0 (~> 0.2)
+      avm-tools (~> 0.135)
       eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.5.0)
+    avm-eac_asciidoctor_base0 (0.6.0)
       asciidoctor (~> 2.0, >= 2.0.17)
-      avm-eac_webapp_base0 (~> 0.4)
-      eac_ruby_utils (~> 0.98)
+      avm-eac_webapp_base0 (~> 0.5, >= 0.5.1)
+      eac_ruby_utils (~> 0.102)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
 
@@ -36,34 +36,34 @@ PATH
 PATH
   remote: sub/avm-eac_latex_base0
   specs:
-    avm-eac_latex_base0 (0.1.2)
-      avm (~> 0.35, >= 0.35.1)
-      avm-eac_webapp_base0 (~> 0.4)
-      eac_ruby_utils (~> 0.98)
+    avm-eac_latex_base0 (0.2.0)
+      avm (~> 0.41)
+      avm-eac_webapp_base0 (~> 0.5, >= 0.5.1)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
-    avm-eac_rails_base0 (0.7.0)
-      avm-eac_rails_base1 (~> 0.5)
-      eac_ruby_utils (~> 0.98)
+    avm-eac_rails_base0 (0.8.0)
+      avm-eac_rails_base1 (~> 0.6)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.5.0)
-      avm (~> 0.35, >= 0.35.1)
-      avm-eac_ruby_base1 (~> 0.19)
-      avm-eac_webapp_base0 (~> 0.4)
-      eac_ruby_utils (~> 0.98)
+    avm-eac_rails_base1 (0.6.0)
+      avm (~> 0.41)
+      avm-eac_ruby_base1 (~> 0.20)
+      avm-eac_webapp_base0 (~> 0.6)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.13.0)
-      avm (~> 0.39, >= 0.39.1)
+    avm-eac_redmine_base0 (0.14.0)
+      avm (~> 0.41)
       avm-eac_generic_base0 (~> 0.5)
-      avm-eac_rails_base1 (~> 0.5)
+      avm-eac_rails_base1 (~> 0.6)
       avm-eac_ubuntu_base0 (~> 0.3)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.12, >= 0.12.3)
@@ -88,8 +88,8 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.5.0)
-      avm (~> 0.39, >= 0.39.1)
+    avm-eac_webapp_base0 (0.6.1)
+      avm (~> 0.41, >= 0.41.1)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
@@ -98,18 +98,18 @@ PATH
 PATH
   remote: sub/avm-eac_wordpress_base0
   specs:
-    avm-eac_wordpress_base0 (0.1.2)
-      avm (~> 0.35, >= 0.35.1)
-      avm-eac_webapp_base0 (~> 0.4)
-      eac_ruby_utils (~> 0.98)
+    avm-eac_wordpress_base0 (0.2.0)
+      avm (~> 0.41)
+      avm-eac_webapp_base0 (~> 0.6)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.133.0)
+    avm-tools (0.135.0)
       aranha-parsers (~> 0.14, >= 0.14.1)
-      avm (~> 0.37)
-      avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
+      avm (~> 0.41)
+      avm-eac_ruby_base1 (~> 0.20)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.3, >= 0.3.2)
       avm-git (~> 0.4)
@@ -118,13 +118,13 @@ PATH
       eac_git (~> 0.12, >= 0.12.2)
       eac_ruby_base0 (~> 0.16, >= 0.16.6)
       eac_templates (~> 0.3, >= 0.3.1)
-      git (~> 1.11)
+      git (~> 1.12)
       ruby-progressbar (~> 1.11)
 
 PATH
   remote: sub/avm
   specs:
-    avm (0.39.1)
+    avm (0.41.1)
       eac_cli (~> 0.27, >= 0.27.8)
       eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.4, >= 0.4.2)
@@ -193,8 +193,8 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     aranha-parsers (0.14.1)
       activesupport (>= 4.0.0)
       addressable (~> 2.7)
@@ -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)
@@ -293,7 +294,7 @@ GEM
     parser (3.1.2.1)
       ast (~> 2.4.1)
     parslet (2.0.0)
-    public_suffix (4.0.7)
+    public_suffix (5.0.0)
     racc (1.6.0)
     rack (2.2.4)
     rainbow (3.1.1)

data/lib/eac_tools/version.rb

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

data/sub/avm/lib/avm/applications/base.rb

@@ -38,7 +38,7 @@ module Avm
 
       # @return [Avm::Sources::Base]
       def local_source_uncached
-        ::Avm::Registry.sources.detect(local_instance.fs_path)
+        ::Avm::Registry.sources.detect(local_instance.install_path)
       end
     end
   end

data/sub/avm/lib/avm/data/instance/files_unit.rb

@@ -18,7 +18,8 @@ module Avm
         before_load :clear_files
 
         def files_path
-          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH), fs_path_subpath)
+          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
+                      fs_path_subpath)
         end
 
         def dump_command

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_entry_path, :entries_provider, to: :uri_component_entry_value
+
+          def default_value_method_name
+            "#{component_entry_path.parts.join('_').variableize}_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 :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_entry_path.parts.join('_').variableize}_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/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,18 @@ module Avm
             require 'avm/entries/auto_values/uri_entry'
             ::Avm::Entries::AutoValues::UriEntry.new(self, 'install').value
           end
+
+          def install_data_path_inherited_value_proc(value)
+            value + '/' + id
+          end
+
+          def install_groupname_default_value
+            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+          end
+
+          def install_path_inherited_value_proc(value)
+            install_data_path_inherited_value_proc(value)
+          end
         end
       end
     end

data/sub/avm/lib/avm/instances/entry_keys.rb

@@ -45,11 +45,10 @@ module Avm
       end
 
       {
-        '' => %w[fs_path name source_instance_id],
+        '' => %w[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 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.41.1'
 end

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

@@ -15,8 +15,8 @@ RSpec.describe ::Avm::Instances::Base do
   describe '#read_entry' do
     {
       'app_0' => {
-        fs_path: '/fs_root/app_0',
         ::Avm::Instances::EntryKeys::INSTALL_DATA_PATH => '/data_fs_root/app_0',
+        ::Avm::Instances::EntryKeys::INSTALL_PATH => '/fs_root/app_0',
         ::Avm::Instances::EntryKeys::DATABASE_NAME => 'app_0',
         ::Avm::Instances::EntryKeys::DATABASE_USERNAME => 'user1',
         ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',
@@ -71,7 +71,7 @@ RSpec.describe ::Avm::Instances::Base do
         ::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'
+        ::Avm::Instances::EntryKeys::INSTALL_PATH => '/path/to/app5/app_6'
       },
       'mailer_0' => {
         ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',

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

@@ -3,10 +3,10 @@ app_0:
   install:
     id: app_1
 app_1:
-  fs_path: /fs_root
   install:
     id: app_2
     data_path: /data_fs_root
+    path: /fs_root
   database:
     name: app_1_db
     username: user1

data/sub/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,template}/**/*']
 
   s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.17'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.4'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.5', '>= 0.5.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
   s.add_dependency 'os', '~> 1.1', '>= 1.1.4'
   s.add_dependency 'rouge', '~> 3.30'
 

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/apache_host.rb

@@ -6,7 +6,7 @@ module Avm
   module EacAsciidoctorBase0
     class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
       def document_root
-        instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+        instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
       end
 
       def extra_content

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/deploy.rb

@@ -18,7 +18,7 @@ module Avm
 
       def project_uncached
         ::Avm::EacAsciidoctorBase0::Sources::Base.new(
-          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
         )
       end
     end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/sub/avm-eac_latex_base0/avm-eac_latex_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.4'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'avm', '~> 0.41'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.5', '>= 0.5.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/instances/apache_host.rb

@@ -7,7 +7,7 @@ module Avm
     module Instances
       class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
         def document_root
-          instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+          instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
         end
 
         def extra_content

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/instances/deploy.rb

@@ -29,7 +29,7 @@ module Avm
 
         def project_uncached
           ::Avm::EacLatexBase0::Sources::Base.new(
-            instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+            instance.source_instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
           )
         end
       end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacLatexBase0
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.5'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/deploy.rb

@@ -44,7 +44,7 @@ module Avm
       def touch_restart_file
         infom 'Touching restart file...'
         instance.host_env.command(
-          'touch', ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH),
+          'touch', ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
                                'tmp', 'restart.txt')
         ).system!
       end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe ::Avm::EacRailsBase0::ApacheHost do
     let(:expected_content) { fixtures_dir.join('apache_host_spec_no_ssl_content.conf').read }
 
     before do
-      instance.entry('fs_path').write('/path/to/stub-app_0')
+      instance.entry('install.path').write('/path/to/stub-app_0')
       instance.entry('web.url').write('http://stubapp.net')
     end
 

data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe ::Avm::EacRailsBase0::ApachePath do
     let(:expected_content) { expect_file.read }
 
     before do
-      instance.entry(::Avm::Instances::EntryKeys::FS_PATH).write('/path/to/stub-app_0')
+      instance.entry(::Avm::Instances::EntryKeys::INSTALL_PATH).write('/path/to/stub-app_0')
       instance.entry('web.url').write('http://stubapp.net/stub-app_0')
     end
 

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/apache_path/extra_content.conf

@@ -1,5 +1,5 @@
 <Location "%%WEB.PATH%%">
   PassengerBaseURI "%%WEB.PATH%%"
-  PassengerAppRoot "%%FS_PATH%%"
+  PassengerAppRoot "%%INSTALL.PATH%%"
   PassengerAppEnv production
 </Location>

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.19'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.4'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'avm', '~> 0.41'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.20'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.6'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/apache_host.rb

@@ -6,7 +6,7 @@ module Avm
   module EacRailsBase1
     class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
       def document_root
-        "#{instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)}/public"
+        "#{instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)}/public"
       end
 
       def extra_content

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/base.rb

@@ -18,8 +18,9 @@ module Avm
         end
 
         def the_gem
-          @the_gem ||= ::Avm::EacRubyBase1::Sources::Base.new(::File.join(read_entry('fs_path')))
-                         .env_set(host_env)
+          @the_gem ||= ::Avm::EacRubyBase1::Sources::Base.new(
+            ::File.join(read_entry('install.path'))
+          ).env_set(host_env)
         end
       end
     end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/log.rb

@@ -20,7 +20,7 @@ module Avm
         private
 
         def log_path
-          ::File.join(rails_instance.read_entry('fs_path'), 'log', "#{rails_environment}.log")
+          ::File.join(rails_instance.read_entry('install.path'), 'log', "#{rails_environment}.log")
         end
 
         def start_banner

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/sub/avm-eac_rails_base1/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.sh

@@ -3,4 +3,4 @@
 set -e
 
 source "$HOME/.rvm/scripts/rvm"
-( cd '%%fs_path%%'; RAILS_ENV=production bundle exec tasks_scheduler "$@" )
+( cd '%%install.path%%'; RAILS_ENV=production bundle exec tasks_scheduler "$@" )

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.39', '>= 0.39.1'
+  s.add_dependency 'avm', '~> 0.41'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.5'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb

@@ -21,7 +21,7 @@ module Avm
         def docker_run_arguments
           [
             '--volume',
-            "#{read_entry(::Avm::Instances::EntryKeys::FS_PATH)}:/home/myuser/eac_redmine_base0",
+            "#{install_path}:/home/myuser/eac_redmine_base0",
             '--publish', "#{read_entry(:ssh_port)}:22",
             '--publish', "#{read_entry(:http_port)}:80",
             '--publish', "#{read_entry(:https_port)}:443"

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/deploy.rb

@@ -21,7 +21,7 @@ module Avm
         end
 
         def installer_path
-          ::File.join(instance.fs_path, 'plugins', 'redmine_installer', 'installer', 'run.sh')
+          ::File.join(instance.install_path, 'plugins', 'redmine_installer', 'installer', 'run.sh')
         end
 
         def install_task

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -77,7 +77,7 @@ module Avm
         end
 
         def git_repo_uncached
-          ::EacGit::Local.new(instance.source_instance.fs_path)
+          ::EacGit::Local.new(instance.source_instance.install_path)
         end
 
         def redmine_source_git_id

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.13.0'
+    VERSION = '0.14.0'
   end
 end

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.39', '>= 0.39.1'
+  s.add_dependency 'avm', '~> 0.41', '>= 0.41.1'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/apache_path.rb

@@ -15,7 +15,7 @@ module Avm
       end
 
       def document_root
-        instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+        instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
       end
 
       def extra_content

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/file_unit.rb

@@ -27,7 +27,7 @@ module Avm
         end
 
         def target_path
-          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH),
+          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
                       fs_path_subpath.to_s)
         end
 

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/git_info.rb

@@ -38,7 +38,7 @@ module Avm
         end
 
         def git_repository_path
-          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
         end
 
         def git_uncached

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/write_on_target.rb

@@ -9,7 +9,7 @@ module Avm
         def write_on_target
           ::Avm::Files::Deploy.new(
             instance.host_env,
-            instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+            instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
           ).append_plain_directory(build_dir).run
         end
       end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb

@@ -23,13 +23,13 @@ module Avm
         end
 
         def data_dump_runner_class
-          "#{stereotype_namespace_module}::Runner::Data::Dump".constantize
+          ::Avm::EacWebappBase0::Instances::Runners::Data::Dump
         end
 
         def run_subcommand(subcommand_class, argv)
           subcommand_class.create(
             argv: argv,
-            parent: ::Avm::EacWebappBase0::Instance::SubcommandParent.new(self)
+            parent: ::Avm::EacWebappBase0::Instances::Base::SubcommandParent.new(self)
           ).run
         end
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.5.0'
+    VERSION = '0.6.1'
   end
 end

data/sub/avm-eac_wordpress_base0/avm-eac_wordpress_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.4'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'avm', '~> 0.41'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.6'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

data/sub/avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0/instances/apache_host.rb

@@ -7,7 +7,7 @@ module Avm
     module Instances
       class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
         def document_root
-          instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+          instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
         end
 
         def extra_content

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWordpressBase0
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_wordpress_base0/spec/lib/avm/eac_wordpress_base0/instances/apache_host_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe ::Avm::EacWordpressBase0::Instances::ApacheHost do
     end
 
     before do
-      instance.entry(::Avm::Instances::EntryKeys::FS_PATH).write('/path/to/stub-app_0')
+      instance.entry(::Avm::Instances::EntryKeys::INSTALL_PATH).write('/path/to/stub-app_0')
       instance.entry(::Avm::Instances::EntryKeys::WEB_URL).write('http://stubapp.net')
       instance.entry(::Avm::Instances::EntryKeys::INSTALL_USERNAME).write('myuser')
     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.41'
+  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'
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
   s.add_dependency 'eac_ruby_base0', '~> 0.16', '>= 0.16.6'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
-  s.add_dependency 'git', '~> 1.11'
+  s.add_dependency 'git', '~> 1.12'
   s.add_dependency 'ruby-progressbar', '~> 1.11'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -71,7 +71,7 @@ module Avm
           def dev_instance_fs_path
             instance.if_present do |v|
               v.application.instance('dev').read_entry_optional(
-                ::Avm::Instances::EntryKeys::FS_PATH
+                ::Avm::Instances::EntryKeys::INSTALL_PATH
               )
             end
           end
@@ -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.135.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.27.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.41'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.39.1
+        version: 0.41.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.41'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.39.1
+        version: 0.41.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -64,62 +64,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -154,48 +148,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.133'
+        version: '0.135'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.133'
+        version: '0.135'
 - !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
@@ -783,7 +780,6 @@ files:
 - sub/avm/lib/avm/instances/base/auto_values/admin.rb
 - sub/avm/lib/avm/instances/base/auto_values/data.rb
 - sub/avm/lib/avm/instances/base/auto_values/database.rb
-- sub/avm/lib/avm/instances/base/auto_values/filesystem.rb
 - sub/avm/lib/avm/instances/base/auto_values/install.rb
 - sub/avm/lib/avm/instances/base/auto_values/mailer.rb
 - sub/avm/lib/avm/instances/base/auto_values/ruby.rb

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

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/entry_keys'
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Filesystem
-          def auto_fs_path
-            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
-  end
-end