kitchen-sync 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de3176802b5d0d2d9e1f1596f6dea7c3b779a5e8
-  data.tar.gz: fb8c7e2f628f05a4b02f4412b3a17fc815d6f88c
+  metadata.gz: 0376fdf7d97ee105cfbfb248cd7a42ffd0e6132c
+  data.tar.gz: 6fa0f7cb5fd4dd9eba236520f17de3591a507f48
 SHA512:
-  metadata.gz: 4227cbf1e1a90875146c48ad09a508a550ef19adba081cde50b14449ff9a55b0b22791da4a4c85a5fc94c3f52a6def3874a2d2dc31093a5f75bcaf64774ca032
-  data.tar.gz: e75859c18388457ae8df42177cfa22a8fdfe6982dcedcca4afaf933133173cbf8a30fd6d87d7e3ca0f6b3330f2d77bc8946a22daa4a9fd7e25e6ea108edabb20
+  metadata.gz: 2f587f0f0b9885937e4e5852e98bb308ae6105ea2a0c3b9d9ed76cbf24a37e181a1651c72055c39ff564f7aa6b00893bb36796eb5127a9d4e1fef747e20d0234
+  data.tar.gz: e82b6548d9f31de4acb86f4ee12ace4a9b1644078f116e12735291f1b6d99f0033dd8c0de70173b2eda1acd48db14330443a13064ed0b382296d8f4be21d5ef6

data/lib/kitchen-sync/version.rb

@@ -16,5 +16,5 @@
 
 
 class KitchenSync
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/lib/kitchen/transport/sftp.rb

@@ -50,11 +50,23 @@ module Kitchen
         def close
           if @sftp_session
             logger.debug("[SFTP] closing connection to #{self}")
-            sftp_session.close_channel
+            begin
+              sftp_session.close_channel
+            rescue Net::SSH::Disconnect
+              # Welp, we tried.
+            end
           end
         ensure
           @sftp_session = nil
-          super
+          # Make sure we can turn down the session even if closing the channels
+          # fails in the middle because of a remote disconnect.
+          saved_session = @session
+          begin
+            super
+          rescue Net::SSH::Disconnect
+            # Boooo zlib warnings.
+            saved_session.transport.close if saved_session
+          end
         end
 
         def upload(locals, remote)
@@ -99,6 +111,7 @@ module Kitchen
         # Tracked in https://github.com/test-kitchen/test-kitchen/pull/724
         def execute_with_exit_code(command)
           exit_code = nil
+          closed = false
           session.open_channel do |channel|
 
             channel.request_pty
@@ -116,9 +129,13 @@ module Kitchen
               channel.on_request("exit-status") do |_ch, data|
                 exit_code = data.read_long
               end
+
+              channel.on_close do |ch| # This block is new.
+                closed = true
+              end
             end
           end
-          session.loop { exit_code.nil? } # THERE IS A CHANGE ON THIS LINE, PAY ATTENTION!!!!!!
+          session.loop { exit_code.nil? && !closed } # THERE IS A CHANGE ON THIS LINE, PAY ATTENTION!!!!!!
           exit_code
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-sync
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen