ztk 1.6.21 → 1.6.22

data/lib/ztk/rescue_retry.rb

@@ -133,7 +133,7 @@ module ZTK
 
             retry
           else
-            options.ui.logger.fatal { "Caught #{e.inspect} and we have no more tries left, sorry, we have to give up now." }
+            options.ui.logger.fatal { "Caught #{e.inspect} and we have no more tries left! We have to give up now!" }
 
             raise e
           end

data/lib/ztk/ssh/bootstrap.rb

@@ -44,13 +44,9 @@ module ZTK
         command << remote_tempfile
         command = command.join(' ')
 
-        result = nil
+        self.upload(local_tempfile.path, remote_tempfile)
 
-        ZTK::RescueRetry.try(:ui => config.ui, :tries => 3, :on_retry => method(:on_retry)) do
-          self.upload(local_tempfile.path, remote_tempfile)
-
-          result = self.exec(command, options)
-        end
+        result = self.exec(command, options)
 
         local_tempfile.close!
 

data/lib/ztk/ssh/core.rb

@@ -9,6 +9,7 @@ module ZTK
       # Primarily used internally.
       def ssh
         @ssh ||= Net::SSH.start(config.host_name, config.user, ssh_options)
+        @ssh
       end
 
       # Starts an SFTP session.  Can also be used to get the Net::SFTP object.
@@ -16,14 +17,15 @@ module ZTK
       # Primarily used internally.
       def sftp
         @sftp ||= self.ssh.sftp
+        @sftp
       end
 
       # Close our session gracefully.
       def close
         config.ui.logger.debug { "close" }
 
-        if (ssh  && !ssh.closed?)
-          ssh.close
+        if (@ssh && !@ssh.closed?)
+          @ssh.close
         end
 
         @ssh = nil

data/lib/ztk/ssh/file.rb

@@ -36,14 +36,12 @@ module ZTK
         !block.nil? and block.call(local_tempfile)
         local_tempfile.respond_to?(:flush) and local_tempfile.flush
 
-        ZTK::RescueRetry.try(:ui => config.ui, :tries => 3, :on_retry => method(:on_retry)) do
-          self.upload(local_tempfile.path, remote_tempfile)
+        self.upload(local_tempfile.path, remote_tempfile)
 
-          self.exec(%(sudo mv -fv #{remote_tempfile} #{target}), :silence => true)
+        self.exec(%(sudo mv -fv #{remote_tempfile} #{target}), :silence => true)
 
-          chown.nil? or self.exec(%(sudo chown -v #{chown} #{target}), :silence => true)
-          chmod.nil? or self.exec(%(sudo chmod -v #{chmod} #{target}), :silence => true)
-        end
+        chown.nil? or self.exec(%(sudo chown -v #{chown} #{target}), :silence => true)
+        chmod.nil? or self.exec(%(sudo chmod -v #{chmod} #{target}), :silence => true)
 
         local_tempfile.close!
 

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.6.21"
+  VERSION = "1.6.22"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.6.21
+  version: 1.6.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -275,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3636631208901024067
+      hash: -4037562965285202835
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3636631208901024067
+      hash: -4037562965285202835
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25