From 0aa18752cfcc2e9bd47afe57348ddc0fc966c981 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 3 Nov 2021 18:34:13 +0900
Subject: [PATCH 01/26] Fix typo [ci skip]

---
 test/optparse/test_did_you_mean.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/optparse/test_did_you_mean.rb b/test/optparse/test_did_you_mean.rb
index 7630625..f191f03 100644
--- a/test/optparse/test_did_you_mean.rb
+++ b/test/optparse/test_did_you_mean.rb
@@ -44,7 +44,7 @@ def test_verbose
     end
   end
 
-  def test_ambiguos
+  def test_ambiguous
     assert_raise_with_message(OptionParser::AmbiguousOption, /ambiguous option: --ba\nDid you mean\?\s+bar\s+baz\Z/) do
       @opt.permute!(%w"--ba")
     end

From 61df7522f80a04ce40fc7dea655d4b016f224c83 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 3 Nov 2021 19:52:14 +0900
Subject: [PATCH 02/26] Remove the test for deprecated
 DidYouMean::VerboseFormatter

---
 test/optparse/test_did_you_mean.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/test/optparse/test_did_you_mean.rb b/test/optparse/test_did_you_mean.rb
index f191f03..aa866f4 100644
--- a/test/optparse/test_did_you_mean.rb
+++ b/test/optparse/test_did_you_mean.rb
@@ -36,14 +36,6 @@ def test_plain
     end
   end
 
-  def test_verbose
-    require 'did_you_mean/formatters/verbose_formatter'
-    ::DidYouMean.formatter = ::DidYouMean::VerboseFormatter.new
-    assert_raise_with_message(OptionParser::InvalidOption, /invalid option: --baa\n\s+Did you mean\?\s+bar\s+baz\s*\Z/) do
-      @opt.permute!(%w"--baa")
-    end
-  end
-
   def test_ambiguous
     assert_raise_with_message(OptionParser::AmbiguousOption, /ambiguous option: --ba\nDid you mean\?\s+bar\s+baz\Z/) do
       @opt.permute!(%w"--ba")

From faf8e5c8fba85ae2dda8d9d882de4c7016b31ec5 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Tue, 14 Dec 2021 20:49:32 -0800
Subject: [PATCH 03/26] s/RubyVM::JIT/RubyVM::MJIT/g (#29)

---
 test/lib/core_assertions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lib/core_assertions.rb b/test/lib/core_assertions.rb
index 4471525..bac3856 100644
--- a/test/lib/core_assertions.rb
+++ b/test/lib/core_assertions.rb
@@ -100,7 +100,7 @@ def syntax_check(code, fname, line)
 
       def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: false, **opt)
         # TODO: consider choosing some appropriate limit for MJIT and stop skipping this once it does not randomly fail
-        pend 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::JIT) && RubyVM::JIT.enabled?
+        pend 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
 
         require_relative 'memory_status'
         raise Test::Unit::PendedError, "unsupported platform" unless defined?(Memory::Status)

From e4f26821283dbf7d7dba8973e332641cff3f119f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Tue, 4 Jan 2022 08:32:45 +0100
Subject: [PATCH 04/26] Use `require_relative` for internal requires (#28)

---
 lib/optparse/ac.rb         | 2 +-
 lib/optparse/date.rb       | 2 +-
 lib/optparse/kwargs.rb     | 2 +-
 lib/optparse/shellwords.rb | 2 +-
 lib/optparse/time.rb       | 2 +-
 lib/optparse/uri.rb        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/optparse/ac.rb b/lib/optparse/ac.rb
index 9d52010..0953725 100644
--- a/lib/optparse/ac.rb
+++ b/lib/optparse/ac.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require 'optparse'
+require_relative '../optparse'
 
 class OptionParser::AC < OptionParser
   private
diff --git a/lib/optparse/date.rb b/lib/optparse/date.rb
index d6649c8..7bbf12b 100644
--- a/lib/optparse/date.rb
+++ b/lib/optparse/date.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require 'optparse'
+require_relative '../optparse'
 require 'date'
 
 OptionParser.accept(DateTime) do |s,|
diff --git a/lib/optparse/kwargs.rb b/lib/optparse/kwargs.rb
index ccf20c6..992aca4 100644
--- a/lib/optparse/kwargs.rb
+++ b/lib/optparse/kwargs.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'optparse'
+require_relative '../optparse'
 
 class OptionParser
   # :call-seq:
diff --git a/lib/optparse/shellwords.rb b/lib/optparse/shellwords.rb
index bf31701..4feb199 100644
--- a/lib/optparse/shellwords.rb
+++ b/lib/optparse/shellwords.rb
@@ -2,6 +2,6 @@
 # -*- ruby -*-
 
 require 'shellwords'
-require 'optparse'
+require_relative '../optparse'
 
 OptionParser.accept(Shellwords) {|s,| Shellwords.shellwords(s)}
diff --git a/lib/optparse/time.rb b/lib/optparse/time.rb
index ffc6ff0..0ce651f 100644
--- a/lib/optparse/time.rb
+++ b/lib/optparse/time.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require 'optparse'
+require_relative '../optparse'
 require 'time'
 
 OptionParser.accept(Time) do |s,|
diff --git a/lib/optparse/uri.rb b/lib/optparse/uri.rb
index 51550cf..31d1059 100644
--- a/lib/optparse/uri.rb
+++ b/lib/optparse/uri.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 # -*- ruby -*-
 
-require 'optparse'
+require_relative '../optparse'
 require 'uri'
 
 OptionParser.accept(URI) {|s,| URI.parse(s) if s}

From ed283559d492e917f1c28b0ece9ea9c3e1327016 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 12 Jan 2022 18:16:30 +0900
Subject: [PATCH 05/26] Add .document files

---
 .document              | 7 +++++++
 doc/optparse/.document | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 .document
 create mode 100644 doc/optparse/.document

diff --git a/.document b/.document
new file mode 100644
index 0000000..f175b1d
--- /dev/null
+++ b/.document
@@ -0,0 +1,7 @@
+COPYING
+ChangeLog
+README.md
+doc/
+lib/
+logs/
+misc/
diff --git a/doc/optparse/.document b/doc/optparse/.document
new file mode 100644
index 0000000..96dfc77
--- /dev/null
+++ b/doc/optparse/.document
@@ -0,0 +1 @@
+*.rdoc

From d182cd60b58eb6bc537f23b0309cde187309056b Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 12 Jan 2022 18:17:22 +0900
Subject: [PATCH 06/26] Add rdoc options

Specify the main page and the page directory.  Also in Rakefile,
extract and use the same options from the gemspec file.
---
 Rakefile         | 2 +-
 optparse.gemspec | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 2262982..29d9a18 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,5 +16,5 @@ end
 task :default => :test
 
 task :rdoc do
-  sh("rdoc", "--op", "rdoc")
+  sh("rdoc", *Bundler::GemHelper.instance.gemspec.rdoc_options, ".")
 end
diff --git a/optparse.gemspec b/optparse.gemspec
index ae65966..a4287dd 100644
--- a/optparse.gemspec
+++ b/optparse.gemspec
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
 
   spec.files         = Dir["{doc,lib,misc}/**/*"] + %w[README.md ChangeLog COPYING]
+  spec.rdoc_options  = ["--main=README.md", "--op=rdoc", "--page-dir=doc"]
   spec.bindir        = "exe"
   spec.executables   = []
   spec.require_paths = ["lib"]

From dab72c543db6c0c0f89a470006ae71390adf0c50 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 12 Jan 2022 18:22:11 +0900
Subject: [PATCH 07/26] Fix links to the page directory files

https://bugs.ruby-lang.org/issues/18468
---
 doc/optparse/creates_option.rdoc | 4 ++--
 doc/optparse/option_params.rdoc  | 2 +-
 doc/optparse/tutorial.rdoc       | 4 ++--
 lib/optparse.rb                  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/optparse/creates_option.rdoc b/doc/optparse/creates_option.rdoc
index 131c877..ad52c66 100644
--- a/doc/optparse/creates_option.rdoc
+++ b/doc/optparse/creates_option.rdoc
@@ -1,7 +1,7 @@
 Creates an option from the given parameters +params+.
-See {Parameters for New Options}[./doc/optparse/option_params_rdoc.html].
+See {Parameters for New Options}[./option_params.rdoc].
 
 The block, if given, is the handler for the created option.
 When the option is encountered during command-line parsing,
 the block is called with the argument given for the option, if any.
-See {Option Handlers}[./option_params_rdoc.html#label-Option+Handlers].
+See {Option Handlers}[./option_params.rdoc#label-Option+Handlers].
diff --git a/doc/optparse/option_params.rdoc b/doc/optparse/option_params.rdoc
index 3e6cb1b..b2e4e1a 100644
--- a/doc/optparse/option_params.rdoc
+++ b/doc/optparse/option_params.rdoc
@@ -410,7 +410,7 @@ from the default \String to an instance of another class.
 There are a number of built-in converters.
 You can also define custom converters.
 
-See {Argument Converters}[./argument_converters_rdoc.html].
+See {Argument Converters}[./argument_converters.rdoc].
 
 === Descriptions
 
diff --git a/doc/optparse/tutorial.rdoc b/doc/optparse/tutorial.rdoc
index 1d7c52b..19c86b9 100644
--- a/doc/optparse/tutorial.rdoc
+++ b/doc/optparse/tutorial.rdoc
@@ -541,7 +541,7 @@ Executions:
   [#<Date: 2001-02-03 ((2451944j,0s,0n),+0s,2299161j)>, Date]
 
 You can also define custom converters.
-See {Argument Converters}[./argument_converters_rdoc.html]
+See {Argument Converters}[./argument_converters.rdoc]
 for both built-in and custom converters.
 
 === Help
@@ -657,7 +657,7 @@ Though you may never need to call it directly,
 here's the core method for defining an option:
 
 - \Method \OptionParser#make_switch accepts an array of parameters and a block.
-  See {Parameters for New Options}[./option_params_rdoc.html].
+  See {Parameters for New Options}[./option_params.rdoc].
   This method is unlike others here in that it:
   - Accepts an <em>array of parameters</em>;
     others accept a <em>sequence of parameter arguments</em>.
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 61dd87f..a61eff3 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -50,7 +50,7 @@
 #
 # === New to \OptionParser?
 #
-# See the {Tutorial}[./doc/optparse/tutorial_rdoc.html].
+# See the {Tutorial}[optparse/tutorial.rdoc].
 #
 # === Introduction
 #
@@ -420,7 +420,7 @@
 # === Further documentation
 #
 # The above examples, along with the accompanying
-# {Tutorial}[./doc/optparse/tutorial_rdoc.html],
+# {Tutorial}[optparse/tutorial.rdoc],
 # should be enough to learn how to use this class.
 # If you have any questions, file a ticket at http://bugs.ruby-lang.org.
 #

From 0ac99576964657f7f44dadcca4c2546594076f88 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 12 Jan 2022 19:37:33 +0900
Subject: [PATCH 08/26] DidYouMean::PlainFormatter is deprecated

---
 test/optparse/test_did_you_mean.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/optparse/test_did_you_mean.rb b/test/optparse/test_did_you_mean.rb
index aa866f4..14f6ebe 100644
--- a/test/optparse/test_did_you_mean.rb
+++ b/test/optparse/test_did_you_mean.rb
@@ -12,16 +12,20 @@ def setup
     @opt.def_option("--foo", Integer) { |v| @foo = v }
     @opt.def_option("--bar", Integer) { |v| @bar = v }
     @opt.def_option("--baz", Integer) { |v| @baz = v }
-    @formatter = ::DidYouMean.formatter
-    case @formatter
-    when ::DidYouMean::PlainFormatter
-    else
-      ::DidYouMean.formatter = ::DidYouMean::PlainFormatter.new
+    unless ::DidYouMean::Formatter.respond_to?(:message_for)
+      @formatter = ::DidYouMean.formatter
+      case @formatter
+      when ::DidYouMean::PlainFormatter
+      else
+        ::DidYouMean.formatter = ::DidYouMean::PlainFormatter.new
+      end
     end
   end
 
   def teardown
-    ::DidYouMean.formatter = @formatter
+    unless ::DidYouMean::Formatter.respond_to?(:message_for)
+      ::DidYouMean.formatter = @formatter
+    end
   end
 
   def test_no_suggestion

From 9e29d86c12819dc383e042cc0059224299a8fcd8 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 12 Jan 2022 20:58:54 +0900
Subject: [PATCH 09/26] Fix for ruby 3.0 or earlier

---
 test/optparse/test_did_you_mean.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/optparse/test_did_you_mean.rb b/test/optparse/test_did_you_mean.rb
index 14f6ebe..4c6da4f 100644
--- a/test/optparse/test_did_you_mean.rb
+++ b/test/optparse/test_did_you_mean.rb
@@ -12,8 +12,10 @@ def setup
     @opt.def_option("--foo", Integer) { |v| @foo = v }
     @opt.def_option("--bar", Integer) { |v| @bar = v }
     @opt.def_option("--baz", Integer) { |v| @baz = v }
-    unless ::DidYouMean::Formatter.respond_to?(:message_for)
-      @formatter = ::DidYouMean.formatter
+    @formatter = ::DidYouMean.formatter
+    if ::DidYouMean.const_defined?(:Formatter)
+      ::DidYouMean.formatter = ::DidYouMean::Formatter
+    else
       case @formatter
       when ::DidYouMean::PlainFormatter
       else
@@ -23,9 +25,7 @@ def setup
   end
 
   def teardown
-    unless ::DidYouMean::Formatter.respond_to?(:message_for)
-      ::DidYouMean.formatter = @formatter
-    end
+    ::DidYouMean.formatter = @formatter
   end
 
   def test_no_suggestion

From 5bc8b13b8806bac75f8aa0adeaa75a6631b992ec Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Fri, 25 Mar 2022 16:49:09 +0900
Subject: [PATCH 10/26] Added dependabot (#30)

---
 .github/dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..b18fd29
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

From 482a42668e7228485b3274cfb0523af87ab44e56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Mar 2022 16:56:25 +0900
Subject: [PATCH 11/26] Bump actions/checkout from 2 to 3 (#31)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eaac9f6..cc117eb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
         git config --global core.autocrlf false
         git config --global core.eol lf
         git config --global advice.detachedHead 0
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

From a3f0ec21b19bd26111f1025fd8434e55beef309d Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Mon, 4 Apr 2022 15:05:15 +0900
Subject: [PATCH 12/26] Define `inspect` and `pretty_inspect`

---
 lib/optparse.rb | 73 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/lib/optparse.rb b/lib/optparse.rb
index a61eff3..ec37bde 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -674,6 +674,29 @@ def compsys(sdone, ldone)   # :nodoc:
       end
     end
 
+    def pretty_print_contents(q) # :nodoc:
+      if @block
+        q.text ":" + @block.source_location.join(":") + ":"
+        first = false
+      else
+        first = true
+      end
+      [@short, @long].each do |list|
+        list.each do |opt|
+          if first
+            q.text ":"
+            first = false
+          end
+          q.breakable
+          q.text opt
+        end
+      end
+    end
+
+    def pretty_print(q)         # :nodoc:
+      q.object_group(self) {pretty_print_contents(q)}
+    end
+
     #
     # Switch that takes no arguments.
     #
@@ -693,6 +716,10 @@ def self.incompatible_argument_styles(*)
       def self.pattern
         Object
       end
+
+      def pretty_head           # :nodoc:
+        "NoArgument"
+      end
     end
 
     #
@@ -710,6 +737,10 @@ def parse(arg, argv)
         end
         conv_arg(*parse_arg(arg, &method(:raise)))
       end
+
+      def pretty_head           # :nodoc:
+        "Required"
+      end
     end
 
     #
@@ -727,6 +758,10 @@ def parse(arg, argv, &error)
           conv_arg(arg)
         end
       end
+
+      def pretty_head           # :nodoc:
+        "Optional"
+      end
     end
 
     #
@@ -750,6 +785,10 @@ def parse(arg, argv, &error)
         end
         val
       end
+
+      def pretty_head           # :nodoc:
+        "Placed"
+      end
     end
   end
 
@@ -781,6 +820,17 @@ def initialize
       @list = []
     end
 
+    def pretty_print(q)         # :nodoc:
+      q.group(1, "(", ")") do
+        @list.each do |sw|
+          next unless Switch === sw
+          q.group(1, "(" + sw.pretty_head, ")") do
+            sw.pretty_print_contents(q)
+          end
+        end
+      end
+    end
+
     #
     # See OptionParser.accept.
     #
@@ -1293,6 +1343,29 @@ def summarize(to = [], width = @summary_width, max = width - 1, indent = @summar
   def help; summarize("#{banner}".sub(/\n?\z/, "\n")) end
   alias to_s help
 
+  def pretty_print(q)           # :nodoc:
+    q.object_group(self) do
+      first = true
+      if @stack.size > 2
+        @stack.each_with_index do |s, i|
+          next if i < 2
+          next if s.list.empty?
+          if first
+            first = false
+            q.text ":"
+          end
+          q.breakable
+          s.pretty_print(q)
+        end
+      end
+    end
+  end
+
+  def inspect                   # :nodoc:
+    require 'pp'
+    pretty_print_inspect
+  end
+
   #
   # Returns option summary list.
   #

From 3653d5b909d876d3322546a4c2157ea5a94df1b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 03:21:22 +0000
Subject: [PATCH 13/26] Bump actions/upload-artifact from 2 to 3

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cc117eb..d84dacb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
         RUNNING_OS: ${{matrix.os}}
       shell: bash
     - name: Upload package
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: pkg/*.gem
         name: ${{steps.build.outputs.pkg}}

From 2bea3b38c354c3a49b5705f9f560eef522b4b1e2 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Thu, 14 Apr 2022 11:15:57 -0400
Subject: [PATCH 14/26] Fix broken links in docs

---
 doc/optparse/creates_option.rdoc | 4 ++--
 doc/optparse/tutorial.rdoc       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/optparse/creates_option.rdoc b/doc/optparse/creates_option.rdoc
index ad52c66..ab672d5 100644
--- a/doc/optparse/creates_option.rdoc
+++ b/doc/optparse/creates_option.rdoc
@@ -1,7 +1,7 @@
 Creates an option from the given parameters +params+.
-See {Parameters for New Options}[./option_params.rdoc].
+See {Parameters for New Options}[optparse/option_params.rdoc].
 
 The block, if given, is the handler for the created option.
 When the option is encountered during command-line parsing,
 the block is called with the argument given for the option, if any.
-See {Option Handlers}[./option_params.rdoc#label-Option+Handlers].
+See {Option Handlers}[optparse/option_params.rdoc#label-Option+Handlers].
diff --git a/doc/optparse/tutorial.rdoc b/doc/optparse/tutorial.rdoc
index 19c86b9..b950898 100644
--- a/doc/optparse/tutorial.rdoc
+++ b/doc/optparse/tutorial.rdoc
@@ -657,7 +657,7 @@ Though you may never need to call it directly,
 here's the core method for defining an option:
 
 - \Method \OptionParser#make_switch accepts an array of parameters and a block.
-  See {Parameters for New Options}[./option_params.rdoc].
+  See {Parameters for New Options}[optparse/option_params.rdoc].
   This method is unlike others here in that it:
   - Accepts an <em>array of parameters</em>;
     others accept a <em>sequence of parameter arguments</em>.

From 4b47d9c24b3b143bc661c3ef5d0de9f71882b4ce Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Fri, 22 Apr 2022 13:01:43 -0700
Subject: [PATCH 15/26] Avoid defining the same test class in multiple files

Should fix issues with parallel testing sometimes not running all
tests.

This should be viewed skipping whitespace changes.

Fixes [Bug #18731]
---
 test/optparse/test_acceptable.rb      |  2 +-
 test/optparse/test_autoconf.rb        |  4 +---
 test/optparse/test_bash_completion.rb |  4 +---
 test/optparse/test_cclass.rb          |  2 +-
 test/optparse/test_did_you_mean.rb    |  2 +-
 test/optparse/test_getopts.rb         |  4 +---
 test/optparse/test_kwargs.rb          |  4 +---
 test/optparse/test_noarg.rb           |  6 +++---
 test/optparse/test_optarg.rb          |  2 +-
 test/optparse/test_placearg.rb        |  2 +-
 test/optparse/test_reqarg.rb          | 10 +++++-----
 test/optparse/test_summary.rb         |  2 +-
 test/optparse/test_zsh_completion.rb  |  4 +---
 13 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/test/optparse/test_acceptable.rb b/test/optparse/test_acceptable.rb
index 12f7886..12f5322 100644
--- a/test/optparse/test_acceptable.rb
+++ b/test/optparse/test_acceptable.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-class TestOptionParser::Acceptable < TestOptionParser
+class TestOptionParserAcceptable < TestOptionParser
 
   def setup
     super
diff --git a/test/optparse/test_autoconf.rb b/test/optparse/test_autoconf.rb
index 45f2ba0..ec87744 100644
--- a/test/optparse/test_autoconf.rb
+++ b/test/optparse/test_autoconf.rb
@@ -2,9 +2,7 @@
 require 'test/unit'
 require 'optparse/ac'
 
-class TestOptionParser < Test::Unit::TestCase; end
-
-class TestOptionParser::AutoConf < Test::Unit::TestCase
+class TestOptionParserAutoConf < Test::Unit::TestCase
   def setup
     @opt = OptionParser::AC.new
     @foo = @bar = self.class
diff --git a/test/optparse/test_bash_completion.rb b/test/optparse/test_bash_completion.rb
index 513e986..60c82f7 100644
--- a/test/optparse/test_bash_completion.rb
+++ b/test/optparse/test_bash_completion.rb
@@ -2,9 +2,7 @@
 require 'test/unit'
 require 'optparse'
 
-class TestOptionParser < Test::Unit::TestCase
-end
-class TestOptionParser::BashCompletion < Test::Unit::TestCase
+class TestOptionParserBashCompletion < Test::Unit::TestCase
   def setup
     @opt = OptionParser.new
     @opt.define("-z", "zzz") {}
diff --git a/test/optparse/test_cclass.rb b/test/optparse/test_cclass.rb
index ac46f46..0ded61f 100644
--- a/test/optparse/test_cclass.rb
+++ b/test/optparse/test_cclass.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-class TestOptionParser::CClass < TestOptionParser
+class TestOptionParserCClass < TestOptionParser
   def test_no_argument
     flags = []
     @opt.def_option("-[a-z]") {|x| flags << x}
diff --git a/test/optparse/test_did_you_mean.rb b/test/optparse/test_did_you_mean.rb
index 4c6da4f..3c92392 100644
--- a/test/optparse/test_did_you_mean.rb
+++ b/test/optparse/test_did_you_mean.rb
@@ -6,7 +6,7 @@
   return
 end
 
-class TestOptionParser::DidYouMean < TestOptionParser
+class TestOptionParserDidYouMean < TestOptionParser
   def setup
     super
     @opt.def_option("--foo", Integer) { |v| @foo = v }
diff --git a/test/optparse/test_getopts.rb b/test/optparse/test_getopts.rb
index 3711e6f..7d9160f 100644
--- a/test/optparse/test_getopts.rb
+++ b/test/optparse/test_getopts.rb
@@ -2,9 +2,7 @@
 require 'test/unit'
 require 'optparse'
 
-class TestOptionParser < Test::Unit::TestCase
-end
-class TestOptionParser::Getopts < Test::Unit::TestCase
+class TestOptionParserGetopts < Test::Unit::TestCase
   def setup
     @opt = OptionParser.new
   end
diff --git a/test/optparse/test_kwargs.rb b/test/optparse/test_kwargs.rb
index 78d7e2e..2e826bf 100644
--- a/test/optparse/test_kwargs.rb
+++ b/test/optparse/test_kwargs.rb
@@ -3,9 +3,7 @@
 require 'optparse'
 require 'optparse/kwargs'
 
-class TestOptionParser < Test::Unit::TestCase
-end
-class TestOptionParser::KwArg < Test::Unit::TestCase
+class TestOptionParserKwArg < Test::Unit::TestCase
   class K
     def initialize(host:, port: 8080)
       @host = host
diff --git a/test/optparse/test_noarg.rb b/test/optparse/test_noarg.rb
index 8f20519..a53399a 100644
--- a/test/optparse/test_noarg.rb
+++ b/test/optparse/test_noarg.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-module TestOptionParser::NoArg
+module TestOptionParserNoArg
   def setup
     super
     @opt.def_option "--with_underscore" do |x| @flag = x end
@@ -9,7 +9,7 @@ def setup
   end
 
   class Def1 < TestOptionParser
-    include NoArg
+    include TestOptionParserNoArg
     def setup
       super
       @opt.def_option("-x") {|x| @flag = x}
@@ -17,7 +17,7 @@ def setup
     end
   end
   class Def2 < TestOptionParser
-    include NoArg
+    include TestOptionParserNoArg
     def setup
       super
       @opt.def_option("-x", "--option") {|x| @flag = x}
diff --git a/test/optparse/test_optarg.rb b/test/optparse/test_optarg.rb
index 14584f7..81127a8 100644
--- a/test/optparse/test_optarg.rb
+++ b/test/optparse/test_optarg.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-class TestOptionParser::OptArg < TestOptionParser
+class TestOptionParserOptArg < TestOptionParser
   def setup
     super
     @opt.def_option("-x[VAL]") {|x| @flag = x}
diff --git a/test/optparse/test_placearg.rb b/test/optparse/test_placearg.rb
index 8acfdb2..94cfb0e 100644
--- a/test/optparse/test_placearg.rb
+++ b/test/optparse/test_placearg.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-class TestOptionParser::PlaceArg < TestOptionParser
+class TestOptionParserPlaceArg < TestOptionParser
   def setup
     super
     @opt.def_option("-x [VAL]") {|x| @flag = x}
diff --git a/test/optparse/test_reqarg.rb b/test/optparse/test_reqarg.rb
index b2e4755..d5686d1 100644
--- a/test/optparse/test_reqarg.rb
+++ b/test/optparse/test_reqarg.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-module TestOptionParser::ReqArg
+module TestOptionParserReqArg
   def setup
     super
     @opt.def_option "--with_underscore=VAL" do |x| @flag = x end
@@ -9,7 +9,7 @@ def setup
   end
 
   class Def1 < TestOptionParser
-    include ReqArg
+    include TestOptionParserReqArg
     def setup
       super
       @opt.def_option("-xVAL") {|x| @flag = x}
@@ -19,21 +19,21 @@ def setup
     end
   end
   class Def2 < TestOptionParser
-    include ReqArg
+    include TestOptionParserReqArg
     def setup
       super
       @opt.def_option("-x", "--option=VAL") {|x| @flag = x}
     end
   end
   class Def3 < TestOptionParser
-    include ReqArg
+    include TestOptionParserReqArg
     def setup
       super
       @opt.def_option("--option=VAL", "-x") {|x| @flag = x}
     end
   end
   class Def4 < TestOptionParser
-    include ReqArg
+    include TestOptionParserReqArg
     def setup
       super
       @opt.def_option("-xVAL", "--option=VAL") {|x| @flag = x}
diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb
index 67b0567..6b36ce3 100644
--- a/test/optparse/test_summary.rb
+++ b/test/optparse/test_summary.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-class TestOptionParser::SummaryTest < TestOptionParser
+class TestOptionParserSummaryTest < TestOptionParser
   def test_short_clash
     r = nil
     o = OptionParser.new do |opts|
diff --git a/test/optparse/test_zsh_completion.rb b/test/optparse/test_zsh_completion.rb
index c548d4a..76f0a73 100644
--- a/test/optparse/test_zsh_completion.rb
+++ b/test/optparse/test_zsh_completion.rb
@@ -2,9 +2,7 @@
 require 'test/unit'
 require 'optparse'
 
-class TestOptionParser < Test::Unit::TestCase
-end
-class TestOptionParser::ZshCompletion < Test::Unit::TestCase
+class TestOptionParserZshCompletion < Test::Unit::TestCase
   def setup
     @opt = OptionParser.new
     @opt.define("-z", "zzz") {}

From e70e689deddb6c1d72e2073a5c4723b3fdfff68c Mon Sep 17 00:00:00 2001
From: ydah <13041216+ydah@users.noreply.github.com>
Date: Sat, 21 May 2022 06:24:41 +0900
Subject: [PATCH 16/26] Fix typo in documentation

- "hypnen" -> "hyphen"
- "hadler" -> "handler"
---
 doc/optparse/option_params.rdoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/optparse/option_params.rdoc b/doc/optparse/option_params.rdoc
index b2e4e1a..ace2c42 100644
--- a/doc/optparse/option_params.rdoc
+++ b/doc/optparse/option_params.rdoc
@@ -418,7 +418,7 @@ A description parameter is any string parameter
 that is not recognized as an
 {option name}[#label-Option+Names] or a
 {terminator}[#label-Terminators];
-in other words, it does not begin with a hypnen.
+in other words, it does not begin with a hyphen.
 
 You may give any number of description parameters;
 each becomes a line in the text generated by option <tt>--help</tt>.
@@ -453,7 +453,7 @@ when the option is encountered.  The handler may be:
 
 ==== Handler Blocks
 
-An option hadler may be a block.
+An option handler may be a block.
 
 File +block.rb+ defines an option that has a handler block.
 

From f2b8318631d3d265131a0b281ee730025eda9027 Mon Sep 17 00:00:00 2001
From: konsolebox <konsolebox@gmail.com>
Date: Thu, 9 Jun 2022 19:43:24 +0800
Subject: [PATCH 17/26] Also accept '-' as an optional argument (#35)

---
 lib/optparse.rb                | 6 +++---
 test/optparse/test_placearg.rb | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/optparse.rb b/lib/optparse.rb
index ec37bde..1d42c79 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -765,15 +765,15 @@ def pretty_head           # :nodoc:
     end
 
     #
-    # Switch that takes an argument, which does not begin with '-'.
+    # Switch that takes an argument, which does not begin with '-' or is '-'.
     #
     class PlacedArgument < self
 
       #
-      # Returns nil if argument is not present or begins with '-'.
+      # Returns nil if argument is not present or begins with '-' and is not '-'.
       #
       def parse(arg, argv, &error)
-        if !(val = arg) and (argv.empty? or /\A-/ =~ (val = argv[0]))
+        if !(val = arg) and (argv.empty? or /\A-./ =~ (val = argv[0]))
           return nil, block, nil
         end
         opt = (val = parse_arg(val, &error))[1]
diff --git a/test/optparse/test_placearg.rb b/test/optparse/test_placearg.rb
index 94cfb0e..ed0e4d3 100644
--- a/test/optparse/test_placearg.rb
+++ b/test/optparse/test_placearg.rb
@@ -18,6 +18,8 @@ def setup
   def test_short
     assert_equal(%w"", no_error {@opt.parse!(%w"-x -n")})
     assert_equal(nil, @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x -")})
+    assert_equal("-", @flag)
     @flag = false
     assert_equal(%w"", no_error {@opt.parse!(%w"-x foo")})
     assert_equal("foo", @flag)
@@ -30,6 +32,8 @@ def test_short
   def test_abbrev
     assert_equal(%w"", no_error {@opt.parse!(%w"-o -n")})
     assert_equal(nil, @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o -")})
+    assert_equal("-", @flag)
     @flag = false
     assert_equal(%w"", no_error {@opt.parse!(%w"-o foo")})
     assert_equal("foo", @flag)
@@ -42,6 +46,8 @@ def test_abbrev
   def test_long
     assert_equal(%w"", no_error {@opt.parse!(%w"--opt -n")})
     assert_equal(nil, @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt -")})
+    assert_equal("-", @flag)
     assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt= foo")})
     assert_equal("", @flag)
     assert_equal(%w"", no_error {@opt.parse!(%w"--opt=foo")})

From 3bcca8a81574aaef19a6ba09f91fc1e318aadfa4 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Fri, 17 Jun 2022 18:35:47 +0900
Subject: [PATCH 18/26] Update Ruby versions on GHA with ci_versions/all.json

---
 .github/workflows/test.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d84dacb..98a7642 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,10 +3,21 @@ name: test
 on: [push, pull_request]
 
 jobs:
-  build:
+  ruby-versions:
+    runs-on: ubuntu-latest
+    outputs:
+      versions: ${{ steps.versions.outputs.value }}
+    steps:
+      - id: versions
+        run: |
+          versions=$(curl -s 'https://cache.ruby-lang.org/pub/misc/ci_versions/all.json' | jq -c '. + ["2.5"]')
+          echo "::set-output name=value::${versions}"
+  test:
+    needs: ruby-versions
+    name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ '3.0', 2.7, 2.6, 2.5, head ]
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:

From 078638ee6da875680ebcfd06efa50bb573fd1af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciek=20Rz=C4=85sa?= <maciejrzasa@gmail.com>
Date: Sat, 8 Oct 2022 12:30:12 +0200
Subject: [PATCH 19/26] Don't treat empty string as an option description

---
 lib/optparse.rb               |  2 +-
 test/optparse/test_summary.rb | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/optparse.rb b/lib/optparse.rb
index 1d42c79..9dad2e4 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1502,7 +1502,7 @@ def make_switch(opts, block = nil)
         style = notwice(default_style.guess(arg = o), style, 'style')
         default_pattern, conv = search(:atype, Object) unless default_pattern
       else
-        desc.push(o)
+        desc.push(o) if o && !o.empty?
       end
     end
 
diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb
index 6b36ce3..b5dcb35 100644
--- a/test/optparse/test_summary.rb
+++ b/test/optparse/test_summary.rb
@@ -55,4 +55,27 @@ def test_ver
     o.release = "rel"
     assert_equal "foo 0.1 (rel)", o.ver
   end
+
+  # https://github.com/ruby/optparse/issues/37
+  def test_very_long_without_short
+    o = OptionParser.new do |opts|
+      # This causes TypeError
+      opts.on('',   '--long-long-option-param-without-short', "Error desc") { options[:long_long_option_param_without_short] = true }
+      opts.on('',   '--long-option-param', "Long desc") { options[:long_option_param_without_short] = true }
+      opts.on('-a', '--long-long-option-param-with-short', "Normal description") { options[:long_long_option_param_with_short] = true }
+
+      opts.on('',   '--long-long-option-param-without-short-but-with-desc', 'Description of the long long param') { options[:long_long_option_param_without_short_but_with_desc] = true }
+    end
+
+    s = o.summarize
+
+    assert_match(/^\s*--long-long-option-param-without-short$/, s[0])
+    assert_match(/^\s*Error desc$/, s[1])
+    assert_match(/^\s*--long-option-param\s+Long desc$/, s[2])
+    assert_match(/^\s*-a\s+Normal description$/, s[3])
+    assert_match(/^\s*--long-long-option-param-with-short$/, s[4])
+
+    assert_match(/^\s*--long-long-option-param-without-short-but-with-desc$/, s[5])
+    assert_match(/^\s*Description of the long long param$/, s[6])
+  end
 end

From fb34a1d3a36aa33a5d2a02d511fbd705887505b0 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sat, 29 Oct 2022 22:23:14 +0900
Subject: [PATCH 20/26] Add tests for `OptionParser#load`

---
 test/optparse/test_load.rb | 139 +++++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 test/optparse/test_load.rb

diff --git a/test/optparse/test_load.rb b/test/optparse/test_load.rb
new file mode 100644
index 0000000..de24f1c
--- /dev/null
+++ b/test/optparse/test_load.rb
@@ -0,0 +1,139 @@
+# frozen_string_literal: false
+require 'test/unit'
+require 'optparse'
+require 'tmpdir'
+
+class TestOptionParserLoad < Test::Unit::TestCase
+  def setup
+    @tmpdir = Dir.mktmpdir("optparse_test-")
+    @basename = File.basename($0, '.*')
+    @envs = %w[HOME XDG_CONFIG_HOME XDG_CONFIG_DIRS].each_with_object({}) do |v, h|
+      h[v] = ENV.delete(v)
+    end
+  end
+
+  def teardown
+    ENV.update(@envs)
+    FileUtils.rm_rf(@tmpdir)
+  end
+
+  def new_parser
+    @result = nil
+    OptionParser.new do |opt|
+      opt.on("--test=arg") {|v| @result = v}
+    end
+  end
+
+  def assert_load(result)
+    assert new_parser.load
+    assert_equal(result, @result)
+  end
+
+  def setup_options(env, dir, suffix = nil)
+    optdir = File.join(@tmpdir, dir)
+    FileUtils.mkdir_p(optdir)
+    file = File.join(optdir, [@basename, suffix].join(""))
+    File.write(file, "--test=#{dir}")
+    ENV.update(env)
+    if block_given?
+      begin
+        yield dir, optdir
+      ensure
+        File.unlink(file)
+        Dir.rmdir(optdir) rescue nil
+      end
+    else
+      return dir, optdir
+    end
+  end
+
+  def setup_options_home(&block)
+    setup_options({'HOME'=>@tmpdir}, ".options", &block)
+  end
+
+  def setup_options_xdg_config_home(&block)
+    setup_options({'XDG_CONFIG_HOME'=>@tmpdir+"/xdg"}, "xdg", ".options", &block)
+  end
+
+  def setup_options_home_config(&block)
+    setup_options({'HOME'=>@tmpdir}, ".config", ".options", &block)
+  end
+
+  def setup_options_xdg_config_dirs(&block)
+    setup_options({'XDG_CONFIG_DIRS'=>@tmpdir+"/xdgconf"}, "xdgconf", ".options", &block)
+  end
+
+  def setup_options_home_config_settings(&block)
+    setup_options({'HOME'=>@tmpdir}, "config/settings", ".options", &block)
+  end
+
+  def test_load_home_options
+    result, = setup_options_home
+    assert_load(result)
+
+    setup_options_xdg_config_home do
+      assert_load(result)
+    end
+
+    setup_options_home_config do
+      assert_load(result)
+    end
+
+    setup_options_xdg_config_dirs do
+      assert_load(result)
+    end
+
+    setup_options_home_config_settings do
+      assert_load(result)
+    end
+  end
+
+  def test_load_xdg_config_home
+    result, = setup_options_xdg_config_home
+    assert_load(result)
+
+    setup_options_home_config do
+      assert_load(result)
+    end
+
+    setup_options_xdg_config_dirs do
+      assert_load(result)
+    end
+
+    setup_options_home_config_settings do
+      assert_load(result)
+    end
+  end
+
+  def test_load_home_config
+    result, = setup_options_home_config
+    assert_load(result)
+
+    setup_options_xdg_config_dirs do
+      assert_load(result)
+    end
+
+    setup_options_home_config_settings do
+      assert_load(result)
+    end
+  end
+
+  def test_load_xdg_config_dirs
+    result, = setup_options_xdg_config_dirs
+    assert_load(result)
+
+    setup_options_home_config_settings do
+      assert_load(result)
+    end
+  end
+
+  def test_load_home_config_settings
+    result, = setup_options_home_config_settings
+    assert_load(result)
+  end
+
+  def test_load_nothing
+    assert !new_parser.load
+    assert_nil @result
+  end
+end

From 2ea626fcff72b68b5ae6e1381c28f5db94de7e94 Mon Sep 17 00:00:00 2001
From: Whyme Lyu <5longluna@gmail.com>
Date: Sat, 29 Oct 2022 21:46:23 +0800
Subject: [PATCH 21/26] #load() into hash (#42)

OptionParser#load learns .load(into: Hash)

Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org>
---
 lib/optparse.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/optparse.rb b/lib/optparse.rb
index 9dad2e4..238fa1e 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1903,10 +1903,13 @@ def candidate(word)
   # directory ~/.options, then the basename with '.options' suffix
   # under XDG and Haiku standard places.
   #
-  def load(filename = nil)
+  # The optional +into+ keyword argument works exactly like that accepted in
+  # method #parse.
+  #
+  def load(filename = nil, into: nil)
     unless filename
       basename = File.basename($0, '.*')
-      return true if load(File.expand_path(basename, '~/.options')) rescue nil
+      return true if load(File.expand_path(basename, '~/.options'), into: into) rescue nil
       basename << ".options"
       return [
         # XDG
@@ -1918,11 +1921,11 @@ def load(filename = nil)
         '~/config/settings',
       ].any? {|dir|
         next if !dir or dir.empty?
-        load(File.expand_path(basename, dir)) rescue nil
+        load(File.expand_path(basename, dir), into: into) rescue nil
       }
     end
     begin
-      parse(*IO.readlines(filename).each {|s| s.chomp!})
+      parse(*IO.readlines(filename).each {|s| s.chomp!}, into: into)
       true
     rescue Errno::ENOENT, Errno::ENOTDIR
       false

From 51f7e060ee6e2ccab6b052e7fb14532bc3485ce2 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sat, 29 Oct 2022 22:25:42 +0900
Subject: [PATCH 22/26] Add tests for `load(into:)`

---
 test/optparse/test_load.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/optparse/test_load.rb b/test/optparse/test_load.rb
index de24f1c..0ebe855 100644
--- a/test/optparse/test_load.rb
+++ b/test/optparse/test_load.rb
@@ -27,6 +27,8 @@ def new_parser
   def assert_load(result)
     assert new_parser.load
     assert_equal(result, @result)
+    assert new_parser.load(into: into = {})
+    assert_equal({test: result}, into)
   end
 
   def setup_options(env, dir, suffix = nil)

From ab5073e4d8928814a1e667bb93164d6998bf2558 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Mon, 21 Nov 2022 18:28:33 +0900
Subject: [PATCH 23/26] Use class methods of `File` over `IO`

---
 lib/optparse.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/optparse.rb b/lib/optparse.rb
index 238fa1e..7ddde82 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1925,7 +1925,7 @@ def load(filename = nil, into: nil)
       }
     end
     begin
-      parse(*IO.readlines(filename).each {|s| s.chomp!}, into: into)
+      parse(*File.readlines(filename, chomp: true), into: into)
       true
     rescue Errno::ENOENT, Errno::ENOTDIR
       false

From 12529653cd35ed38cb0a00d22ec0fe6e0907ce89 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 30 Oct 2022 00:36:19 +0900
Subject: [PATCH 24/26] Add `raise_unknown` flag (#38)

---
 lib/optparse.rb                |  7 +++++++
 test/optparse/test_optparse.rb | 12 ++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/lib/optparse.rb b/lib/optparse.rb
index 7ddde82..7cc7d10 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1148,6 +1148,7 @@ def initialize(banner = nil, width = 32, indent = ' ' * 4)
     @summary_indent = indent
     @default_argv = ARGV
     @require_exact = false
+    @raise_unknown = true
     add_officious
     yield self if block_given?
   end
@@ -1225,6 +1226,9 @@ def self.reject(*args, &blk) top.reject(*args, &blk) end
   # abbreviated long option as short option).
   attr_accessor :require_exact
 
+  # Whether to raise at unknown option.
+  attr_accessor :raise_unknown
+
   #
   # Heading banner preceding summary.
   #
@@ -1639,9 +1643,11 @@ def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
           begin
             sw, = complete(:long, opt, true)
             if require_exact && !sw.long.include?(arg)
+              throw :terminate, arg unless raise_unknown
               raise InvalidOption, arg
             end
           rescue ParseError
+            throw :terminate, arg unless raise_unknown
             raise $!.set_option(arg, true)
           end
           begin
@@ -1673,6 +1679,7 @@ def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
               end
             end
           rescue ParseError
+            throw :terminate, arg unless raise_unknown
             raise $!.set_option(arg, true)
           end
           begin
diff --git a/test/optparse/test_optparse.rb b/test/optparse/test_optparse.rb
index 5f5ea18..285c4a5 100644
--- a/test/optparse/test_optparse.rb
+++ b/test/optparse/test_optparse.rb
@@ -98,6 +98,18 @@ def test_require_exact
     assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-z foo))}
   end
 
+  def test_raise_unknown
+    @opt.def_option('--foo [ARG]') {|arg| @foo = arg}
+    assert @opt.raise_unknown
+
+    @opt.raise_unknown = false
+    assert_equal(%w[--bar], @opt.parse(%w[--foo --bar]))
+    assert_nil(@foo)
+
+    assert_equal(%w[--bar], @opt.parse(%w[--foo x --bar]))
+    assert_equal("x", @foo)
+  end
+
   def test_nonopt_pattern
     @opt.def_option(/^[^-]/) do |arg|
       assert(false, "Never gets called")

From fee86ef7a443e602e951ac67143a890a22e8aa3a Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@ruby-lang.org>
Date: Tue, 29 Nov 2022 01:14:47 +0900
Subject: [PATCH 25/26] Fix the test failure i ruby/ruby

```
$ make test-all TESTS=test/optparse/
...

[148/178] TestOptionParserDidYouMean#test_raise_unknown = 0.00 s
  1) Failure:
TestOptionParserDidYouMean#test_raise_unknown [/home/mame/work/ruby/test/optparse/test_optparse.rb:106]:
<["--bar"]> expected but was
<[]>.
```

In the old test/unit (bundled in ruby/ruby), when a test class inherits from
another test class, the child class runs all the tests defined in the parent
class.
However, it looks like the new test/unit does not do so. This is because the
test failure does not occur in ruby/optparse.

As a tentative solution, this changes the option names in TestOptionParser to
avoid the name conflict with TestOptionParserDidYouMean.
---
 test/optparse/test_optparse.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/optparse/test_optparse.rb b/test/optparse/test_optparse.rb
index 285c4a5..5a0593d 100644
--- a/test/optparse/test_optparse.rb
+++ b/test/optparse/test_optparse.rb
@@ -99,14 +99,14 @@ def test_require_exact
   end
 
   def test_raise_unknown
-    @opt.def_option('--foo [ARG]') {|arg| @foo = arg}
+    @opt.def_option('--my-foo [ARG]') {|arg| @foo = arg}
     assert @opt.raise_unknown
 
     @opt.raise_unknown = false
-    assert_equal(%w[--bar], @opt.parse(%w[--foo --bar]))
+    assert_equal(%w[--my-bar], @opt.parse(%w[--my-foo --my-bar]))
     assert_nil(@foo)
 
-    assert_equal(%w[--bar], @opt.parse(%w[--foo x --bar]))
+    assert_equal(%w[--my-bar], @opt.parse(%w[--my-foo x --my-bar]))
     assert_equal("x", @foo)
   end
 

From c80dfb1ebd9e92142de4a0719f7fb91d753c35e5 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Mon, 5 Dec 2022 16:17:01 +0900
Subject: [PATCH 26/26] Bump version to 0.3.0

---
 lib/optparse.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/optparse.rb b/lib/optparse.rb
index 7cc7d10..dc2b8a0 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -425,7 +425,7 @@
 # If you have any questions, file a ticket at http://bugs.ruby-lang.org.
 #
 class OptionParser
-  OptionParser::Version = "0.2.0"
+  OptionParser::Version = "0.3.0"
 
   # :stopdoc:
   NoArgument = [NO_ARGUMENT = :NONE, nil].freeze