From 10a47fcc50f4d78a1e54c75949a0088719812b46 Mon Sep 17 00:00:00 2001 From: Andre Arko Date: Fri, 13 Feb 2015 21:34:23 +1100 Subject: mri doesn’t use forking workers anymore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- lib/bundler/installer.rb | 7 +++---- 1 file 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 -- cgit v1.2.3