ztk 1.4.2 → 1.4.3

data/lib/ztk/ssh.rb

@@ -185,6 +185,13 @@ module ZTK
       ssh and !ssh.closed? and ssh.close
     end
 
+    # The on_retry method we'll use with the RescueRetry class.
+    def on_retry(exception)
+      close
+      @ssh = nil
+      @sftp = nil
+    end
+
     # Launches an SSH console, replacing the current process with the console
     # process.
     #

data/lib/ztk/ssh/download.rb

@@ -41,7 +41,7 @@ module ZTK
         config.ui.logger.debug { "config=#{config.send(:table).inspect}" }
         config.ui.logger.info { "download(#{remote.inspect}, #{local.inspect})" }
 
-        ZTK::RescueRetry.try(:tries => 3, :on => EOFError) do
+        ZTK::RescueRetry.try(:tries => 3, :on => EOFError, :on_retry => method(:on_retry)) do
           sftp.download!(remote.to_s, local.to_s) do |event, downloader, *args|
             case event
             when :open

data/lib/ztk/ssh/exec.rb

@@ -58,7 +58,7 @@ module ZTK
 
         begin
           Timeout.timeout(options.timeout) do
-            ZTK::RescueRetry.try(:tries => 3, :on => EOFError) do
+            ZTK::RescueRetry.try(:tries => 3, :on => EOFError, :on_retry => method(:on_retry)) do
 
               channel = ssh.open_channel do |chan|
                 options.ui.logger.debug { "Channel opened." }

data/lib/ztk/ssh/file.rb

@@ -49,12 +49,15 @@ module ZTK
         ::File.open(tempfile, 'w') do |file|
           yield(file)
         end
-        self.upload(tempfile.path, tempfile.path)
 
-        self.exec(%(sudo mv -v #{tempfile.path} #{target}), :silence => true)
+        ZTK::RescueRetry.try(:tries => 2, :on_retry => method(:on_retry)) do
+          upload(tempfile.path, tempfile.path)
 
-        self.exec(%(sudo chown -v #{chown} #{target}), :silence => true) if !chown.nil?
-        self.exec(%(sudo chmod -v #{chmod} #{target}), :silence => true) if !chmod.nil?
+          exec(%(sudo mv -v #{tempfile.path} #{target}), :silence => true)
+
+          exec(%(sudo chown -v #{chown} #{target}), :silence => true) if !chown.nil?
+          exec(%(sudo chmod -v #{chmod} #{target}), :silence => true) if !chmod.nil?
+        end
 
         true
       end

data/lib/ztk/ssh/upload.rb

@@ -41,7 +41,7 @@ module ZTK
         config.ui.logger.debug { "config=#{config.send(:table).inspect}" }
         config.ui.logger.info { "upload(#{local.inspect}, #{remote.inspect})" }
 
-        ZTK::RescueRetry.try(:tries => 3, :on => EOFError) do
+        ZTK::RescueRetry.try(:tries => 3, :on => EOFError, :on_retry => method(:on_retry)) do
           sftp.upload!(local.to_s, remote.to_s) do |event, uploader, *args|
             case event
             when :open

data/lib/ztk/version.rb

@@ -21,6 +21,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -263,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -568917063704352555
+      hash: -1475474265463745848
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -568917063704352555
+      hash: -1475474265463745848
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25