eac_tools 0.22.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04cbda8d8b53185b46e806e22d26098771f627a4574eb028e9836905e700a27d
-  data.tar.gz: 7862b02bf94a320aee41d7ef63052b2049484a5f1540392268b41402b4eb6ba4
+  metadata.gz: 01ef491263c804f929167ab7067054cfd5341598cf5c7855915f187d8206727c
+  data.tar.gz: 6dfc25b5ee4e38978a80a50980cdbb15a992f6a7fd8a695d7298e481f176f839
 SHA512:
-  metadata.gz: d51e79b98e8a886236b82b1cafbbe7e3f817cf4dcc18bce329f19d4d5a176a2ae10c78ed5ca871d6de8e79b31244687bccfd0a4fdca71bf88e9e806aa6faab28
-  data.tar.gz: 42d8f5266e63f7dac0bf2f952bea10d9ad342fd223c1f41ea7984aeb3f37bce37dc5389bd00da9411607badf39bfed74f24b3fac04dd4bd6a3b3b4a2b55c4736
+  metadata.gz: ddd276d51b2eccb1b53ef335d58000de09c32d2d8d86283a8a0723e1a9ea2edb854f6603f37ffdb0a4ec8df9ed23a073ec5a9fcdfc5c95d3f7966fcdd93f9eb8
+  data.tar.gz: c4b5df3fe0a896e24cbeabbb27aa573e6a814460cbadc1fb3941c6490a5e2f129c9c747135085dc064f7cfd6d201cd6e2cbc4fcf246cd304bc64d282b59708cd

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.22.0)
-      avm (~> 0.35, >= 0.35.1)
-      avm-eac_asciidoctor_base0 (~> 0.4)
+    eac_tools (0.24.1)
+      avm (~> 0.38)
+      avm-eac_asciidoctor_base0 (~> 0.5)
       avm-eac_generic_base0 (~> 0.5)
-      avm-eac_latex_base0 (~> 0.1, >= 0.1.1)
-      avm-eac_rails_base0 (~> 0.6, >= 0.6.1)
-      avm-eac_rails_base1 (~> 0.4, >= 0.4.2)
-      avm-eac_redmine_base0 (~> 0.11)
+      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_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.19)
-      avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
-      avm-eac_wordpress_base0 (~> 0.1, >= 0.1.1)
-      avm-tools (~> 0.132, >= 0.132.1)
-      eac_ruby_utils (~> 0.98)
+      avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
+      avm-eac_webapp_base0 (~> 0.4)
+      avm-eac_wordpress_base0 (~> 0.1, >= 0.1.2)
+      avm-tools (~> 0.133)
+      eac_ruby_utils (~> 0.100)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.4.0)
-      asciidoctor (~> 2.0, >= 2.0.12)
-      avm-eac_webapp_base0 (~> 0.2)
-      eac_ruby_utils (~> 0.63)
-      os
-      rouge (~> 3.26)
+    avm-eac_asciidoctor_base0 (0.5.0)
+      asciidoctor (~> 2.0, >= 2.0.17)
+      avm-eac_webapp_base0 (~> 0.4)
+      eac_ruby_utils (~> 0.98)
+      os (~> 1.1, >= 1.1.4)
+      rouge (~> 3.30)
 
 PATH
   remote: sub/avm-eac_generic_base0
@@ -36,39 +36,39 @@ PATH
 PATH
   remote: sub/avm-eac_latex_base0
   specs:
-    avm-eac_latex_base0 (0.1.1)
-      avm (~> 0.34)
-      avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
-      eac_ruby_utils (~> 0.97)
+    avm-eac_latex_base0 (0.1.2)
+      avm (~> 0.35, >= 0.35.1)
+      avm-eac_webapp_base0 (~> 0.4)
+      eac_ruby_utils (~> 0.98)
 
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
-    avm-eac_rails_base0 (0.6.1)
-      avm-eac_rails_base1 (~> 0.4, >= 0.4.2)
-      eac_ruby_utils (~> 0.97)
+    avm-eac_rails_base0 (0.7.0)
+      avm-eac_rails_base1 (~> 0.5)
+      eac_ruby_utils (~> 0.98)
 
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.4.2)
-      avm (~> 0.31)
-      avm-eac_ruby_base1 (~> 0.11)
-      avm-eac_webapp_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.97)
+    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)
 
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.11.0)
-      avm (~> 0.29)
-      avm-eac_generic_base0 (~> 0.4)
-      avm-eac_rails_base1 (~> 0.4, >= 0.4.1)
+    avm-eac_redmine_base0 (0.12.0)
+      avm (~> 0.35, >= 0.35.1)
+      avm-eac_generic_base0 (~> 0.5)
+      avm-eac_rails_base1 (~> 0.5)
       avm-eac_ubuntu_base0 (~> 0.3)
-      curb (~> 0.9.11)
-      eac_fs (~> 0.12, >= 0.12.2)
+      curb (~> 0.9, >= 0.9.11)
+      eac_fs (~> 0.12, >= 0.12.3)
       eac_rest (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.95, >= 0.95.2)
+      eac_ruby_utils (~> 0.98)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -80,7 +80,7 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.19.0)
+    avm-eac_ruby_base1 (0.19.1)
       avm (~> 0.35, >= 0.35.1)
       avm-eac_generic_base0 (~> 0.5)
       eac_ruby_utils (~> 0.98)
@@ -88,34 +88,34 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.3.1)
-      avm (~> 0.1)
-      avm-eac_generic_base0 (~> 0.1)
-      avm-eac_postgresql_base0 (~> 0.1)
+    avm-eac_webapp_base0 (0.4.0)
+      avm (~> 0.35, >= 0.35.1)
+      avm-eac_generic_base0 (~> 0.5)
+      avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.68)
+      eac_ruby_utils (~> 0.98)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
   specs:
-    avm-eac_wordpress_base0 (0.1.1)
-      avm (~> 0.35)
-      avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
-      eac_ruby_utils (~> 0.97)
+    avm-eac_wordpress_base0 (0.1.2)
+      avm (~> 0.35, >= 0.35.1)
+      avm-eac_webapp_base0 (~> 0.4)
+      eac_ruby_utils (~> 0.98)
 
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.132.1)
+    avm-tools (0.133.0)
       aranha-parsers (~> 0.14, >= 0.14.1)
-      avm (~> 0.35, >= 0.35.1)
-      avm-eac_ruby_base1 (~> 0.19)
+      avm (~> 0.37)
+      avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.3, >= 0.3.2)
       avm-git (~> 0.4)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
-      eac_git (~> 0.12, >= 0.12.1)
+      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)
@@ -124,12 +124,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.35.1)
+    avm (0.38.0)
       eac_cli (~> 0.27, >= 0.27.8)
-      eac_config (~> 0.10)
+      eac_config (~> 0.11)
       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.100)
       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.0)
+      addressable (~> 2.8)
+      eac_ruby_utils (~> 0.100)
 
 PATH
   remote: sub/eac_docker
@@ -177,7 +177,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.98.0)
+    eac_ruby_utils (0.100.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.6)
       bundler
@@ -229,7 +229,7 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_git (0.12.1)
+    eac_git (0.12.2)
       eac_ruby_utils (~> 0.83)
       parseconfig (~> 1.0, >= 1.0.8)
     eac_rest (0.6.1)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.22.0'
+  VERSION = '0.24.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'
   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.100'
   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/base/uri_component_entry_value.rb

@@ -0,0 +1,55 @@
+# 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
+        common_constructor :entries_provider, :component_entry_path do
+          self.component_entry_path = ::EacConfig::EntryPath.assert(component_entry_path)
+        end
+
+        def inherited_result
+          entries_provider.inherited_entry_value(
+            id_entry_path.to_string,
+            component_entry_path.to_string
+          )
+        end
+
+        # @return [EacConfig::EntryPath]
+        def id_entry_path
+          root_entry_path + %w[id]
+        end
+
+        # @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
+        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
+
+        # @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

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/install.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/entries/uri_builder'
 require 'avm/instances/entry_keys'
 
 module Avm
@@ -13,19 +14,10 @@ module Avm
               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)
-          end
-
-          def auto_install_port
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_PORT) || 22
-          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|
+            define_method "auto_install_#{component}" do
+              uri_component_entry_value("install.#{component}")
+            end
           end
 
           def auto_install_url

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

@@ -53,7 +53,7 @@ module Avm
       def host_env_uncached
         install_uri = entry(::Avm::Instances::EntryKeys::INSTALL_URL).value.to_uri
         case install_uri.scheme
-        when 'local' then ::EacRubyUtils::Envs.local
+        when 'file' then ::EacRubyUtils::Envs.local
         when 'ssh' then ::EacRubyUtils::Envs.ssh(install_uri)
         else raise("Unmapped access value: \"#{install_uri}\"")
         end

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

data/sub/avm/lib/avm/sources/base/application.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'avm/applications/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Application
+        APPLICATION_NAME_KEY = 'application'
+
+        # @return [Avm::Applications::Base]
+        def application
+          @application ||= ::Avm::Applications::Base.new(application_id)
+        end
+
+        # @return [String]
+        def application_id
+          application_id_by_configuration || application_id_by_directory
+        end
+
+        # @return [String, nil]
+        def application_id_by_configuration
+          configuration.entry(APPLICATION_NAME_KEY).value
+        end
+
+        # @return [String]
+        def application_id_by_directory
+          path.basename.to_path
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base/configuration.rb

@@ -24,6 +24,8 @@ module Avm
 
         # @return [EacRubyUtils::Envs::Command, nil]
         def configuration_value_to_env_command(value)
+          return value if value.is_a?(::EacRubyUtils::Envs::Command)
+
           configuration_value_to_shell_words(value).if_present { |v| env.command(v).chdir(path) }
         end
 

data/sub/avm/lib/avm/sources/base/testing.rb

@@ -57,7 +57,7 @@ module Avm
 
         def configured_enumerable_value_as_test_commands(value)
           configured_hash_value_as_test_commands(
-            value.each_with_index.map { |v| ["test_#{v[1]}", v[0]] }.to_h
+            value.each_with_index.map { |v, i| ["test_#{i}", v] }.to_h
           )
         end
 

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

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

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

@@ -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

@@ -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_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.12'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.63'
-  s.add_dependency 'os'
-  s.add_dependency 'rouge', '~> 3.26'
+  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 'os', '~> 1.1', '>= 1.1.4'
+  s.add_dependency 'rouge', '~> 3.30'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/base'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class Base < ::Avm::EacWebappBase0::Instances::Base
+        FILES_UNITS = {}.freeze
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      require_sub __FILE__
+    end
+  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.4.0'
+    VERSION = '0.5.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.34'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.3', '>= 0.3.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.97'
+  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_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/instance'
+require 'avm/eac_webapp_base0/instances/base'
 
 module Avm
   module EacLatexBase0
     module Instances
-      class Base < ::Avm::EacWebappBase0::Instance
+      class Base < ::Avm::EacWebappBase0::Instances::Base
         FILES_UNITS = {}.freeze
       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.1'
+    VERSION = '0.1.2'
   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.4', '>= 0.4.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.97'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.5'
+  s.add_dependency 'eac_ruby_utils', '~> 0.98'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instances/base'
+
+module Avm
+  module EacRailsBase0
+    module Instances
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        FILES_UNITS = { uploads: 'public/uploads' }.freeze
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase0
+    module Instances
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base0/instance'
+require 'avm/eac_rails_base0/instances/base'
 require 'avm/eac_rails_base0/deploy'
 require 'avm/eac_rails_base0/apache_host'
 require 'avm/eac_rails_base0/apache_path'

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

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