eac_tools 0.24.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6548064142eb8ef0905dfc0c1705229f1554f3adb631fa0ec171888c32e8f0fa
-  data.tar.gz: 0c76aefc07d8a02763ffbcdd551a07b0f0a019f5b1fa626ce727ca4ce5eec0da
+  metadata.gz: 2dd36587fe5621b65a2fd826e04b44f9c941b848a9e5d3bb82f0e40375ec679b
+  data.tar.gz: '0880b563b0f3b7f367ddc299a385a76c626260937d779f4cd92f1884ad0ecc3d'
 SHA512:
-  metadata.gz: 18a95cc1eb6a32ec6f0273fb07be9c9217cba540033166b95007ebcfa73f53e29619fd4d5bfde46d57c7085c8af8834be5f7a2ad945fb06350d4621b9f7e8227
-  data.tar.gz: cb554e78ef18fe33ff56de3cf1f9e75f0da77b07a7a37e5dabfb569cfc20123ba140913da82f271ae6245499982c3f1a62291fdde931cf5b9ece6e737c6da98e
+  metadata.gz: 8edc33b2af676aaa9ba92138791e4e13fea951c028acd1efc6988a2d4922efd03bad2bb39ff15391110f070c63872ae17bb6a2831421095b62768f8a64c63864
+  data.tar.gz: 68360fc6669359864fbebeab00cf8a858bd341ffc849ed6855a4f5783efa5ee319c4c5a861a5752b0c55894be786b9a7230c0af5c5624cf99ef14bc354ccb064

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.24.0)
-      avm (~> 0.37)
+    eac_tools (0.25.1)
+      avm (~> 0.39, >= 0.39.1)
       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.98)
+      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
@@ -124,12 +124,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.37.0)
+    avm (0.39.1)
       eac_cli (~> 0.27, >= 0.27.8)
-      eac_config (~> 0.10)
+      eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.4, >= 0.4.2)
-      eac_git (~> 0.12, >= 0.12.1)
-      eac_ruby_utils (~> 0.98)
+      eac_git (~> 0.12, >= 0.12.2)
+      eac_ruby_utils (~> 0.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.10.0)
-      addressable
-      eac_ruby_utils (~> 0.97)
+    eac_config (0.11.1)
+      addressable (~> 2.8)
+      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
@@ -280,7 +280,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 +361,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.0'
+  VERSION = '0.25.1'
 end

data/sub/avm/avm.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.8'
-  s.add_dependency 'eac_config', '~> 0.10'
+  s.add_dependency 'eac_config', '~> 0.11', '>= 0.11.1'
   s.add_dependency 'eac_docker', '~> 0.4', '>= 0.4.2'
-  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.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.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentEntryValue
+        enable_method_class
+
+        enable_listable
+        lists.add_symbol :option, :default_value, :inherited_value_block
+
+        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]
+        end
+
+        # @return [String, nil]
+        def result
+          url_entry_value || inherited_result || default_value
+        end
+
+        # @return [EacConfig::EntryPath]
+        def root_entry_path
+          component_entry_path[0..-2]
+        end
+
+        # @return [Avm::Entries::Entry]
+        def url_entry
+          entries_provider.entry((root_entry_path + %w[url]).to_string)
+        end
+
+        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
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,8 @@ require 'avm/entries/entry'
 module Avm
   module Entries
     module Base
+      require_sub __FILE__, require_dependency: true
+
       def entries_provider_id
         id
       end
@@ -32,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/entries/entry.rb

@@ -10,7 +10,16 @@ module Avm
       common_constructor :parent, :suffix, :options
 
       def auto_value
-        ::Avm::Entries::AutoValues::Entry.new(parent, suffix).value
+        auto_value_entry.value
+      end
+
+      def auto_value_entry
+        @auto_value_entry ||= ::Avm::Entries::AutoValues::Entry.new(parent, suffix)
+      end
+
+      # @return [Boolean]
+      def context_found?
+        context_entry.found?
       end
 
       def full_path

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

@@ -42,6 +42,10 @@ module Avm
 
       common_constructor :data, default: [{}]
 
+      def avm_field_get(avm_field)
+        field_get(translate_field(avm_field))
+      end
+
       def field_get(name)
         data[name.to_sym].if_present(&:to_s)
       end

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

@@ -12,11 +12,6 @@ module Avm
                                   ::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

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/entries/uri_builder'
 require 'avm/instances/entry_keys'
 
 module Avm
@@ -7,25 +8,29 @@ 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
-
-          def auto_install_hostname
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME)
+          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_port
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_PORT) || 22
+          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
 
-          def auto_install_username
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+          ::Avm::Entries::UriBuilder::ENTRIES_FIELDS.each do |component|
+            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
 
           def auto_install_url

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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+require 'avm/entries/uri_builder'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Instances
     module EntryKeys
-      URI_FIELDS = %i[fragment hostname password path port query scheme url username].freeze
+      URI_FIELDS = ::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[url]
 
       class << self
         def all
@@ -44,12 +45,12 @@ 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.37.0'
+  VERSION = '0.39.1'
 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',
@@ -57,6 +57,22 @@ RSpec.describe ::Avm::Instances::Base do
         ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'group4',
         ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://user4@host4.net'
       },
+      'app_5' => {
+        ::Avm::Instances::EntryKeys::INSTALL_SCHEME => 'ssh',
+        ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'host5.net',
+        ::Avm::Instances::EntryKeys::INSTALL_PORT => '2222',
+        ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'user5',
+        ::Avm::Instances::EntryKeys::INSTALL_PASSWORD => 'passwd5',
+        ::Avm::Instances::EntryKeys::INSTALL_PATH => '/path/to/app5'
+      },
+      'app_6' => {
+        ::Avm::Instances::EntryKeys::INSTALL_SCHEME => 'ssh',
+        ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'host5.net',
+        ::Avm::Instances::EntryKeys::INSTALL_PORT => '2222',
+        ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'user5',
+        ::Avm::Instances::EntryKeys::INSTALL_PASSWORD => 'passwd5',
+        ::Avm::Instances::EntryKeys::INSTALL_PATH => '/path/to/app5'
+      },
       'mailer_0' => {
         ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
         ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => '',

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

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

data/sub/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

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

@@ -16,6 +16,8 @@ module Avm
         end
 
         def deploy_class
+          runner_context.call(:stereotype_module).const_get('Instances').const_get('Deploy')
+        rescue ::NameError
           runner_context.call(:stereotype_module).const_get('Deploy')
         end