kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Merge Bundler 2.0.1 from upstream.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2019-01-04 13:10:58 +00:00
parent 4bbbbb6a3f
commit e97741e12a
97 changed files with 578 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/bundler/install/gemfile/gemspec_spec.rb
View file

@ -433,7 +433,7 @@ RSpec.describe "bundle install from an existing gemspec" do
end
end
context "on ruby", :bundler => "< 2" do
context "on ruby", :bundler => "< 3" do
before do
simulate_platform("ruby")
bundle :install
@ -534,7 +534,7 @@ RSpec.describe "bundle install from an existing gemspec" do
end
end
context "on ruby", :bundler => "2" do
context "on ruby", :bundler => "3" do
before do
simulate_platform("ruby")
bundle :install

2
spec/bundler/install/gemfile/git_spec.rb
View file

@ -26,7 +26,7 @@ RSpec.describe "bundle install with git sources" do
expect(out).to eq("WIN")
end
it "caches the git repo", :bundler => "< 2" do
it "caches the git repo", :bundler => "< 3" do
expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"]).to have_attributes :size => 1
end

6
spec/bundler/install/gemfile/groups_spec.rb
View file

@ -192,19 +192,19 @@ RSpec.describe "bundle install with groups" do
expect(the_bundle).not_to include_gems "thin 1.0"
end
it "does remove groups from without when passed at --with", :bundler => "< 2" do
it "does remove groups from without when passed at --with", :bundler => "< 3" do
bundle :install, forgotten_command_line_options(:without => "emo")
bundle :install, forgotten_command_line_options(:with => "emo")
expect(the_bundle).to include_gems "activesupport 2.3.5"
end
it "does remove groups from with when passed at --without", :bundler => "< 2" do
it "does remove groups from with when passed at --without", :bundler => "< 3" do
bundle :install, forgotten_command_line_options(:with => "debugging")
bundle :install, forgotten_command_line_options(:without => "debugging")
expect(the_bundle).not_to include_gem "thin 1.0"
end
it "errors out when passing a group to with and without via CLI flags", :bundler => "< 2" do
it "errors out when passing a group to with and without via CLI flags", :bundler => "< 3" do
bundle :install, forgotten_command_line_options(:with => "emo debugging", :without => "emo")
expect(last_command).to be_failure
expect(out).to include("The offending groups are: emo")

2
spec/bundler/install/gemfile/path_spec.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe "bundle install with explicit source paths" do
it "fetches gems with a global path source", :bundler => "< 2" do
it "fetches gems with a global path source", :bundler => "< 3" do
build_lib "foo"
install_gemfile <<-G

2
spec/bundler/install/gemfile/platform_spec.rb
View file

@ -230,7 +230,7 @@ RSpec.describe "bundle install across platforms" do
expect(the_bundle).to include_gems "nokogiri 1.4.2 JAVA", "weakling 0.0.3"
end
it "works with gems that have extra platform-specific runtime dependencies", :bundler => "< 2" do
it "works with gems that have extra platform-specific runtime dependencies", :bundler => "< 3" do
simulate_platform x64_mac
update_repo2 do

8
spec/bundler/install/gemfile/sources_spec.rb
View file

@ -28,7 +28,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
bundle "config major_deprecations true"
end
it "warns about ambiguous gems, but installs anyway, prioritizing sources last to first", :bundler => "< 2" do
it "warns about ambiguous gems, but installs anyway, prioritizing sources last to first", :bundler => "< 3" do
bundle :install
expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.")
@ -58,7 +58,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
bundle "config major_deprecations true"
end
it "warns about ambiguous gems, but installs anyway", :bundler => "< 2" do
it "warns about ambiguous gems, but installs anyway", :bundler => "< 3" do
bundle :install
expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.")
@ -248,7 +248,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
G
end
it "installs from the other source and warns about ambiguous gems", :bundler => "< 2" do
it "installs from the other source and warns about ambiguous gems", :bundler => "< 3" do
bundle "config major_deprecations true"
bundle :install
expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.")
@ -276,7 +276,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
G
end
it "installs the dependency from the pinned source without warning", :bundler => "< 2" do
it "installs the dependency from the pinned source without warning", :bundler => "< 3" do
bundle :install
expect(out).not_to include("Warning: the gem 'rack' was found in multiple sources.")