open files in binary mode to appease Windows

Author: jamis

CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== *unreleased*
+
+* Open files in binary mode to appease Windows [Jamis Buck]
+
+
 === 2.0.0 / 1 May 2008
 
 * Make Net::SSH::Connection::Session#sftp accept an argument determining whether or not to block while the SFTP subsystem initializes (defaults to true) [Jamis Buck]

lib/net/sftp/operations/download.rb

@@ -307,7 +307,7 @@ def on_open(response)
         raise "open #{entry.remote}: #{response}" unless response.ok?
 
         entry.handle = response[:handle]
-        entry.sink = entry.local.respond_to?(:write) ? entry.local : ::File.open(entry.local, "w")
+        entry.sink = entry.local.respond_to?(:write) ? entry.local : ::File.open(entry.local, "wb")
         entry.offset = 0
 
         download_next_chunk(entry)

lib/net/sftp/operations/upload.rb

@@ -276,7 +276,7 @@ def open_file(local, remote)
           file = local
           name = options[:name] || "<memory>"
         else
-          file = ::File.open(local)
+          file = ::File.open(local, "rb")
           name = local
         end
 

test/test_download.rb

@@ -13,7 +13,7 @@ def test_download_file_should_transfer_remote_to_local
     expect_file_transfer(remote, text)
 
     file = StringIO.new
-    File.stubs(:open).with(local, "w").returns(file)
+    File.stubs(:open).with(local, "wb").returns(file)
 
     assert_scripted_command { sftp.download(remote, local) }
     assert_equal text, file.string
@@ -143,7 +143,7 @@ def prepare_large_file_download(local, remote, text)
       end
 
       file = StringIO.new
-      File.stubs(:open).with(local, "w").returns(file)
+      File.stubs(:open).with(local, "wb").returns(file)
 
       return file
     end
@@ -244,8 +244,8 @@ def prepare_directory_tree_download(local, remote)
 
       file1 = StringIO.new
       file2 = StringIO.new
-      File.expects(:open).with(File.join(local, "file1"), "w").returns(file1)
-      File.expects(:open).with(File.join(local, "subdir1", "file2"), "w").returns(file2)
+      File.expects(:open).with(File.join(local, "file1"), "wb").returns(file1)
+      File.expects(:open).with(File.join(local, "subdir1", "file2"), "wb").returns(file2)
 
       [file1, file2]
     end

test/test_upload.rb

@@ -196,7 +196,7 @@ def expect_file(path, data)
       File.stubs(:exists?).with(path).returns(true)
       file = StringIO.new(data)
       file.stubs(:stat).returns(stub("stat", :size => data.length))
-      File.stubs(:open).with(path).returns(file)
+      File.stubs(:open).with(path, "rb").returns(file)
     end
 
     def expect_directory(path, entries)