eac_tools 0.27.2 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69feb1fcacbebe2c9a3e55f803f1ab72cf23b9396296ec50d4a5979d2183ce5b
-  data.tar.gz: 34f748e9a7ccede566b689a338eebe7996d2d66b81b3225f85ef7c43ec5c7c0f
+  metadata.gz: 702b93f483faabce748c237dafa2c8cb08d1f1eb4094a93f09166e4e0457c55e
+  data.tar.gz: cd78bbcf11c9da7593068a6667fb2acfdc6c09fa37a6ba7acabd61602915e378
 SHA512:
-  metadata.gz: 984112c656a9b42ce43c18a0d12de2e030ec972da7eefa6ac9ad689c632876ee682d4a174dc96bd26780f6e38163853d27ba06805576af1f02c295308f2b3385
-  data.tar.gz: 36f2d19db33361e76d7e6412be9652d5be8bcc98607d08e285d3a1f13ca171386cc5ba5f7aa7852a6b05eecab7e011498dcd703829e652b0788ff851653b9c36
+  metadata.gz: 87b38acdc3473f7c62ef5bbf64353fc83daca80c80e9dc8d88ca0d1ddb2225584e57ca81c4bf5a2f9d95abe59ee470da41fb1fc0ac16ff973c7f2e6520d95eb1
+  data.tar.gz: 30edd04c05f07e3d1616321ec2685dc0b00b25d3c165fbbf4fac6c109dc030fc2a7293f084d8229a4b8349e7ed1a8fb10e0ec04e66f00462a1a760ba4ce9ea6f

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.27.2)
-      avm (~> 0.41, >= 0.41.1)
-      avm-eac_asciidoctor_base0 (~> 0.6, >= 0.6.1)
+    eac_tools (0.29.0)
+      avm (~> 0.43)
+      avm-eac_asciidoctor_base0 (~> 0.7)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.2)
       avm-eac_rails_base0 (~> 0.8)
@@ -11,18 +11,18 @@ PATH
       avm-eac_redmine_base0 (~> 0.14)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.20, >= 0.20.1)
-      avm-eac_webapp_base0 (~> 0.6, >= 0.6.1)
+      avm-eac_webapp_base0 (~> 0.8)
       avm-eac_wordpress_base0 (~> 0.2)
-      avm-tools (~> 0.135)
-      eac_ruby_utils (~> 0.102)
+      avm-tools (~> 0.136)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.6.1)
+    avm-eac_asciidoctor_base0 (0.7.0)
       asciidoctor (~> 2.0, >= 2.0.17)
-      avm-eac_webapp_base0 (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.102)
+      avm-eac_webapp_base0 (~> 0.7)
+      eac_ruby_utils (~> 0.102, >= 0.102.1)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
 
@@ -88,12 +88,12 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.6.1)
-      avm (~> 0.41, >= 0.41.1)
+    avm-eac_webapp_base0 (0.8.0)
+      avm (~> 0.42)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.102)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -106,10 +106,10 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.135.0)
+    avm-tools (0.136.0)
       aranha-parsers (~> 0.14, >= 0.14.1)
-      avm (~> 0.41)
-      avm-eac_ruby_base1 (~> 0.20)
+      avm (~> 0.42)
+      avm-eac_ruby_base1 (~> 0.20, >= 0.20.1)
       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.41.1)
+    avm (0.43.0)
       eac_cli (~> 0.27, >= 0.27.8)
       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.102)
+      eac_ruby_utils (~> 0.103)
       eac_templates (~> 0.3, >= 0.3.1)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -177,7 +177,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.102.0)
+    eac_ruby_utils (0.103.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8)
       bundler
@@ -187,7 +187,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.6.1)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -195,15 +195,15 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    aranha-parsers (0.14.1)
+    aranha-parsers (0.14.3)
       activesupport (>= 4.0.0)
-      addressable (~> 2.7)
-      curb (~> 0.9.10)
-      eac_ruby_utils (~> 0.92, >= 0.92.1)
+      addressable (~> 2.8, >= 2.8.1)
+      curb (~> 0.9, >= 0.9.11)
+      eac_ruby_utils (~> 0.102, >= 0.102.1)
       faraday-gzip (~> 0.1)
-      faraday_middleware
-      nokogiri (~> 1.12, >= 1.12.4)
-      ofx-parser (~> 1.1.0)
+      faraday_middleware (~> 1.2)
+      nokogiri (~> 1.13, >= 1.13.8)
+      ofx-parser (~> 1.1)
     asciidoctor (2.0.17)
     ast (2.4.2)
     avm-eac_postgresql_base0 (0.2.0)
@@ -240,9 +240,9 @@ GEM
       rubocop (~> 0.80.1)
       rubocop-rails (~> 2.4.2)
       rubocop-rspec (~> 1.38.1)
-    eac_templates (0.3.1)
-      eac_config (~> 0.5)
-      eac_ruby_utils (~> 0.64)
+    eac_templates (0.3.2)
+      eac_config (~> 0.11, >= 0.11.1)
+      eac_ruby_utils (~> 0.102, >= 0.102.1)
     faraday (1.10.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -307,13 +307,13 @@ GEM
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+    rspec-support (3.11.1)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   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.102'
+  s.add_dependency 'eac_ruby_utils', '~> 0.103'
   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/instances/base/auto_values/install.rb

@@ -8,7 +8,8 @@ module Avm
     class Base
       module AutoValues
         module Install
-          (::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[data_path groupname]).each do |component|
+          (::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[data_path email groupname])
+            .each do |component|
             method_suffix = "install_#{component}"
             define_method "auto_#{method_suffix}" do
               uri_component_entry_value(

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

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

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

@@ -49,7 +49,7 @@ module Avm
         admin: URI_FIELDS + %w[api_key],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
-        install: URI_FIELDS + %w[id data_path groupname],
+        install: URI_FIELDS + %w[id data_path email 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/instances/runner.rb

@@ -6,35 +6,31 @@ require 'eac_cli/core_ext'
 module Avm
   module Instances
     class Runner < ::Avm::Runners::Base
-      class << self
-        def application_stereotype
-          ::Avm::Registry.application_stereotypes.detect(stereotype_name)
-        end
-
-        delegate :instance_class, to: :application_stereotype
+      runner_with :help, :subcommands do
+        desc 'Utilities for a instance.'
+        pos_arg 'instance-id'
+        subcommands
+      end
 
-        def stereotype_module
-          ::Avm.const_get(stereotype_name)
-        end
+      delegate :class, to: :instance, prefix: true
+      delegate :stereotype_module, :stereotype_name, to: :class
 
-        def stereotype_name
-          name.demodulize
-        end
+      def extra_available_subcommands
+        instance.if_present({}, &:extra_available_subcommands)
       end
 
-      description = "Utilities for #{stereotype_name} instances."
-      runner_with :help, :subcommands do
-        desc description
-        pos_arg 'instance-id'
-        subcommands
+      def stereotype_module
+        instance.application.stereotype.namespace_module
       end
 
-      delegate :instance_class, :stereotype_module, :stereotype_name, to: :class
+      def stereotype_name
+        stereotype_module.name
+      end
 
       private
 
       def instance_uncached
-        self.class.instance_class.by_id(parsed.instance_id)
+        parsed.instance_id.if_present { |v| ::Avm::Registry.instances.detect(v) }
       end
     end
   end

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

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

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.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.7'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102', '>= 0.102.1'
   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

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

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/{apache_path.rb → instances/apache_path.rb}

@@ -4,7 +4,9 @@ require 'avm/eac_webapp_base0/apache_path'
 
 module Avm
   module EacAsciidoctorBase0
-    class ApachePath < ::Avm::EacWebappBase0::ApachePath
+    module Instances
+      class ApachePath < ::Avm::EacWebappBase0::ApachePath
+      end
     end
   end
 end

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'avm/eac_asciidoctor_base0/instances/apache_host'
+require 'avm/eac_asciidoctor_base0/instances/apache_path'
+require 'avm/eac_asciidoctor_base0/instances/deploy'
 require 'avm/eac_webapp_base0/instances/base'
 
 module Avm

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/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
+        def build_content
+          ::Avm::EacAsciidoctorBase0::Sources::Build.new(
+            project,
+            ::Avm::EacAsciidoctorBase0::Sources::Build::OPTION_TARGET_DIRECTORY => build_dir
+          ).run
+        end
+
+        private
+
+        def project_uncached
+          ::Avm::EacAsciidoctorBase0::Sources::Base.new(
+            instance.source_instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
+          )
+        end
+      end
+    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.6.1'
+    VERSION = '0.7.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.41', '>= 0.41.1'
+  s.add_dependency 'avm', '~> 0.42'
   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.102'
+  s.add_dependency 'eac_ruby_utils', '~> 0.103'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -8,10 +8,15 @@ require 'eac_templates/core_ext'
 module Avm
   module EacWebappBase0
     class ApacheHost
+      APACHE_DIRECTORY_EXTRA_CONFIG_KEY = 'install.apache_directory_extra_config'
       JOBS = %w[write_available_no_ssl_site enable_no_ssl_site remove_ssl_site reload_apache
                 run_certbot enable_ssl_site reload_apache].freeze
       include ::Avm::Jobs::Base
 
+      def directory_extra_config
+        instance.entry(APACHE_DIRECTORY_EXTRA_CONFIG_KEY).value.if_present { |v| "  #{v}\n" }
+      end
+
       def no_ssl_site_content
         ::Avm::EacWebappBase0::ApacheHost
           .template.child('no_ssl.conf')
@@ -61,7 +66,7 @@ module Avm
         instance.host_env.command(
           'sudo', 'certbot', '--apache', '--domain', instance.read_entry('web.hostname'),
           '--redirect', '--non-interactive', '--agree-tos',
-          '--email', instance.read_entry('admin.email')
+          '--email', instance.install_email
         ).system!
       end
 

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/apache_host.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class ApacheHost
+          runner_with :help do
+            desc 'Configure Apache virtual host for instance.'
+            bool_opt '-c', '--certbot', 'Install certbot.'
+          end
+
+          def run
+            result = stereotype_apache_host_class.new(runner_context.call(:instance),
+                                                      stereotype_apache_host_options).run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          def stereotype_apache_host_class
+            "#{runner_context.call(:instance).class.name.deconstantize}::ApacheHost".constantize
+          end
+
+          def stereotype_apache_host_options
+            { certbot: parsed.certbot? }
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/apache_path.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class ApachePath
+          runner_with :help do
+            desc 'Configure Apache path configuration for instance.'
+          end
+
+          def run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          private
+
+          def apache_path_uncached
+            stereotype_apache_path_class.new(runner_context.call(:instance))
+          end
+
+          def result_uncached
+            apache_path.run
+          end
+
+          def stereotype_apache_path_class
+            "#{runner_context.call(:instance).class.name.deconstantize}::ApachePath".constantize
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/deploy.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/instances/runner'
+require 'avm/path_string'
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class Deploy
+          runner_with :help do
+            desc 'Deploy for instance.'
+            arg_opt '-r', '--reference', 'Git reference to deploy.'
+            arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
+            bool_opt '-T', '--no-request-test', 'Do not test web interface after deploy.'
+          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
+
+          def run
+            result = deploy_class.new(runner_context.call(:instance), deploy_options).run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          def deploy_options
+            { reference: parsed.reference,
+              appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
+              no_request_test: parsed.no_request_test? }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.6.1'
+    VERSION = '0.8.0'
   end
 end

data/sub/avm-eac_webapp_base0/template/avm/eac_webapp_base0/apache_host/no_ssl.conf

@@ -7,5 +7,5 @@
     Allow from all
     Options -MultiViews
     Require all granted
-  </Directory>
+%%DIRECTORY_EXTRA_CONFIG%%  </Directory>
 </VirtualHost>

data/sub/avm-tools/avm-tools.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'avm', '~> 0.41'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.20'
+  s.add_dependency 'avm', '~> 0.42'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.20', '>= 0.20.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'avm-git', '~> 0.4'

data/sub/avm-tools/lib/avm/tools/runner/instance/info.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 require 'avm/instances/entry_keys'
+require 'avm/instances/runner'
 require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class Instance
+      class Instance < ::Avm::Instances::Runner
         class Info
           runner_with :help do
             desc 'Show info about a instance.'

data/sub/avm-tools/lib/avm/tools/runner/instance.rb

@@ -1,31 +1,15 @@
 # frozen_string_literal: true
 
 require 'avm/instances/base'
+require 'avm/instances/runner'
 require 'avm/registry'
 require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class Instance
+      class Instance < ::Avm::Instances::Runner
         require_sub __FILE__
-        runner_with :help, :subcommands do
-          desc 'Utilities for generic instances.'
-          pos_arg :instance_id
-          subcommands
-        end
-
-        def extra_available_subcommands
-          instance.if_present({}, &:extra_available_subcommands)
-        end
-
-        private
-
-        def instance_uncached
-          parsed.instance_id.if_present do |v|
-            ::Avm::Registry.instances.detect(v)
-          end
-        end
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.135.0'
+    VERSION = '0.136.0'
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/method_class.rb

@@ -3,6 +3,7 @@
 require 'active_support/core_ext/module/introspection'
 require 'eac_ruby_utils/patches/class/common_constructor'
 require 'eac_ruby_utils/patches/module/common_concern'
+require 'eac_ruby_utils/patches/module/module_parent'
 require 'eac_ruby_utils/patches/string/inflector'
 
 module EacRubyUtils

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/module_parent.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/introspection'
+
+::Module.alias_method :module_parent, :parent unless ::Module.method_defined?(:module_parent)

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/object/debug.rb

@@ -2,7 +2,7 @@
 
 class Object
   def pretty_debug(options = {})
-    print_debug_title(options)
+    print_debug_options(options)
 
     STDERR.write(pretty_inspect)
 
@@ -10,18 +10,22 @@ class Object
   end
 
   def print_debug(options = {})
-    print_debug_title(options)
+    print_debug_options(options)
     STDERR.write(to_debug + "\n")
 
     self
   end
 
-  def print_debug_title(title)
-    if title.is_a?(::Hash)
-      return unless title[:title]
+  def print_debug_label(label)
+    STDERR.write("#{label}: ")
+  end
 
-      title = title[:title]
-    end
+  def print_debug_options(options)
+    options[:title].if_present { |v| print_debug_title(v) }
+    options[:label].if_present { |v| print_debug_label(v) }
+  end
+
+  def print_debug_title(title)
     char = '='
     STDERR.write(char * (4 + title.length) + "\n")
     STDERR.write("#{char} #{title} #{char}\n")

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.102.0'
+  VERSION = '0.103.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.27.2
+  version: 0.29.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,40 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: '0.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -160,20 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -194,28 +176,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.135'
+        version: '0.136'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.135'
+        version: '0.136'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.103'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.103'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -243,11 +225,11 @@ files:
 - sub/avm-eac_asciidoctor_base0/Gemfile
 - sub/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0.rb
-- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/apache_host.rb
-- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/apache_path.rb
-- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/deploy.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/apache_host.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/apache_path.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/base.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/deploy.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/runners.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/runners/base.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources.rb
@@ -541,13 +523,13 @@ files:
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/subcommand_parent.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/apache_host.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/apache_path.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/dump.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/load.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/deploy.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/runner.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/runner/apache_host.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/runner/apache_path.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/runner/deploy.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/sources.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/sources/base.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb
@@ -787,7 +769,6 @@ files:
 - sub/avm/lib/avm/instances.rb
 - sub/avm/lib/avm/instances/base.rb
 - sub/avm/lib/avm/instances/base/auto_values.rb
-- sub/avm/lib/avm/instances/base/auto_values/admin.rb
 - sub/avm/lib/avm/instances/base/auto_values/data.rb
 - sub/avm/lib/avm/instances/base/auto_values/database.rb
 - sub/avm/lib/avm/instances/base/auto_values/install.rb
@@ -1150,6 +1131,7 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/immutable.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/listable.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/method_class.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/module_parent.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/patch.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/require_sub.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/simple_cache.rb

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

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Admin
-          def auto_admin_email
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'admin.email')
-          end
-
-          def auto_admin_name
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'admin.name')
-          end
-        end
-      end
-    end
-  end
-end

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

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

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

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_webapp_base0/deploy'
-require 'avm/eac_asciidoctor_base0/sources/base'
-require 'avm/eac_asciidoctor_base0/sources/build'
-
-module Avm
-  module EacAsciidoctorBase0
-    class Deploy < ::Avm::EacWebappBase0::Deploy
-      def build_content
-        ::Avm::EacAsciidoctorBase0::Sources::Build.new(
-          project,
-          ::Avm::EacAsciidoctorBase0::Sources::Build::OPTION_TARGET_DIRECTORY => build_dir
-        ).run
-      end
-
-      private
-
-      def project_uncached
-        ::Avm::EacAsciidoctorBase0::Sources::Base.new(
-          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
-        )
-      end
-    end
-  end
-end

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

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/runner'
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    class Runner < ::Avm::Instances::Runner
-      class ApacheHost
-        runner_with :help do
-          desc 'Configure Apache virtual host for instance.'
-          bool_opt '-c', '--certbot', 'Install certbot.'
-        end
-
-        def run
-          result = stereotype_apache_host_class.new(runner_context.call(:instance),
-                                                    stereotype_apache_host_options).run
-          if result.error?
-            fatal_error result.to_s
-          else
-            infov 'Result', result.label
-          end
-        end
-
-        def stereotype_apache_host_class
-          "#{runner_context.call(:instance).class.name.deconstantize}::ApacheHost".constantize
-        end
-
-        def stereotype_apache_host_options
-          { certbot: parsed.certbot? }
-        end
-      end
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-require 'avm/instances/runner'
-require 'avm/eac_webapp_base0/runner/apache_host'
-require 'avm/eac_rails_base0/apache_path'
-
-module Avm
-  module EacWebappBase0
-    class Runner < ::Avm::Instances::Runner
-      class ApachePath
-        runner_with :help do
-          desc 'Configure Apache path configuration for instance.'
-        end
-
-        def run
-          if result.error?
-            fatal_error result.to_s
-          else
-            infov 'Result', result.label
-          end
-        end
-
-        private
-
-        def apache_path_uncached
-          stereotype_apache_path_class.new(runner_context.call(:instance))
-        end
-
-        def result_uncached
-          apache_path.run
-        end
-
-        def stereotype_apache_path_class
-          "#{runner_context.call(:instance).class.name.deconstantize}::ApachePath".constantize
-        end
-      end
-    end
-  end
-end

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

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/runner'
-require 'avm/path_string'
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    class Runner < ::Avm::Instances::Runner
-      class Deploy
-        runner_with :help do
-          desc 'Deploy for instance.'
-          arg_opt '-r', '--reference', 'Git reference to deploy.'
-          arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
-          bool_opt '-T', '--no-request-test', 'Do not test web interface after deploy.'
-        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
-
-        def run
-          result = deploy_class.new(runner_context.call(:instance), deploy_options).run
-          if result.error?
-            fatal_error result.to_s
-          else
-            infov 'Result', result.label
-          end
-        end
-
-        def deploy_options
-          { reference: parsed.reference,
-            appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
-            no_request_test: parsed.no_request_test? }
-        end
-      end
-    end
-  end
-end