eac_tools 0.25.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b50382fd923923ea176726318a5adeed1194cdc1aac56b3d70c2211a030d2e86
-  data.tar.gz: f35a6fe715fc7d265f046e3692201a8edbab95e16cc324942956ab31804bff0d
+  metadata.gz: ea35ded68776ddeadf8e107f9cdcd0b507f5c9faff2c7569a93b03e0bfbf3493
+  data.tar.gz: 46664e26b961edb4e19b2c30aec1c9736b7782138332730729f13fec602eea97
 SHA512:
-  metadata.gz: 8495da6e5565b3b03901d8c11a4f5bfe1d08fbe02cfafed82d59c4d33c69e92a43f8042e78e29ac32416eeed25250ab46088e9ca21193e0a912db82c2987c3ef
-  data.tar.gz: 81f4b76062b762acd52c63f9b4ec03bbb8e7d599032d7235ea24f2f291001664c3674fbb4db74d0e8f31783e36760f7a59427e1893d38ad087eaa34b24d87b29
+  metadata.gz: a8031e90bca20fed7ec24c53e6d03e86cf876085ec85c1f080a871329590c4b95836ca02c8f162f701734b0aeb38e338a8f0d175e01109db3b9d4ac48b6a367e
+  data.tar.gz: 991180687e138de7d5f4d9397ebf39d0f9768c661025a1d39d5cbea9bcdd0db56a8298352b2b7d68f4f145a5d1c31acbce20c60868656380255302426e14dced

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.25.0)
-      avm (~> 0.39)
-      avm-eac_asciidoctor_base0 (~> 0.5)
+    eac_tools (0.27.0)
+      avm (~> 0.41)
+      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.12)
+      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.19, >= 0.19.1)
-      avm-eac_webapp_base0 (~> 0.4, >= 0.4.1)
-      avm-eac_wordpress_base0 (~> 0.1, >= 0.1.2)
-      avm-tools (~> 0.133)
-      eac_ruby_utils (~> 0.101)
+      avm-eac_ruby_base1 (~> 0.20)
+      avm-eac_webapp_base0 (~> 0.6)
+      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,39 +36,39 @@ 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.12.0)
-      avm (~> 0.35, >= 0.35.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)
       eac_rest (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.98)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -80,36 +80,36 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.19.1)
-      avm (~> 0.35, >= 0.35.1)
+    avm-eac_ruby_base1 (0.20.0)
+      avm (~> 0.39, >= 0.39.1)
       avm-eac_generic_base0 (~> 0.5)
-      eac_ruby_utils (~> 0.98)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.4.1)
-      avm (~> 0.39)
+    avm-eac_webapp_base0 (0.6.0)
+      avm (~> 0.41)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.101)
+      eac_ruby_utils (~> 0.102)
 
 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,18 +118,18 @@ 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.0)
+    avm (0.41.0)
       eac_cli (~> 0.27, >= 0.27.8)
-      eac_config (~> 0.11)
+      eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.4, >= 0.4.2)
       eac_git (~> 0.12, >= 0.12.2)
-      eac_ruby_utils (~> 0.101)
+      eac_ruby_utils (~> 0.102)
       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.11.0)
+    eac_config (0.11.1)
       addressable (~> 2.8)
-      eac_ruby_utils (~> 0.100)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/eac_docker
@@ -177,11 +177,11 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.101.0)
+    eac_ruby_utils (0.102.0)
       activesupport (>= 4, < 7)
-      addressable (~> 2.6)
+      addressable (~> 2.8)
       bundler
-      filesize
+      filesize (~> 0.2)
       net-ssh (~> 4.2)
 
 GEM
@@ -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)
@@ -280,7 +281,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     minitar (0.9)
-    minitest (5.16.2)
+    minitest (5.16.3)
     multipart-post (2.2.3)
     net-ssh (4.2.0)
     nokogiri (1.13.8-x86_64-linux)
@@ -361,4 +362,4 @@ DEPENDENCIES
   eac_tools!
 
 BUNDLED WITH
-   2.3.18
+   2.3.20

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.25.0'
+  VERSION = '0.27.0'
 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.11'
+  s.add_dependency 'eac_config', '~> 0.11', '>= 0.11.1'
   s.add_dependency 'eac_docker', '~> 0.4', '>= 0.4.2'
   s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.101'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
   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/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/auto_values/uri_entry.rb

@@ -15,7 +15,7 @@ module Avm
 
         def value
           ::Avm::Entries::UriBuilder.from_all_fields do |field_name|
-            entries_provider.entry([suffix, field_name]).value
+            entries_provider.entry([suffix, field_name]).optional_value
           end.to_uri.to_s
         end
       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_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/filesystem.rb

@@ -7,31 +7,6 @@ module Avm
     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

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.0'
+  VERSION = '0.41.0'
 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