From c958f48296f8c8f7b49fac902271ca13f5379142 Mon Sep 17 00:00:00 2001
From: ParadoxV5 <paradox.ver5@gmail.com>
Date: Sat, 28 Dec 2024 14:09:02 -0700
Subject: [PATCH 1/4] `Kernel#gets` and `ARGF#gets` *also* accept `chomp: true`

---
 core/kernel.rbs           | 2 +-
 core/rbs/unnamed/argf.rbs | 2 +-
 test/stdlib/ARGF_test.rb  | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/kernel.rbs b/core/kernel.rbs
index 262719c46..ec5220cd1 100644
--- a/core/kernel.rbs
+++ b/core/kernel.rbs
@@ -1163,7 +1163,7 @@ module Kernel : BasicObject
   # The style of programming using `$_` as an implicit parameter is gradually
   # losing favor in the Ruby community.
   #
-  def self?.gets: (?String arg0, ?Integer arg1) -> String?
+  def self?.gets: (?String sep, ?Integer limit, ?chomp: boolish) -> String?
 
   # <!--
   #   rdoc-file=eval.c
diff --git a/core/rbs/unnamed/argf.rbs b/core/rbs/unnamed/argf.rbs
index b443954f3..d0236d2b4 100644
--- a/core/rbs/unnamed/argf.rbs
+++ b/core/rbs/unnamed/argf.rbs
@@ -639,7 +639,7 @@ module RBS
       # See IO.readlines for details about getline_args.
       #
       %a{annotate:rdoc:copy:ARGF#gets}
-      def gets: (?String sep, ?Integer limit) -> String?
+      def gets: (?String sep, ?Integer limit, ?chomp: boolish) -> String?
 
       # <!--
       #   rdoc-file=io.c
diff --git a/test/stdlib/ARGF_test.rb b/test/stdlib/ARGF_test.rb
index dc7c3a8c9..63e2fa273 100644
--- a/test/stdlib/ARGF_test.rb
+++ b/test/stdlib/ARGF_test.rb
@@ -27,6 +27,10 @@ def test_gets
                       ARGF.class.new(__FILE__), :gets, "\n"
     assert_send_type  "(::String sep, ::Integer limit) -> ::String",
                       ARGF.class.new(__FILE__), :gets, "\n", 1
+    assert_send_type  "(chomp: boolish) -> ::String",
+                      ARGF.class.new(__FILE__), :gets, chomp: true
+    assert_send_type  "(::String sep, ::Integer limit, chomp: boolish) -> ::String",
+                      ARGF.class.new(__FILE__), :gets, "\n", 1, chomp: true
     assert_send_type  "() -> nil",
                       ARGF.class.new(Tempfile.new), :gets
   end

From 74c7a7ba05b7cd235cd8c0a329566b6b8a9700bd Mon Sep 17 00:00:00 2001
From: ParadoxV5 <paradox.ver5@gmail.com>
Date: Thu, 23 Jan 2025 20:09:37 -0700
Subject: [PATCH 2/4] `#readline`s and `#readlines`s *also* accept `chomp:
 true`

(wow how many `chomp: true`s are there)
* Kernel
* ARGF
* StringIO
* OpenSSL::Buffering
---
 core/kernel.rbs                |  2 +-
 core/rbs/unnamed/argf.rbs      |  4 ++--
 stdlib/openssl/0/openssl.rbs   |  2 +-
 stdlib/stringio/0/stringio.rbs |  2 +-
 test/stdlib/ARGF_test.rb       |  8 ++++++++
 test/stdlib/StringIO_test.rb   | 26 ++++++++++++++++++++++++++
 6 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/core/kernel.rbs b/core/kernel.rbs
index ec5220cd1..77d629111 100644
--- a/core/kernel.rbs
+++ b/core/kernel.rbs
@@ -1486,7 +1486,7 @@ module Kernel : BasicObject
   # Optional keyword argument `chomp` specifies whether line separators are to be
   # omitted.
   #
-  def self?.readline: (?String arg0, ?Integer arg1) -> String
+  def self?.readline: (?String arg0, ?Integer arg1, ?chomp: boolish) -> String
 
   # <!--
   #   rdoc-file=io.c
diff --git a/core/rbs/unnamed/argf.rbs b/core/rbs/unnamed/argf.rbs
index d0236d2b4..e9a599c2b 100644
--- a/core/rbs/unnamed/argf.rbs
+++ b/core/rbs/unnamed/argf.rbs
@@ -1024,7 +1024,7 @@ module RBS
       # An EOFError is raised at the end of the file.
       #
       %a{annotate:rdoc:copy:ARGF#readline}
-      def readline: (?String sep, ?Integer limit) -> String
+      def readline: (?String sep, ?Integer limit, ?chomp: boolish) -> String
 
       # <!--
       #   rdoc-file=io.c
@@ -1044,7 +1044,7 @@ module RBS
       # See `IO.readlines` for a full description of all options.
       #
       %a{annotate:rdoc:copy:ARGF#readlines}
-      def readlines: (?String sep, ?Integer limit) -> ::Array[String]
+      def readlines: (?String sep, ?Integer limit, ?chomp: boolish) -> ::Array[String]
 
       # <!--
       #   rdoc-file=io.c
diff --git a/stdlib/openssl/0/openssl.rbs b/stdlib/openssl/0/openssl.rbs
index 2b3e52f6d..77390ba7d 100644
--- a/stdlib/openssl/0/openssl.rbs
+++ b/stdlib/openssl/0/openssl.rbs
@@ -2025,7 +2025,7 @@ module OpenSSL
     #
     # Unlike IO#gets the separator must be provided if a limit is provided.
     #
-    def gets: (?String | Regexp eol, ?Integer limit) -> String?
+    def gets: (?String | Regexp eol, ?Integer limit, ?chomp: boolish) -> String?
 
     # <!--
     #   rdoc-file=ext/openssl/lib/openssl/buffering.rb
diff --git a/stdlib/stringio/0/stringio.rbs b/stdlib/stringio/0/stringio.rbs
index dc50404b8..ba3357407 100644
--- a/stdlib/stringio/0/stringio.rbs
+++ b/stdlib/stringio/0/stringio.rbs
@@ -338,7 +338,7 @@ class StringIO
 
   def readchar: () -> String
 
-  def readline: (?String sep, ?Integer limit) -> String
+  def readline: (?String sep, ?Integer limit, ?chomp: boolish) -> String
 
   # <!--
   #   rdoc-file=ext/stringio/stringio.c
diff --git a/test/stdlib/ARGF_test.rb b/test/stdlib/ARGF_test.rb
index 63e2fa273..a85d5e15d 100644
--- a/test/stdlib/ARGF_test.rb
+++ b/test/stdlib/ARGF_test.rb
@@ -64,6 +64,10 @@ def test_readline
                       ARGF.class.new(__FILE__), :readline, "\n"
     assert_send_type  "(::String sep, ::Integer limit) -> ::String",
                       ARGF.class.new(__FILE__), :readline, "\n", 1
+    assert_send_type  "(chomp: boolish) -> ::String",
+                      ARGF.class.new(__FILE__), :readline, chomp: true
+    assert_send_type  "(::String sep, ::Integer limit, chomp: boolish) -> ::String",
+                      ARGF.class.new(__FILE__), :readline, "\n", 1, chomp: true
   end
 
   def test_readlines
@@ -73,6 +77,10 @@ def test_readlines
                       ARGF.class.new(__FILE__), :readlines, "\n"
     assert_send_type  "(::String sep, ::Integer limit) -> ::Array[::String]",
                       ARGF.class.new(__FILE__), :readlines, "\n", 1
+    assert_send_type  "(chomp: boolish) -> ::Array[::String]",
+                      ARGF.class.new(__FILE__), :readlines, chomp: true
+    assert_send_type  "(::String sep, ::Integer limit, chomp: boolish) -> ::Array[::String]",
+                      ARGF.class.new(__FILE__), :readlines, "\n", 1, chomp: true
   end
 
   def test_inspect
diff --git a/test/stdlib/StringIO_test.rb b/test/stdlib/StringIO_test.rb
index a66a3664f..62745afc8 100644
--- a/test/stdlib/StringIO_test.rb
+++ b/test/stdlib/StringIO_test.rb
@@ -59,4 +59,30 @@ def test_truncate
       io, :truncate, 10
     )
   end
+
+  def test_readline
+    assert_send_type  "() -> ::String",
+                      StringIO.new("\n"), :readline
+    assert_send_type  "(::String sep) -> ::String",
+                      StringIO.new("\n"), :readline, "\n"
+    assert_send_type  "(::String sep, ::Integer limit) -> ::String",
+                      StringIO.new("\n"), :readline, "\n", 1
+    assert_send_type  "(chomp: boolish) -> ::String",
+                      StringIO.new("\n"), :readline, chomp: true
+    assert_send_type  "(::String sep, ::Integer limit, chomp: boolish) -> ::String",
+                      StringIO.new("\n"), :readline, "\n", 1, chomp: true
+  end
+
+  def test_readlines
+    assert_send_type  "() -> ::Array[::String]",
+                      StringIO.new("\n"), :readlines
+    assert_send_type  "(::String sep) -> ::Array[::String]",
+                      StringIO.new("\n"), :readlines, "\n"
+    assert_send_type  "(::String sep, ::Integer limit) -> ::Array[::String]",
+                      StringIO.new("\n"), :readlines, "\n", 1
+    assert_send_type  "(chomp: boolish) -> ::Array[::String]",
+                      StringIO.new("\n"), :readlines, chomp: true
+    assert_send_type  "(::String sep, ::Integer limit, chomp: boolish) -> ::Array[::String]",
+                      StringIO.new("\n"), :readlines, "\n", 1, chomp: true
+  end
 end

From b4b636502f6b2175f3434e0539a58ccf8cd937e6 Mon Sep 17 00:00:00 2001
From: Soutaro Matsumoto <matsumoto@soutaro.com>
Date: Thu, 27 Feb 2025 17:08:03 +0900
Subject: [PATCH 3/4] Add test for `Kernel#readlines`

---
 test/stdlib/Kernel_test.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/test/stdlib/Kernel_test.rb b/test/stdlib/Kernel_test.rb
index 94e59e338..1af2bf0dd 100644
--- a/test/stdlib/Kernel_test.rb
+++ b/test/stdlib/Kernel_test.rb
@@ -561,4 +561,25 @@ def test_raise
       end
     end
   end
+
+  def test_readlines
+    $stdin = File.open(__FILE__)
+
+    assert_send_type(
+      "() -> Array[String]",
+      JustKernel.new, :readlines
+    )
+
+    with_int(3) do |limit|
+      with_string(",") do |separator|
+        $stdin = File.open(__FILE__)
+        assert_send_type(
+          "(string, int, chomp: bool) -> Array[String]",
+          JustKernel.new, :readlines, ",", 3, chomp: true
+        )
+      end
+    end
+  ensure
+    $stdin = STDIN
+  end
 end

From 5f398df180c847a242c7af8a2d2897241e9948a0 Mon Sep 17 00:00:00 2001
From: Soutaro Matsumoto <matsumoto@soutaro.com>
Date: Thu, 27 Feb 2025 17:25:15 +0900
Subject: [PATCH 4/4] Run CGI_test in dedicated ruby process

---
 Rakefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 908555fa8..c4fdbbaa2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -112,7 +112,7 @@ end
 
 task :stdlib_test => :compile do
   test_files = FileList["test/stdlib/**/*_test.rb"].reject do |path|
-    path =~ %r{Ractor} || path =~ %r{Encoding}
+    path =~ %r{Ractor} || path =~ %r{Encoding} || path =~ %r{CGI_test}
   end
 
   if ENV["RANDOMIZE_STDLIB_TEST_ORDER"] == "true"
@@ -121,6 +121,7 @@ task :stdlib_test => :compile do
 
   sh "#{ruby} -Ilib #{bin}/test_runner.rb #{test_files.join(' ')}"
   # TODO: Ractor tests need to be run in a separate process
+  sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/CGI_test.rb"
   sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/Ractor_test.rb"
   sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/Encoding_test.rb"
 end