net-ssh 4.0.0.beta2 → 4.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22fb7b0fc6aadf02461ac28cfb52e67f7eeb289
-  data.tar.gz: 502436b98a673a775cbc9728b29ca9d462982813
+  metadata.gz: 146419fe3e2b0cf850b18f87d8697a309a169370
+  data.tar.gz: c578d63fd847d87466e31bda279b188efe89cb58
 SHA512:
-  metadata.gz: 0044867033880c2aa00ce745ab9021138c0266106a23c1edfc3c9163208fc687b5a1ccabe4620495a1d85f7f94bad62d3f237e32ef3af644d65408a621d417f6
-  data.tar.gz: 4f5701087ee35d6567517fb773582b19c241b3ef7467729adb3adeb9906ffcbd2b54ef2a5224b143694ab3fdf3777d5ddae978e48f187d1abd6020dd34296146
+  metadata.gz: 99e33fcbc5bdd89c5f0068e6610798b87d7b78b87e6c18a969d2e894ccfea1a89d01847e3a2bed1006db21a3032e847df416ca854988d2ef004b4feb60a99186
+  data.tar.gz: 551f47778fa0921ad2cffbee6cfdc0c08df7fde716f83cf95f4330892a16c851fa22be10197a3d3bf6ab87ebc20d9642f9fd54b77a31353e8662717702d302a6

data/CHANGES.txt

@@ -1,3 +1,7 @@
+=== 4.0.0.beta3
+
+ * Fix Net::SSH::Disconnect exceptions when channels are closed cleanly [Miklos Fazekas, #421, #422]
+
 === 4.0.0.beta2
 
  * Fix raiseUnlessLoaded undefined ERROR issue [Miklos Fazekas, #418]

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

@@ -120,7 +120,11 @@ module Net; module SSH; module Connection
     def close
       info { "closing remaining channels (#{channels.length} open)" }
       channels.each { |id, channel| channel.close }
-      loop(0.1) { channels.any? }
+      begin
+        loop(0.1) { channels.any? }
+      rescue Net::SSH::Disconnect
+        raise unless channels.empty?
+      end
       transport.close
     end
 

data/lib/net/ssh/transport/packet_stream.rb

@@ -86,7 +86,12 @@ module Net; module SSH; module Transport
       when :nonblock then
         if available_for_read?
           if fill <= 0
-            raise Net::SSH::Disconnect, "connection closed by remote host"
+            result = poll_next_packet
+            if result.nil?
+              raise Net::SSH::Disconnect, "connection closed by remote host"
+            else
+              return result
+            end
           end
         end
         poll_next_packet

data/lib/net/ssh/version.rb

@@ -55,7 +55,7 @@ module Net; module SSH
 
     # The prerelease component of this version of the Net::SSH library 
     # nil allowed
-    PRE   = "beta2"
+    PRE   = "beta3"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
   s/ZUKye79ELwFYKJOhjW5g725OL3hy+llhEleytwKRwgXFQBPTC4f5UkdxZVVWGH
   e2C9M1m/2odPZo8h
   -----END CERTIFICATE-----
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbnacl-libsodium