From 483bd8ee8da279fbf93a3b02a4d5dfc6f6acaf2a Mon Sep 17 00:00:00 2001 From: James Wen Date: Sat, 27 Feb 2016 00:13:43 -0500 Subject: [PATCH] Allow `Bundler::RubyVersion` to handle `RUBY_PATCHLEVEL` of -1 - Closes #4317 --- lib/bundler/ruby_version.rb | 3 +++ spec/bundler/ruby_version_spec.rb | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/lib/bundler/ruby_version.rb b/lib/bundler/ruby_version.rb index 800a4433f24..92f9d4c3962 100644 --- a/lib/bundler/ruby_version.rb +++ b/lib/bundler/ruby_version.rb @@ -103,6 +103,9 @@ def self.system private def matches?(requirements, version) + # Handles RUBY_PATCHLEVEL of -1 for instances like ruby-head + return requirements == version if requirements.to_s == "-1" || version.to_s == "-1" + Array(requirements).all? do |requirement| Gem::Requirement.create(requirement).satisfied_by?(Gem::Version.create(version)) end diff --git a/spec/bundler/ruby_version_spec.rb b/spec/bundler/ruby_version_spec.rb index ce68463029e..08a7e0e8e46 100644 --- a/spec/bundler/ruby_version_spec.rb +++ b/spec/bundler/ruby_version_spec.rb @@ -328,6 +328,28 @@ it_behaves_like "there is a difference in the engine versions" end + + context "with a patchlevel of -1" do + let(:version) { ">= 2.0.0" } + let(:patchlevel) { "-1" } + let(:engine) { "ruby" } + let(:engine_version) { "~> 2.0.1" } + let(:other_version) { version } + let(:other_engine) { engine } + let(:other_engine_version) { engine_version } + + context "and comparing with another patchlevel of -1" do + let(:other_patchlevel) { patchlevel } + + it_behaves_like "there are no differences" + end + + 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" + end + end end describe "#system" do