Merge pull request #6023 from tnir/tnir-6012-ignore-patchlevel-in-ruby-dsl

Bundler: ignore patchlevel kwarg in ruby DSL

Author: hsbt

bundler/lib/bundler/definition.rb

@@ -487,12 +487,6 @@ def validate_ruby!
                 "Your Ruby version is #{actual}, but your Gemfile specified #{expected}"
               when :engine_version
                 "Your #{Bundler::RubyVersion.system.engine} version is #{actual}, but your Gemfile specified #{ruby_version.engine} #{expected}"
-              when :patchlevel
-                if !expected.is_a?(String)
-                  "The Ruby patchlevel in your Gemfile must be a string"
-                else
-                  "Your Ruby patchlevel is #{actual}, but your Gemfile specified #{expected}"
-                end
         end
 
         raise RubyVersionMismatch, msg

bundler/lib/bundler/ruby_version.rb

@@ -96,8 +96,6 @@ def diff(other)
         [:version, versions_string(versions), versions_string(other.versions)]
       elsif @input_engine && !matches?(engine_versions, other.engine_gem_version)
         [:engine_version, versions_string(engine_versions), versions_string(other.engine_versions)]
-      elsif patchlevel && (!patchlevel.is_a?(String) || !other.patchlevel.is_a?(String) || !matches?(patchlevel, other.patchlevel))
-        [:patchlevel, patchlevel, other.patchlevel]
       end
     end
 

spec/bundler/ruby_version_spec.rb

@@ -137,7 +137,7 @@
         end
       end
 
-      context "the versions, pathlevels, engines, and engine_versions match" do
+      shared_examples_for "the versions, engines, and engine_versions match" do
         it "should return true" do
           expect(subject).to eq(other_ruby_version)
         end
@@ -149,6 +149,12 @@
         it_behaves_like "two ruby versions are not equal"
       end
 
+      context "the patchlevels do not match" do
+        let(:other_patchlevel) { "21" }
+
+        it_behaves_like "the versions, engines, and engine_versions match"
+      end
+
       context "the engines do not match" do
         let(:other_engine) { "ruby" }
 
@@ -222,9 +228,9 @@
         end
       end
 
-      shared_examples_for "there is a difference in the patchlevels" do
-        it "should return a tuple with :patchlevel and the two different patchlevels" do
-          expect(ruby_version.diff(other_ruby_version)).to eq([:patchlevel, patchlevel, other_patchlevel])
+      shared_examples_for "even there is a difference in the patchlevels" do
+        it "should return nil" do
+          expect(ruby_version.diff(other_ruby_version)).to be_nil
         end
       end
 
@@ -281,10 +287,10 @@
         it_behaves_like "there is a difference in the engine versions"
       end
 
-      context "detects patchlevel discrepancies last" do
+      context "ignores patchlevel discrepancies last" do
         let(:other_patchlevel) { "643" }
 
-        it_behaves_like "there is a difference in the patchlevels"
+        it_behaves_like "even there is a difference in the patchlevels"
       end
 
       context "successfully matches gem requirements" do
@@ -349,7 +355,7 @@
         let(:other_engine)         { "ruby" }
         let(:other_engine_version) { "2.0.5" }
 
-        it_behaves_like "there is a difference in the patchlevels"
+        it_behaves_like "even there is a difference in the patchlevels"
       end
 
       context "successfully detects bad gem requirements with engine versions" do
@@ -383,7 +389,7 @@
         context "and comparing with a patchlevel that is not -1" do
           let(:other_patchlevel)     { "642" }
 
-          it_behaves_like "there is a difference in the patchlevels"
+          it_behaves_like "even there is a difference in the patchlevels"
         end
       end
     end

spec/commands/platform_spec.rb

@@ -302,9 +302,9 @@ def should_be_engine_version_incorrect
     expect(err).to be_include("Your #{local_ruby_engine} version is #{local_engine_version}, but your Gemfile specified #{local_ruby_engine} #{not_local_engine_version}")
   end
 
-  def should_be_patchlevel_incorrect
-    expect(exitstatus).to eq(18)
-    expect(err).to be_include("Your Ruby patchlevel is #{RUBY_PATCHLEVEL}, but your Gemfile specified #{not_local_patchlevel}")
+  def should_ignore_patchlevel
+    expect(exitstatus).to eq(0)
+    expect(err).to eq("")
   end
 
   def should_be_patchlevel_fixnum
@@ -382,16 +382,16 @@ def should_be_patchlevel_fixnum
       should_be_engine_version_incorrect
     end
 
-    it "doesn't install when patchlevel doesn't match" do
+    it "does install even when patchlevel doesn't match" do
       install_gemfile <<-G, raise_on_error: false
         source "https://gem.repo1"
         gem "myrack"
 
         #{patchlevel_incorrect}
       G
 
-      expect(bundled_app_lock).not_to exist
-      should_be_patchlevel_incorrect
+      expect(bundled_app_lock).to exist
+      should_ignore_patchlevel
     end
   end
 
@@ -481,7 +481,7 @@ def should_be_patchlevel_fixnum
       should_be_engine_version_incorrect
     end
 
-    it "fails when patchlevel doesn't match" do
+    it "checks fine even when patchlevel doesn't match" do
       install_gemfile <<-G
         source "https://gem.repo1"
         gem "myrack"
@@ -494,8 +494,8 @@ def should_be_patchlevel_fixnum
         #{patchlevel_incorrect}
       G
 
-      bundle :check, raise_on_error: false
-      should_be_patchlevel_incorrect
+      bundle :check
+      should_ignore_patchlevel
     end
   end
 
@@ -598,19 +598,20 @@ def should_be_patchlevel_fixnum
       should_be_engine_version_incorrect
     end
 
-    it "fails when patchlevel doesn't match" do
+    it "updates fine even when patchlevel doesn't match" do
       gemfile <<-G
-        source "https://gem.repo1"
-        gem "myrack"
+        source "https://gem.repo2"
+        gem "activesupport"
 
         #{patchlevel_incorrect}
       G
       update_repo2 do
         build_gem "activesupport", "3.0"
       end
 
-      bundle :update, all: true, raise_on_error: false
-      should_be_patchlevel_incorrect
+      bundle :update, all: true
+      should_ignore_patchlevel
+      expect(the_bundle).to include_gems "activesupport 3.0"
     end
   end
 
@@ -682,19 +683,17 @@ def should_be_patchlevel_fixnum
       should_be_engine_version_incorrect
     end
 
-    it "fails when patchlevel doesn't match" do
+    it "prints path even when patchlevel doesn't match" do
       gemfile <<-G
         source "https://gem.repo1"
-        gem "myrack"
+        gem "rails"
 
         #{patchlevel_incorrect}
       G
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-      end
 
-      bundle "show rails", raise_on_error: false
-      should_be_patchlevel_incorrect
+      bundle "show rails"
+      should_ignore_patchlevel
+      expect(out).to eq(default_bundle_path("gems", "rails-2.3.2").to_s)
     end
   end
 
@@ -766,16 +765,17 @@ def should_be_patchlevel_fixnum
       should_be_engine_version_incorrect
     end
 
-    it "fails when patchlevel doesn't match" do
+    it "copies the .gem file to vendor/cache even when patchlevel doesn't match" do
       gemfile <<-G
         source "https://gem.repo1"
         gem "myrack"
 
         #{patchlevel_incorrect}
       G
 
-      bundle :cache, raise_on_error: false
-      should_be_patchlevel_incorrect
+      bundle :cache
+      should_ignore_patchlevel
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     end
   end
 
@@ -847,16 +847,17 @@ def should_be_patchlevel_fixnum
       should_be_engine_version_incorrect
     end
 
-    it "fails when patchlevel doesn't match" do
+    it "copies the .gem file to vendor/cache even when patchlevel doesn't match" do
       gemfile <<-G
         source "https://gem.repo1"
         gem "myrack"
 
         #{patchlevel_incorrect}
       G
 
-      bundle :cache, raise_on_error: false
-      should_be_patchlevel_incorrect
+      bundle :cache
+      should_ignore_patchlevel
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     end
   end
 
@@ -926,16 +927,17 @@ def should_be_patchlevel_fixnum
       should_be_engine_version_incorrect
     end
 
-    it "fails when patchlevel doesn't match" do
+    it "activates the correct gem even when patchlevel doesn't match" do
       gemfile <<-G
         source "https://gem.repo1"
         gem "myrack"
 
         #{patchlevel_incorrect}
       G
 
-      bundle "exec myrackup", raise_on_error: false
-      should_be_patchlevel_incorrect
+      bundle "exec myrackup"
+      should_ignore_patchlevel
+      expect(out).to include("1.0.0")
     end
   end
 
@@ -995,11 +997,15 @@ def should_be_patchlevel_fixnum
       should_be_engine_version_incorrect
     end
 
-    it "fails when patchlevel doesn't match" do
+    it "starts IRB with the default group loaded even when patchlevel doesn't match", :readline do
       gemfile gemfile + "\n\n#{patchlevel_incorrect}\n"
 
-      bundle "console", raise_on_error: false
-      should_be_patchlevel_incorrect
+      bundle "console" do |input, _, _|
+        input.puts("puts MYRACK")
+        input.puts("exit")
+      end
+      should_ignore_patchlevel
+      expect(out).to include("0.9.1")
     end
   end
 
@@ -1095,7 +1101,7 @@ def should_be_patchlevel_fixnum
       should_be_engine_version_incorrect
     end
 
-    it "fails when patchlevel doesn't match" do
+    it "makes a Gemfile.lock even when patchlevel doesn't match" do
       install_gemfile <<-G, raise_on_error: false
         source "https://gem.repo1"
         gem "yard"
@@ -1106,10 +1112,10 @@ def should_be_patchlevel_fixnum
 
       FileUtils.rm(bundled_app_lock)
 
-      ruby "require 'bundler/setup'", env: { "BUNDLER_VERSION" => Bundler::VERSION }, raise_on_error: false
+      ruby "require 'bundler/setup'", env: { "BUNDLER_VERSION" => Bundler::VERSION }
 
-      expect(bundled_app_lock).not_to exist
-      should_be_patchlevel_incorrect
+      should_ignore_patchlevel
+      expect(bundled_app_lock).to exist
     end
   end
 
@@ -1231,7 +1237,7 @@ def should_be_patchlevel_fixnum
       should_be_engine_version_incorrect
     end
 
-    it "fails when the patchlevel doesn't match", :jruby_only do
+    it "reports outdated gems even when patchlevel doesn't match" do
       update_repo2 do
         build_gem "activesupport", "3.0"
         update_git "foo", path: lib_path("foo")
@@ -1246,25 +1252,9 @@ def should_be_patchlevel_fixnum
       G
 
       bundle "outdated", raise_on_error: false
-      should_be_patchlevel_incorrect
-    end
-
-    it "fails when the patchlevel is a fixnum", :jruby_only do
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-        update_git "foo", path: lib_path("foo")
-      end
-
-      gemfile <<-G
-        source "https://gem.repo2"
-        gem "activesupport", "2.3.5"
-        gem "foo", :git => "#{lib_path("foo")}"
-
-        #{patchlevel_fixnum}
-      G
-
-      bundle "outdated", raise_on_error: false
-      should_be_patchlevel_fixnum
+      expect(err).not_to include("patchlevel")
+      expect(out).to include("activesupport")
+      expect(out).to include("foo")
     end
   end
 end

spec/install/gemspecs_spec.rb

@@ -122,7 +122,7 @@ module Persistent💎
       expect(the_bundle).to include_gems "foo 1.0"
     end
 
-    it "fails and complains about patchlevel on patchlevel mismatch",
+    it "installs gems ignoring the mismatch even when patchlevel is mismatch",
       if: RUBY_PATCHLEVEL >= 0 do
       patchlevel = RUBY_PATCHLEVEL.to_i + 1
       build_lib("foo", path: bundled_app) do |s|
@@ -135,9 +135,7 @@ module Persistent💎
         gemspec
       G
 
-      expect(err).to include("Ruby patchlevel")
-      expect(err).to include("but your Gemfile specified")
-      expect(exitstatus).to eq(18)
+      expect(the_bundle).to include_gems "foo 1.0"
     end
 
     it "fails and complains about version on version mismatch" do