eac_tools 0.24.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01ef491263c804f929167ab7067054cfd5341598cf5c7855915f187d8206727c
-  data.tar.gz: 6dfc25b5ee4e38978a80a50980cdbb15a992f6a7fd8a695d7298e481f176f839
+  metadata.gz: 6de32a35373e92c90852a1d3d432b16112da4a908cd94bda757d64ca31647e93
+  data.tar.gz: 2b9c7aa3b2d163f2d5427c3f1d6de0da7e938d58ee79c4bc22418efce16ce1a6
 SHA512:
-  metadata.gz: ddd276d51b2eccb1b53ef335d58000de09c32d2d8d86283a8a0723e1a9ea2edb854f6603f37ffdb0a4ec8df9ed23a073ec5a9fcdfc5c95d3f7966fcdd93f9eb8
-  data.tar.gz: c4b5df3fe0a896e24cbeabbb27aa573e6a814460cbadc1fb3941c6490a5e2f129c9c747135085dc064f7cfd6d201cd6e2cbc4fcf246cd304bc64d282b59708cd
+  metadata.gz: 5e26f055dd1a4d7f617ebd982f820e25b3a81d10ef81d2e0d93648fcfed43a483e9dee6ce6b3a56c7546688aeb19a65edd4d8ae87e5a4dd6850555326cad9535
+  data.tar.gz: e5da4638216094a63e821b2aef2cb9a346c90cb952a41e8e408295e78628a9c0ff26c55922f4ad7dd7f3f5a5908a16d1dc681dfda3e4482fd9b9229d691a6181

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.24.1)
-      avm (~> 0.38)
+    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)
       avm-eac_rails_base0 (~> 0.7)
       avm-eac_rails_base1 (~> 0.5)
-      avm-eac_redmine_base0 (~> 0.12)
+      avm-eac_redmine_base0 (~> 0.13)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
-      avm-eac_webapp_base0 (~> 0.4)
+      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)
-      eac_ruby_utils (~> 0.100)
+      avm-tools (~> 0.134)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -60,15 +60,15 @@ PATH
 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.13.0)
+      avm (~> 0.39, >= 0.39.1)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_rails_base1 (~> 0.5)
       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,20 +80,20 @@ 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.0)
-      avm (~> 0.35, >= 0.35.1)
+    avm-eac_webapp_base0 (0.5.0)
+      avm (~> 0.39, >= 0.39.1)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.98)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -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,12 +124,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.38.0)
+    avm (0.40.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.100)
+      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.100.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.24.1'
+  VERSION = '0.26.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.100'
+  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/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/inherited_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 InheritedEntryValue
+        enable_method_class
+        common_constructor :entries_provider, :source_entry_suffix, :target_entry_suffix, :block,
+                           block_arg: true
+
+        def result
+          self_entry_value.if_present do |instance_id|
+            other_entry_value(instance_id).if_present(&block)
+          end
+        end
+
+        def other_entry_value(instance_id)
+          ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(target_entry_suffix)
+        end
+
+        def self_entry_value
+          entries_provider.read_entry_optional(source_entry_suffix)
+        end
+      end
+    end
+  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, :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,15 +9,14 @@ module Avm
     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
+        require_sub __FILE__, require_dependency: true
 
-        def inherited_result
-          entries_provider.inherited_entry_value(
-            id_entry_path.to_string,
-            component_entry_path.to_string
-          )
+        enable_listable
+        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
 
         # @return [EacConfig::EntryPath]
@@ -27,12 +26,7 @@ module Avm
 
         # @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
+          url_entry_value || inherited_value || default_value
         end
 
         # @return [EacConfig::EntryPath]
@@ -40,11 +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
-
         # @return [String]
         def component
           component_entry_path.last

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

@@ -34,16 +34,6 @@ module Avm
         end
         (path_prefix + entry_suffix).join('.')
       end
-
-      def inherited_entry_value(source_entry_suffix, target_entry_suffix, &block)
-        read_entry_optional(source_entry_suffix).if_present do |instance_id|
-          other_entry_value(instance_id, target_entry_suffix).if_present(&block)
-        end
-      end
-
-      def other_entry_value(instance_id, entry_suffix)
-        ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(entry_suffix)
-      end
     end
   end
 end

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

@@ -11,32 +11,6 @@ module Avm
             inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
           end
-
-          def auto_data_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::DATA_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,15 +8,12 @@ module Avm
     class Base
       module AutoValues
         module Install
-          def auto_install_groupname
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME) ||
-              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
-          end
-
-          ::Avm::Entries::UriBuilder::ENTRIES_FIELDS.each do |component|
-            define_method "auto_install_#{component}" do
-              uri_component_entry_value("install.#{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(
+                ::Avm::Instances::EntryKeys.const_get(method_suffix.underscore.upcase)
+              )
             end
           end
 
@@ -30,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

@@ -45,12 +45,11 @@ module Avm
       end
 
       {
-        '' => %w[data_fs_path fs_path name source_instance_id],
+        '' => %w[fs_path 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 groupname],
+        install: URI_FIELDS + %w[id data_path groupname],
         mailer: {
           '' => %w[id from reply_to],
           smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]

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

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

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

@@ -16,7 +16,7 @@ RSpec.describe ::Avm::Instances::Base do
     {
       'app_0' => {
         fs_path: '/fs_root/app_0',
-        data_fs_path: '/data_fs_root/app_0',
+        ::Avm::Instances::EntryKeys::INSTALL_DATA_PATH => '/data_fs_root/app_0',
         ::Avm::Instances::EntryKeys::DATABASE_NAME => 'app_0',
         ::Avm::Instances::EntryKeys::DATABASE_USERNAME => 'user1',
         ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',

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

@@ -4,9 +4,9 @@ app_0:
     id: app_1
 app_1:
   fs_path: /fs_root
-  data_fs_path: /data_fs_root
   install:
     id: app_2
+    data_path: /data_fs_root
   database:
     name: app_1_db
     username: user1

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

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm', '~> 0.39', '>= 0.39.1'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.5'
   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'
   s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/deploy'
+require 'eac_ruby_utils/ruby'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Deploy < ::Avm::EacWebappBase0::Deploy
+        set_callback :assert_instance_branch, :after, :run_installer
+
+        def run_installer
+          infom 'Running installer'
+          ::EacRubyUtils::Ruby.on_clean_environment do
+            installer_command.system!
+          end
+        end
+
+        def installer_command
+          instance.host_env.command(installer_path, install_task)
+        end
+
+        def installer_path
+          ::File.join(instance.fs_path, 'plugins', 'redmine_installer', 'installer', 'run.sh')
+        end
+
+        def install_task
+          if instance.web_path_optional.present?
+            'redmine_as_apache_path'
+          else
+            'redmine_as_apache_base'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/instances/base'
-require 'avm/eac_redmine_base0/deploy'
+require 'avm/eac_redmine_base0/instances/deploy'
 require 'avm/eac_redmine_base0/apache_host'
 require 'avm/eac_rails_base1/runner'
 require 'eac_ruby_utils/core_ext'

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

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

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm', '~> 0.39', '>= 0.39.1'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/update_dependencies_requirements.rb

@@ -11,6 +11,7 @@ module Avm
         class UpdateDependenciesRequirements
           runner_with :help do
             bool_opt '-a', '--all'
+            arg_opt '-e', '--exclude', repeat: true
             pos_arg :gem_name, repeat: true, optional: true
           end
 
@@ -32,8 +33,13 @@ module Avm
 
           private
 
+          def exclude?(gem_name)
+            parsed.exclude.include?(gem_name)
+          end
+
           def gem_names_uncached
-            ::Set.new(parsed.gem_name + gem_names_from_all).sort
+            ::Set.new(parsed.gem_name + gem_names_from_all).reject { |gem_name| exclude?(gem_name) }
+              .sort
           end
 
           def gem_names_from_all

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.19.1'
+    VERSION = '0.20.0'
   end
 end

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

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm', '~> 0.39', '>= 0.39.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'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -23,7 +23,7 @@ module Avm
         end
 
         def source_path
-          ::File.join(instance.read_entry(:data_fs_path), data_key.to_s)
+          ::File.join(instance.install_data_path, data_key.to_s)
         end
 
         def target_path