From 394cd143f007e03db70d72c353bf5d3752139b21 Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Thu, 9 Jan 2020 15:33:23 +0100 Subject: Reactivate usused code for ruby version resolution The code was changed in commit 38b0e7ed64c3ca1c40f43c5aa9a1ead2f6cd7049 so that RubyVersion.system was no longer respected. This is reactivated now and specs are adjusted accordingly. --- lib/bundler/definition.rb | 4 ++-- spec/install/gems/resolving_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 3e5186039a..efd7618194 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -860,8 +860,8 @@ module Bundler @metadata_dependencies ||= begin ruby_versions = concat_ruby_version_requirements(@ruby_version) if ruby_versions.empty? || !@ruby_version.exact? - concat_ruby_version_requirements(RubyVersion.system) - concat_ruby_version_requirements(locked_ruby_version_object) unless @unlock[:ruby] + concat_ruby_version_requirements(RubyVersion.system, ruby_versions) + concat_ruby_version_requirements(locked_ruby_version_object, ruby_versions) unless @unlock[:ruby] end [ Dependency.new("Ruby\0", ruby_versions), diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb index 547d13134f..20fe4c7728 100644 --- a/spec/install/gems/resolving_spec.rb +++ b/spec/install/gems/resolving_spec.rb @@ -194,7 +194,7 @@ RSpec.describe "bundle install with install-time dependencies" do describe "with a < requirement" do let(:ruby_requirement) { %("< 5000") } - let(:error_message_requirement) { "< 5000" } + let(:error_message_requirement) { Gem::Requirement.new(["< 5000", "= #{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"]).to_s } it_behaves_like "ruby version conflicts" end @@ -202,7 +202,7 @@ RSpec.describe "bundle install with install-time dependencies" do describe "with a compound requirement" do let(:reqs) { ["> 0.1", "< 5000"] } let(:ruby_requirement) { reqs.map(&:dump).join(", ") } - let(:error_message_requirement) { Gem::Requirement.new(reqs).to_s } + let(:error_message_requirement) { Gem::Requirement.new(reqs + ["= #{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"]).to_s } it_behaves_like "ruby version conflicts" end -- cgit v1.2.1