Merge pull request #51 from eligible/master

Adding optional parameter version to SFTP::Session

Author: mfazekas

lib/net/sftp/session.rb

@@ -75,8 +75,9 @@ class Session
     #
     #   sftp = Net::SFTP::Session.new(ssh)
     #   sftp.loop { sftp.opening? }
-    def initialize(session, &block)
+    def initialize(session, version = nil, &block)
       @session    = session
+      @version    = version
       @input      = Net::SSH::Buffer.new
       self.logger = session.logger
       @state      = :closed
@@ -876,7 +877,7 @@ def when_subsystem_started(channel, success)
         channel.on_close(&method(:when_channel_closed))
         channel.on_process(&method(:when_channel_polled))
 
-        send_packet(FXP_INIT, :long, HIGHEST_PROTOCOL_VERSION_SUPPORTED)
+        send_packet(FXP_INIT, :long, @version || HIGHEST_PROTOCOL_VERSION_SUPPORTED)
       end
 
       # Called when the SSH server closes the underlying channel.

test/common.rb

@@ -36,8 +36,8 @@ def raw(*args)
       Net::SSH::Buffer.from(*args).to_s
     end
 
-    def sftp(options={})
-      @sftp ||= Net::SFTP::Session.new(connection(options))
+    def sftp(options={}, version=nil)
+      @sftp ||= Net::SFTP::Session.new(connection(options), version)
     end
 
     def expect_sftp_session(opts={})

test/test_session.rb

@@ -13,6 +13,14 @@ class SessionTest < Net::SFTP::TestCase
     end
   end
 
+  def test_passing_version_should_cause_same_version_to_be_passed_and_used
+    version = 3
+    expect_sftp_session :client_version => version, :server_version => version
+    assert_scripted { sftp({},version).connect! }
+    assert_equal version, sftp.protocol.version
+  end
+
+
   def test_v1_open_read_only_that_succeeds_should_invoke_callback
     expect_open("/path/to/file", "r", nil, :server_version => 1)
     assert_successful_open("/path/to/file")