From b653be0ba572adc145dfb13ea312439edca49e68 Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Fri, 4 Oct 2024 10:48:55 -0700 Subject: [PATCH] [rubygems/rubygems] Update spec rubygems_ext Signed-off-by: Samuel Giddins https://github.com/rubygems/rubygems/commit/1ef33fa0af --- spec/bundler/support/rubygems_ext.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/spec/bundler/support/rubygems_ext.rb b/spec/bundler/support/rubygems_ext.rb index 1fc5aa16c0..5dfc2591b7 100644 --- a/spec/bundler/support/rubygems_ext.rb +++ b/spec/bundler/support/rubygems_ext.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -abort "RubyGems only supports Ruby 3.0 or higher" if RUBY_VERSION < "3.0.0" +abort "RubyGems only supports Ruby 3.1 or higher" if RUBY_VERSION < "3.1.0" require_relative "path" @@ -125,14 +125,7 @@ module Spec def gem_activate_and_possibly_install(gem_name) gem_activate(gem_name) rescue Gem::LoadError => e - # Windows 3.0 puts a Windows stub script as `rake` while it should be - # named `rake.bat`. RubyGems does not like that and avoids overwriting it - # unless explicitly instructed to do so with `force`. - if RUBY_VERSION.start_with?("3.0") && Gem.win_platform? - Gem.install(gem_name, e.requirement, force: true) - else - Gem.install(gem_name, e.requirement) - end + Gem.install(gem_name, e.requirement) retry end