diff options
Diffstat (limited to 'lib/bundler/rubygems_integration.rb')
| -rw-r--r-- | lib/bundler/rubygems_integration.rb | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index d97621cd92..0ff3df9a08 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -346,7 +346,7 @@ module Bundler raise e end - # backwards compatibility shim, see https://github.com/bundler/bundler/issues/5102 + # backwards compatibility shim, see https://github.com/rubygems/bundler/issues/5102 kernel_class.send(:public, :gem) if Bundler.feature_flag.setup_makes_kernel_gem_public? end end @@ -443,35 +443,6 @@ module Bundler Gem.clear_paths end - # This backports base_dir which replaces installation path - # RubyGems 1.8+ - def backport_base_dir - redefine_method(Gem::Specification, :base_dir) do - return Gem.dir unless loaded_from - File.dirname File.dirname loaded_from - end - end - - def backport_cache_file - redefine_method(Gem::Specification, :cache_dir) do - @cache_dir ||= File.join base_dir, "cache" - end - - redefine_method(Gem::Specification, :cache_file) do - @cache_file ||= File.join cache_dir, "#{full_name}.gem" - end - end - - def backport_spec_file - redefine_method(Gem::Specification, :spec_dir) do - @spec_dir ||= File.join base_dir, "specifications" - end - - redefine_method(Gem::Specification, :spec_file) do - @spec_file ||= File.join spec_dir, "#{full_name}.gemspec" - end - end - def undo_replacements @replaced_methods.each do |(sym, klass), method| redefine_method(klass, sym, method) @@ -602,10 +573,10 @@ module Bundler def backport_ext_builder_monitor # So we can avoid requiring "rubygems/ext" in its entirety - Gem.module_eval <<-RB, __FILE__, __LINE__ + 1 + Gem.module_eval <<-RUBY, __FILE__, __LINE__ + 1 module Ext end - RB + RUBY require "rubygems/ext/builder" |