diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/net/ftp.rb | 11 | ||||
| -rw-r--r-- | test/net/ftp/test_buffered_socket.rb | 40 |
3 files changed, 54 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Tue Jun 17 16:41:49 2014 Shugo Maeda <shugo@ruby-lang.org> + + * lib/net/ftp.rb (gets, readline): read lines without LF properly. + [ruby-core:63205] [Bug #9949] + + * test/net/ftp/test_buffered_socket.rb: related test. + Tue Jun 17 12:35:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (extract_raise_opts): pass unknown options to the diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index eabe6f5f08..6b452b8a75 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -1105,13 +1105,16 @@ module Net end def gets - return readuntil("\n") - rescue EOFError - return nil + line = readuntil("\n", true) + return line.empty? ? nil : line end def readline - return readuntil("\n") + line = gets + if line.nil? + raise EOFError, "end of file reached" + end + return line end end # :startdoc: diff --git a/test/net/ftp/test_buffered_socket.rb b/test/net/ftp/test_buffered_socket.rb new file mode 100644 index 0000000000..f9eefcd988 --- /dev/null +++ b/test/net/ftp/test_buffered_socket.rb @@ -0,0 +1,40 @@ +require "net/ftp" +require "test/unit" +require "ostruct" +require "stringio" + +class FTPTest < Test::Unit::TestCase + def test_gets_empty + sock = create_buffered_socket("") + assert_equal(nil, sock.gets) + end + + def test_gets_one_line + sock = create_buffered_socket("foo\n") + assert_equal("foo\n", sock.gets) + end + + def test_gets_one_line_without_term + sock = create_buffered_socket("foo") + assert_equal("foo", sock.gets) + end + + def test_gets_two_lines + sock = create_buffered_socket("foo\nbar\n") + assert_equal("foo\n", sock.gets) + assert_equal("bar\n", sock.gets) + end + + def test_gets_two_lines_without_term + sock = create_buffered_socket("foo\nbar") + assert_equal("foo\n", sock.gets) + assert_equal("bar", sock.gets) + end + + private + + def create_buffered_socket(s) + io = StringIO.new(s) + return Net::FTP::BufferedSocket.new(io) + end +end |