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

optparse.rb: hyphenize

Browse source 
* lib/optparse.rb (make_switch, parse_in_order): unify underscores
  to hyphens.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-10-14 08:20:26 +00:00
parent def1fbde5c
commit 99ad512486
6 changed files with 77 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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

12
lib/optparse.rb
View file

@ -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

21
test/optparse/test_noarg.rb
View file

@ -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

13
test/optparse/test_optarg.rb
View file

@ -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

13
test/optparse/test_placearg.rb
View file

@ -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)

17
test/optparse/test_reqarg.rb
View file

@ -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