ztk 1.4.1 → 1.4.2

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'coveralls', :require => false
-
 gemspec

data/lib/ztk/rescue_retry.rb

@@ -114,6 +114,8 @@ module ZTK
       #   instead of performing retry on all exceptions.
       # @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
+      #   when we catch an exception and retry.
       #
       # @yield Block should execute the tasks to be rescued and retried if
       #   needed.
@@ -133,10 +135,15 @@ module ZTK
         rescue options.on => e
           if ((options.tries -= 1) > 0)
             options.ui.logger.warn { "Caught #{e.inspect}, we will give it #{options.tries} more tr#{options.tries > 1 ? 'ies' : 'y'}." }
+
             sleep(options.delay)
+
+            options.on_retry and options.on_retry.call(e)
+
             retry
           else
             options.ui.logger.fatal { "Caught #{e.inspect} and we have no more tries left, sorry, we have to give up now." }
+
             raise e
           end
         end

data/lib/ztk/version.rb

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

data/spec/ztk/rescue_retry_spec.rb

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

data/ztk.gemspec

@@ -46,4 +46,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("rspec")
   spec.add_development_dependency("yard")
   spec.add_development_dependency("redcarpet")
+  spec.add_development_dependency("coveralls")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Zachary's (DevOp) Tool Kit
 email:
 - zachary@jovelabs.com
@@ -247,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4161660178397173415
+      hash: -568917063704352555
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -256,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4161660178397173415
+      hash: -568917063704352555
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25