eac_tools 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7722b0da596d9938d82c6644ba890cb4a652ac1a59c1e5e076cf777755d62295
-  data.tar.gz: 4186335c28edaa415fdede3bc509d5f1f435ef0156e199d2f8c7a4c8518733fb
+  metadata.gz: 702b93f483faabce748c237dafa2c8cb08d1f1eb4094a93f09166e4e0457c55e
+  data.tar.gz: cd78bbcf11c9da7593068a6667fb2acfdc6c09fa37a6ba7acabd61602915e378
 SHA512:
-  metadata.gz: '0697f2a0047227a89cd7eb78a46a4dc42fda37bb8e73ee8574dd1c02eaa0578dd2e90732dd684ff296512f439184cff8b4e6cb8e5b94932e9fa21cb4c4a0138e'
-  data.tar.gz: 2d8baec6a15bf0bccb580f8d60ec1a38213cd63db00366f40c6a827bc162f6e7ce113e8a48312f73428ee68c45e0e4f6759f9858d2045c005ca652b9dac41cae
+  metadata.gz: 87b38acdc3473f7c62ef5bbf64353fc83daca80c80e9dc8d88ca0d1ddb2225584e57ca81c4bf5a2f9d95abe59ee470da41fb1fc0ac16ff973c7f2e6520d95eb1
+  data.tar.gz: 30edd04c05f07e3d1616321ec2685dc0b00b25d3c165fbbf4fac6c109dc030fc2a7293f084d8229a4b8349e7ed1a8fb10e0ec04e66f00462a1a760ba4ce9ea6f

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.28.0)
-      avm (~> 0.42)
+    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)
@@ -11,10 +11,10 @@ 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.7)
+      avm-eac_webapp_base0 (~> 0.8)
       avm-eac_wordpress_base0 (~> 0.2)
       avm-tools (~> 0.136)
-      eac_ruby_utils (~> 0.102, >= 0.102.1)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -88,12 +88,12 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.7.0)
-      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, >= 0.102.1)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -124,12 +124,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.42.0)
+    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, >= 0.102.1)
+      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.1)
+    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,8 +195,8 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    aranha-parsers (0.14.2)
-      activesupport (~> 6.1.6, >= 6.1.6.1)
+    aranha-parsers (0.14.3)
+      activesupport (>= 4.0.0)
       addressable (~> 2.8, >= 2.8.1)
       curb (~> 0.9, >= 0.9.11)
       eac_ruby_utils (~> 0.102, >= 0.102.1)
@@ -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.28.0'
+  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', '>= 0.102.1'
+  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/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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.42.0'
+  VERSION = '0.43.0'
 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', '>= 0.102.1'
+  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/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.7.0'
+    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/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.1'
+  VERSION = '0.103.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -190,20 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.102.1
+        version: '0.103'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.102.1
+        version: '0.103'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -775,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

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