optparse 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 393ddfd5f19439c98112418ff879314c8570d9955e4a26a148b6d3bd94354cda
-  data.tar.gz: 270b3538983dfd6920cae9b2fcda5d7dcb5304157ae1e323a0d56daf33a6dd60
+  metadata.gz: 7133ed3cb8069a5f9e30dc050bdf3f593c0c6c1cdb438662846922cb36efb6ca
+  data.tar.gz: 2f831a85adf7093e20bfb5894a28864475fa0fac996c1076d9746cf2466d3587
 SHA512:
-  metadata.gz: 80e82b866fccf4b8598d3b495941629255ddfa907a8686a092d9ab5135d145d1c0a83d9d3d42ededcf1d33e21bc5ea6bfbee79f40085140e29a4ac54e6b96a1d
-  data.tar.gz: 998881fc6568b9725d7874145111cdee53e2366050a63f0e5908395f183d080eda16bf6740e8d83f90fe60064cf85fb424c24cd70e4589b344ee9dc3b997d283
+  metadata.gz: 7696cd28fc5ea95a88bdb9815d67e916787ba891baf526e4c966bbf28c8893ad63c6835967f5907f7ff3b0932e8e07e058cc0028a13a5e8fb6f4433d245026b0
+  data.tar.gz: 71b51296c92eaeb0ec443a5d502f81fda00884e6cf8b77c8cfff8e5cbe60d5a27d6b170c3107235028136c0c6953e6ba60d08a2744ea890d96d213ba2e31b5b5

data/.document

@@ -0,0 +1,7 @@
+COPYING
+ChangeLog
+README.md
+doc/
+lib/
+logs/
+misc/

data/.rdoc_options

@@ -0,0 +1,4 @@
+---
+page_dir: doc
+main_page: README.md
+title: Documentation for OptionParser

data/ChangeLog

@@ -1,163 +1,9 @@
 -*- coding: utf-8 -*-
 
-commit acbf6e3e12de4d116f7215b64432f204d293da97
+commit 080360ffd4578aceb9f711eef8f16ee520cd3f00
   Author:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  AuthorDate: 2023-11-07 10:40:38 +0900
+  AuthorDate: 2024-11-08 13:22:26 +0900
   Commit:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  CommitDate: 2023-11-07 10:40:38 +0900
+  CommitDate: 2024-11-08 13:22:26 +0900
 
-    Bump up 0.4.0
-
-commit 38848ce4b31977d4a892c2a5573b304c77208283
-  Author:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  AuthorDate: 2023-10-05 16:17:40 +0900
-  Commit:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  CommitDate: 2023-10-05 16:26:53 +0900
-
-    Use test-unit-ruby-core gem
-
-commit a291ef5c26445d423bf0223b0cb64340df18f0cb
-  Author:     dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
-  AuthorDate: 2023-09-11 03:20:53 +0000
-  Commit:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  CommitDate: 2023-09-11 14:02:17 +0900
-
-    Bump actions/checkout from 3 to 4
-
-    Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
-    - [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/v3...v4)
-
-    ---
-    updated-dependencies:
-    - dependency-name: actions/checkout
-      dependency-type: direct:production
-      update-type: version-update:semver-major
-    ...
-
-    Signed-off-by: dependabot[bot] <support@github.com>
-
-commit 2940dbb65a7df013995934a93e6906109adda766
-  Author:     BurdetteLamar <burdettelamar@yahoo.com>
-  AuthorDate: 2023-07-30 16:35:00 +0100
-  Commit:     BurdetteLamar <burdettelamar@yahoo.com>
-  CommitDate: 2023-07-30 16:35:00 +0100
-
-    [DOC] Corrections to tutorial
-
-commit e8bee0be8f52f5a3e08d0db09a13798701670391
-  Author:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  AuthorDate: 2023-07-30 11:24:59 +0900
-  Commit:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  CommitDate: 2023-07-30 11:24:59 +0900
-
-    [DOC] Mark up constant and method names as code
-
-commit 3cde2178d3d1bd1c7bf9c7e2af930e89e0bad6e5
-  Author:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  AuthorDate: 2023-07-12 01:07:11 +0900
-  Commit:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  CommitDate: 2023-07-12 01:07:37 +0900
-
-    Upload according to build results
-
-commit fb91d97c109269aee4fb0f7ecc1b3826dad118d8
-  Author:     Jeremy Evans <code@jeremyevans.net>
-  AuthorDate: 2023-04-04 13:58:59 -0700
-  Commit:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  CommitDate: 2023-04-05 08:43:45 +0900
-
-    Document requires needed for Date/DateTime/Time/URI/Shellwords support
-
-    Fixes [Bug #19566]
-
-commit 5bf4fa8a72a00d0891106af21655800db1d2ceff
-  Author:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  AuthorDate: 2023-03-24 13:01:25 +0900
-  Commit:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  CommitDate: 2023-03-24 13:38:04 +0900
-
-    Update test libraries from https://github.com/ruby/ruby/commit/b4e438d8aabaf4bba2b27f374c787543fae07c58
-
-commit b67cc2407e6f9b5b4c9bc0751e21fa4969da0ceb
-  Author:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  AuthorDate: 2023-02-18 16:37:54 +0900
-  Commit:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  CommitDate: 2023-02-18 16:46:18 +0900
-
-    Skip build and upload package with Windows
-
-commit fd6621a23da2e8d3d1a3ab75003dbfeb0e42e2ab
-  Author:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  AuthorDate: 2023-02-18 16:31:55 +0900
-  Commit:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  CommitDate: 2023-02-18 16:46:18 +0900
-
-    Exclude JRuby from Windows
-
-commit 426726fa170ab5a1ddba4f2ef04ae6864ed2a625
-  Author:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  AuthorDate: 2023-02-18 16:25:39 +0900
-  Commit:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  CommitDate: 2023-02-18 16:46:18 +0900
-
-    Try with Windows
-
-commit 45fade52f519f656f62eb601899e3e96d3f69fca
-  Author:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  AuthorDate: 2023-02-18 16:25:25 +0900
-  Commit:     Hiroshi SHIBATA <hsbt@ruby-lang.org>
-  CommitDate: 2023-02-18 16:46:18 +0900
-
-    Use ruby/actions/.github/workflows/ruby_versions.yml@master
-
-commit 366a6a6b569037420013e83ada92012d0c6a2f76
-  Author:     Keishi Tanaka <k-tanaka@ruby-dev.jp>
-  AuthorDate: 2023-01-21 14:09:00 +0900
-  Commit:     GitHub <noreply@github.com>
-  CommitDate: 2023-01-21 14:09:00 +0900
-
-    Migrate set-output to $GITHUB_OUTPUT (#50)
-
-    https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
-
-commit 3e63d878f895a299a6ddeee5f8c615b69edf401c
-  Author:     Junichi Ito <jit@sonicgarden.jp>
-  AuthorDate: 2022-11-29 08:07:47 +0900
-  Commit:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  CommitDate: 2022-12-22 19:58:43 +0900
-
-    Add symbolize_names to getopts
-
-commit 73661899ad17e1061c7fc0f88cc4ac4e66a3c9a9
-  Author:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  AuthorDate: 2022-12-22 19:57:30 +0900
-  Commit:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  CommitDate: 2022-12-22 19:57:30 +0900
-
-    bump up to 0.4.0.pre.1
-
-commit 697ea7bf8e343704e735fb2d1f7787d96b843469
-  Author:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  AuthorDate: 2022-12-22 19:55:51 +0900
-  Commit:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  CommitDate: 2022-12-22 19:55:51 +0900
-
-    Add .rdoc_options
-
-commit ab0022bd23d77e515390cbb2c165f7647400be46
-  Author:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  AuthorDate: 2021-09-29 11:47:47 +0900
-  Commit:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  CommitDate: 2022-12-22 19:53:20 +0900
-
-    Cron test
-
-commit 33663e2c50eb8496b81750976b3480c14783470d
-  Author:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  AuthorDate: 2022-12-22 19:48:22 +0900
-  Commit:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  CommitDate: 2022-12-22 19:50:16 +0900
-
-    Add `helper.bump`
+    Bump up v0.6.0

data/README.md

@@ -50,7 +50,7 @@ p ARGV
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bundle install` to install dependencies. Then, run `rake test` to run the tests.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/doc/optparse/.document

@@ -0,0 +1 @@
+*.rdoc

data/doc/optparse/option_params.rdoc

@@ -31,7 +31,7 @@ Contents:
     - {Long Names with Optional Arguments}[#label-Long+Names+with+Optional+Arguments]
     - {Long Names with Negation}[#label-Long+Names+with+Negation]
   - {Mixed Names}[#label-Mixed+Names]
-- {Argument Styles}[#label-Argument+Styles]
+- {Argument Strings}[#label-Argument+Strings]
 - {Argument Values}[#label-Argument+Values]
   - {Explicit Argument Values}[#label-Explicit+Argument+Values]
     - {Explicit Values in Array}[#label-Explicit+Values+in+Array]

data/doc/optparse/ruby/argument_abbreviation.rb

@@ -0,0 +1,9 @@
+require 'optparse'
+parser = OptionParser.new
+parser.on('-x', '--xxx=VALUE', %w[ABC def], 'Argument abbreviations') do |value|
+  p ['--xxx', value]
+end
+parser.on('-y', '--yyy=VALUE', {"abc"=>"XYZ", def: "FOO"}, 'Argument abbreviations') do |value|
+  p ['--yyy', value]
+end
+parser.parse!

data/doc/optparse/tutorial.rdoc

@@ -351,6 +351,29 @@ Executions:
 
 Omitting an optional argument does not raise an error.
 
+==== Argument Abbreviations
+
+Specify an argument list as an Array or a Hash.
+
+  :include: ruby/argument_abbreviation.rb
+
+When an argument is abbreviated, the expanded argument yielded.
+
+Executions:
+
+  $ ruby argument_abbreviation.rb --help
+  Usage: argument_abbreviation [options]
+  Usage: argument_abbreviation [options]
+      -x, --xxx=VALUE                  Argument abbreviations
+      -y, --yyy=VALUE                  Argument abbreviations
+  $ ruby argument_abbreviation.rb --xxx A
+  ["--xxx", "ABC"]
+  $ ruby argument_abbreviation.rb --xxx c
+  argument_abbreviation.rb:9:in `<main>': invalid argument: --xxx c (OptionParser::InvalidArgument)
+  $ ruby argument_abbreviation.rb --yyy a --yyy d
+  ["--yyy", "XYZ"]
+  ["--yyy", "FOO"]
+
 === Argument Values
 
 Permissible argument values may be restricted

data/lib/optparse/ac.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: false
 require_relative '../optparse'
 
+#
+# autoconf-like options.
+#
 class OptionParser::AC < OptionParser
+  # :stopdoc:
   private
 
   def _check_ac_args(name, block)
@@ -14,6 +18,7 @@ class OptionParser::AC < OptionParser
   end
 
   ARG_CONV = proc {|val| val.nil? ? true : val}
+  private_constant :ARG_CONV
 
   def _ac_arg_enable(prefix, name, help_string, block)
     _check_ac_args(name, block)
@@ -29,16 +34,27 @@ class OptionParser::AC < OptionParser
     enable
   end
 
+  # :startdoc:
+
   public
 
+  # Define <tt>--enable</tt> / <tt>--disable</tt> style option
+  #
+  # Appears as <tt>--enable-<i>name</i></tt> in help message.
   def ac_arg_enable(name, help_string, &block)
     _ac_arg_enable("enable", name, help_string, block)
   end
 
+  # Define <tt>--enable</tt> / <tt>--disable</tt> style option
+  #
+  # Appears as <tt>--disable-<i>name</i></tt> in help message.
   def ac_arg_disable(name, help_string, &block)
     _ac_arg_enable("disable", name, help_string, block)
   end
 
+  # Define <tt>--with</tt> / <tt>--without</tt> style option
+  #
+  # Appears as <tt>--with-<i>name</i></tt> in help message.
   def ac_arg_with(name, help_string, &block)
     _check_ac_args(name, block)
 

data/lib/optparse/kwargs.rb

@@ -7,12 +7,17 @@ class OptionParser
   #
   # :include: ../../doc/optparse/creates_option.rdoc
   #
-  def define_by_keywords(options, meth, **opts)
-    meth.parameters.each do |type, name|
+  # Defines options which set in to _options_ for keyword parameters
+  # of _method_.
+  #
+  # Parameters for each keywords are given as elements of _params_.
+  #
+  def define_by_keywords(options, method, **params)
+    method.parameters.each do |type, name|
       case type
       when :key, :keyreq
         op, cl = *(type == :key ? %w"[ ]" : ["", ""])
-        define("--#{name}=#{op}#{name.upcase}#{cl}", *opts[name]) do |o|
+        define("--#{name}=#{op}#{name.upcase}#{cl}", *params[name]) do |o|
           options[name] = o
         end
       end

data/lib/optparse/version.rb

@@ -2,6 +2,11 @@
 # OptionParser internal utility
 
 class << OptionParser
+  #
+  # Shows version string in packages if Version is defined.
+  #
+  # +pkgs+:: package list
+  #
   def show_version(*pkgs)
     progname = ARGV.options.program_name
     result = false
@@ -47,6 +52,8 @@ class << OptionParser
     result
   end
 
+  # :stopdoc:
+
   def each_const(path, base = ::Object)
     path.split(/::|\//).inject(base) do |klass, name|
       raise NameError, path unless Module === klass
@@ -68,4 +75,6 @@ class << OptionParser
       end
     end
   end
+
+  # :startdoc:
 end

data/lib/optparse.rb

@@ -8,7 +8,6 @@
 # See OptionParser for documentation.
 #
 
-
 #--
 # == Developer Documentation (not for RDoc output)
 #
@@ -425,7 +424,8 @@
 # If you have any questions, file a ticket at http://bugs.ruby-lang.org.
 #
 class OptionParser
-  OptionParser::Version = "0.4.0"
+  # The version string
+  OptionParser::Version = "0.6.0"
 
   # :stopdoc:
   NoArgument = [NO_ARGUMENT = :NONE, nil].freeze
@@ -438,6 +438,8 @@ class OptionParser
   # and resolved against a list of acceptable values.
   #
   module Completion
+    # :nodoc:
+
     def self.regexp(key, icase)
       Regexp.new('\A' + Regexp.quote(key).gsub(/\w+\b/, '\&\w*'), icase)
     end
@@ -459,7 +461,7 @@ class OptionParser
       candidates
     end
 
-    def candidate(key, icase = false, pat = nil)
+    def candidate(key, icase = false, pat = nil, &_)
       Completion.candidate(key, icase, pat, &method(:each))
     end
 
@@ -510,6 +512,8 @@ class OptionParser
   # RequiredArgument, etc.
   #
   class Switch
+    # :nodoc:
+
     attr_reader :pattern, :conv, :short, :long, :arg, :desc, :block
 
     #
@@ -697,6 +701,11 @@ class OptionParser
       q.object_group(self) {pretty_print_contents(q)}
     end
 
+    def omitted_argument(val)   # :nodoc:
+      val.pop if val.size == 3 and val.last.nil?
+      val
+    end
+
     #
     # Switch that takes no arguments.
     #
@@ -710,10 +719,10 @@ class OptionParser
         conv_arg(arg)
       end
 
-      def self.incompatible_argument_styles(*)
+      def self.incompatible_argument_styles(*) # :nodoc:
       end
 
-      def self.pattern
+      def self.pattern          # :nodoc:
         Object
       end
 
@@ -730,7 +739,7 @@ class OptionParser
       #
       # Raises an exception if argument is not present.
       #
-      def parse(arg, argv)
+      def parse(arg, argv, &_)
         unless arg
           raise MissingArgument if argv.empty?
           arg = argv.shift
@@ -755,7 +764,7 @@ class OptionParser
         if arg
           conv_arg(*parse_arg(arg, &error))
         else
-          conv_arg(arg)
+          omitted_argument conv_arg(arg)
         end
       end
 
@@ -774,13 +783,14 @@ class OptionParser
       #
       def parse(arg, argv, &error)
         if !(val = arg) and (argv.empty? or /\A-./ =~ (val = argv[0]))
-          return nil, block, nil
+          return nil, block
         end
         opt = (val = parse_arg(val, &error))[1]
         val = conv_arg(*val)
         if opt and !arg
           argv.shift
         else
+          omitted_argument val
           val[0] = nil
         end
         val
@@ -798,6 +808,8 @@ class OptionParser
   # matching pattern and converter pair. Also provides summary feature.
   #
   class List
+    # :nodoc:
+
     # Map from acceptable argument types to pattern and converter pairs.
     attr_reader :atype
 
@@ -837,7 +849,7 @@ class OptionParser
     def accept(t, pat = /.*/m, &block)
       if pat
         pat.respond_to?(:match) or
-          raise TypeError, "has no `match'", ParseError.filter_backtrace(caller(2))
+          raise TypeError, "has no 'match'", ParseError.filter_backtrace(caller(2))
       else
         pat = t if t.respond_to?(:match)
       end
@@ -1033,11 +1045,31 @@ XXX
     to << "#compdef #{name}\n"
     to << COMPSYS_HEADER
     visit(:compsys, {}, {}) {|o, d|
-      to << %Q[  "#{o}[#{d.gsub(/[\"\[\]]/, '\\\\\&')}]" \\\n]
+      to << %Q[  "#{o}[#{d.gsub(/[\\\"\[\]]/, '\\\\\&')}]" \\\n]
     }
     to << "  '*:file:_files' && return 0\n"
   end
 
+  def help_exit
+    if STDOUT.tty? && (pager = ENV.values_at(*%w[RUBY_PAGER PAGER]).find {|e| e && !e.empty?})
+      less = ENV["LESS"]
+      args = [{"LESS" => "#{!less || less.empty? ? '-' : less}Fe"}, pager, "w"]
+      print = proc do |f|
+        f.puts help
+      rescue Errno::EPIPE
+        # pager terminated
+      end
+      if Process.respond_to?(:fork) and false
+        IO.popen("-") {|f| f ? Process.exec(*args, in: f) : print.call(STDOUT)}
+        # unreachable
+      end
+      IO.popen(*args, &print)
+    else
+      puts help
+    end
+    exit
+  end
+
   #
   # Default options for ARGV, which never appear in option summary.
   #
@@ -1049,8 +1081,7 @@ XXX
   #
   Officious['help'] = proc do |parser|
     Switch::NoArgument.new do |arg|
-      puts parser.help
-      exit
+      parser.help_exit
     end
   end
 
@@ -1084,7 +1115,7 @@ XXX
     Switch::OptionalArgument.new do |pkg|
       if pkg
         begin
-          require 'optparse/version'
+          require_relative 'optparse/version'
         rescue LoadError
         else
           show_version(*pkg.split(/,/)) or
@@ -1129,6 +1160,10 @@ XXX
       default.to_i + 1
     end
   end
+
+  #
+  # See self.inc
+  #
   def inc(*args)
     self.class.inc(*args)
   end
@@ -1167,11 +1202,19 @@ XXX
   def terminate(arg = nil)
     self.class.terminate(arg)
   end
+  #
+  # See #terminate.
+  #
   def self.terminate(arg = nil)
     throw :terminate, arg
   end
 
   @stack = [DefaultList]
+  #
+  # Returns the global top option list.
+  #
+  # Do not use directly.
+  #
   def self.top() DefaultList end
 
   #
@@ -1192,9 +1235,9 @@ XXX
   #
   # Directs to reject specified class argument.
   #
-  # +t+:: Argument class specifier, any object including Class.
+  # +type+:: Argument class specifier, any object including Class.
   #
-  #   reject(t)
+  #   reject(type)
   #
   def reject(*args, &blk) top.reject(*args, &blk) end
   #
@@ -1284,10 +1327,24 @@ XXX
     end
   end
 
+  #
+  # Shows warning message with the program name
+  #
+  # +mesg+:: Message, defaulted to +$!+.
+  #
+  # See Kernel#warn.
+  #
   def warn(mesg = $!)
     super("#{program_name}: #{mesg}")
   end
 
+  #
+  # Shows message with the program name then aborts.
+  #
+  # +mesg+:: Message, defaulted to +$!+.
+  #
+  # See Kernel#abort.
+  #
   def abort(mesg = $!)
     super("#{program_name}: #{mesg}")
   end
@@ -1309,6 +1366,9 @@ XXX
   #
   # Pushes a new List.
   #
+  # If a block is given, yields +self+ and returns the result of the
+  # block, otherwise returns +self+.
+  #
   def new
     @stack.push(List.new)
     if block_given?
@@ -1532,6 +1592,12 @@ XXX
       nolong
   end
 
+  # ----
+  # Option definition phase methods
+  #
+  # These methods are used to define options, or to construct an
+  # OptionParser instance in other words.
+
   # :call-seq:
   #   define(*params, &block)
   #
@@ -1607,6 +1673,13 @@ XXX
     top.append(string, nil, nil)
   end
 
+  # ----
+  # Arguments parse phase methods
+  #
+  # These methods parse +argv+, convert, and store the results by
+  # calling handlers.  As these methods do not modify +self+, +self+
+  # can be frozen.
+
   #
   # Parses command line arguments +argv+ in order. When a block is given,
   # each non-option argument is yielded. When optional +into+ keyword
@@ -1616,21 +1689,21 @@ XXX
   #
   # Returns the rest of +argv+ left unparsed.
   #
-  def order(*argv, into: nil, &nonopt)
+  def order(*argv, **keywords, &nonopt)
     argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    order!(argv, into: into, &nonopt)
+    order!(argv, **keywords, &nonopt)
   end
 
   #
   # Same as #order, but removes switches destructively.
   # Non-option arguments remain in +argv+.
   #
-  def order!(argv = default_argv, into: nil, &nonopt)
+  def order!(argv = default_argv, into: nil, **keywords, &nonopt)
     setter = ->(name, val) {into[name.to_sym] = val} if into
-    parse_in_order(argv, setter, &nonopt)
+    parse_in_order(argv, setter, **keywords, &nonopt)
   end
 
-  def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
+  def parse_in_order(argv = default_argv, setter = nil, exact: require_exact, **, &nonopt)  # :nodoc:
     opt, arg, val, rest = nil
     nonopt ||= proc {|a| throw :terminate, a}
     argv.unshift(arg) if arg = catch(:terminate) {
@@ -1641,19 +1714,24 @@ XXX
           opt, rest = $1, $2
           opt.tr!('_', '-')
           begin
-            sw, = complete(:long, opt, true)
-            if require_exact && !sw.long.include?(arg)
-              throw :terminate, arg unless raise_unknown
-              raise InvalidOption, arg
+            if exact
+              sw, = search(:long, opt)
+            else
+              sw, = complete(:long, opt, true)
             end
           rescue ParseError
             throw :terminate, arg unless raise_unknown
             raise $!.set_option(arg, true)
+          else
+            unless sw
+              throw :terminate, arg unless raise_unknown
+              raise InvalidOption, arg
+            end
           end
           begin
             opt, cb, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
-            val = cb.call(val) if cb
-            setter.call(sw.switch_name, val) if setter
+            val = callback!(cb, 1, val) if cb
+            callback!(setter, 2, sw.switch_name, val) if setter
           rescue ParseError
             raise $!.set_option(arg, rest)
           end
@@ -1671,7 +1749,7 @@ XXX
                 val = arg.delete_prefix('-')
                 has_arg = true
               rescue InvalidOption
-                raise if require_exact
+                raise if exact
                 # if no short options match, try completion with long
                 # options.
                 sw, = complete(:long, opt)
@@ -1691,8 +1769,8 @@ XXX
           end
           begin
             argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
-            val = cb.call(val) if cb
-            setter.call(sw.switch_name, val) if setter
+            val = callback!(cb, 1, val) if cb
+            callback!(setter, 2, sw.switch_name, val) if setter
           rescue ParseError
             raise $!.set_option(arg, arg.length > 2)
           end
@@ -1718,6 +1796,19 @@ XXX
   end
   private :parse_in_order
 
+  # Calls callback with _val_.
+  def callback!(cb, max_arity, *args) # :nodoc:
+    args.compact!
+
+    if (size = args.size) < max_arity and cb.to_proc.lambda?
+      (arity = cb.arity) < 0 and arity = (1-arity)
+      arity = max_arity if arity > max_arity
+      args[arity - 1] = nil if arity > size
+    end
+    cb.call(*args)
+  end
+  private :callback!
+
   #
   # Parses command line arguments +argv+ in permutation mode and returns
   # list of non-option arguments. When optional +into+ keyword
@@ -1725,18 +1816,18 @@ XXX
   # <code>[]=</code> method (so it can be Hash, or OpenStruct, or other
   # similar object).
   #
-  def permute(*argv, into: nil)
+  def permute(*argv, **keywords)
     argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    permute!(argv, into: into)
+    permute!(argv, **keywords)
   end
 
   #
   # Same as #permute, but removes switches destructively.
   # Non-option arguments remain in +argv+.
   #
-  def permute!(argv = default_argv, into: nil)
+  def permute!(argv = default_argv, **keywords)
     nonopts = []
-    order!(argv, into: into, &nonopts.method(:<<))
+    order!(argv, **keywords, &nonopts.method(:<<))
     argv[0, 0] = nonopts
     argv
   end
@@ -1748,20 +1839,20 @@ XXX
   # values are stored there via <code>[]=</code> method (so it can be Hash,
   # or OpenStruct, or other similar object).
   #
-  def parse(*argv, into: nil)
+  def parse(*argv, **keywords)
     argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    parse!(argv, into: into)
+    parse!(argv, **keywords)
   end
 
   #
   # Same as #parse, but removes switches destructively.
   # Non-option arguments remain in +argv+.
   #
-  def parse!(argv = default_argv, into: nil)
+  def parse!(argv = default_argv, **keywords)
     if ENV.include?('POSIXLY_CORRECT')
-      order!(argv, into: into)
+      order!(argv, **keywords)
     else
-      permute!(argv, into: into)
+      permute!(argv, **keywords)
     end
   end
 
@@ -1784,7 +1875,7 @@ XXX
   #   # params[:bar] = "x"  # --bar x
   #   # params[:zot] = "z"  # --zot Z
   #
-  def getopts(*args, symbolize_names: false)
+  def getopts(*args, symbolize_names: false, **keywords)
     argv = Array === args.first ? args.shift : default_argv
     single_options, *long_options = *args
 
@@ -1812,7 +1903,7 @@ XXX
       end
     end
 
-    parse_in_order(argv, result.method(:[]=))
+    parse_in_order(argv, result.method(:[]=), **keywords)
     symbolize_names ? result.transform_keys(&:to_sym) : result
   end
 
@@ -1881,6 +1972,9 @@ XXX
     DidYouMean.formatter.message_for(all_candidates & checker.correct(opt))
   end
 
+  #
+  # Return candidates for +word+.
+  #
   def candidate(word)
     list = []
     case word
@@ -1922,10 +2016,10 @@ XXX
   # The optional +into+ keyword argument works exactly like that accepted in
   # method #parse.
   #
-  def load(filename = nil, into: nil)
+  def load(filename = nil, **keywords)
     unless filename
       basename = File.basename($0, '.*')
-      return true if load(File.expand_path(basename, '~/.options'), into: into) rescue nil
+      return true if load(File.expand_path(basename, '~/.options'), **keywords) rescue nil
       basename << ".options"
       return [
         # XDG
@@ -1937,11 +2031,11 @@ XXX
         '~/config/settings',
       ].any? {|dir|
         next if !dir or dir.empty?
-        load(File.expand_path(basename, dir), into: into) rescue nil
+        load(File.expand_path(basename, dir), **keywords) rescue nil
       }
     end
     begin
-      parse(*File.readlines(filename, chomp: true), into: into)
+      parse(*File.readlines(filename, chomp: true), **keywords)
       true
     rescue Errno::ENOENT, Errno::ENOTDIR
       false
@@ -1954,10 +2048,10 @@ XXX
   #
   # +env+ defaults to the basename of the program.
   #
-  def environment(env = File.basename($0, '.*'))
+  def environment(env = File.basename($0, '.*'), **keywords)
     env = ENV[env] || ENV[env.upcase] or return
     require 'shellwords'
-    parse(*Shellwords.shellwords(env))
+    parse(*Shellwords.shellwords(env), **keywords)
   end
 
   #
@@ -2123,6 +2217,7 @@ XXX
     # Reason which caused the error.
     Reason = 'parse error'
 
+    # :nodoc:
     def initialize(*args, additional: nil)
       @additional = additional
       @arg0, = args
@@ -2273,19 +2368,19 @@ XXX
     # Parses +self+ destructively in order and returns +self+ containing the
     # rest arguments left unparsed.
     #
-    def order!(&blk) options.order!(self, &blk) end
+    def order!(**keywords, &blk) options.order!(self, **keywords, &blk) end
 
     #
     # Parses +self+ destructively in permutation mode and returns +self+
     # containing the rest arguments left unparsed.
     #
-    def permute!() options.permute!(self) end
+    def permute!(**keywords) options.permute!(self, **keywords) end
 
     #
     # Parses +self+ destructively and returns +self+ containing the
     # rest arguments left unparsed.
     #
-    def parse!() options.parse!(self) end
+    def parse!(**keywords) options.parse!(self, **keywords) end
 
     #
     # Substitution of getopts is possible as follows. Also see
@@ -2298,8 +2393,8 @@ XXX
     #   rescue OptionParser::ParseError
     #   end
     #
-    def getopts(*args, symbolize_names: false)
-      options.getopts(self, *args, symbolize_names: symbolize_names)
+    def getopts(*args, symbolize_names: false, **keywords)
+      options.getopts(self, *args, symbolize_names: symbolize_names, **keywords)
     end
 
     #
@@ -2309,7 +2404,8 @@ XXX
       super
       obj.instance_eval {@optparse = nil}
     end
-    def initialize(*args)
+
+    def initialize(*args)       # :nodoc:
       super
       @optparse = nil
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optparse
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Nobu Nakada
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies: []
 description: OptionParser is a class for command-line option analysis.
 email:
@@ -17,12 +17,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".document"
+- ".rdoc_options"
 - COPYING
 - ChangeLog
 - README.md
+- doc/optparse/.document
 - doc/optparse/argument_converters.rdoc
 - doc/optparse/creates_option.rdoc
 - doc/optparse/option_params.rdoc
+- doc/optparse/ruby/argument_abbreviation.rb
 - doc/optparse/ruby/argument_keywords.rb
 - doc/optparse/ruby/argument_strings.rb
 - doc/optparse/ruby/argv.rb
@@ -97,7 +101,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/optparse
   source_code_uri: https://github.com/ruby/optparse
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--main=README.md"
 - "--op=rdoc"
@@ -115,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.5.11
+signing_key: 
 specification_version: 4
 summary: OptionParser is a class for command-line option analysis.
 test_files: []