diff options
author | The Bundler Bot <bot@bundler.io> | 2017-12-23 23:42:20 +0000 |
---|---|---|
committer | The Bundler Bot <bot@bundler.io> | 2017-12-23 23:42:20 +0000 |
commit | 57d4653321ced430d3ce57cf8796d133a94a5fbe (patch) | |
tree | 48c602cbd6d266e2873ac39a63909324ce14d034 | |
parent | 060e2f953c8f08dd7bed9711863e6341eebe5fe2 (diff) | |
parent | 8a8b7738739f9533b6ea1fb7b6fa5c1fc52571f7 (diff) | |
download | bundler-57d4653321ced430d3ce57cf8796d133a94a5fbe.tar.gz |
Auto merge of #6224 - bundler:fix-ruby18-test, r=hsbt
Re-order gem dependency for Ruby 1.8 build matrix.
Fixes https://travis-ci.org/bundler/bundler/jobs/320785817
-rw-r--r-- | spec/support/rubygems_ext.rb | 3 |
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(" ") |