eac_tools 0.31.0 → 0.32.0

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module Install
+        common_concern do
+          uri_components_entries_values 'install', %w[data_path email groupname]
+        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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'addressable'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module Web
+        common_concern do
+          uri_components_entries_values 'web'
+        end
+      end
+    end
+  end
+end

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

@@ -12,8 +12,8 @@ module Avm
       enable_abstract_methods
       enable_listable
       enable_simple_cache
-      require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
+      require_sub __FILE__, include_modules: true
       include ::Avm::With::ExtraSubcommands
       include ::Avm::With::ApplicationStereotype
 

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/entries/keys_constants_set'
 require 'avm/entries/uri_builder'
 require 'eac_ruby_utils/core_ext'
 
@@ -14,19 +15,7 @@ module Avm
         end
 
         def keys_consts_set(prefix, suffixes)
-          if suffixes.is_a?(::Hash)
-            keys_consts_set_from_hash(prefix, suffixes)
-          elsif suffixes.is_a?(::Enumerable)
-            keys_consts_set_from_enum(prefix, suffixes)
-          else
-            raise "Unmapped suffixes class: #{suffixes.class}"
-          end
-        end
-
-        def key_const_set(prefix, suffix)
-          key = [prefix, suffix].reject(&:blank?).join('.')
-          const_set(key.gsub('.', '_').upcase, key)
-          all_keys << key
+          all_keys.merge(::Avm::Entries::KeysConstantsSet.new(self, prefix, suffixes).result)
         end
 
         private
@@ -34,14 +23,6 @@ module Avm
         def all_keys
           @all_keys ||= ::Set.new
         end
-
-        def keys_consts_set_from_enum(prefix, suffixes)
-          suffixes.each { |suffix| key_const_set(prefix, suffix) }
-        end
-
-        def keys_consts_set_from_hash(prefix, suffixes)
-          suffixes.each { |k, v| keys_consts_set(prefix.to_s + (k.blank? ? '' : ".#{k}"), v) }
-        end
       end
 
       {
@@ -54,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.43.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::AutoValues::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

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/instances/deploy'
 require 'avm/eac_asciidoctor_base0/sources/base'
 require 'avm/eac_asciidoctor_base0/sources/build'
 
 module Avm
   module EacAsciidoctorBase0
     module Instances
-      class Deploy < ::Avm::EacWebappBase0::Deploy
+      class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
         def build_content
           ::Avm::EacAsciidoctorBase0::Sources::Build.new(
             project,

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   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.41'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.5', '>= 0.5.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'avm', '~> 0.45'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.9'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   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

@@ -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 EacLatexBase0
     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_latex_base0/lib/avm/eac_latex_base0/instances/deploy.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/instances/deploy'
 require 'avm/eac_latex_base0/sources/base'
 require 'avm/eac_latex_base0/sources/build'
 
 module Avm
   module EacLatexBase0
     module Instances
-      class Deploy < ::Avm::EacWebappBase0::Deploy
+      class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
         def build_content
           ::Avm::EacLatexBase0::Sources::Build.new(project, output_file:
               build_dir.join(pdf_path))

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacLatexBase0
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   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.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.7'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base1/apache_host'
+require 'avm/eac_rails_base1/instances/apache_host'
 
 module Avm
   module EacRailsBase0
-    class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
+    class ApacheHost < ::Avm::EacRailsBase1::Instances::ApacheHost
     end
   end
 end

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'eac_templates/core_ext'
-require 'avm/eac_webapp_base0/apache_path'
+require 'avm/eac_webapp_base0/instances/apache_path'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacRailsBase0
-    class ApachePath < ::Avm::EacWebappBase0::ApachePath
+    class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
       def document_root
         ::File.join(super, 'public')
       end

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'eac_templates/core_ext'
-require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/instances/deploy'
 require 'avm/instances/entry_keys'
 
 module Avm
   module EacRailsBase0
-    class Deploy < ::Avm::EacWebappBase0::Deploy
+    class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
       set_callback :assert_instance_branch, :after do
         bundle_install
         assert_database

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.8.0'
+    VERSION = '0.8.1'
   end
 end

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.41'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.20'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'avm', '~> 0.45'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.21'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.9'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_host.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/apache_host'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheHost
+        def document_root
+          "#{instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)}/public"
+        end
+
+        def extra_content
+          'PassengerEnabled On'
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/systemd_unit/service.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class SystemdUnit
+        module Service
+          def service_content
+            template.child('tasks_scheduler.service').apply(variables_source)
+          end
+
+          def service_exec_lines
+            service_exec_operations
+              .map { |k, v| "#{k}=#{tasks_scheduler_command_path} #{v}" }
+              .join("\n")
+          end
+
+          def service_path
+            ::Pathname.new('/etc/systemd/system').join(unit_name)
+          end
+
+          def service_link_path
+            ::Pathname.new('/etc/systemd/system/multi-user.target.wants').join(unit_name)
+          end
+
+          def verify_service
+            sudo_system!('systemd-analyze', 'verify', service_path)
+          end
+
+          private
+
+          def enable_service
+            systemctl('enable', unit_name)
+          end
+
+          def link_service
+            sudo_execute!('rm', '-f', service_link_path)
+            sudo_execute!('ln', '-s', service_path, service_link_path)
+          end
+
+          def reload_systemd
+            systemctl('daemon-reload')
+          end
+
+          # @return [Hash<String, String>]
+          def service_exec_operations
+            if exec_run?
+              { 'ExecStart' => 'run' }
+            else
+              { 'ExecStart' => 'start', 'ExecStop' => 'stop' }
+            end
+          end
+
+          def start_service
+            systemctl('start', unit_name)
+          end
+
+          def systemctl(*args)
+            sudo_system!('systemctl', *args)
+          end
+
+          def write_service
+            infom 'Writing service\'s unit file...'
+            platform_instance.file_sudo_write(service_path, service_content)
+          end
+        end
+      end
+    end
+  end
+end