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

[bundler/bundler] Revert "Add all platforms to lockfile by default"

Browse source 
This reverts commit 3dc509e645abb497e4dc92a7c42be471ff87db0b.

https://github.com/bundler/bundler/commit/b5766564fb
This commit is contained in:
David Rodríguez 2019-08-21 20:53:36 +02:00 committed by Hiroshi SHIBATA
parent 6f16ededdd
commit 0c6529bac2
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
4 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/bundler/cli/outdated.rb
View file

@ -169,8 +169,6 @@ module Bundler
end end
def retrieve_active_spec(definition, current_spec) def retrieve_active_spec(definition, current_spec)
return unless current_spec.match_platform(Bundler.local_platform)
if strict if strict
active_spec = definition.find_resolved_spec(current_spec) active_spec = definition.find_resolved_spec(current_spec)
else else

8
lib/bundler/definition.rb
View file

@ -113,7 +113,7 @@ module Bundler
end end
@unlocking ||= @unlock[:ruby] ||= (!@locked_ruby_version ^ !@ruby_version) @unlocking ||= @unlock[:ruby] ||= (!@locked_ruby_version ^ !@ruby_version)
add_platforms unless Bundler.frozen_bundle? add_current_platform unless Bundler.frozen_bundle?
converge_path_sources_to_gemspec_sources converge_path_sources_to_gemspec_sources
@path_changes = converge_paths @path_changes = converge_paths
@ -543,12 +543,6 @@ module Bundler
private private
def add_platforms
(@dependencies.flat_map(&:expanded_platforms) + current_platforms).uniq.each do |platform|
add_platform(platform)
end
end
def current_platforms def current_platforms
current_platform = Bundler.local_platform current_platform = Bundler.local_platform
[].tap do |platforms| [].tap do |platforms|

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

@ -372,7 +372,7 @@ RSpec.describe "bundle install with platform conditionals" do
expect(out).not_to match(/Could not find gem 'some_gem/) expect(out).not_to match(/Could not find gem 'some_gem/)
end end
it "resolves all platforms by default and without warning messages" do it "prints a helpful warning when a dependency is unused on any platform" do
simulate_platform "ruby" simulate_platform "ruby"
simulate_ruby_engine "ruby" simulate_ruby_engine "ruby"
@ -384,27 +384,9 @@ RSpec.describe "bundle install with platform conditionals" do
bundle! "install" bundle! "install"
expect(err).to be_empty expect(err).to include <<-O.strip
The dependency #{Gem::Dependency.new("rack", ">= 0")} will be unused by any of the platforms Bundler is installing for. Bundler is installing for ruby but the dependency is only for x86-mingw32, x86-mswin32, x64-mingw32, java. To add those platforms to the bundle, run `bundle lock --add-platform x86-mingw32 x86-mswin32 x64-mingw32 java`.
lockfile_should_be <<-L O
GEM
remote: #{file_uri_for(gem_repo1)}/
specs:
rack (1.0.0)
PLATFORMS
java
ruby
x64-mingw32
x86-mingw32
x86-mswin32
DEPENDENCIES
rack
BUNDLED WITH
#{Bundler::VERSION}
L
end end
context "when disable_platform_warnings is true" do context "when disable_platform_warnings is true" do

2
spec/bundler/runtime/require_spec.rb
View file

@ -425,7 +425,7 @@ RSpec.describe "Bundler.require with platform specific dependencies" do
source "#{file_uri_for(gem_repo1)}" source "#{file_uri_for(gem_repo1)}"
platforms :#{not_local_tag} do platforms :#{not_local_tag} do
gem "platform_specific", :require => "omgomg" gem "fail", :require => "omgomg"
end end
gem "rack", "1.0.0" gem "rack", "1.0.0"