eac_tools 0.31.1 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 892682917367f717a0f078304525d17496c7212c3830629384e476d4ccbaa5f3
-  data.tar.gz: 9f3e28c9c3c5a94ca9c110e0fcaac8d5e3158248bb00d27797eb1855c2cee7e3
+  metadata.gz: 81dc6bdf661e34dc3a4136b707733bea7f9528829dc30e9b918a656c156db423
+  data.tar.gz: 87651ba1f7ea344fc8d53e29f7360e65a391b4acf0c4f77456104bfbd6a6af43
 SHA512:
-  metadata.gz: f798e7f96fcb48382de6b4a17d83ded84ddaebc54a56636453821ee588749e1abec34eb74f1bd5d78a6399464db5a7c29f14365c2672538e3fa764caac5b4b91
-  data.tar.gz: 115edfd9cdd9b6e96bca831a1d3d984186665854422abbe24af41b653f2130b6ac1c6750b8faa6365b079f6e75065b05005b85cd7fa415417438b0d51e43cdc4
+  metadata.gz: 39579d9d45e8a0b0064553aec347e5d0915c8bdf9e14037af7ea5f29c3bb8f4d5622a16405095906db82e0691c1d5ca33a5a3808b5f6acfdb478775961a04003
+  data.tar.gz: f0b3749dcf1ebc71f2a15bb04a2a2bbbf1785655b9ce7a0cb2331ddd3d44dc9a389247e963595e0899a75fc0bd5505743e5954890ec3df0800638b193873ee78

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.31.1)
-      avm (~> 0.44)
-      avm-eac_asciidoctor_base0 (~> 0.7)
+    eac_tools (0.32.0)
+      avm (~> 0.45)
+      avm-eac_asciidoctor_base0 (~> 0.7, >= 0.7.1)
       avm-eac_generic_base0 (~> 0.5)
-      avm-eac_latex_base0 (~> 0.2)
-      avm-eac_rails_base0 (~> 0.8)
-      avm-eac_rails_base1 (~> 0.6)
-      avm-eac_redmine_base0 (~> 0.15)
+      avm-eac_latex_base0 (~> 0.2, >= 0.2.1)
+      avm-eac_rails_base0 (~> 0.8, >= 0.8.1)
+      avm-eac_rails_base1 (~> 0.7)
+      avm-eac_redmine_base0 (~> 0.16)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.21)
-      avm-eac_webapp_base0 (~> 0.8)
-      avm-eac_wordpress_base0 (~> 0.2)
+      avm-eac_webapp_base0 (~> 0.9)
+      avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
       avm-tools (~> 0.136, >= 0.136.2)
       eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.7.0)
+    avm-eac_asciidoctor_base0 (0.7.1)
       asciidoctor (~> 2.0, >= 2.0.17)
-      avm-eac_webapp_base0 (~> 0.7)
-      eac_ruby_utils (~> 0.102, >= 0.102.1)
+      avm-eac_webapp_base0 (~> 0.9)
+      eac_ruby_utils (~> 0.104)
       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.2.0)
-      avm (~> 0.41)
-      avm-eac_webapp_base0 (~> 0.5, >= 0.5.1)
-      eac_ruby_utils (~> 0.102)
+    avm-eac_latex_base0 (0.2.1)
+      avm (~> 0.45)
+      avm-eac_webapp_base0 (~> 0.9)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
-    avm-eac_rails_base0 (0.8.0)
-      avm-eac_rails_base1 (~> 0.6)
-      eac_ruby_utils (~> 0.102)
+    avm-eac_rails_base0 (0.8.1)
+      avm-eac_rails_base1 (~> 0.7)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    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)
+    avm-eac_rails_base1 (0.7.0)
+      avm (~> 0.45)
+      avm-eac_ruby_base1 (~> 0.21)
+      avm-eac_webapp_base0 (~> 0.9)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.15.0)
-      avm (~> 0.43)
+    avm-eac_redmine_base0 (0.16.0)
+      avm (~> 0.44)
       avm-eac_generic_base0 (~> 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.103)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -88,20 +88,20 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.8.0)
-      avm (~> 0.42)
+    avm-eac_webapp_base0 (0.9.0)
+      avm (~> 0.45)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.103)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
   specs:
-    avm-eac_wordpress_base0 (0.2.0)
-      avm (~> 0.41)
-      avm-eac_webapp_base0 (~> 0.6)
-      eac_ruby_utils (~> 0.102)
+    avm-eac_wordpress_base0 (0.2.1)
+      avm (~> 0.45)
+      avm-eac_webapp_base0 (~> 0.9)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-files
@@ -134,11 +134,11 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.44.0)
+    avm (0.45.0)
       eac_cli (~> 0.28)
       eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.4, >= 0.4.2)
-      eac_git (~> 0.12, >= 0.12.2)
+      eac_git (~> 0.12, >= 0.12.3)
       eac_ruby_utils (~> 0.104)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_cli', '~> 0.28'
   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_git', '~> 0.12', '>= 0.12.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.104'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'

data/sub/avm/lib/avm/entries/auto_values/entry.rb

@@ -8,15 +8,22 @@ module Avm
     module AutoValues
       class Entry
         class << self
-          def auto_value_method_name(suffix)
-            "auto_#{suffix.to_s.gsub('.', '_')}"
+          # @param path [EacConfig::EntryPath]
+          # @return String
+          def auto_value_method_name(path)
+            "auto_#{::EacConfig::EntryPath.assert(path).to_string.gsub('.', '_')}"
           end
         end
 
-        common_constructor :entries_provider, :suffix
+        # @!method initialize(entries_provider, path)
+        #   @param entries_provider
+        #   @param path [EacConfig::EntryPath]
+        common_constructor :entries_provider, :path do
+          self.path = ::EacConfig::EntryPath.assert(path)
+        end
 
         def auto_value_method
-          self.class.auto_value_method_name(suffix)
+          self.class.auto_value_method_name(path)
         end
 
         def found?

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/with_variables_source'
+require 'avm/result'
+require 'eac_cli/core_ext'
+
+module Avm
+  module Entries
+    module Jobs
+      module Base
+        common_concern do
+          include ::ActiveSupport::Callbacks
+          include ::Avm::Entries::Jobs::WithVariablesSource
+
+          enable_speaker
+          enable_simple_cache
+          enable_listable
+          common_constructor :instance, :options, default: [{}] do
+            if option_list.present?
+              self.options = option_list.hash_keys_validate!(options.symbolize_keys)
+            end
+          end
+          define_callbacks(*jobs)
+        end
+
+        module ClassMethods
+          def jobs
+            const_get('JOBS').dup
+          end
+        end
+
+        module InstanceMethods
+          def option_list
+            nil
+          end
+
+          def run
+            start_banner if respond_to?(:start_banner)
+            run_jobs
+            ::Avm::Result.success('Done!')
+          rescue ::Avm::Result::Error => e
+            e.to_result
+          end
+
+          protected
+
+          def run_jobs
+            jobs.each do |job|
+              run_callbacks job do
+                send(job)
+              end
+            end
+          end
+
+          def jobs
+            self.class.jobs
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/jobs/variables_source/read_entry.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Jobs
+      class VariablesSource
+        class ReadEntry
+          enable_method_class
+          common_constructor :variables_source, :path, :options, default: [{}]
+          delegate :instance, :job, to: :variables_source
+
+          def result
+            return result_from_job if result_from_job?
+            return result_from_instance_method if result_from_instance_method?
+
+            result_from_instance_entry
+          end
+
+          private
+
+          def path_method_name
+            path.gsub('.', '_').underscore
+          end
+
+          def result_from_instance_entry
+            instance.read_entry(path, options)
+          end
+
+          def result_from_instance_method
+            instance.send(path_method_name)
+          end
+
+          def result_from_instance_method?
+            instance.respond_to?(path_method_name, true)
+          end
+
+          def result_from_job
+            job.send(path_method_name)
+          end
+
+          def result_from_job?
+            job.respond_to?(path_method_name, true)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/jobs/variables_source.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Jobs
+      class VariablesSource
+        require_sub __FILE__, require_dependency: true
+        common_constructor :job
+        delegate :instance, to: :job
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/jobs/with_variables_source.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/variables_source'
+
+module Avm
+  module Entries
+    module Jobs
+      module WithVariablesSource
+        def variables_source
+          ::Avm::Entries::Jobs::VariablesSource.new(self)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/{jobs.rb → entries/jobs.rb}

@@ -3,7 +3,9 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Jobs
-    require_sub __FILE__
+  module Entries
+    module Jobs
+      require_sub __FILE__
+    end
   end
 end

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

@@ -13,7 +13,7 @@ module Avm
           end
 
           define_method "#{method_name}_optional" do
-            read_entry(key, required: false)
+            read_entry_optional(key)
           end
         end
       end

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

@@ -35,7 +35,7 @@ module Avm
           '' => %w[id from reply_to],
           smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]
         },
-        web: URI_FIELDS + %w[authority userinfo]
+        web: URI_FIELDS
       }.each { |prefix, suffixes| keys_consts_set(prefix, suffixes) }
     end
   end

data/sub/avm/lib/avm/rspec/setup.rb

@@ -5,17 +5,16 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Rspec
     module Setup
-      def self.extended(obj)
-        obj.setup_in_avm_registry_example
-        obj.setup_not_in_avm_registry_example
-      end
+      EXAMPLES = %w[entries_values in_avm_registry not_in_avm_registry].freeze
 
-      def setup_in_avm_registry_example
-        require 'avm/rspec/shared_examples/in_avm_registry'
+      def self.extended(obj)
+        obj.setup_examples
       end
 
-      def setup_not_in_avm_registry_example
-        require 'avm/rspec/shared_examples/not_in_avm_registry'
+      def setup_examples
+        EXAMPLES.each do |example|
+          require "avm/rspec/shared_examples/#{example}"
+        end
       end
     end
   end

data/sub/avm/lib/avm/rspec/shared_examples/entries_values.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+::RSpec.shared_examples 'entries_values' do |spec_file, expected_values|
+  describe '#read_entry' do
+    config_path = spec_file.to_pathname
+    config_path = config_path.dirname.join("#{config_path.basename_noext}_files", 'config.yml')
+    ::EacRubyUtils::Rspec.default_setup.stub_eac_config_node(self, config_path)
+
+    expected_values.each do |instance_id, values|
+      values.each do |input, expected|
+        context "when a auto value is requested for \"#{instance_id}.#{input}\"" do
+          let(:instance) { described_class.by_id(instance_id) }
+
+          it ".read_entry should return \"#{expected}\"" do
+            expect(instance.read_entry(input)).to eq(expected)
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -4,105 +4,85 @@ require 'avm/instances/base'
 require 'avm/instances/entry_keys'
 
 RSpec.describe ::Avm::Instances::Base do
-  let(:app2) { described_class.by_id('app_2') }
-  let(:app1) { described_class.by_id('app_1') }
-  let(:app0) { described_class.by_id('app_0') }
-
-  ::EacRubyUtils::Rspec
-    .default_setup
-    .stub_eac_config_node(self, ::File.join(__dir__, 'base_spec_configs_storage.yml'))
-
-  describe '#read_entry' do
-    {
-      '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',
-        ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => 'database.net',
-        ::Avm::Instances::EntryKeys::DATABASE_PORT => 5432,
-        ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'myhost.com',
-        ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'myuser',
-        ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'myuser',
-        ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com'
-      },
-      'app_2' => {
-        ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => '127.0.0.1',
-        ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'myuser',
-        ::Avm::Instances::EntryKeys::SOURCE_INSTANCE_ID => 'app_dev'
-      },
-      'app_3' => {
-        ::Avm::Instances::EntryKeys::DATABASE_SYSTEM => 'postgresql',
-        ::Avm::Instances::EntryKeys::DATABASE_NAME => 'app_1_db',
-        ::Avm::Instances::EntryKeys::DATABASE_USERNAME => 'user1',
-        ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',
-        ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => 'database.net',
-        ::Avm::Instances::EntryKeys::DATABASE_PORT => 5432,
-        ::Avm::Instances::EntryKeys::MAILER_ID => 'mailer_0',
-        ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
-        ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => nil,
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_ADDRESS => 'smtp.example.net',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_PORT => '587',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_DOMAIN => 'example.net',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_USERNAME => 'a_user',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_PASSWORD => 'a_secret',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_AUTHENTICATION => 'plain',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_STARTTLS_AUTO => 'true'
-      },
-      'app_4' => {
-        ::Avm::Instances::EntryKeys::INSTALL_SCHEME => 'ssh',
-        ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'host4.net',
-        ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'user4',
-        ::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/app_6'
-      },
-      'mailer_0' => {
-        ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
-        ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => '',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_ADDRESS => 'smtp.example.net',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_PORT => '587',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_DOMAIN => 'example.net',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_USERNAME => 'a_user',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_PASSWORD => 'a_secret',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_AUTHENTICATION => 'plain',
-        ::Avm::Instances::EntryKeys::MAILER_SMTP_STARTTLS_AUTO => 'true'
-      }
-    }.each do |instance_id, values|
-      values.each do |input, expected|
-        context "when a auto value is requested for \"#{instance_id}.#{input}\"" do
-          let(:instance) { described_class.by_id(instance_id) }
-
-          it do
-            expect(described_class.ancestors.map(&:name)).to(
-              include('Avm::Instances::Base::Install')
-            )
-          end
-
-          it ".read_entry should return \"#{expected}\"" do
-            expect(instance.read_entry(input)).to eq(expected)
-          end
-        end
-      end
-    end
+  it do
+    expect(described_class.ancestors.map(&:name)).to(
+      include('Avm::Instances::Base::Install')
+    )
   end
 
+  include_examples 'entries_values', __FILE__, {
+    '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',
+      ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => 'database.net',
+      ::Avm::Instances::EntryKeys::DATABASE_PORT => 5432,
+      ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'myhost.com',
+      ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'myuser',
+      ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'myuser',
+      ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com'
+    },
+    'app_2' => {
+      ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => '127.0.0.1',
+      ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'myuser',
+      ::Avm::Instances::EntryKeys::SOURCE_INSTANCE_ID => 'app_dev'
+    },
+    'app_3' => {
+      ::Avm::Instances::EntryKeys::DATABASE_SYSTEM => 'postgresql',
+      ::Avm::Instances::EntryKeys::DATABASE_NAME => 'app_1_db',
+      ::Avm::Instances::EntryKeys::DATABASE_USERNAME => 'user1',
+      ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',
+      ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => 'database.net',
+      ::Avm::Instances::EntryKeys::DATABASE_PORT => 5432,
+      ::Avm::Instances::EntryKeys::MAILER_ID => 'mailer_0',
+      ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
+      ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => nil,
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_ADDRESS => 'smtp.example.net',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_PORT => '587',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_DOMAIN => 'example.net',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_USERNAME => 'a_user',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_PASSWORD => 'a_secret',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_AUTHENTICATION => 'plain',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_STARTTLS_AUTO => 'true'
+    },
+    'app_4' => {
+      ::Avm::Instances::EntryKeys::INSTALL_SCHEME => 'ssh',
+      ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'host4.net',
+      ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'user4',
+      ::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/app_6'
+    },
+    'mailer_0' => {
+      ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
+      ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => '',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_ADDRESS => 'smtp.example.net',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_PORT => '587',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_DOMAIN => 'example.net',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_USERNAME => 'a_user',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_PASSWORD => 'a_secret',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_AUTHENTICATION => 'plain',
+      ::Avm::Instances::EntryKeys::MAILER_SMTP_STARTTLS_AUTO => 'true'
+    }
+  }
+
   describe '#by_id' do
     {
       'avm-tools_0' => %w[avm-tools 0],

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.7'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102', '>= 0.102.1'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.9'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
   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/instances/apache_host.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/apache_host'
+require 'avm/eac_webapp_base0/instances/apache_host'
 
 module Avm
   module EacAsciidoctorBase0
     module Instances
-      class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheHost
         def document_root
           instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
         end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/apache_path'
+require 'avm/eac_webapp_base0/instances/apache_path'
 
 module Avm
   module EacAsciidoctorBase0
     module Instances
-      class ApachePath < ::Avm::EacWebappBase0::ApachePath
+      class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
       end
     end
   end