Merge pull request #86 from jstuckey/remove_duplicate_rewind

Remove duplicate Net::SFTP::Operations::File#rewind

Author: mfazekas

lib/net/sftp/operations/file.rb

@@ -127,14 +127,6 @@ def readline(sep_or_limit=$/, limit=Float::INFINITY)
       return line
     end
 
-    # Resets position to beginning of file
-    def rewind
-      @pos      = 0
-      @real_pos = 0
-      @real_eof = false
-      @buffer   = ""
-    end
-
     # Writes the given data to the stream, incrementing the file position and
     # returning the number of bytes written.
     def write(data)
@@ -157,6 +149,7 @@ def size
       stat.size
     end
 
+    # Resets position to beginning of file
     def rewind
       self.pos = 0
     end

test/test_file.rb

@@ -142,6 +142,16 @@ def test_rewind_should_reset_to_beginning_of_file
     assert_equal 0, @file.pos
   end
 
+  def test_rewind
+    @sftp.expects(:write!).with("handle", 0, "hello world\n")
+    @sftp.expects(:read!).with("handle", 12, 8192).returns("hello world\n")
+    @sftp.expects(:read!).with("handle", 0, 8192).returns("hello world\n")
+    @file.puts "hello world\n"
+    assert_equal "hello", @file.read(5)
+    @file.rewind
+    assert_equal "hello world", @file.read(11)
+  end
+
   def test_write_should_write_data_and_increment_pos_and_return_data_length
     @sftp.expects(:write!).with("handle", 0, "hello world")
     assert_equal 11, @file.write("hello world")
@@ -202,14 +212,4 @@ def test_size_should_return_size_from_stat
     @sftp.expects(:fstat!).with("handle").returns(stat)
     assert_equal 1024, @file.size
   end
-
-  def test_rewind
-    @sftp.expects(:write!).with("handle", 0, "hello world\n")
-    @sftp.expects(:read!).with("handle", 12, 8192).returns("hello world\n")
-    @sftp.expects(:read!).with("handle", 0, 8192).returns("hello world\n")
-    @file.puts "hello world\n"
-    assert_equal "hello", @file.read(5)
-    @file.rewind
-    assert_equal "hello world", @file.read(11)
-  end
 end