aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-02-13 21:34:23 +1100
committerAndre Arko <andre@arko.net>2015-02-13 22:07:13 +1100
commit10a47fcc50f4d78a1e54c75949a0088719812b46 (patch)
tree0d33aa5034064324d2e5cf11bd40afd428ebf660
parent42105c671b9910963b0345e45406438687800d5b (diff)
downloadbundler-10a47fcc50f4d78a1e54c75949a0088719812b46.tar.gz
mri doesn’t use forking workers anymore
which means that we need a threadsafe rubygems to be able to install gems in parallel even on MRI. also, rubygems 2.0.7 was released as 2.1.
-rw-r--r--lib/bundler/installer.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 52797314..10526115 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -195,13 +195,12 @@ module Bundler
private
def can_install_in_parallel?
- min_rubygems = "2.0.7"
- if Bundler.current_ruby.mri? || Bundler.rubygems.provides?(">= #{min_rubygems}")
+ if Bundler.rubygems.provides?(">= 2.1.0")
true
else
Bundler.ui.warn "Rubygems #{Gem::VERSION} is not threadsafe, so your "\
- "gems must be installed one at a time. Upgrade to Rubygems " \
- "#{min_rubygems} or higher to enable parallel gem installation."
+ "gems must be installed one at a time. Upgrade to Rubygems 2.1.0 " \
+ "or higher to enable parallel gem installation."
false
end
end