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 | |
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')
-rw-r--r-- | spec/bundler/support/artifice/vcr_cassettes/realworld/rubygems.org/gems/rack-2.0.1.gem/GET/request | 7 | ||||
-rw-r--r-- | spec/bundler/support/artifice/vcr_cassettes/realworld/rubygems.org/gems/rack-2.0.1.gem/GET/response | bin | 0 -> 254790 bytes | |||
-rw-r--r-- | spec/bundler/support/builders.rb | 2 | ||||
-rw-r--r-- | spec/bundler/support/indexes.rb | 15 | ||||
-rw-r--r-- | spec/bundler/support/rubygems_ext.rb | 3 |
5 files changed, 25 insertions, 2 deletions
diff --git a/spec/bundler/support/artifice/vcr_cassettes/realworld/rubygems.org/gems/rack-2.0.1.gem/GET/request b/spec/bundler/support/artifice/vcr_cassettes/realworld/rubygems.org/gems/rack-2.0.1.gem/GET/request new file mode 100644 index 0000000000..ed63e334fa --- /dev/null +++ b/spec/bundler/support/artifice/vcr_cassettes/realworld/rubygems.org/gems/rack-2.0.1.gem/GET/request @@ -0,0 +1,7 @@ +> GET /gems/rack-2.0.1.gem +> accept-encoding: gzip;q=1.0,deflate;q=0.6,identity;q=0.3 +> accept: */* +> user-agent: Ruby +> connection: keep-alive +> keep-alive: 30 +> host: rubygems.org
\ No newline at end of file diff --git a/spec/bundler/support/artifice/vcr_cassettes/realworld/rubygems.org/gems/rack-2.0.1.gem/GET/response b/spec/bundler/support/artifice/vcr_cassettes/realworld/rubygems.org/gems/rack-2.0.1.gem/GET/response Binary files differnew file mode 100644 index 0000000000..4e2fc2b8cd --- /dev/null +++ b/spec/bundler/support/artifice/vcr_cassettes/realworld/rubygems.org/gems/rack-2.0.1.gem/GET/response diff --git a/spec/bundler/support/builders.rb b/spec/bundler/support/builders.rb index e8208eacd9..377ca35523 100644 --- a/spec/bundler/support/builders.rb +++ b/spec/bundler/support/builders.rb @@ -391,7 +391,7 @@ module Spec index end - def build_spec(name, version, platform = nil, &block) + def build_spec(name, version = "0.0.1", platform = nil, &block) Array(version).map do |v| Gem::Specification.new do |s| s.name = name diff --git a/spec/bundler/support/indexes.rb b/spec/bundler/support/indexes.rb index 05605195b1..c56d6145a7 100644 --- a/spec/bundler/support/indexes.rb +++ b/spec/bundler/support/indexes.rb @@ -401,5 +401,20 @@ module Spec gem("d", %w[1.0.0 2.0.0]) end end + + def optional_prereleases_index + build_index do + gem("a", %w[1.0.0]) + + gem("a", "2.0.0") do + dep "b", ">= 2.0.0.pre" + end + + gem("b", %w[0.9.0 1.5.0 2.0.0.pre]) + + # --- Pre-release support + gem "rubygems\0", ["1.3.2"] + end + end end end 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(" ") |