net-ssh 2.0.22 → 2.0.23

data/CHANGELOG.rdoc

@@ -1,4 +1,13 @@
 
+=== 2.0.23 / 03 Jun 2010
+
+* delay CHANNEL_EOF packet until output buffer is empty [Rich Lane]
+
+Previously, calling #eof! after #send_data would result in the CHANNEL_EOF
+packet being sent immediately, ahead of the data in the output buffer. Now
+buffer becomes empty.
+
+
 === 2.0.22 / 20 Apr 2010
 
 * Fix for: "Parsing the config errors out because it coerces the "1" into an integer and then tries to split it on spaces for multiple host checking." (http://net-ssh.lighthouseapp.com/projects/36253/tickets/10) [Lee Marlow]

data/lib/net/ssh/connection/channel.rb

@@ -126,7 +126,7 @@ module Net; module SSH; module Connection
       @pending_requests = []
       @on_open_failed = @on_data = @on_extended_data = @on_process = @on_close = @on_eof = nil
       @on_request = {}
-      @closing = @eof = false
+      @closing = @eof = @sent_eof = false
     end
 
     # A shortcut for accessing properties of the channel (see #properties).
@@ -298,10 +298,10 @@ module Net; module SSH; module Connection
 
     # Tells the remote end of the channel that no more data is forthcoming
     # from this end of the channel. The remote end may still send data.
+    # The CHANNEL_EOF packet will be sent once the output buffer is empty.
     def eof!
       return if eof?
       @eof = true
-      connection.send_message(Buffer.from(:byte, CHANNEL_EOF, :long, remote_id))
     end
 
     # If an #on_process handler has been set up, this will cause it to be
@@ -310,6 +310,11 @@ module Net; module SSH; module Connection
     def process
       @on_process.call(self) if @on_process
       enqueue_pending_output
+
+      if @eof and not @sent_eof and output.empty?
+        connection.send_message(Buffer.from(:byte, CHANNEL_EOF, :long, remote_id))
+        @sent_eof = true
+      end
     end
 
     # Registers a callback to be invoked when data packets are received by the

data/lib/net/ssh/version.rb

@@ -51,7 +51,7 @@ module Net; module SSH
     MINOR = 0
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 22
+    TINY  = 23
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-ssh.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "net-ssh"
         s.rubyforge_project = 'net-ssh'
-	s.version = "2.0.22"
+	s.version = "2.0.23"
 	s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 	s.description = s.summary
 	s.authors = ["Jamis Buck", "Delano Mandelbaum"]

data/test/connection/test_channel.rb

@@ -378,6 +378,7 @@ module Connection
       channel.do_open_confirmation(0, 1000, 1000)
       connection.expect { |t,p| assert_equal CHANNEL_EOF, p.type }
       channel.eof!
+      channel.process
     end
 
     def test_eof_bang_should_not_send_eof_if_eof_was_already_declared
@@ -385,6 +386,7 @@ module Connection
       connection.expect { |t,p| assert_equal CHANNEL_EOF, p.type }
       channel.eof!
       assert_nothing_raised { channel.eof! }
+      channel.process
     end
 
     def test_eof_q_should_return_true_if_eof_declared
@@ -394,15 +396,28 @@ module Connection
       assert !channel.eof?
       channel.eof!
       assert channel.eof?
+      channel.process
     end
 
     def test_send_data_should_raise_exception_if_eof_declared
       channel.do_open_confirmation(0, 1000, 1000)
       connection.expect { |t,p| assert_equal CHANNEL_EOF, p.type }
       channel.eof!
+      channel.process
       assert_raises(EOFError) { channel.send_data("die! die! die!") }
     end
 
+    def test_data_should_precede_eof
+      channel.do_open_confirmation(0, 1000, 1000)
+      connection.expect do |t,p|
+        assert_equal CHANNEL_DATA, p.type
+        connection.expect { |t,p| assert_equal CHANNEL_EOF, p.type }
+      end
+      channel.send_data "foo"
+      channel.eof!
+      channel.process
+   end
+
     private
 
       class MockConnection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.22
+  version: 2.0.23
 platform: ruby
 authors: 
 - Jamis Buck
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -04:00
+date: 2010-06-03 00:00:00 -04:00
 default_executable: 
 dependencies: []