retry_block 1.1.0 → 1.2.0

data/README.rdoc

@@ -181,3 +181,24 @@ The output of the above code is:
   Failed again!  Sleeping 16 seconds ...
   Failed again!  Sleeping 16 seconds ...
   Finished
+
+=== Do NOT Catch This!
+
+If you would like to write a catch-all, but would like to exclude certain
+exceptions, you can specify the <tt>:do_not_catch</tt> option.  The
+following block of code will keep executing until it either completes
+successfully or the <tt>Interrupt</tt> exception is raised, thus allowing a
+user to easily quit the process with Ctrl-C.
+
+  retry_block :do_not_catch => Interrupt do
+    // do something useful
+  end
+
+You may pass an exception or a list of exceptions to
+<tt>:do_not_catch</tt>.  Please note that, unlike the <tt>:catch</tt>
+option, the <tt>:do_not_catch</tt> option must pass the exact classes that
+it wishes to not catch.  Subclasses will <i>not</i> match.  For example,
+passing <tt>Exception</tt> to <tt>:catch</tt> will catch all subclasses of
+<tt>Exception</tt>.  However, passing <tt>Exception</tt> to
+<tt>:do_not_catch</tt> will ONLY match if <tt>Exception</tt> is raised, but
+not any of its subclasses.

data/lib/retry_block.rb

@@ -1,15 +1,15 @@
-require "retry_block/version"
-
 module Kernel
   def retry_block (opts={}, &block)
     opts = {
       :attempts => nil,        # Number of times to try block. Nil means to retry forever until success
       :sleep => 0,             # Seconds to sleep between attempts
       :catch => Exception,     # An exception or array of exceptions to listen for
+      :do_not_catch => nil,    # Do not catch the specified exception or list of exceptions.
       :fail_callback => nil    # Proc/lambda that gets executed between attempts
     }.merge(opts)
 
     opts[:catch] = [ opts[:catch] ].flatten
+    opts[:do_not_catch] = [ opts[:do_not_catch] ].flatten
     attempts = 1
 
     if (not opts[:attempts].nil?) and (not opts[:attempts].is_a? Integer or opts[:attempts] <= 0)
@@ -20,6 +20,8 @@ module Kernel
       return yield attempts
     rescue *opts[:catch] => exception
 
+      raise if opts[:do_not_catch].include? exception.class
+
       # If a callable object was given for :fail_callback then call it
       if opts[:fail_callback].respond_to? :call
         callback_opts = [attempts, exception].slice(0, opts[:fail_callback].arity)

data/retry_block.gemspec

@@ -4,7 +4,7 @@ require "retry_block/version"
 
 Gem::Specification.new do |s|
   s.name        = "retry_block"
-  s.version     = RetryBlock::VERSION
+  s.version     = "1.2.0"
   s.authors     = ["Alfred J. Fazio"]
   s.email       = ["alfred.fazio@gmail.com"]
   s.homepage    = ""

data/test/test_retry_block.rb

@@ -199,6 +199,28 @@ class TestRetryBlock < Test::Unit::TestCase
     end
     assert_equal 10, @run_count
   end
+
+  def test_do_not_catch1
+    assert_raises(Interrupt) do
+      retry_block(:do_not_catch => Interrupt, :attempts => 2, :fail_callback => @fail_callback) do |attempt|
+        @run_count += 1
+        raise Interrupt if attempt == 1
+      end
+    end
+    assert_equal 1, @run_count
+    assert_equal 0, @fail_count
+  end
+
+  def test_do_not_catch2
+    assert_raises(Interrupt) do
+      retry_block(:do_not_catch => [ArgumentError, Interrupt], :attempts => 2, :fail_callback => @fail_callback) do |attempt|
+        @run_count += 1
+        raise Interrupt if attempt == 1
+      end
+    end
+    assert_equal 1, @run_count
+    assert_equal 0, @fail_count
+  end
 end
 
 class TestException < Exception

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: retry_block
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Alfred J. Fazio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 Z
+date: 2011-11-07 00:00:00 Z
 dependencies: []
 
 description: Take control of unstable or indeterminate code with retry_block