From 84edb8456e90ae79428bf5e5db3accf29cdc9999 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 25 Dec 2025 11:47:08 +0900 Subject: [PATCH 1/4] Revert "Rollback to minitest-5.27.0" This reverts commit 8d097bc472fc66221dee23bb8f9e0dddac16db23. --- NEWS.md | 2 +- gems/bundled_gems | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 991f34965fe1fc..5d932fbf5d34f0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -373,7 +373,7 @@ The following default gems are updated. The following bundled gems are updated. -* minitest 5.27.0 +* minitest 6.0.0 * power_assert 3.0.1 * 2.0.5 to [v3.0.0][power_assert-v3.0.0], [v3.0.1][power_assert-v3.0.1] * rake 13.3.1 diff --git a/gems/bundled_gems b/gems/bundled_gems index 82dffd091e9edb..9461122e62dd73 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -6,7 +6,7 @@ # - revision: revision in repository-url to test # if `revision` is not given, "v"+`version` or `version` will be used. -minitest 5.27.0 https://github.com/minitest/minitest +minitest 6.0.0 https://github.com/minitest/minitest power_assert 3.0.1 https://github.com/ruby/power_assert rake 13.3.1 https://github.com/ruby/rake test-unit 3.7.5 https://github.com/test-unit/test-unit From b908306f99db834470167d569b81661d7b19a02b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 25 Dec 2025 11:45:27 +0900 Subject: [PATCH 2/4] [DOC] Reword "Regular Expression" to "Matched Data" `$~` and its accessors are related to regular expressions, but are not themselves. --- doc/language/globals.md | 4 ++-- doc/string/partition.rdoc | 4 ++-- doc/string/rpartition.rdoc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/language/globals.md b/doc/language/globals.md index 905a23ed05dbe4..dc891ff28addd1 100644 --- a/doc/language/globals.md +++ b/doc/language/globals.md @@ -19,7 +19,7 @@ require 'English' | `$!` | `$ERROR_INFO` | \Exception object or `nil` | `nil` | Yes | Kernel#raise | | `$@` | `$ERROR_POSITION` | \Array of backtrace positions or `nil` | `nil` | Yes | Kernel#raise | -### Regular Expression +### Matched Data | Variable | \English | Contains | Initially | Read-Only | Reset By | |:-------------:|:-------------------:|-----------------------------------|:---------:|:---------:|-----------------| @@ -127,7 +127,7 @@ Output: English - `$ERROR_POSITION`. -## Regular Expression +## Matched Data These global variables store information about the most recent successful match in the current scope. diff --git a/doc/string/partition.rdoc b/doc/string/partition.rdoc index 86c3a9ca0a975a..d822f8ec0e0738 100644 --- a/doc/string/partition.rdoc +++ b/doc/string/partition.rdoc @@ -17,7 +17,7 @@ Note that in the examples below, a returned string 'hello' is a copy of +self+, not +self+. If +pattern+ is a Regexp, performs the equivalent of self.match(pattern) -(also setting {pattern-matching global variables}[rdoc-ref:language/globals.md@Regular+Expression]): +(also setting {matched-data variables}[rdoc-ref:language/globals.md@Matched+Data]): 'hello'.partition(/h/) # => ["", "h", "ello"] 'hello'.partition(/l/) # => ["he", "l", "lo"] @@ -30,7 +30,7 @@ If +pattern+ is a Regexp, performs the equivalent of self.match(pattern)self.index(pattern) -(and does _not_ set {pattern-matching global variables}[rdoc-ref:language/globals.md@Regular+Expression]): +(and does _not_ set {matched-data global variables}[rdoc-ref:language/globals.md@Matched+Data]): 'hello'.partition('h') # => ["", "h", "ello"] 'hello'.partition('l') # => ["he", "l", "lo"] diff --git a/doc/string/rpartition.rdoc b/doc/string/rpartition.rdoc index 879b6ee2864295..6a17b5e944bffc 100644 --- a/doc/string/rpartition.rdoc +++ b/doc/string/rpartition.rdoc @@ -23,7 +23,7 @@ The pattern used is: Note that in the examples below, a returned string 'hello' is a copy of +self+, not +self+. If +pattern+ is a Regexp, searches for the last matching substring -(also setting {pattern-matching global variables}[rdoc-ref:language/globals.md@Regular+Expression]): +(also setting {matched-data global variables}[rdoc-ref:language/globals.md@Matched+Data]): 'hello'.rpartition(/l/) # => ["hel", "l", "o"] 'hello'.rpartition(/ll/) # => ["he", "ll", "o"] @@ -36,7 +36,7 @@ If +pattern+ is a Regexp, searches for the last matching substring If +pattern+ is not a Regexp, converts it to a string (if it is not already one), then searches for the last matching substring -(and does _not_ set {pattern-matching global variables}[rdoc-ref:language/globals.md@Regular+Expression]): +(and does _not_ set {matched-data global variables}[rdoc-ref:language/globals.md@Matched+Data]): 'hello'.rpartition('l') # => ["hel", "l", "o"] 'hello'.rpartition('ll') # => ["he", "ll", "o"] From d375bcc965d4a0c661785fa94150f6202e99c1ce Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 25 Dec 2025 11:56:41 +0900 Subject: [PATCH 3/4] [DOC] Escape capitalized word "data" not to be linked unexpectedly --- doc/language/globals.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/language/globals.md b/doc/language/globals.md index dc891ff28addd1..83a024b141865f 100644 --- a/doc/language/globals.md +++ b/doc/language/globals.md @@ -19,7 +19,7 @@ require 'English' | `$!` | `$ERROR_INFO` | \Exception object or `nil` | `nil` | Yes | Kernel#raise | | `$@` | `$ERROR_POSITION` | \Array of backtrace positions or `nil` | `nil` | Yes | Kernel#raise | -### Matched Data +### Matched \Data | Variable | \English | Contains | Initially | Read-Only | Reset By | |:-------------:|:-------------------:|-----------------------------------|:---------:|:---------:|-----------------| @@ -127,7 +127,7 @@ Output: English - `$ERROR_POSITION`. -## Matched Data +## Matched \Data These global variables store information about the most recent successful match in the current scope. From 6a66129d6c289b0da99cd89592f5ee948da6f381 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Thu, 25 Dec 2025 15:31:50 +0900 Subject: [PATCH 4/4] fix the condition of www repo --- tool/releng/gen-mail.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/releng/gen-mail.rb b/tool/releng/gen-mail.rb index 6dc0e4cec1bf7d..17fa499d698fcd 100755 --- a/tool/releng/gen-mail.rb +++ b/tool/releng/gen-mail.rb @@ -10,7 +10,7 @@ # Confirm current directory is www.ruby-lang.org's working directory def confirm_w_r_l_o_wd File.foreach('.git/config') do |line| - return true if line.include?('git@github.com:ruby/www.ruby-lang.org.git') + return true if line.include?('ruby/www.ruby-lang.org.git') end abort "Run this script in www.ruby-lang.org's working directory" end