diff --git a/bundler/lib/bundler/installer.rb b/bundler/lib/bundler/installer.rb index e08cc9722bca..53750eb0616b 100644 --- a/bundler/lib/bundler/installer.rb +++ b/bundler/lib/bundler/installer.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "erb" require "rubygems/dependency_installer" require_relative "worker" require_relative "installer/parallel_installer" @@ -136,6 +135,7 @@ def generate_bundler_executable_stubs(spec, options = {}) end mode = Bundler::WINDOWS ? "wb:UTF-8" : "w" + require "erb" content = if RUBY_VERSION >= "2.6" ERB.new(template, :trim_mode => "-").result(binding) else @@ -182,6 +182,7 @@ def generate_standalone_bundler_executable_stubs(spec) executable_path = executable_path mode = Bundler::WINDOWS ? "wb:UTF-8" : "w" + require "erb" content = if RUBY_VERSION >= "2.6" ERB.new(template, :trim_mode => "-").result(binding) else diff --git a/bundler/spec/runtime/inline_spec.rb b/bundler/spec/runtime/inline_spec.rb index fa741978aded..009fbbdac3ef 100644 --- a/bundler/spec/runtime/inline_spec.rb +++ b/bundler/spec/runtime/inline_spec.rb @@ -388,7 +388,9 @@ def confirm(msg, newline = nil) build_gem "fileutils", default_fileutils_version, :to_system => true, :default => true end - realworld_system_gems "fiddle" + realworld_system_gems "fiddle" # not sure why, but this is needed on Windows to boot rubygems succesfully + + realworld_system_gems "timeout uri" # this spec uses net/http which requires these default gems script <<-RUBY, :dir => tmp("path_without_gemfile"), :env => { "BUNDLER_GEM_DEFAULT_DIR" => system_gem_path.to_s } require "bundler/inline" diff --git a/lib/rubygems/uri_formatter.rb b/lib/rubygems/uri_formatter.rb index ab5cc78e67ec..ac86fc73bdec 100644 --- a/lib/rubygems/uri_formatter.rb +++ b/lib/rubygems/uri_formatter.rb @@ -1,5 +1,4 @@ # frozen_string_literal: true -require 'cgi' ## # The UriFormatter handles URIs from user-input and escaping. @@ -26,6 +25,7 @@ def initialize(uri) def escape return unless @uri + require 'cgi' CGI.escape @uri end @@ -41,6 +41,7 @@ def normalize def unescape return unless @uri + require 'cgi' CGI.unescape @uri end end