diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-22 23:08:05 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-22 23:08:05 +0000 |
| commit | 52ddd2067a1902aeac50716d3cd5ed55e729210c (patch) | |
| tree | 83cbcf419e0feeb2ab0fd063ed85e0776eb0081b /lib/rubygems | |
| parent | ef1525d708456c0fb9f5c47a326479adbd52a9dc (diff) | |
| download | ruby-52ddd2067a1902aeac50716d3cd5ed55e729210c.tar.gz | |
Postponing the Bundler merge.
I faced a big issue about Bundler with ruby core.
I have no time to resolve it issue before 2.5 final release.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems')
| -rw-r--r-- | lib/rubygems/test_case.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 82afb8a068..f7f216e5e3 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -25,7 +25,9 @@ unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty? gem 'json' end -require 'bundler' +if Gem::USE_BUNDLER_FOR_GEMDEPS + require 'bundler' +end require 'minitest/autorun' require 'rubygems/deprecate' @@ -235,7 +237,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase @current_dir = Dir.pwd @fetcher = nil - Bundler.ui = Bundler::UI::Silent.new + if Gem::USE_BUNDLER_FOR_GEMDEPS + Bundler.ui = Bundler::UI::Silent.new + end @back_ui = Gem::DefaultUserInteraction.ui @ui = Gem::MockGemUi.new # This needs to be a new instance since we call use_ui(@ui) when we want to @@ -331,7 +335,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase Gem.loaded_specs.clear Gem.clear_default_specs Gem::Specification.unresolved_deps.clear - Bundler.reset! + if Gem::USE_BUNDLER_FOR_GEMDEPS + Bundler.reset! + end Gem.configuration.verbose = true Gem.configuration.update_sources = true |