eac_tools 0.25.0 → 0.27.0

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.5'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -44,7 +44,7 @@ module Avm
       def touch_restart_file
         infom 'Touching restart file...'
         instance.host_env.command(
-          'touch', ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH),
+          'touch', ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
                                'tmp', 'restart.txt')
         ).system!
       end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe ::Avm::EacRailsBase0::ApacheHost do
     let(:expected_content) { fixtures_dir.join('apache_host_spec_no_ssl_content.conf').read }
 
     before do
-      instance.entry('fs_path').write('/path/to/stub-app_0')
+      instance.entry('install.path').write('/path/to/stub-app_0')
       instance.entry('web.url').write('http://stubapp.net')
     end
 

data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe ::Avm::EacRailsBase0::ApachePath do
     let(:expected_content) { expect_file.read }
 
     before do
-      instance.entry(::Avm::Instances::EntryKeys::FS_PATH).write('/path/to/stub-app_0')
+      instance.entry(::Avm::Instances::EntryKeys::INSTALL_PATH).write('/path/to/stub-app_0')
       instance.entry('web.url').write('http://stubapp.net/stub-app_0')
     end
 

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/apache_path/extra_content.conf

@@ -1,5 +1,5 @@
 <Location "%%WEB.PATH%%">
   PassengerBaseURI "%%WEB.PATH%%"
-  PassengerAppRoot "%%FS_PATH%%"
+  PassengerAppRoot "%%INSTALL.PATH%%"
   PassengerAppEnv production
 </Location>

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.19'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.4'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'avm', '~> 0.41'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.20'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.6'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -6,7 +6,7 @@ module Avm
   module EacRailsBase1
     class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
       def document_root
-        "#{instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)}/public"
+        "#{instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)}/public"
       end
 
       def extra_content

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

@@ -18,8 +18,9 @@ module Avm
         end
 
         def the_gem
-          @the_gem ||= ::Avm::EacRubyBase1::Sources::Base.new(::File.join(read_entry('fs_path')))
-                         .env_set(host_env)
+          @the_gem ||= ::Avm::EacRubyBase1::Sources::Base.new(
+            ::File.join(read_entry('install.path'))
+          ).env_set(host_env)
         end
       end
     end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/log.rb

@@ -20,7 +20,7 @@ module Avm
         private
 
         def log_path
-          ::File.join(rails_instance.read_entry('fs_path'), 'log', "#{rails_environment}.log")
+          ::File.join(rails_instance.read_entry('install.path'), 'log', "#{rails_environment}.log")
         end
 
         def start_banner

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/sub/avm-eac_rails_base1/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.sh

@@ -3,4 +3,4 @@
 set -e
 
 source "$HOME/.rvm/scripts/rvm"
-( cd '%%fs_path%%'; RAILS_ENV=production bundle exec tasks_scheduler "$@" )
+( cd '%%install.path%%'; RAILS_ENV=production bundle exec tasks_scheduler "$@" )

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.41'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.5'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
   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/base.rb

@@ -21,7 +21,7 @@ module Avm
         def docker_run_arguments
           [
             '--volume',
-            "#{read_entry(::Avm::Instances::EntryKeys::FS_PATH)}:/home/myuser/eac_redmine_base0",
+            "#{install_path}:/home/myuser/eac_redmine_base0",
             '--publish', "#{read_entry(:ssh_port)}:22",
             '--publish', "#{read_entry(:http_port)}:80",
             '--publish', "#{read_entry(:https_port)}:443"

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.install_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/instances/docker_image.rb

@@ -77,7 +77,7 @@ module Avm
         end
 
         def git_repo_uncached
-          ::EacGit::Local.new(instance.source_instance.fs_path)
+          ::EacGit::Local.new(instance.source_instance.install_path)
         end
 
         def redmine_source_git_id

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.14.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.41'
   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/apache_path.rb

@@ -15,7 +15,7 @@ module Avm
       end
 
       def document_root
-        instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+        instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
       end
 
       def extra_content

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

@@ -27,7 +27,7 @@ module Avm
         end
 
         def target_path
-          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH),
+          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
                       fs_path_subpath.to_s)
         end
 

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

@@ -38,7 +38,7 @@ module Avm
         end
 
         def git_repository_path
-          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
         end
 
         def git_uncached

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

@@ -9,7 +9,7 @@ module Avm
         def write_on_target
           ::Avm::Files::Deploy.new(
             instance.host_env,
-            instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+            instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
           ).append_plain_directory(build_dir).run
         end
       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.6.0'
   end
 end

data/sub/avm-eac_wordpress_base0/avm-eac_wordpress_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.4'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'avm', '~> 0.41'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.6'
+  s.add_dependency 'eac_ruby_utils', '~> 0.102'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

data/sub/avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0/instances/apache_host.rb

@@ -7,7 +7,7 @@ module Avm
     module Instances
       class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
         def document_root
-          instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+          instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
         end
 
         def extra_content

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWordpressBase0
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_wordpress_base0/spec/lib/avm/eac_wordpress_base0/instances/apache_host_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe ::Avm::EacWordpressBase0::Instances::ApacheHost do
     end
 
     before do
-      instance.entry(::Avm::Instances::EntryKeys::FS_PATH).write('/path/to/stub-app_0')
+      instance.entry(::Avm::Instances::EntryKeys::INSTALL_PATH).write('/path/to/stub-app_0')
       instance.entry(::Avm::Instances::EntryKeys::WEB_URL).write('http://stubapp.net')
       instance.entry(::Avm::Instances::EntryKeys::INSTALL_USERNAME).write('myuser')
     end

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.37'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.19', '>= 0.19.1'
+  s.add_dependency 'avm', '~> 0.41'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.20'
   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'
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
   s.add_dependency 'eac_ruby_base0', '~> 0.16', '>= 0.16.6'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
-  s.add_dependency 'git', '~> 1.11'
+  s.add_dependency 'git', '~> 1.12'
   s.add_dependency 'ruby-progressbar', '~> 1.11'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-tools/lib/avm/tools/runner/git/deploy.rb

@@ -71,7 +71,7 @@ module Avm
           def dev_instance_fs_path
             instance.if_present do |v|
               v.application.instance('dev').read_entry_optional(
-                ::Avm::Instances::EntryKeys::FS_PATH
+                ::Avm::Instances::EntryKeys::INSTALL_PATH
               )
             end
           end
@@ -86,7 +86,7 @@ module Avm
 
           def target_url
             parsed.target_url.if_present { |v| return v }
-            instance.if_present { |v| return v.read_entry(::Avm::Instances::EntryKeys::FS_URL) }
+            instance.if_present { |v| return v.install_url }
             nil
           end
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.133.0'
+    VERSION = '0.135.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