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

merge revision(s) 35467:

Browse source 
* lib/optparse.rb (OptionParser#to_a): split for each lines.
	  [ruby-dev:45568][Bug #6348]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-04-24 20:57:07 +00:00
parent bea7c1c899
commit 864fdcfb11
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Apr 25 05:56:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser#to_a): split for each lines.
[ruby-dev:45568][Bug #6348]
Tue Apr 24 21:20:39 2012 NARUSE, Yui <naruse@ruby-lang.org> Tue Apr 24 21:20:39 2012 NARUSE, Yui <naruse@ruby-lang.org>
* lib/optparse.rb (OptionParser#to_a): should split by end-of-line, * lib/optparse.rb (OptionParser#to_a): should split by end-of-line,

2
lib/optparse.rb
View file

@ -1071,7 +1071,7 @@ XXX
# #
# Returns option summary list. # Returns option summary list.
# #
def to_a; summarize("#{banner}".split) end def to_a; summarize("#{banner}".split(/^/)) end
# #
# Checks if an argument is given twice, in which case an ArgumentError is # Checks if an argument is given twice, in which case an ArgumentError is

2
test/optparse/test_summary.rb
View file

@ -33,6 +33,6 @@ class TestOptionParser::SummaryTest < TestOptionParser
def test_summary def test_summary
o = OptionParser.new("foo\nbar") o = OptionParser.new("foo\nbar")
assert_equal("foo\nbar\n", o.to_s) assert_equal("foo\nbar\n", o.to_s)
assert_equal(["foo", "bar"], o.to_a) assert_equal(["foo\n", "bar"], o.to_a)
end end
end end

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 199 #define RUBY_PATCHLEVEL 200
#define RUBY_RELEASE_DATE "2012-04-24" #define RUBY_RELEASE_DATE "2012-04-25"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 24 #define RUBY_RELEASE_DAY 25
#include "ruby/version.h" #include "ruby/version.h"