Merge branch 'master' into add-limit-argument

Author: mfazekas

lib/net/sftp/operations/file.rb

@@ -153,6 +153,14 @@ def print(*items)
       nil
     end
 
+    def size
+      stat.size
+    end
+
+    def rewind
+      self.pos = 0
+    end
+
     # Writes each argument to the stream, appending a newline to any item
     # that does not already end in a newline. Array arguments are flattened.
     def puts(*items)

lib/net/sftp/version.rb

@@ -56,7 +56,7 @@ def to_i
 
       # The prerelease component of this version of the Net::SFTP library
       # nil allowed
-      PRE   = "rc2"
+      PRE   = "rc3"
 
       # The current version of the Net::SFTP library as a Version instance
       CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

net-sftp.gemspec

@@ -31,16 +31,16 @@ Gem::Specification.new do |spec|
     spec.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      spec.add_runtime_dependency(%q<net-ssh>, [">= 2.6.5", "< 5.0.0"])
+      spec.add_runtime_dependency(%q<net-ssh>, [">= 2.6.5", "< 6.0.0"])
       spec.add_development_dependency(%q<test-unit>, [">= 0"])
       spec.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      spec.add_dependency(%q<net-ssh>, [">= 2.6.5", "< 5.0.0"])
+      spec.add_dependency(%q<net-ssh>, [">= 2.6.5", "< 6.0.0"])
       spec.add_dependency(%q<test-unit>, [">= 0"])
       spec.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    spec.add_dependency(%q<net-ssh>, [">= 2.6.5", "< 5.0.0"])
+    spec.add_dependency(%q<net-ssh>, [">= 2.6.5", "< 6.0.0"])
     spec.add_dependency(%q<test-unit>, [">= 0"])
     spec.add_dependency(%q<mocha>, [">= 0"])
   end

test/test_file.rb

@@ -196,4 +196,20 @@ def test_stat_should_return_attributes_object_for_handle
     @sftp.expects(:fstat!).with("handle").returns(stat)
     assert_equal stat, @file.stat
   end
+
+  def test_size_should_return_size_from_stat
+    stat = stub(size: 1024)
+    @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

test/test_upload.rb

@@ -207,7 +207,7 @@ def prepare_directory
 
     def expect_file(path, data)
       File.stubs(:directory?).with(path).returns(false)
-      File.stubs(:exists?).with(path).returns(true)
+      File.stubs(:exist?).with(path).returns(true)
       file = StringIO.new(data)
       file.stubs(:stat).returns(stub("stat", :size => data.length))
       File.stubs(:open).with(path, "rb").returns(file)