diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-12 06:15:44 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-12 06:15:44 +0000 |
| commit | a1a20cfaa2cf73ae8daaf2123d7c5b513427162e (patch) | |
| tree | 7f112577119ebda6c3dfd71cbc24f1bc559280ae /spec/bundler/support/rubygems_ext.rb | |
| parent | f1c33950998bf2d38d9416aa4f5dfe7f9f869f86 (diff) | |
| download | ruby-a1a20cfaa2cf73ae8daaf2123d7c5b513427162e.tar.gz | |
Merge 1-16-stable branch of bundler.
It's rc version for bundler-1.16.1. I'm going to update it version
after official release from bundler team.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/bundler/support/rubygems_ext.rb')
| -rw-r--r-- | spec/bundler/support/rubygems_ext.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/bundler/support/rubygems_ext.rb b/spec/bundler/support/rubygems_ext.rb index 73e90f6883..c174c76636 100644 --- a/spec/bundler/support/rubygems_ext.rb +++ b/spec/bundler/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(" ") |