eac_tools 0.25.0 → 0.27.0

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.27.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -58,62 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base0
   requirement: !ruby/object:Gem::Requirement
     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_rails_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -134,88 +128,70 @@ 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.6'
   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.6'
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.133'
+        version: '0.135'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.133'
+        version: '0.135'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     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 +368,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 +388,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
@@ -780,6 +756,9 @@ files:
 - sub/avm/lib/avm/entries/base.rb
 - sub/avm/lib/avm/entries/base/inherited_entry_value.rb
 - sub/avm/lib/avm/entries/base/uri_component_entry_value.rb
+- sub/avm/lib/avm/entries/base/uri_component_entry_value/default_value.rb
+- sub/avm/lib/avm/entries/base/uri_component_entry_value/inherited_value.rb
+- sub/avm/lib/avm/entries/base/uri_component_entry_value/url_entry_value.rb
 - sub/avm/lib/avm/entries/entry.rb
 - sub/avm/lib/avm/entries/uri_builder.rb
 - sub/avm/lib/avm/executables.rb
@@ -1195,6 +1174,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 +1233,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