summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/optparse.rb12
-rw-r--r--test/optparse/test_noarg.rb21
-rw-r--r--test/optparse/test_optarg.rb13
-rw-r--r--test/optparse/test_placearg.rb13
-rw-r--r--test/optparse/test_reqarg.rb17
6 files changed, 77 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fb7b8e123f..c0a518a6b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 14 17:20:24 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (make_switch, parse_in_order): unify underscores
+ to hyphens.
+
Fri Oct 14 10:48:37 2016 Eric Wong <e@80x24.org>
* lib/webrick/utils.rb (TimeoutHandler): use monotonic clock
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 7ff7b8e499..afeff80740 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1386,7 +1386,8 @@ XXX
default_style = Switch::NoArgument
default_pattern, conv = search(:atype, FalseClass) unless default_pattern
ldesc << "--no-#{q}"
- long << 'no-' + (q = q.downcase)
+ (q = q.downcase).tr!('_', '-')
+ long << "no-#{q}"
nolong << q
when /^--\[no-\]([^\[\]=\s]*)(.+)?/
q, a = $1, $2
@@ -1396,10 +1397,11 @@ XXX
default_pattern, conv = search(:atype, o) unless default_pattern
end
ldesc << "--[no-]#{q}"
- long << (o = q.downcase)
+ (o = q.downcase).tr!('_', '-')
+ long << o
not_pattern, not_conv = search(:atype, FalseClass) unless not_style
not_style = Switch::NoArgument
- nolong << 'no-' + o
+ nolong << "no-#{o}"
when /^--([^\[\]=\s]*)(.+)?/
q, a = $1, $2
if a
@@ -1408,7 +1410,8 @@ XXX
default_pattern, conv = search(:atype, o) unless default_pattern
end
ldesc << "--#{q}"
- long << (o = q.downcase)
+ (o = q.downcase).tr!('_', '-')
+ long << o
when /^-(\[\^?\]?(?:[^\\\]]|\\.)*\])(.+)?/
q, a = $1, $2
o = notwice(Object, klass, 'type')
@@ -1538,6 +1541,7 @@ XXX
# long option
when /\A--([^=]*)(?:=(.*))?/m
opt, rest = $1, $2
+ opt.tr!('_', '-')
begin
sw, = complete(:long, opt, true)
rescue ParseError
diff --git a/test/optparse/test_noarg.rb b/test/optparse/test_noarg.rb
index 8f9be29ab8..8f20519408 100644
--- a/test/optparse/test_noarg.rb
+++ b/test/optparse/test_noarg.rb
@@ -2,6 +2,12 @@
require_relative 'test_optparse'
module TestOptionParser::NoArg
+ 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 NoArg
def setup
@@ -55,4 +61,19 @@ module TestOptionParser::NoArg
assert_equal(%w"", no_error {@opt.parse!(%w"--opt")})
assert_equal(true, @flag)
end
+
+ def test_hyphenize
+ @flag = nil
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with_underscore")})
+ assert_equal(true, @flag)
+ @flag = nil
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with-underscore")})
+ assert_equal(true, @flag)
+ @flag = nil
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with-hyphen")})
+ assert_equal(true, @flag)
+ @flag = nil
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with_hyphen")})
+ assert_equal(true, @flag)
+ end
end
diff --git a/test/optparse/test_optarg.rb b/test/optparse/test_optarg.rb
index b7436fb74c..14584f7e89 100644
--- a/test/optparse/test_optarg.rb
+++ b/test/optparse/test_optarg.rb
@@ -7,6 +7,8 @@ class TestOptionParser::OptArg < TestOptionParser
@opt.def_option("-x[VAL]") {|x| @flag = x}
@opt.def_option("--option[=VAL]") {|x| @flag = x}
@opt.def_option("--regexp[=REGEXP]", Regexp) {|x| @reopt = x}
+ @opt.def_option "--with_underscore[=VAL]" do |x| @flag = x end
+ @opt.def_option "--with-hyphen[=VAL]" do |x| @flag = x end
@reopt = nil
end
@@ -44,4 +46,15 @@ class TestOptionParser::OptArg < TestOptionParser
assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt foo")})
assert_equal(nil, @flag)
end
+
+ def test_hyphenize
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with_underscore=foo1")})
+ assert_equal("foo1", @flag)
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with-underscore=foo2")})
+ assert_equal("foo2", @flag)
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with-hyphen=foo3")})
+ assert_equal("foo3", @flag)
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with_hyphen=foo4")})
+ assert_equal("foo4", @flag)
+ end
end
diff --git a/test/optparse/test_placearg.rb b/test/optparse/test_placearg.rb
index 90b2b97a63..8acfdb2161 100644
--- a/test/optparse/test_placearg.rb
+++ b/test/optparse/test_placearg.rb
@@ -11,6 +11,8 @@ class TestOptionParser::PlaceArg < TestOptionParser
@opt.def_option("-n") {}
@opt.def_option("--regexp [REGEXP]", Regexp) {|x| @reopt = x}
@reopt = nil
+ @opt.def_option "--with_underscore=VAL" do |x| @flag = x end
+ @opt.def_option "--with-hyphen=VAL" do |x| @flag = x end
end
def test_short
@@ -48,6 +50,17 @@ class TestOptionParser::PlaceArg < TestOptionParser
assert_equal("bar", @flag)
end
+ def test_hyphenize
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with_underscore=foo1")})
+ assert_equal("foo1", @flag)
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with-underscore=foo2")})
+ assert_equal("foo2", @flag)
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with-hyphen=foo3")})
+ assert_equal("foo3", @flag)
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with_hyphen=foo4")})
+ assert_equal("foo4", @flag)
+ end
+
def test_conv
assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T te.rb")})
assert_nil(@topt)
diff --git a/test/optparse/test_reqarg.rb b/test/optparse/test_reqarg.rb
index 1904f46154..b2e4755f80 100644
--- a/test/optparse/test_reqarg.rb
+++ b/test/optparse/test_reqarg.rb
@@ -2,6 +2,12 @@
require_relative 'test_optparse'
module TestOptionParser::ReqArg
+ 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 ReqArg
def setup
@@ -64,6 +70,17 @@ module TestOptionParser::ReqArg
assert_equal("foo", @flag)
end
+ def test_hyphenize
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with_underscore foo1")})
+ assert_equal("foo1", @flag)
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with-underscore foo2")})
+ assert_equal("foo2", @flag)
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with-hyphen foo3")})
+ assert_equal("foo3", @flag)
+ assert_equal(%w"", no_error {@opt.parse!(%w"--with_hyphen foo4")})
+ assert_equal("foo4", @flag)
+ end
+
class TestOptionParser::WithPattern < TestOptionParser
def test_pattern
pat = num = nil