eac_tools 0.28.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7722b0da596d9938d82c6644ba890cb4a652ac1a59c1e5e076cf777755d62295
-  data.tar.gz: 4186335c28edaa415fdede3bc509d5f1f435ef0156e199d2f8c7a4c8518733fb
+  metadata.gz: dc1385a1932c7e4a6b89b66db8ea6084663a9c690571b00ca73465b47421ddd2
+  data.tar.gz: 7dd2dab5f79240a7b8087532ee959accaf130ac12f4c6d9745b86a0ab85efd5f
 SHA512:
-  metadata.gz: '0697f2a0047227a89cd7eb78a46a4dc42fda37bb8e73ee8574dd1c02eaa0578dd2e90732dd684ff296512f439184cff8b4e6cb8e5b94932e9fa21cb4c4a0138e'
-  data.tar.gz: 2d8baec6a15bf0bccb580f8d60ec1a38213cd63db00366f40c6a827bc162f6e7ce113e8a48312f73428ee68c45e0e4f6759f9858d2045c005ca652b9dac41cae
+  metadata.gz: 6b28b72f7c1eafb7ca609ab9b0450cc07254316756668ae980af135710fa01dcd364d18bc403c2912b50dd1c3e6c5832f220c59aa8aaac7b2366436801aebb4a
+  data.tar.gz: e6fcad611277f1d36707f180da96fed11a25a98139e5cc889bb5aa3e5728d42d3a9fa4667d70f1055fdff114291dbc364b099d4fb72615696d6d6be1e19a05fc

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.28.0)
-      avm (~> 0.42)
+    eac_tools (0.30.0)
+      avm (~> 0.43)
       avm-eac_asciidoctor_base0 (~> 0.7)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.2)
@@ -10,11 +10,11 @@ PATH
       avm-eac_rails_base1 (~> 0.6)
       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_ruby_base1 (~> 0.21)
+      avm-eac_webapp_base0 (~> 0.8)
       avm-eac_wordpress_base0 (~> 0.2)
-      avm-tools (~> 0.136)
-      eac_ruby_utils (~> 0.102, >= 0.102.1)
+      avm-tools (~> 0.136, >= 0.136.1)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -80,20 +80,20 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.20.1)
+    avm-eac_ruby_base1 (0.21.0)
       avm (~> 0.41, >= 0.41.1)
       avm-eac_generic_base0 (~> 0.5)
-      eac_ruby_utils (~> 0.102)
+      eac_ruby_utils (~> 0.103)
 
 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
@@ -103,33 +103,43 @@ PATH
       avm-eac_webapp_base0 (~> 0.6)
       eac_ruby_utils (~> 0.102)
 
+PATH
+  remote: sub/avm-files
+  specs:
+    avm-files (0.4.0)
+      avm (~> 0.43)
+      eac_cli (~> 0.28)
+      eac_fs (~> 0.12, >= 0.12.3)
+      eac_ruby_utils (~> 0.103)
+      eac_templates (~> 0.3, >= 0.3.2)
+
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.136.0)
-      aranha-parsers (~> 0.14, >= 0.14.1)
+    avm-tools (0.136.1)
+      aranha-parsers (~> 0.14, >= 0.14.3)
       avm (~> 0.42)
-      avm-eac_ruby_base1 (~> 0.20, >= 0.20.1)
+      avm-eac_ruby_base1 (~> 0.21)
       avm-eac_ubuntu_base0 (~> 0.3)
-      avm-files (~> 0.3, >= 0.3.2)
+      avm-files (~> 0.4)
       avm-git (~> 0.4)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.12, >= 0.12.2)
-      eac_ruby_base0 (~> 0.16, >= 0.16.6)
-      eac_templates (~> 0.3, >= 0.3.1)
+      eac_ruby_base0 (~> 0.17)
+      eac_templates (~> 0.3, >= 0.3.2)
       git (~> 1.12)
       ruby-progressbar (~> 1.11)
 
 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)
@@ -138,10 +148,10 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.27.8)
-      colorize (~> 0.8.1)
-      eac_config (~> 0.8)
-      eac_ruby_utils (~> 0.95)
+    eac_cli (0.28.0)
+      colorize (~> 0.8, >= 0.8.1)
+      eac_config (~> 0.11, >= 0.11.1)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/eac_config
@@ -168,16 +178,16 @@ PATH
 PATH
   remote: sub/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.16.6)
-      avm-eac_ruby_base1 (~> 0.8)
-      eac_cli (~> 0.27, >= 0.27.5)
-      eac_fs (~> 0.10)
-      eac_ruby_utils (~> 0.95, >= 0.95.1)
+    eac_ruby_base0 (0.17.0)
+      avm-eac_ruby_base1 (~> 0.21)
+      eac_cli (~> 0.28)
+      eac_fs (~> 0.12, >= 0.12.3)
+      eac_ruby_utils (~> 0.103)
 
 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 +197,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 +205,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)
@@ -213,11 +223,6 @@ GEM
       avm (~> 0.7)
       eac_ruby_utils (~> 0.77, >= 0.77.1)
       eac_templates (~> 0.3)
-    avm-files (0.3.2)
-      avm (~> 0.6)
-      eac_fs (~> 0.5)
-      eac_ruby_utils (~> 0.76)
-      eac_templates (~> 0.2)
     avm-git (0.4.0)
       avm-files (~> 0.1)
       eac_git (~> 0.11)
@@ -307,13 +312,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)
@@ -351,6 +356,7 @@ DEPENDENCIES
   avm-eac_ruby_base1!
   avm-eac_webapp_base0!
   avm-eac_wordpress_base0!
+  avm-files!
   avm-tools!
   eac_cli!
   eac_config!

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.28.0'
+  VERSION = '0.30.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_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'avm', '~> 0.41', '>= 0.41.1'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'eac_ruby_utils', '~> 0.103'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/runners/base/lib_rename.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'avm/eac_ruby_base1/sources/namespace_replacer'
+
+module Avm
+  module EacRubyBase1
+    module Runners
+      class Base
+        class LibRename
+          runner_with :help, :file_replacer do
+            desc 'Rename Ruby modules classes Ruby.'
+            arg_opt '-f', '--from', 'Rename "from".'
+            arg_opt '-t', '--to', 'Rename "to".'
+          end
+
+          def run
+            start_banner
+            validate
+            replacements_banner
+            run_filesystem_traverser
+            success 'Done!'
+          end
+
+          def validate
+            %w[from to].each do |opt|
+              fatal_error "No \"#{opt}\" option" if send(opt).blank?
+            end
+          end
+
+          def start_banner
+            infov 'From', from
+            infov 'To', to
+          end
+
+          private
+
+          def namespace_replacer_uncached
+            ::Avm::EacRubyBase1::Sources::NamespaceReplacer.new(from, to)
+          end
+
+          def text_replacer
+            @text_replacer ||= super.gsub(from, to).gsub(from_path, to_path)
+                                 .gsub(namespace_replacer.from_result, namespace_replacer.to_result)
+          end
+
+          def replace_file?(file)
+            file.extname == '.rb'
+          end
+
+          def replacements_banner
+            infov 'Replacements', text_replacer.replacements.count
+            text_replacer.replacements.each do |rep|
+              infov '  * ', rep
+            end
+          end
+
+          def from
+            parsed.from.to_s
+          end
+
+          def to
+            parsed.to.to_s
+          end
+
+          def from_path
+            from.underscore
+          end
+
+          def to_path
+            to.underscore
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/namespace_replacer.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class NamespaceReplacer
+        common_constructor :from, :to
+
+        def concat_regex(regexes)
+          r = regexes.first
+          regexes[1..-1].each do |x|
+            r = ::Regexp.new(r.source + x.source)
+          end
+          r
+        end
+
+        def from_result
+          /\n#{from_open.source}(.+)#{from_close.source}/m
+        end
+
+        def from_open
+          concat_regex(from.split('::')
+            .map { |v| / *(?:class|module) +#{::Regexp.quote(v)} *\n/m })
+        end
+
+        def from_close
+          concat_regex(from.split('::').count.times.map { / *end *\n/m })
+        end
+
+        def to_result
+          "\n\n#{to_open}\\1#{to_close}"
+        end
+
+        def to_open
+          s = ''
+          to.split('::').each_with_index do |part, index|
+            s += ('  ' * index) + "module #{part}\n"
+          end
+          s
+        end
+
+        def to_close
+          parts = to.split('::')
+          s = ''
+          parts.each_with_index do |_part, index|
+            tabc = (parts.count - 1 - index)
+            tabc -= 1 if index.zero?
+            s += ('  ' * tabc) + "end\n"
+          end
+          s
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/update_dependencies_requirements.rb

@@ -16,13 +16,9 @@ module Avm
           end
 
           def run
-            runner_context.call(:source_banner)
-            infov 'Gems to update', gem_names.count
-            gem_names.each do |gem_name|
-              infov 'Gem to update', gem_name
-              ::Avm::EacRubyBase1::Sources::UpdateDependencyRequirements
-                .new(runner_context.call(:source), gem_name).perform
-            end
+            start_banner
+            update_gemfile_lock
+            process_all_gems
           end
 
           def gemspec
@@ -47,6 +43,24 @@ module Avm
 
             gemspec.dependencies.map(&:gem_name)
           end
+
+          def process_all_gems
+            gem_names.each do |gem_name|
+              infov 'Gem to update', gem_name
+              ::Avm::EacRubyBase1::Sources::UpdateDependencyRequirements
+                .new(runner_context.call(:source), gem_name).perform
+            end
+          end
+
+          def start_banner
+            runner_context.call(:source_banner)
+            infov 'Gems to update', gem_names.count
+          end
+
+          def update_gemfile_lock
+            infom 'Updating Gemfile\'s lock...'
+            runner_context.call(:source).bundle('update').execute!
+          end
         end
       end
     end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.20.1'
+    VERSION = '0.21.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', '>= 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/avm-files/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/avm-files/avm-files.gemspec

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/files/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-files'
+  s.version     = Avm::Files::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'avm', '~> 0.43'
+  s.add_dependency 'eac_cli', '~> 0.28'
+  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
+  s.add_dependency 'eac_ruby_utils', '~> 0.103'
+  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
+end

data/sub/avm-files/lib/avm/files/appendable/file_content.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/files/appendable/resource_base'
+
+module Avm
+  module Files
+    module Appendable
+      class FileContent < ::Avm::Files::Appendable::ResourceBase
+        attr_reader :target_path, :content
+
+        def initialize(deploy, target_path, content)
+          super(deploy)
+          @target_path = target_path
+          @content = content
+        end
+
+        def write_on(target_dir)
+          target_dir.join(target_path).write(content)
+        end
+      end
+    end
+  end
+end

data/sub/avm-files/lib/avm/files/appendable/plain_directory.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/files/appendable/resource_base'
+
+module Avm
+  module Files
+    module Appendable
+      class PlainDirectory < ::Avm::Files::Appendable::ResourceBase
+        attr_reader :source_path
+
+        def initialize(appender, source_path)
+          super(appender)
+          @source_path = source_path.to_pathname
+        end
+
+        def write_on(target_dir)
+          raise "\"#{source_path}\" is not a directory" unless source_path.directory?
+
+          ::FileUtils.cp_r("#{source_path}/.", target_dir.to_path)
+        end
+      end
+    end
+  end
+end

data/sub/avm-files/lib/avm/files/appendable/resource_base.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Files
+    module Appendable
+      class ResourceBase
+        common_constructor :appender
+      end
+    end
+  end
+end

data/sub/avm-files/lib/avm/files/appendable/tar_output_command.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs'
+require 'avm/files/appendable/resource_base'
+
+module Avm
+  module Files
+    module Appendable
+      class TarOutputCommand < ::Avm::Files::Appendable::ResourceBase
+        attr_reader :command
+
+        def initialize(appender, command)
+          super(appender)
+          @command = command
+        end
+
+        def write_on(target_dir)
+          command.pipe(
+            ::EacRubyUtils::Envs.local.command('tar', '-xf', '-', '-C', target_dir)
+          ).execute!
+        end
+      end
+    end
+  end
+end

data/sub/avm-files/lib/avm/files/appendable/templatized_directory.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/files/appendable/resource_base'
+require 'eac_templates/directory'
+
+module Avm
+  module Files
+    module Appendable
+      class TemplatizedDirectory < ::Avm::Files::Appendable::ResourceBase
+        attr_reader :source_path
+
+        def initialize(appender, source_path)
+          super(appender)
+          @source_path = source_path
+        end
+
+        def write_on(target_dir)
+          raise 'Variables source not set' if appender.variables_source.blank?
+
+          ::EacTemplates::Directory.new(source_path).apply(
+            appender.variables_source,
+            target_dir
+          )
+        end
+      end
+    end
+  end
+end