archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r23286 from trunk into ruby_1_9_1.

Browse source 
--
* lib/optparse.rb (OptionParser#parse_in_order): do not make an
  option from non-option argument.  [ruby-dev:38333]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-05-11 15:05:43 +00:00
parent f2140e9e4e
commit 19ad6658b5
4 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/optparse/test_optparse.rb
View file

@ -8,6 +8,8 @@ class TestOptionParser < Test::Unit::TestCase
end
def no_error(*args)
assert_nothing_raised(*args) {return yield}
ensure
$!.backtrace.delete_if {|e| /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}/o =~ e} if $!
end
def test_permute

8
test/optparse/test_placearg.rb
View file

@ -5,6 +5,7 @@ class TestOptionParser::PlaceArg < TestOptionParser
super
@opt.def_option("-x [VAL]") {|x| @flag = x}
@opt.def_option("--option [VAL]") {|x| @flag = x}
@opt.def_option("-T [level]", /^[0-4]$/, Integer) {|x| @topt = x}
@opt.def_option("-n") {}
end
@ -42,4 +43,11 @@ class TestOptionParser::PlaceArg < TestOptionParser
assert_equal(%w"", no_error {@opt.parse!(%w"--opt bar")})
assert_equal("bar", @flag)
end
def test_conv
assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T te.rb")})
assert_nil(@topt)
assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T1 te.rb")})
assert_equal(1, @topt)
end
end