eac_tools 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b50382fd923923ea176726318a5adeed1194cdc1aac56b3d70c2211a030d2e86
-  data.tar.gz: f35a6fe715fc7d265f046e3692201a8edbab95e16cc324942956ab31804bff0d
+  metadata.gz: 2dd36587fe5621b65a2fd826e04b44f9c941b848a9e5d3bb82f0e40375ec679b
+  data.tar.gz: '0880b563b0f3b7f367ddc299a385a76c626260937d779f4cd92f1884ad0ecc3d'
 SHA512:
-  metadata.gz: 8495da6e5565b3b03901d8c11a4f5bfe1d08fbe02cfafed82d59c4d33c69e92a43f8042e78e29ac32416eeed25250ab46088e9ca21193e0a912db82c2987c3ef
-  data.tar.gz: 81f4b76062b762acd52c63f9b4ec03bbb8e7d599032d7235ea24f2f291001664c3674fbb4db74d0e8f31783e36760f7a59427e1893d38ad087eaa34b24d87b29
+  metadata.gz: 8edc33b2af676aaa9ba92138791e4e13fea951c028acd1efc6988a2d4922efd03bad2bb39ff15391110f070c63872ae17bb6a2831421095b62768f8a64c63864
+  data.tar.gz: 68360fc6669359864fbebeab00cf8a858bd341ffc849ed6855a4f5783efa5ee319c4c5a861a5752b0c55894be786b9a7230c0af5c5624cf99ef14bc354ccb064

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.25.0)
-      avm (~> 0.39)
+    eac_tools (0.25.1)
+      avm (~> 0.39, >= 0.39.1)
       avm-eac_asciidoctor_base0 (~> 0.5)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.1, >= 0.1.2)
       avm-eac_rails_base0 (~> 0.7)
       avm-eac_rails_base1 (~> 0.5)
-      avm-eac_redmine_base0 (~> 0.12)
+      avm-eac_redmine_base0 (~> 0.13)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
-      avm-eac_webapp_base0 (~> 0.4, >= 0.4.1)
+      avm-eac_ruby_base1 (~> 0.20)
+      avm-eac_webapp_base0 (~> 0.5)
       avm-eac_wordpress_base0 (~> 0.1, >= 0.1.2)
       avm-tools (~> 0.133)
-      eac_ruby_utils (~> 0.101)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -60,15 +60,15 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.12.0)
-      avm (~> 0.35, >= 0.35.1)
+    avm-eac_redmine_base0 (0.13.0)
+      avm (~> 0.39, >= 0.39.1)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_rails_base1 (~> 0.5)
       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.98)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -80,20 +80,20 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.19.1)
-      avm (~> 0.35, >= 0.35.1)
+    avm-eac_ruby_base1 (0.20.0)
+      avm (~> 0.39, >= 0.39.1)
       avm-eac_generic_base0 (~> 0.5)
-      eac_ruby_utils (~> 0.98)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.4.1)
-      avm (~> 0.39)
+    avm-eac_webapp_base0 (0.5.0)
+      avm (~> 0.39, >= 0.39.1)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.101)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -124,12 +124,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.39.0)
+    avm (0.39.1)
       eac_cli (~> 0.27, >= 0.27.8)
-      eac_config (~> 0.11)
+      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.101)
+      eac_ruby_utils (~> 0.102)
       eac_templates (~> 0.3, >= 0.3.1)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -146,9 +146,9 @@ PATH
 PATH
   remote: sub/eac_config
   specs:
-    eac_config (0.11.0)
+    eac_config (0.11.1)
       addressable (~> 2.8)
-      eac_ruby_utils (~> 0.100)
+      eac_ruby_utils (~> 0.102)
 
 PATH
   remote: sub/eac_docker
@@ -177,11 +177,11 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.101.0)
+    eac_ruby_utils (0.102.0)
       activesupport (>= 4, < 7)
-      addressable (~> 2.6)
+      addressable (~> 2.8)
       bundler
-      filesize
+      filesize (~> 0.2)
       net-ssh (~> 4.2)
 
 GEM
@@ -280,7 +280,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     minitar (0.9)
-    minitest (5.16.2)
+    minitest (5.16.3)
     multipart-post (2.2.3)
     net-ssh (4.2.0)
     nokogiri (1.13.8-x86_64-linux)
@@ -361,4 +361,4 @@ DEPENDENCIES
   eac_tools!
 
 BUNDLED WITH
-   2.3.18
+   2.3.20

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.8'
-  s.add_dependency 'eac_config', '~> 0.11'
+  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.101'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
   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/entries/auto_values/uri_entry.rb

@@ -15,7 +15,7 @@ module Avm
 
         def value
           ::Avm::Entries::UriBuilder.from_all_fields do |field_name|
-            entries_provider.entry([suffix, field_name]).value
+            entries_provider.entry([suffix, field_name]).optional_value
           end.to_uri.to_s
         end
       end

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

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

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm', '~> 0.39', '>= 0.39.1'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.5'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
   s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/deploy'
+require 'eac_ruby_utils/ruby'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Deploy < ::Avm::EacWebappBase0::Deploy
+        set_callback :assert_instance_branch, :after, :run_installer
+
+        def run_installer
+          infom 'Running installer'
+          ::EacRubyUtils::Ruby.on_clean_environment do
+            installer_command.system!
+          end
+        end
+
+        def installer_command
+          instance.host_env.command(installer_path, install_task)
+        end
+
+        def installer_path
+          ::File.join(instance.fs_path, 'plugins', 'redmine_installer', 'installer', 'run.sh')
+        end
+
+        def install_task
+          if instance.web_path_optional.present?
+            'redmine_as_apache_path'
+          else
+            'redmine_as_apache_base'
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/runners/base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/instances/base'
-require 'avm/eac_redmine_base0/deploy'
+require 'avm/eac_redmine_base0/instances/deploy'
 require 'avm/eac_redmine_base0/apache_host'
 require 'avm/eac_rails_base1/runner'
 require 'eac_ruby_utils/core_ext'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.12.0'
+    VERSION = '0.13.0'
   end
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm', '~> 0.39', '>= 0.39.1'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   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/sources/runners/update_dependencies_requirements.rb

@@ -11,6 +11,7 @@ module Avm
         class UpdateDependenciesRequirements
           runner_with :help do
             bool_opt '-a', '--all'
+            arg_opt '-e', '--exclude', repeat: true
             pos_arg :gem_name, repeat: true, optional: true
           end
 
@@ -32,8 +33,13 @@ module Avm
 
           private
 
+          def exclude?(gem_name)
+            parsed.exclude.include?(gem_name)
+          end
+
           def gem_names_uncached
-            ::Set.new(parsed.gem_name + gem_names_from_all).sort
+            ::Set.new(parsed.gem_name + gem_names_from_all).reject { |gem_name| exclude?(gem_name) }
+              .sort
           end
 
           def gem_names_from_all

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.19.1'
+    VERSION = '0.20.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.39'
+  s.add_dependency 'avm', '~> 0.39', '>= 0.39.1'
   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.101'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -16,6 +16,8 @@ module Avm
         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
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
   end
 end

data/sub/eac_config/eac_config.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'addressable', '~> 2.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.100'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_config/lib/eac_config/entry.rb

@@ -22,6 +22,10 @@ module EacConfig
       node_entry.if_present(&:secret_value)
     end
 
+    def to_s
+      "#{self.class}[RootNode: #{root_node}, Path: #{path}]"
+    end
+
     def value
       node_entry.if_present(&:value)
     end

data/sub/eac_config/lib/eac_config/envvars_node.rb

@@ -21,5 +21,9 @@ module EacConfig
     def url
       URI
     end
+
+    def to_s
+      "#{self.class}[ObjectId: #{object_id}]}"
+    end
   end
 end

data/sub/eac_config/lib/eac_config/node_entry.rb

@@ -18,5 +18,10 @@ module EacConfig
     def secret_value
       value
     end
+
+    # @return [String]
+    def to_s
+      "#{self.class}[Node: #{node}, Path: #{path}]"
+    end
   end
 end

data/sub/eac_config/lib/eac_config/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacConfig
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

data/sub/eac_config/lib/eac_config/yaml_file_node.rb

@@ -31,6 +31,10 @@ module EacConfig
       ::Addressable::URI.parse("file://#{path.expand_path}")
     end
 
+    def to_s
+      "#{self.class}[#{path}]"
+    end
+
     private
 
     def data_uncached

data/sub/eac_config/spec/lib/eac_config/envvars_node_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_config/envvars_node'
+require 'eac_ruby_utils/ruby'
 
 RSpec.describe ::EacConfig::EnvvarsNode do
   let(:instance) { described_class.new }
@@ -18,6 +19,16 @@ RSpec.describe ::EacConfig::EnvvarsNode do
     it { expect(entry.value).to eq('AAA') }
     it { expect(entry.found_node).to eq(instance) }
     it { expect(entry).to be_found }
+
+    context 'with a clean ruby environment' do
+      let(:entry_value) do
+        ::EacRubyUtils::Ruby.on_clean_environment do
+          entry.value
+        end
+      end
+
+      it { expect(entry_value).to eq('AAA') }
+    end
   end
 
   context 'with blank entry' do

data/sub/eac_ruby_utils/eac_ruby_utils.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*', 'MIT-LICENSE', 'README.rdoc']
 
   s.add_dependency 'activesupport', '>= 4', '< 7'
-  s.add_dependency 'addressable', '~> 2.6'
+  s.add_dependency 'addressable', '~> 2.8'
   s.add_dependency 'bundler'
-  s.add_dependency 'filesize'
+  s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'net-ssh', '~> 4.2'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb

@@ -1,37 +1,70 @@
 # frozen_string_literal: true
 
 require 'bundler'
+require 'eac_ruby_utils/ruby/on_replace_objects'
 
 module EacRubyUtils
   module Ruby
     class << self
       # Executes a block in an environment when the variables BUNDLE* and RUBY* are removed.
-      def on_clean_environment
-        bundler_with_unbundled_env do
-          on_clean_envvars('BUNDLE', 'RUBY') { yield }
-        end
+      def on_clean_environment(&block)
+        OnCleanEnvironment.new(&block).perform
       end
 
-      private
+      class OnCleanEnvironment
+        ENVVARS_PREFIXES_TO_CLEAN = %w[BUNDLE RUBY].freeze
+
+        attr_reader :block, :original_env
 
-      def bundler_with_unbundled_env(&block)
-        if ::Bundler.respond_to?(:with_unbundled_env)
-          ::Bundler.with_unbundled_env(&block)
-        else
-          ::Bundler.with_clean_env(&block)
+        def initialize(&block)
+          @block = block
+          @original_env = ::ENV.to_h
         end
-      end
 
-      def on_clean_envvars(*start_with_vars)
-        old_values = envvars_starting_with(start_with_vars)
-        old_values.each_key { |k| ENV.delete(k) }
-        yield
-      ensure
-        old_values&.each { |k, v| ENV[k] = v }
-      end
+        # @return [Array<String>]
+        def envvars_prefixes_to_clean
+          ENVVARS_PREFIXES_TO_CLEAN
+        end
 
-      def envvars_starting_with(start_with_vars)
-        ENV.select { |k, _v| start_with_vars.any? { |var| k.start_with?(var) } }
+        def perform
+          bundler_with_unbundled_env do
+            on_clean_envvars
+          end
+        end
+
+        private
+
+        def bundler_with_unbundled_env(&block)
+          with_bundler_modified do
+            ::Bundler.send(bundler_with_env_method_name, &block)
+          end
+        end
+
+        def bundler_with_env_method_name
+          if ::Bundler.respond_to?(:with_unbundled_env)
+            :with_unbundled_env
+          else
+            :with_clean_env
+          end
+        end
+
+        def clean_env
+          r = original_env.dup
+          r.delete_if { |k, _| envvars_prefixes_to_clean.any? { |prefix| k.start_with?(prefix) } }
+          r
+        end
+
+        def on_clean_envvars
+          ::Bundler.send('with_env', clean_env) { block.call }
+        end
+
+        def with_bundler_modified(&block)
+          cloned_env = original_env.dup
+          ::EacRubyUtils::Ruby.on_replace_objects do |replacer|
+            replacer.replace_self_method(::Bundler, :original_env) { cloned_env }
+            block.call
+          end
+        end
       end
     end
   end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_replace_objects/replace_instance_method.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'active_support/inflector'
+require 'eac_ruby_utils/ruby/on_replace_objects/replace_instance_method'
+
+module EacRubyUtils
+  module Ruby
+    class OnReplaceObjects
+      class ReplaceInstanceMethod
+        attr_reader :a_module, :method_new_block, :original_method
+
+        def initialize(a_module, method_name, &method_new_block)
+          @a_module = a_module
+          @original_method = a_module.instance_method(method_name)
+          @method_new_block = method_new_block
+        end
+
+        def apply
+          a_module.define_method(method_name, &method_new_block)
+
+          self
+        end
+
+        def method_name
+          original_method.name
+        end
+
+        def restore
+          a_module.define_method(method_name, original_method)
+
+          self
+        end
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_replace_objects.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'active_support/inflector'
+require 'eac_ruby_utils/ruby/on_replace_objects/replace_instance_method'
+
+module EacRubyUtils
+  module Ruby
+    class << self
+      def on_replace_objects
+        replacer = OnReplaceObjects.new
+        replacer.on_replacement do
+          yield(replacer)
+        end
+      end
+    end
+
+    class OnReplaceObjects
+      def on_replacement(&block)
+        clear_replacements
+        block.call(self)
+      ensure
+        restore_replacements
+      end
+
+      def replace_instance_method(a_module, method_name, &block)
+        add_replacement(__method__, a_module, method_name, &block)
+      end
+
+      def replace_self_method(object, method_name, &block)
+        add_replacement(:replace_instance_method, object.singleton_class, method_name, &block)
+      end
+
+      private
+
+      def add_replacement(method_name, *args, &block)
+        @replacements << replacement_class(method_name).new(*args, &block).apply
+      end
+
+      def replacement_class(method_name)
+        self.class.const_get(::ActiveSupport::Inflector.camelize(method_name))
+      end
+
+      def clear_replacements
+        @replacements = []
+      end
+
+      def restore_replacements
+        @replacements.reverse.each(&:restore)
+      end
+    end
+  end
+end

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

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

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/{ruby_spec.rb → ruby/on_clean_environment_spec.rb}

@@ -6,9 +6,12 @@ RSpec.describe ::EacRubyUtils::Ruby do
   describe '#on_clean_environment' do
     let(:envvar_name) { 'BUNDLE_NOT_EXISTENT_ENV_VAR' }
     let(:envvar_value) { 'any value' }
+    let(:noruby_envvar_name) { 'ANY_ENVIRONMENT_VARIABLE' }
+    let(:noruby_envvar_value) { 'another any value' }
 
     before do
       ENV[envvar_name] = envvar_value
+      ENV[noruby_envvar_name] = noruby_envvar_value
     end
 
     it do # rubocop:disable RSpec/MultipleExpectations
@@ -18,5 +21,13 @@ RSpec.describe ::EacRubyUtils::Ruby do
       end
       expect(ENV[envvar_name]).to eq(envvar_value)
     end
+
+    it do # rubocop:disable RSpec/MultipleExpectations
+      expect(ENV[noruby_envvar_name]).to eq(noruby_envvar_value)
+      described_class.on_clean_environment do
+        expect(ENV[noruby_envvar_name]).to eq(noruby_envvar_value)
+      end
+      expect(ENV[noruby_envvar_name]).to eq(noruby_envvar_value)
+    end
   end
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/ruby/on_replace_objects_spec.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/ruby'
+
+RSpec.describe ::EacRubyUtils::Ruby do
+  describe '#on_replace_objects' do
+    let(:stub_class) do
+      ::Class.new do
+        def self.my_class_method
+          'Original'
+        end
+
+        def my_instance_method
+          'Original'
+        end
+      end
+    end
+
+    let(:stub_instance) { stub_class.new }
+
+    let(:replace_block) do
+      ::Proc.new { 'Replaced' }
+    end
+
+    describe '#my_instance_method' do
+      let(:before) { stub_instance.my_instance_method }
+      let(:inside) do
+        described_class.on_replace_objects do |replacer|
+          replacer.replace_instance_method(stub_class, :my_instance_method, &replace_block)
+          stub_instance.my_instance_method
+        end
+      end
+      let(:after) { stub_instance.my_instance_method }
+
+      before do
+        before
+        inside
+        after
+      end
+
+      it { expect(before).to eq('Original') }
+      it { expect(inside).to eq('Replaced') }
+      it { expect(after).to eq('Original') }
+    end
+
+    describe '#replace_self_method' do
+      let(:before) { stub_class.my_class_method }
+      let(:inside) do
+        described_class.on_replace_objects do |replacer|
+          replacer.replace_self_method(stub_class, :my_class_method, &replace_block)
+          stub_class.my_class_method
+        end
+      end
+      let(:after) { stub_class.my_class_method }
+
+      before do
+        before
+        inside
+        after
+      end
+
+      it { expect(before).to eq('Original') }
+      it { expect(inside).to eq('Replaced') }
+      it { expect(after).to eq('Original') }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.39'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.39.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.39'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.39.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -134,40 +140,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -208,14 +202,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.101'
+        version: '0.102'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.101'
+        version: '0.102'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -392,9 +386,9 @@ files:
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/apache_host.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/core_update.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/data_unit.rb
-- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/deploy.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/deploy.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/docker.rb
@@ -412,8 +406,8 @@ files:
 - sub/avm-eac_redmine_base0/locale/pt-BR.yml
 - sub/avm-eac_redmine_base0/spec/rubocop_spec.rb
 - sub/avm-eac_redmine_base0/spec/spec_helper.rb
-- sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/deploy/config/install.sh.template
-- sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/deploy/config/secrets.yml
+- sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template
+- sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/secrets.yml
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_http_virtualhost.conf.template
@@ -1195,6 +1189,8 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/ruby.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_replace_objects.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_replace_objects/replace_instance_method.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/settings_provider/setting_value.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb
@@ -1252,7 +1248,8 @@ files:
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub/base_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub/base_spec/stubbed_module_a.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub/base_spec/stubbed_not_module.rb
-- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/ruby_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/ruby/on_clean_environment_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/ruby/on_replace_objects_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/struct_spec.rb

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

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_webapp_base0/deploy'
-require 'eac_ruby_utils/ruby'
-
-module Avm
-  module EacRedmineBase0
-    class Deploy < ::Avm::EacWebappBase0::Deploy
-      set_callback :assert_instance_branch, :after, :run_installer
-
-      def run_installer
-        infom 'Running installer'
-        ::EacRubyUtils::Ruby.on_clean_environment do
-          installer_command.system!
-        end
-      end
-
-      def installer_command
-        instance.host_env.command(installer_path, install_task)
-      end
-
-      def installer_path
-        ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH), 'plugins',
-                    'redmine_installer', 'installer', 'run.sh')
-      end
-
-      def install_task
-        if instance.read_entry_optional('web.path').present?
-          'redmine_as_apache_path'
-        else
-          'redmine_as_apache_base'
-        end
-      end
-    end
-  end
-end