Skip to content

Also accept '-' as an optional argument #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nobu merged 2 commits into from
Jun 9, 2022
Merged

Also accept '-' as an optional argument #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d350071
Also accept '-' as an optional argument
konsolebox May 19, 2022
2999c4c
[PATCH] Tests for #35
nobu May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/optparse.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 6 additions & 0 deletions test/optparse/test_placearg.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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")})
Expand Down