Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 15 additions & 6 deletions lib/optparse.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,16 @@ def parse!(argv = default_argv, into: nil)
# # params["bar"] = "x" # --bar x
# # params["zot"] = "z" # --zot Z
#
def getopts(*args)
# Option +symbolize_names+ (boolean) specifies whether returned Hash keys should be Symbols; defaults to +false+ (use Strings).
#
# params = ARGV.getopts("ab:", "foo", "bar:", "zot:Z;zot option", symbolize_names: true)
# # params[:a] = true # -a
# # params[:b] = "1" # -b1
# # params[:foo] = "1" # --foo
# # params[:bar] = "x" # --bar x
# # params[:zot] = "z" # --zot Z
#
def getopts(*args, symbolize_names: false)
argv = Array === args.first ? args.shift : default_argv
single_options, *long_options = *args

Expand Down Expand Up @@ -1804,14 +1813,14 @@ def getopts(*args)
end

parse_in_order(argv, result.method(:[]=))
result
symbolize_names ? result.transform_keys(&:to_sym) : result
end

#
# See #getopts.
#
def self.getopts(*args)
new.getopts(*args)
def self.getopts(*args, symbolize_names: false)
new.getopts(*args, symbolize_names: symbolize_names)
end

#
Expand Down Expand Up @@ -2276,8 +2285,8 @@ def parse!() options.parse!(self) end
# rescue OptionParser::ParseError
# end
#
def getopts(*args)
options.getopts(self, *args)
def getopts(*args, symbolize_names: false)
options.getopts(self, *args, symbolize_names: symbolize_names)
end

#
Expand Down
16 changes: 16 additions & 0 deletions test/optparse/test_getopts.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,39 @@ def test_short_noarg
o = @opt.getopts(%w[-a], "ab")
assert_equal(true, o['a'])
assert_equal(false, o['b'])

o = @opt.getopts(%w[-a], "ab", symbolize_names: true)
assert_equal(true, o[:a])
assert_equal(false, o[:b])
end

def test_short_arg
o = @opt.getopts(%w[-a1], "a:b:")
assert_equal("1", o['a'])
assert_equal(nil, o['b'])

o = @opt.getopts(%w[-a1], "a:b:", symbolize_names: true)
assert_equal("1", o[:a])
assert_equal(nil, o[:b])
end

def test_long_noarg
o = @opt.getopts(%w[--foo], "", "foo", "bar")
assert_equal(true, o['foo'])
assert_equal(false, o['bar'])

o = @opt.getopts(%w[--foo], "", "foo", "bar", symbolize_names: true)
assert_equal(true, o[:foo])
assert_equal(false, o[:bar])
end

def test_long_arg
o = @opt.getopts(%w[--bar ZOT], "", "foo:FOO", "bar:BAR")
assert_equal("FOO", o['foo'])
assert_equal("ZOT", o['bar'])

o = @opt.getopts(%w[--bar ZOT], "", "foo:FOO", "bar:BAR", symbolize_names: true)
assert_equal("FOO", o[:foo])
assert_equal("ZOT", o[:bar])
end
end