From 8a8b7738739f9533b6ea1fb7b6fa5c1fc52571f7 Mon Sep 17 00:00:00 2001
From: SHIBATA Hiroshi <hsbt@ruby-lang.org>
Date: Sun, 24 Dec 2017 08:08:23 +0900
Subject: Re-order gem dependency for Ruby 1.8 build matrix.

---
 spec/support/rubygems_ext.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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(" ")
-- 
cgit v1.2.1