[rubygems/rubygems] Change behavior when gemfile and gemspec dep deps conflict

ruby/rubygems@7026b5f2e5

Author: deivid-rodriguez

lib/bundler/dsl.rb

@@ -247,22 +247,21 @@ def add_dependency(name, version = nil, options = {})
 
           gemspec_dep = [dep, current].find(&:gemspec_dev_dep?)
           if gemspec_dep
-            gemfile_dep = [dep, current].find(&:gemfile_dep?)
-
-            if gemfile_dep && !current_requirement_open
-              Bundler.ui.warn "A gemspec development dependency (#{name}, #{gemspec_dep.requirement}) is being overridden by a Gemfile dependency (#{name}, #{gemfile_dep.requirement}).\n" \
-                              "This behaviour may change in the future. Please remove either of them, or make sure they both have the same requirement\n"
-            elsif gemfile_dep.nil?
-              require_relative "vendor/pub_grub/lib/pub_grub/version_range"
-              require_relative "vendor/pub_grub/lib/pub_grub/version_constraint"
-              require_relative "vendor/pub_grub/lib/pub_grub/version_union"
-              require_relative "vendor/pub_grub/lib/pub_grub/rubygems"
-
-              current_gemspec_range = PubGrub::RubyGems.requirement_to_range(current.requirement)
-              next_gemspec_range = PubGrub::RubyGems.requirement_to_range(dep.requirement)
-
-              if current_gemspec_range.intersects?(next_gemspec_range)
-                dep = Dependency.new(name, current.requirement.as_list + dep.requirement.as_list, options)
+            require_relative "vendor/pub_grub/lib/pub_grub/version_range"
+            require_relative "vendor/pub_grub/lib/pub_grub/version_constraint"
+            require_relative "vendor/pub_grub/lib/pub_grub/version_union"
+            require_relative "vendor/pub_grub/lib/pub_grub/rubygems"
+
+            current_gemspec_range = PubGrub::RubyGems.requirement_to_range(current.requirement)
+            next_gemspec_range = PubGrub::RubyGems.requirement_to_range(dep.requirement)
+
+            if current_gemspec_range.intersects?(next_gemspec_range)
+              dep = Dependency.new(name, current.requirement.as_list + dep.requirement.as_list, options)
+            else
+              gemfile_dep = [dep, current].find(&:gemfile_dep?)
+
+              if gemfile_dep
+                raise GemfileError, "The #{name} dependency has conflicting requirements in Gemfile (#{gemfile_dep.requirement}) and gemspec (#{gemspec_dep.requirement})"
               else
                 raise GemfileError, "Two gemspec development dependencies have conflicting requirements on the same gem: #{dep} and #{current}"
               end

spec/bundler/commands/install_spec.rb

@@ -474,7 +474,7 @@
       expect(the_bundle).to include_gems("my-private-gem 1.0")
     end
 
-    it "throws a warning if a gem is added once in Gemfile and also inside a gemspec as a development dependency, with different requirements" do
+    it "does not warn if a gem is added once in Gemfile and also inside a gemspec as a development dependency, with compatible requirements" do
       build_lib "my-gem", path: bundled_app do |s|
         s.add_development_dependency "rubocop", "~> 1.36.0"
       end
@@ -494,14 +494,32 @@
 
       bundle :install
 
-      expect(err).to include("A gemspec development dependency (rubocop, ~> 1.36.0) is being overridden by a Gemfile dependency (rubocop, >= 0).")
-      expect(err).to include("This behaviour may change in the future. Please remove either of them, or make sure they both have the same requirement")
+      expect(err).to be_empty
+
+      expect(the_bundle).to include_gems("rubocop 1.36.0")
+    end
+
+    it "raises an error if a gem is added once in Gemfile and also inside a gemspec as a development dependency, with incompatible requirements" do
+      build_lib "my-gem", path: bundled_app do |s|
+        s.add_development_dependency "rubocop", "~> 1.36.0"
+      end
+
+      build_repo4 do
+        build_gem "rubocop", "1.36.0"
+        build_gem "rubocop", "1.37.1"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gemspec
+
+        gem "rubocop", "~> 1.37.0", group: :development
+      G
 
-      # This is not the best behavior I believe, it would be better if both
-      # requirements are considered if they are compatible, and a version
-      # satisfying both is chosen. But not sure about changing it right now, so
-      # I went with a warning for the time being.
-      expect(the_bundle).to include_gems("rubocop 1.37.1")
+      bundle :install, raise_on_error: false
+
+      expect(err).to include("The rubocop dependency has conflicting requirements in Gemfile (~> 1.37.0) and gemspec (~> 1.36.0)")
     end
 
     it "includes the gem without warning if two gemspecs add it with the same requirement" do
@@ -590,35 +608,6 @@
       expect(err).to include("Two gemspec development dependencies have conflicting requirements on the same gem: rubocop (~> 1.36.0) and rubocop (~> 2.0). Bundler cannot continue.")
     end
 
-    it "warns when a Gemfile dependency is overriding a gemspec development dependency, with different requirements" do
-      build_lib "my-gem", path: bundled_app do |s|
-        s.add_development_dependency "rails", ">= 5"
-      end
-
-      build_repo4 do
-        build_gem "rails", "7.0.8"
-      end
-
-      gemfile <<~G
-        source "https://gem.repo4"
-
-        gem "rails", "~> 7.0.8"
-
-        gemspec
-      G
-
-      bundle :install
-
-      expect(err).to include("A gemspec development dependency (rails, >= 5) is being overridden by a Gemfile dependency (rails, ~> 7.0.8).")
-      expect(err).to include("This behaviour may change in the future. Please remove either of them, or make sure they both have the same requirement")
-
-      # This is not the best behavior I believe, it would be better if both
-      # requirements are considered if they are compatible, and a version
-      # satisfying both is chosen. But not sure about changing it right now, so
-      # I went with a warning for the time being.
-      expect(the_bundle).to include_gems("rails 7.0.8")
-    end
-
     it "does not warn if a gem is added once in Gemfile and also inside a gemspec as a development dependency, with same requirements, and different sources" do
       build_lib "my-gem", path: bundled_app do |s|
         s.add_development_dependency "activesupport"