cmd-optparse.rb 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cf82f634b0577123de20738385e9b15fbe0f62652ac8af58397d0226c928fdf
-  data.tar.gz: a4831214ac1b1534d13309826f186e2d34087a7613111901e276c056f055e38d
+  metadata.gz: 2a992ee2e03576f3ca4f11a6973c4b00a1783f180032023e35233935c9d56cf8
+  data.tar.gz: 5efb1143314b76ef665b8809f9dccd98ddb600f9e7bd762dfdabe452930a003b
 SHA512:
-  metadata.gz: 9683268f5c6a7e983a85e6018672c2448f080cf61c425f04666e58f38fca9f05735043355e02aeefae8cc45e0f7bb201024b0f94448762f27853fcee9958b9a2
-  data.tar.gz: 4f117eae64d9fb5f18d38c7121dbc74dae9c565335ac0d520a10b690bcd421e0498846d052a0af2aa4049596cfdd14a6b7673bf11e7af35ce166a093ccf3375d
+  metadata.gz: 0e1f4eebc3ec6a6b7e8260f5f4829a6bd813cb8a810fd9b5c785494cf60481b0121daeb420a139b8e7154ebcb5b797ab052abddd483d07e27e7b3d10e55e6d85
+  data.tar.gz: e0a7957f80e7200d4ff6e35a0a7b5b9103fb10326bf1aa8ecf0847a4daf2110b494e7341e4b9aa120130f72c55633a4a0ebb1d773f21f3b11221ec122a463936

data/cmd-optparse.rb.gemspec

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 require "./lib/cmd-optparse"
-
 Gem::Specification.new do |spec|
   spec.name          =  File.basename(__FILE__, ".gemspec")
-  spec.version       = OptionParser::VERSION
+  spec.version       = Cmd::OptionParser::VERSION
   spec.authors       = ["0x1eef", "Nobu Nakada"]
   spec.email         = ["0x1eef@protonmail.com"]
 

data/lib/cmd/option_parser/ac.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-class OptionParser::AC < OptionParser
+class Cmd::OptionParser::AC < Cmd::OptionParser
   private
 
   def _check_ac_args(name, block)

data/lib/cmd/option_parser/date.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: false
 require 'date'
-OptionParser.accept(DateTime) do |s,|
+Cmd::OptionParser.accept(DateTime) do |s,|
   begin
     DateTime.parse(s) if s
   rescue ArgumentError
-    raise OptionParser::InvalidArgument, s
+    raise Cmd::OptionParser::InvalidArgument, s
   end
 end
-OptionParser.accept(Date) do |s,|
+Cmd::OptionParser.accept(Date) do |s,|
   begin
     Date.parse(s) if s
   rescue ArgumentError
-    raise OptionParser::InvalidArgument, s
+    raise Cmd::OptionParser::InvalidArgument, s
   end
 end

data/lib/cmd/option_parser/kwargs.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class OptionParser
+class Cmd::OptionParser
   # :call-seq:
   #   define_by_keywords(options, method, **params)
   #

data/lib/cmd/option_parser/shellwords.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: false
 # -*- ruby -*-
 require 'shellwords'
-OptionParser.accept(Shellwords) {|s,| Shellwords.shellwords(s)}
+Cmd::OptionParser.accept(Shellwords) {|s,| Shellwords.shellwords(s)}

data/lib/cmd/option_parser/time.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: false
 require 'time'
-OptionParser.accept(Time) do |s,|
+Cmd::OptionParser.accept(Time) do |s,|
   begin
     (Time.httpdate(s) rescue Time.parse(s)) if s
   rescue
-    raise OptionParser::InvalidArgument, s
+    raise Cmd::OptionParser::InvalidArgument, s
   end
 end

data/lib/cmd/option_parser/uri.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: false
 # -*- ruby -*-
 require 'uri'
-OptionParser.accept(URI) {|s,| URI.parse(s) if s}
+Cmd::OptionParser.accept(URI) {|s,| URI.parse(s) if s}

data/lib/cmd/option_parser/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 # OptionParser internal utility
 
-class << OptionParser
+class << Cmd::OptionParser
   def show_version(*pkgs)
     progname = ARGV.options.program_name
     result = false

data/lib/cmd/optparse.rb

@@ -8,7 +8,6 @@
 # See OptionParser for documentation.
 #
 
-
 #--
 # == Developer Documentation (not for RDoc output)
 #
@@ -424,8 +423,8 @@
 # should be enough to learn how to use this class.
 # If you have any questions, file a ticket at http://bugs.ruby-lang.org.
 #
-class OptionParser
-  VERSION = "0.5.0"
+class Cmd::OptionParser
+  VERSION = "0.5.2"
 
   # :stopdoc:
   NoArgument = [NO_ARGUMENT = :NONE, nil].freeze
@@ -2333,9 +2332,9 @@ XXX
   # and DecimalNumeric. See Acceptable argument classes (in source code).
   #
   module Acceptables
-    const_set(:DecimalInteger, OptionParser::DecimalInteger)
-    const_set(:OctalInteger, OptionParser::OctalInteger)
-    const_set(:DecimalNumeric, OptionParser::DecimalNumeric)
+    const_set(:DecimalInteger, DecimalInteger)
+    const_set(:OctalInteger, OctalInteger)
+    const_set(:DecimalNumeric, DecimalNumeric)
   end
 
   require_relative "option_parser/ac"
@@ -2345,10 +2344,7 @@ XXX
   require_relative "option_parser/shellwords"
   require_relative "option_parser/uri"
   require_relative "option_parser/version"
-end
 
-# ARGV is arguable by OptionParser
-ARGV.extend(OptionParser::Arguable)
-
-# An alias for OptionParser.
-OptParse = OptionParser  # :nodoc:
+  # ARGV is arguable by OptionParser
+  ARGV.extend(Arguable)
+end

data/lib/cmd-optparse.rb

@@ -1 +1,3 @@
-require_relative "cmd/optparse"
+class Cmd
+  require_relative "cmd/optparse"
+end

data/test/optparse/test_acceptable.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-class TestOptionParserAcceptable < TestOptionParser
+class ::OptionParserAcceptable < ::OptionParser
 
   def setup
     super
@@ -10,11 +10,11 @@ class TestOptionParserAcceptable < TestOptionParser
     @opt.def_option("--numeric VAL", Numeric) { |v| @numeric = v }
 
     @opt.def_option("--decimal-integer VAL",
-                    OptionParser::DecimalInteger) { |i| @decimal_integer = i }
+                    Cmd::OptionParser::DecimalInteger) { |i| @decimal_integer = i }
     @opt.def_option("--octal-integer VAL",
-                    OptionParser::OctalInteger)   { |i| @octal_integer   = i }
+                    Cmd::OptionParser::OctalInteger)   { |i| @octal_integer   = i }
     @opt.def_option("--decimal-numeric VAL",
-                    OptionParser::DecimalNumeric) { |i| @decimal_numeric = i }
+                    Cmd::OptionParser::DecimalNumeric) { |i| @decimal_numeric = i }
   end
 
   def test_integer
@@ -33,19 +33,19 @@ class TestOptionParserAcceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--integer 0x3")})
     assert_equal(3, @integer)
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--integer 0b")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--integer 09")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--integer 0x")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--integer 1234xyz")
     end
   end
@@ -66,11 +66,11 @@ class TestOptionParserAcceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--float 1E-2")})
     assert_in_epsilon(0.01, @float)
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--float 0e")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--float 1.234xyz")
     end
   end
@@ -91,15 +91,15 @@ class TestOptionParserAcceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--numeric 1.2/2.3")})
     assert_equal(Rational(12, 23), @numeric)
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--numeric 1/")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--numeric 12/34xyz")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--numeric 12x/34yz")
     end
   end
@@ -117,15 +117,15 @@ class TestOptionParserAcceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--decimal-integer 09")})
     assert_equal(9, @decimal_integer)
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer 0b1")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer x")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer 1234xyz")
     end
   end
@@ -146,19 +146,19 @@ class TestOptionParserAcceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--octal-integer 011")})
     assert_equal(9, @octal_integer)
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--octal-integer 09")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--octal-integer 0b1")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--octal-integer x")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--octal-integer 01234xyz")
     end
   end
@@ -176,21 +176,21 @@ class TestOptionParserAcceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--decimal-numeric 1E2")})
     assert_in_delta(100.0, @decimal_numeric)
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-numeric 0b1")
     end
 
-    e = assert_raise(OptionParser::InvalidArgument) do
+    e = assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-numeric 09")
     end
 
     assert_equal("invalid argument: --decimal-numeric 09", e.message)
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer 1234xyz")
     end
 
-    assert_raise(OptionParser::InvalidArgument) do
+    assert_raise(Cmd::OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer 12.34xyz")
     end
   end

data/test/optparse/test_autoconf.rb

@@ -2,9 +2,9 @@
 require 'test/unit'
 require 'optparse/ac'
 
-class TestOptionParserAutoConf < Test::Unit::TestCase
+class ::OptionParserAutoConf < Test::Unit::TestCase
   def setup
-    @opt = OptionParser::AC.new
+    @opt = Cmd::OptionParser::AC.new
     @foo = @bar = self.class
     @opt.ac_arg_enable("foo", "foo option") {|x| @foo = x}
     @opt.ac_arg_disable("bar", "bar option") {|x| @bar = x}
@@ -54,7 +54,7 @@ class TestOptionParserAutoConf < Test::Unit::TestCase
   def test_without
     @opt.parse!(%w"--without-zot")
     assert_nil(@zot)
-    assert_raise(OptionParser::NeedlessArgument) {@opt.parse!(%w"--without-zot=foobar")}
+    assert_raise(Cmd::OptionParser::NeedlessArgument) {@opt.parse!(%w"--without-zot=foobar")}
   end
 
   def test_help

data/test/optparse/test_bash_completion.rb

@@ -2,9 +2,9 @@
 require 'test/unit'
 require 'optparse'
 
-class TestOptionParserBashCompletion < Test::Unit::TestCase
+class ::OptionParserBashCompletion < Test::Unit::TestCase
   def setup
-    @opt = OptionParser.new
+    @opt = Cmd::OptionParser.new
     @opt.define("-z", "zzz") {}
     @opt.define("--foo") {}
     @opt.define("--bar=BAR") {}

data/test/optparse/test_cclass.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-class TestOptionParserCClass < TestOptionParser
+class ::OptionParserCClass < ::OptionParser
   def test_no_argument
     flags = []
     @opt.def_option("-[a-z]") {|x| flags << x}

data/test/optparse/test_did_you_mean.rb

@@ -6,7 +6,7 @@ rescue LoadError
   return
 end
 
-class TestOptionParserDidYouMean < TestOptionParser
+class ::OptionParserDidYouMean < ::OptionParser
   def setup
     super
     @opt.def_option("--foo", Integer) { |v| @foo = v }
@@ -29,19 +29,19 @@ class TestOptionParserDidYouMean < TestOptionParser
   end
 
   def test_no_suggestion
-    assert_raise_with_message(OptionParser::InvalidOption, "invalid option: --cuz") do
+    assert_raise_with_message(Cmd::OptionParser::InvalidOption, "invalid option: --cuz") do
       @opt.permute!(%w"--cuz")
     end
   end
 
   def test_plain
-    assert_raise_with_message(OptionParser::InvalidOption, /invalid option: --baa\nDid you mean\?\s+bar\s+baz\Z/) do
+    assert_raise_with_message(Cmd::OptionParser::InvalidOption, /invalid option: --baa\nDid you mean\?\s+bar\s+baz\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
+    assert_raise_with_message(Cmd::OptionParser::AmbiguousOption, /ambiguous option: --ba\nDid you mean\?\s+bar\s+baz\Z/) do
       @opt.permute!(%w"--ba")
     end
   end

data/test/optparse/test_getopts.rb

@@ -2,9 +2,9 @@
 require 'test/unit'
 require 'optparse'
 
-class TestOptionParserGetopts < Test::Unit::TestCase
+class ::OptionParserGetopts < Test::Unit::TestCase
   def setup
-    @opt = OptionParser.new
+    @opt = Cmd::OptionParser.new
   end
 
   def test_short_noarg

data/test/optparse/test_kwargs.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 require 'optparse'
 require 'optparse/kwargs'
 
-class TestOptionParserKwArg < Test::Unit::TestCase
+class ::OptionParserKwArg < Test::Unit::TestCase
   class K
     def initialize(host:, port: 8080)
       @host = host
@@ -25,10 +25,10 @@ class TestOptionParserKwArg < Test::Unit::TestCase
   alias no_error assert_no_error
 
   def test_kwarg
-    opt = OptionParser.new
+    opt = Cmd::OptionParser.new
     options = opt.define_by_keywords({}, K.instance_method(:initialize),
                                      port: [Integer])
-    assert_raise(OptionParser::MissingArgument) {opt.parse!(%w"--host")}
+    assert_raise(Cmd::OptionParser::MissingArgument) {opt.parse!(%w"--host")}
     assert_nothing_raised {opt.parse!(%w"--host=localhost")}
     assert_equal("localhost", options[:host])
     assert_nothing_raised {opt.parse!(%w"--port")}

data/test/optparse/test_load.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 require 'optparse'
 require 'tmpdir'
 
-class TestOptionParserLoad < Test::Unit::TestCase
+class ::OptionParserLoad < Test::Unit::TestCase
   def setup
     @tmpdir = Dir.mktmpdir("optparse_test-")
     @basename = File.basename($0, '.*')
@@ -19,7 +19,7 @@ class TestOptionParserLoad < Test::Unit::TestCase
 
   def new_parser
     @result = nil
-    OptionParser.new do |opt|
+    Cmd::OptionParser.new do |opt|
       opt.on("--test=arg") {|v| @result = v}
     end
   end

data/test/optparse/test_noarg.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-module TestOptionParserNoArg
+module ::OptionParserNoArg
   def setup
     super
     @opt.def_option "--with_underscore" do |x| @flag = x end
     @opt.def_option "--with-hyphen" do |x| @flag = x end
   end
 
-  class Def1 < TestOptionParser
-    include TestOptionParserNoArg
+  class Def1 < ::OptionParser
+    include ::OptionParserNoArg
     def setup
       super
       @opt.def_option("-x") {|x| @flag = x}
       @opt.def_option("--option") {|x| @flag = x}
     end
   end
-  class Def2 < TestOptionParser
-    include TestOptionParserNoArg
+  class Def2 < ::OptionParser
+    include ::OptionParserNoArg
     def setup
       super
       @opt.def_option("-x", "--option") {|x| @flag = x}
@@ -25,7 +25,7 @@ module TestOptionParserNoArg
   end
 
   def test_short
-    assert_raise(OptionParser::InvalidOption) {@opt.parse!(%w"-xq")}
+    assert_raise(Cmd::OptionParser::InvalidOption) {@opt.parse!(%w"-xq")}
     assert_equal(%w"", no_error {@opt.parse!(%w"-x")})
     assert_equal(true, @flag)
     @flag = nil
@@ -34,11 +34,11 @@ module TestOptionParserNoArg
   end
 
   def test_abbrev
-    assert_raise(OptionParser::InvalidOption) {@opt.parse!(%w"-oq")}
+    assert_raise(Cmd::OptionParser::InvalidOption) {@opt.parse!(%w"-oq")}
     assert_equal(%w"", no_error {@opt.parse!(%w"-o")})
     assert_equal(true, @flag)
     @flag = nil
-    assert_raise(OptionParser::InvalidOption) {@opt.parse!(%w"-O")}
+    assert_raise(Cmd::OptionParser::InvalidOption) {@opt.parse!(%w"-O")}
     assert_nil(@flag)
     @flag = nil
     assert_equal(%w"foo", no_error {@opt.parse!(%w"-o foo")})
@@ -46,7 +46,7 @@ module TestOptionParserNoArg
   end
 
   def test_long
-    assert_raise(OptionParser::NeedlessArgument) {@opt.parse!(%w"--option=x")}
+    assert_raise(Cmd::OptionParser::NeedlessArgument) {@opt.parse!(%w"--option=x")}
     assert_equal(%w"", no_error {@opt.parse!(%w"--opt")})
     assert_equal(true, @flag)
     @flag = nil
@@ -56,8 +56,8 @@ module TestOptionParserNoArg
 
   def test_ambiguous
     @opt.def_option("--open") {|x|}
-    assert_raise(OptionParser::AmbiguousOption) {@opt.parse!(%w"--op")}
-    assert_raise(OptionParser::AmbiguousOption) {@opt.parse!(%w"-o")}
+    assert_raise(Cmd::OptionParser::AmbiguousOption) {@opt.parse!(%w"--op")}
+    assert_raise(Cmd::OptionParser::AmbiguousOption) {@opt.parse!(%w"-o")}
     assert_equal(%w"", no_error {@opt.parse!(%w"--opt")})
     assert_equal(true, @flag)
   end

data/test/optparse/test_optarg.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-class TestOptionParserOptArg < TestOptionParser
+class ::OptionParserOptArg < ::OptionParser
   def setup
     super
     @opt.def_option("-x[VAL]") {|x| @flag = x}

data/test/optparse/test_optparse.rb

@@ -2,9 +2,9 @@
 require 'test/unit'
 require 'cmd-optparse'
 
-class TestOptionParser < Test::Unit::TestCase
+class ::OptionParserTest < Test::Unit::TestCase
   def setup
-    @opt = OptionParser.new
+    @opt = Cmd::OptionParser.new
     @flag = self.class		# cannot set by option
   end
 
@@ -98,11 +98,11 @@ class TestOptionParser < Test::Unit::TestCase
       assert_equal({F: 'foo', zrs: 'foo'}, result)
     end
 
-    assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(--zr foo))}
-    assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(--z foo))}
-    assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-zrs foo))}
-    assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-zr foo))}
-    assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-z foo))}
+    assert_raise(Cmd::OptionParser::InvalidOption) {@opt.parse(%w(--zr foo))}
+    assert_raise(Cmd::OptionParser::InvalidOption) {@opt.parse(%w(--z foo))}
+    assert_raise(Cmd::OptionParser::InvalidOption) {@opt.parse(%w(-zrs foo))}
+    assert_raise(Cmd::OptionParser::InvalidOption) {@opt.parse(%w(-zr foo))}
+    assert_raise(Cmd::OptionParser::InvalidOption) {@opt.parse(%w(-z foo))}
   end
 
   def test_raise_unknown
@@ -121,7 +121,7 @@ class TestOptionParser < Test::Unit::TestCase
     @opt.def_option(/^[^-]/) do |arg|
       assert(false, "Never gets called")
     end
-    e = assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-t))}
+    e = assert_raise(Cmd::OptionParser::InvalidOption) {@opt.parse(%w(-t))}
     assert_equal(["-t"], e.args)
   end
 end

data/test/optparse/test_placearg.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-class TestOptionParserPlaceArg < TestOptionParser
+class ::OptionParserPlaceArg < ::OptionParser
   def setup
     super
     @opt.def_option("-x [VAL]") {|x| @flag = x}

data/test/optparse/test_reqarg.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-module TestOptionParserReqArg
+module ::OptionParserReqArg
   def setup
     super
     @opt.def_option "--with_underscore=VAL" do |x| @flag = x end
     @opt.def_option "--with-hyphen=VAL" do |x| @flag = x end
   end
 
-  class Def1 < TestOptionParser
-    include TestOptionParserReqArg
+  class Def1 < ::OptionParser
+    include ::OptionParserReqArg
     def setup
       super
       @opt.def_option("-xVAL") {|x| @flag = x}
@@ -18,22 +18,22 @@ module TestOptionParserReqArg
       @reopt = nil
     end
   end
-  class Def2 < TestOptionParser
-    include TestOptionParserReqArg
+  class Def2 < ::OptionParser
+    include ::OptionParserReqArg
     def setup
       super
       @opt.def_option("-x", "--option=VAL") {|x| @flag = x}
     end
   end
-  class Def3 < TestOptionParser
-    include TestOptionParserReqArg
+  class Def3 < ::OptionParser
+    include ::OptionParserReqArg
     def setup
       super
       @opt.def_option("--option=VAL", "-x") {|x| @flag = x}
     end
   end
-  class Def4 < TestOptionParser
-    include TestOptionParserReqArg
+  class Def4 < ::OptionParser
+    include ::OptionParserReqArg
     def setup
       super
       @opt.def_option("-xVAL", "--option=VAL") {|x| @flag = x}
@@ -41,7 +41,7 @@ module TestOptionParserReqArg
   end
 
   def test_short
-    assert_raise(OptionParser::MissingArgument) {@opt.parse!(%w"-x")}
+    assert_raise(Cmd::OptionParser::MissingArgument) {@opt.parse!(%w"-x")}
     assert_equal(%w"", no_error {@opt.parse!(%w"-x foo")})
     assert_equal("foo", @flag)
     assert_equal(%w"", no_error {@opt.parse!(%w"-xbar")})
@@ -51,7 +51,7 @@ module TestOptionParserReqArg
   end
 
   def test_abbrev
-    assert_raise(OptionParser::MissingArgument) {@opt.parse!(%w"-o")}
+    assert_raise(Cmd::OptionParser::MissingArgument) {@opt.parse!(%w"-o")}
     assert_equal(%w"", no_error {@opt.parse!(%w"-o foo")})
     assert_equal("foo", @flag)
     assert_equal(%w"", no_error {@opt.parse!(%w"-obar")})
@@ -61,7 +61,7 @@ module TestOptionParserReqArg
   end
 
   def test_long
-    assert_raise(OptionParser::MissingArgument) {@opt.parse!(%w"--opt")}
+    assert_raise(Cmd::OptionParser::MissingArgument) {@opt.parse!(%w"--opt")}
     assert_equal(%w"", no_error {@opt.parse!(%w"--opt foo")})
     assert_equal("foo", @flag)
     assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt= foo")})
@@ -81,7 +81,7 @@ module TestOptionParserReqArg
     assert_equal("foo4", @flag)
   end
 
-  class TestOptionParser::WithPattern < TestOptionParser
+  class ::OptionParser::WithPattern < ::OptionParser
     def test_pattern
       pat = num = nil
       @opt.def_option("--pattern=VAL", /(\w+)(?:\s*:\s*(\w+))?/) {|x, y, z| pat = [x, y, z]}

data/test/optparse/test_summary.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: false
 require_relative 'test_optparse'
 
-class TestOptionParserSummaryTest < TestOptionParser
+class ::OptionParserSummaryTest < ::OptionParser
   def test_short_clash
     r = nil
-    o = OptionParser.new do |opts|
+    o = Cmd::OptionParser.new do |opts|
       opts.on("-f", "--first-option", "description 1", "description 2"){r = "first-option"}
       opts.on("-t", "--test-option"){r = "test-option"}
       opts.on("-t", "--another-test-option"){r = "another-test-option"}
@@ -21,32 +21,32 @@ class TestOptionParserSummaryTest < TestOptionParser
   end
 
   def test_banner
-    o = OptionParser.new("foo bar")
+    o = Cmd::OptionParser.new("foo bar")
     assert_equal("foo bar", o.banner)
   end
 
   def test_banner_from_progname
-    o = OptionParser.new
+    o = Cmd::OptionParser.new
     o.program_name = "foobar"
     assert_equal("Usage: foobar [options]\n", o.help)
   end
 
   def test_summary
-    o = OptionParser.new("foo\nbar")
+    o = Cmd::OptionParser.new("foo\nbar")
     assert_equal("foo\nbar\n", o.to_s)
     assert_equal(["foo\n", "bar"], o.to_a)
   end
 
   def test_summary_containing_space
-    # test for r35467. OptionParser#to_a shouldn't split str by spaces.
+    # test for r35467. Cmd::OptionParser#to_a shouldn't split str by spaces.
     bug6348 = '[ruby-dev:45568]'
-    o = OptionParser.new("foo bar")
+    o = Cmd::OptionParser.new("foo bar")
     assert_equal("foo bar\n", o.to_s, bug6348)
     assert_equal(["foo bar"], o.to_a, bug6348)
   end
 
   def test_ver
-    o = OptionParser.new("foo bar")
+    o = Cmd::OptionParser.new("foo bar")
     o.program_name = "foo"
     assert_warning('') {assert_nil(o.version)}
     assert_warning('') {assert_nil(o.release)}
@@ -58,7 +58,7 @@ class TestOptionParserSummaryTest < TestOptionParser
 
   # https://github.com/ruby/optparse/issues/37
   def test_very_long_without_short
-    o = OptionParser.new do |opts|
+    o = Cmd::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 }

data/test/optparse/test_zsh_completion.rb

@@ -2,9 +2,9 @@
 require 'test/unit'
 require 'optparse'
 
-class TestOptionParserZshCompletion < Test::Unit::TestCase
+class ::OptionParserZshCompletion < Test::Unit::TestCase
   def setup
-    @opt = OptionParser.new
+    @opt = Cmd::OptionParser.new
     @opt.define("-z", "zzz") {}
     @opt.define("--foo") {}
     @opt.define("--bar=BAR") {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmd-optparse.rb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - '0x1eef'