From 3aebd84b62a1249766e2b78f83a2a9dd395b3b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 17 Jan 2020 14:11:03 +0100 Subject: Revert "Revert "Remove now meaningless warning"" This reverts commit e93bce3b206895a46b9fb5889c5f908fd29ad554. --- lib/bundler/definition.rb | 12 +----------- spec/install/gemfile/platform_spec.rb | 19 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index d723384189..1bffdbcc6f 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -898,17 +898,7 @@ module Bundler dependencies.each do |dep| dep = Dependency.new(dep, ">= 0") unless dep.respond_to?(:name) next if !remote && !dep.current_platform? - platforms = dep.gem_platforms(sorted_platforms) - if platforms.empty? && !Bundler.settings[:disable_platform_warnings] - mapped_platforms = dep.expanded_platforms - Bundler.ui.warn \ - "The dependency #{dep} will be unused by any of the platforms Bundler is installing for. " \ - "Bundler is installing for #{@platforms.join ", "} but the dependency " \ - "is only for #{mapped_platforms.join ", "}. " \ - "To add those platforms to the bundle, " \ - "run `bundle lock --add-platform #{mapped_platforms.join " "}`." - end - platforms.each do |p| + dep.gem_platforms(sorted_platforms).each do |p| deps << DepProxy.new(dep, p) if remote || p == generic_local_platform end end diff --git a/spec/install/gemfile/platform_spec.rb b/spec/install/gemfile/platform_spec.rb index 2bbda133c9..c637eeee0c 100644 --- a/spec/install/gemfile/platform_spec.rb +++ b/spec/install/gemfile/platform_spec.rb @@ -412,25 +412,6 @@ RSpec.describe "bundle install with platform conditionals" do #{Bundler::VERSION} L end - - context "when disable_platform_warnings is true" do - before { bundle! "config set disable_platform_warnings true" } - - it "does not print the warning when a dependency is unused on any platform" do - simulate_platform "ruby" - simulate_ruby_engine "ruby" - - gemfile <<-G - source "#{file_uri_for(gem_repo1)}" - - gem "rack", :platform => [:mingw, :mswin, :x64_mingw, :jruby] - G - - bundle! "install" - - expect(out).not_to match(/The dependency (.*) will be unused/) - end - end end RSpec.describe "when a gem has no architecture" do -- cgit v1.2.1