From 699813b65f8504c6bb787ac3c8b7fe6419e76cdf Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Sat, 3 Jan 2026 10:12:19 -0800 Subject: [PATCH 1/4] [ruby/rubygems] Remove date require from rebuild command As far as I can see, this isn't used. https://github.com/ruby/rubygems/commit/67c97e7180 --- lib/rubygems/commands/rebuild_command.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/rubygems/commands/rebuild_command.rb b/lib/rubygems/commands/rebuild_command.rb index 77a474ef1ddf32..23b9d7b3ba925b 100644 --- a/lib/rubygems/commands/rebuild_command.rb +++ b/lib/rubygems/commands/rebuild_command.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "date" require "digest" require "fileutils" require "tmpdir" From 01e8b38f601c4866738a76df4361f2b4df0fc300 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 5 Jan 2026 10:55:47 +0900 Subject: [PATCH 2/4] Use RUBY_VERSION in specs instead of hardcoded 'Ruby 4.0.0' to make tests version-independent --- spec/bundled_gems_spec.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/bundled_gems_spec.rb b/spec/bundled_gems_spec.rb index c2a655929ab7bf..e86b5ce6e8c0a7 100644 --- a/spec/bundled_gems_spec.rb +++ b/spec/bundled_gems_spec.rb @@ -113,7 +113,7 @@ def script(code, options = {}) require "active_support/all" RUBY - expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/) + expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/) expect(err).to include(/lib\/active_support\/all\.rb:1/) end @@ -159,7 +159,7 @@ def script(code, options = {}) bundle "exec ruby script.rb" - expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/) + expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/) expect(err).to include(/script\.rb:8/) end @@ -177,7 +177,7 @@ def script(code, options = {}) bundle "exec ./script.rb" - expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/) + expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/) expect(err).to include(/script\.rb:9/) end @@ -186,7 +186,7 @@ def script(code, options = {}) create_file("Gemfile", "source 'https://rubygems.org'") bundle "exec ruby -r./stub -ropenssl -e ''" - expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/) + expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/) end it "Show warning when warn is not the standard one in the current scope" do @@ -209,7 +209,7 @@ def my My.my RUBY - expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/) + expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/) expect(err).to include(/-e:19/) end @@ -251,7 +251,7 @@ def my require Gem::BUNDLED_GEMS::ARCHDIR + 'openssl' RUBY - expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/) + expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/) # TODO: We should assert caller location like below: # test_warn_bootsnap.rb:14: warning: ... end @@ -320,7 +320,7 @@ def my create_file("Gemfile", "source 'https://rubygems.org'") bundle "exec ruby script.rb" - expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/) + expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/) expect(err).to include(/script\.rb:13/) end From e6762d23cb14411ec026b324c5c15c339158ddc4 Mon Sep 17 00:00:00 2001 From: Shugo Maeda Date: Mon, 5 Jan 2026 11:49:48 +0900 Subject: [PATCH 3/4] [DOC] Fix a typo and trim trailing whitespace per .editorconfig --- LEGAL | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/LEGAL b/LEGAL index cb1b867c23bd81..2777aa2c148bb8 100644 --- a/LEGAL +++ b/LEGAL @@ -713,9 +713,8 @@ mentioned below. Copyright (c) 2022 James Edward Anhalt III - https://github.com/jeaiii/itoa {MIT License}[rdoc-ref:@MIT+License] - -[ext/json/ext/vendor/ryu.h] +[ext/json/vendor/ryu.h] This file is adapted from the Ryu algorithm by Ulf Adams https://github.com/ulfjack/ryu. It is dual-licensed under {Apache License 2.0}[rdoc-ref:@Apache+License+2.0] OR {Boost Software License 1.0}[rdoc-ref:@Boost+Software+License+1.0]. @@ -1071,21 +1070,21 @@ mentioned below. >>> Boost Software License - Version 1.0 - August 17th, 2003 - + Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: - + The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT From 99bd18b5b8071659ac9f035eea173b445326f8ad Mon Sep 17 00:00:00 2001 From: Tsutomu Katsube Date: Fri, 2 Jan 2026 20:10:16 +0900 Subject: [PATCH 4/4] Unskip RBS test on Windows for NoMemoryError workaround test-unit 3.7.7 has been fixed this problem. See also: https://github.com/test-unit/test-unit/releases/tag/3.7.7 --- tool/rbs_skip_tests_windows | 2 -- 1 file changed, 2 deletions(-) diff --git a/tool/rbs_skip_tests_windows b/tool/rbs_skip_tests_windows index 35e78e237f1668..db12c69419e88e 100644 --- a/tool/rbs_skip_tests_windows +++ b/tool/rbs_skip_tests_windows @@ -106,8 +106,6 @@ test_new(TempfileSingletonTest) # Errno::EACCES: Permission denied @ apply2files - C:/a/_temp/d20250813-10156-f8z9pn/test.gz test_open(ZlibGzipReaderSingletonTest) -test_reachable_objects_from_root(ObjectSpaceTest) To avoid NoMemoryError with test-unit 3.7.5 - # Errno::EACCES: Permission denied @ rb_file_s_rename # D:/a/ruby/ruby/src/lib/rubygems/util/atomic_file_writer.rb:42:in 'File.rename' test_write_binary(GemSingletonTest)