kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/optparse] Also accept '-' as an optional argument (https://github.com/ruby/optparse/pull/35)

Browse source 
https://github.com/ruby/optparse/commit/f2b8318631
This commit is contained in:
konsolebox 2022-06-09 19:43:24 +08:00 committed by Hiroshi SHIBATA
parent 3725454161
commit 419ad1e13e
Notes: git 2022-07-29 19:10:31 +09:00 
Merged: https://github.com/ruby/ruby/pull/6200
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/optparse.rb
View file

@ -765,15 +765,15 @@ class OptionParser
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]

6
test/optparse/test_placearg.rb
View file

@ -18,6 +18,8 @@ class TestOptionParserPlaceArg < TestOptionParser
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 @@ class TestOptionParserPlaceArg < TestOptionParser
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 @@ class TestOptionParserPlaceArg < TestOptionParser
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")})