summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSHIBATA Hiroshi <hsbt@ruby-lang.org>2017-12-24 08:08:23 +0900
committerSHIBATA Hiroshi <hsbt@ruby-lang.org>2017-12-24 08:08:23 +0900
commit8a8b7738739f9533b6ea1fb7b6fa5c1fc52571f7 (patch)
tree48c602cbd6d266e2873ac39a63909324ce14d034
parent060e2f953c8f08dd7bed9711863e6341eebe5fe2 (diff)
downloadbundler-fix-ruby18-test.tar.gz
Re-order gem dependency for Ruby 1.8 build matrix.fix-ruby18-test
-rw-r--r--spec/support/rubygems_ext.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb
index 3f88215e43..3627e5a71d 100644
--- a/spec/support/rubygems_ext.rb
+++ b/spec/support/rubygems_ext.rb
@@ -54,7 +54,8 @@ module Spec
def self.install_gems(gems)
reqs, no_reqs = gems.partition {|_, req| !req.nil? && !req.split(" ").empty? }
- reqs = reqs.sort_by {|name, _| name == "rack" ? 0 : 1 } # TODO: remove when we drop ruby 1.8.7 support
+ # TODO: remove when we drop ruby 1.8.7-2.2.2 support
+ reqs = reqs.sort_by {|name, _| name == "rack" ? 0 : 1 }.sort_by {|name, _| name =~ /rack/ ? 0 : 1 }
no_reqs.map!(&:first)
reqs.map! {|name, req| "'#{name}:#{req}'" }
deps = reqs.concat(no_reqs).join(" ")