ztk 1.6.20 → 1.6.21

data/Gemfile

@@ -1,6 +1,10 @@
 source 'https://rubygems.org'
 
 gem "json" if (RUBY_VERSION == "1.8.7")
-gem "activesupport", "< 4.0.0" if (RUBY_VERSION < "1.9.3")
+
+if (RUBY_VERSION < "1.9.3")
+  gem "activesupport", "< 4.0.0"
+  gem "redcarpet", "< 3.0.0"
+end
 
 gemspec

data/lib/ztk/rescue_retry.rb

@@ -88,10 +88,13 @@ module ZTK
       # optionally set this to 0, but this is generally a bad idea.
       #
       # @param [Hash] options Configuration options hash.
-      # @option options [String] :tries (1) How many attempts at executing the
+      # @option options [Integer] :tries (1) How many attempts at executing the
       #   block before we give up and surface the *Exception*.
-      # @option options [String] :on (Exception) Watch for a specific exception
-      #   instead of performing retry on all exceptions.
+      # @option options [Exception,Array<Exception>] :on (Exception) Watch for
+      #   specific exceptions instead of performing retry on all exceptions.
+      # @option options [Exception,Array<Exception>] :raise (Exception) Watch
+      #   for specific exceptions and do not attempt to retry if they are
+      #   raised.
       # @option options [Float,Integer] :delay (1) How long to sleep for between
       #   each retry.
       # @option options [Lambda,Proc] :on_retry (nil) A proc or lambda to call
@@ -104,16 +107,24 @@ module ZTK
         options = Base.build_config({
           :tries => 1,
           :on => Exception,
-          :delay => 1
+          :delay => 1,
+          :raise => nil
         }.merge(options))
         options.ui.logger.debug { "options=#{options.send(:table).inspect}" }
 
         !block_given? and Base.log_and_raise(options.ui.logger, RescueRetryError, "You must supply a block!")
 
+        raise_exceptions = [options.raise].flatten.compact
+        retry_exceptions = [options.on].flatten.compact
+
         begin
           return block.call
-        rescue options.on => e
-          if ((options.tries -= 1) > 0)
+
+        rescue *retry_exceptions => e
+
+          options.tries -= 1
+
+          if ((options.tries > 0) && !raise_exceptions.include?(e.class))
             options.ui.logger.warn { "Caught #{e.inspect}, we will give it #{options.tries} more tr#{options.tries > 1 ? 'ies' : 'y'}." }
 
             sleep(options.delay)

data/lib/ztk/ssh/bootstrap.rb

@@ -46,7 +46,7 @@ module ZTK
 
         result = nil
 
-        ZTK::RescueRetry.try(:tries => 3, :on_retry => method(:on_retry)) do
+        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)

data/lib/ztk/ssh/core.rb

@@ -15,20 +15,28 @@ module ZTK
       #
       # Primarily used internally.
       def sftp
-        @sftp ||= Net::SFTP.start(config.host_name, config.user, ssh_options)
+        @sftp ||= self.ssh.sftp
       end
 
       # Close our session gracefully.
       def close
         config.ui.logger.debug { "close" }
-        ssh and !ssh.closed? and ssh.close
+
+        if (ssh  && !ssh.closed?)
+          ssh.close
+        end
+
+        @ssh = nil
+        @sftp = nil
+
+        true
       end
 
       # The on_retry method we'll use with the RescueRetry class.
       def on_retry(exception)
+        config.ui.logger.warn { "ZTK::SSH on_retry triggered!" }
+
         close
-        @ssh = nil
-        @sftp = nil
       end
 
     end

data/lib/ztk/ssh/download.rb

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

data/lib/ztk/ssh/exec.rb

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

data/lib/ztk/ssh/file.rb

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

data/lib/ztk/ssh/upload.rb

@@ -27,7 +27,7 @@ module ZTK
         options.ui.logger.debug { "options=#{options.send(:table).inspect}" }
         config.ui.logger.info { "upload(#{local.inspect}, #{remote.inspect})" }
 
-        ZTK::RescueRetry.try(:tries => 3, :on => EOFError, :on_retry => method(:on_retry)) do
+        ZTK::RescueRetry.try(:ui => config.ui, :tries => 3, :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

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

data/spec/ztk/rescue_retry_spec.rb

@@ -76,7 +76,7 @@ describe ZTK::RescueRetry do
     it "should call our lambda when it catches an exception and retries" do
       $counter = 0
       on_retry_m = lambda { |exception|
-        $counter +=1
+        $counter += 1
       }
       lambda {
         ZTK::RescueRetry.try(:tries => 3, :on => EOFError, :on_retry => on_retry_m) do
@@ -86,6 +86,19 @@ describe ZTK::RescueRetry do
       $counter.should == 2
     end
 
+    it "should not retry exceptions that are ignored" do
+      $counter = 0
+
+      lambda {
+        ZTK::RescueRetry.try(:tries => 3, :raise => EOFError) do
+          $counter += 1
+          raise EOFError
+        end
+      }.should raise_error EOFError
+
+      $counter.should == 1
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.6.20
+  version: 1.6.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-11 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: 2744320051962662907
+      hash: -3636631208901024067
 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: 2744320051962662907
+      hash: -3636631208901024067
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25