retryable 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e02743f5a92c56de8d631d1ce21a2bc1b18abacf
-  data.tar.gz: 236dafbf366171b840d64a1317ad14becf56c099
+  metadata.gz: b8f678cc21a51e9421bbef9213728686216611e1
+  data.tar.gz: 88c5cfb49b9b9e91db47aa937283082b20053c98
 SHA512:
-  metadata.gz: a9cbd76de408e65f6b6238de7082c017a2a05278f5f01c38cacc8088929f08ae4266c1c711a8290fb7255d87120fe83295d63cd7758f66ae7332b0cb35ec490a
-  data.tar.gz: 89fe460024058360678c483b41e75bc75442446c4698df5623bad47e09b0b5321b5370441595940ce8ef9446c772ed1f37523f55f5014c9a493efdd0da744bd0
+  metadata.gz: 3aa5569b58419a57c8ce537ed9fe621ced5551f1685671765092800a3b57d6d3e0327b9389dd2277f716833b432c933ff80fbc81f18195760d4ed47a701564f0
+  data.tar.gz: f798b44022d4bc1607d890b2b804b4f5837ae6e1b95311912d8791684bde2da4aa429f70348463321078e7f253586ab7dbde03aa3c2dc0f909574e210bd193d3

data/README.md

@@ -9,7 +9,7 @@ Description
 Runs a code block, and retries it when an exception occurs. It's great when
 working with flakey webservices (for example).
 
-It's configured using four optional parameters `:tries`, `:on`, `:sleep`, `:matching`, `:ensure`, `:exception_cb` and
+It's configured using five optional parameters `:tries`, `:on`, `:sleep`, `:matching`, `:ensure`, `:exception_cb`, `:not` and
 runs the passed block. Should an exception occur, it'll retry for (n-1) times.
 
 Should the number of retries be reached without success, the last exception
@@ -56,7 +56,7 @@ end
 
 ## Defaults
 
-    :tries => 2, :on => StandardError, :sleep => 1, :matching  => /.*/, :ensure => Proc.new { }, :exception_cb => Proc.new { }
+    :tries => 2, :on => StandardError, :sleep => 1, :matching  => /.*/, :ensure => Proc.new { }, :exception_cb => Proc.new { }, :not => []
 
 Retryable also could be configured globally to change those defaults:
 
@@ -68,6 +68,7 @@ Retryable.configure do |config|
   config.on           = StandardError
   config.sleep        = 1
   config.tries        = 2
+  config.not          = []
 end
 ```
 
@@ -130,6 +131,20 @@ Retryable.enabled?
 => false
 ```
 
+Specify exceptions where a retry should NOT be performed
+--------
+No more tries will be made if an exception listed in `:not` is raised.
+Takes precedence over `:on`.
+
+```
+class MyError < StandardError; end
+
+Retryable.retryable(:tries => 5, :on => [StandardError], :not => [MyError]) do
+  raise MyError "No retries!"
+end
+
+```
+
 Supported Ruby Versions
 -------
 

data/lib/retryable.rb

@@ -17,6 +17,7 @@ module Retryable
     #     config.on           = StandardError
     #     config.sleep        = 1
     #     config.tries        = 2
+    #     config.not          = []
     #   end
     def configure
       yield(configuration)
@@ -47,7 +48,8 @@ module Retryable
         :on           => self.configuration.on,
         :matching     => self.configuration.matching,
         :ensure       => self.configuration.ensure,
-        :exception_cb => self.configuration.exception_cb
+        :exception_cb => self.configuration.exception_cb,
+        :not          => self.configuration.not
       }
 
       check_for_invalid_options(options, opts)
@@ -55,12 +57,16 @@ module Retryable
 
       return if opts[:tries] == 0
 
-      on_exception, tries = [ opts[:on] ].flatten, opts[:tries]
+      on_exception = [ opts[:on] ].flatten
+      not_exception = [ opts[:not] ].flatten
+      tries = opts[:tries]
       retries = 0
       retry_exception = nil
 
       begin
         return yield retries, retry_exception
+      rescue *not_exception
+        raise
       rescue *on_exception => exception
         raise unless configuration.enabled?
         raise unless exception.message =~ opts[:matching]
@@ -69,6 +75,8 @@ module Retryable
         # Interrupt Exception could be raised while sleeping
         begin
           Kernel.sleep opts[:sleep].respond_to?(:call) ? opts[:sleep].call(retries) : opts[:sleep]
+        rescue *not_exception
+          raise
         rescue *on_exception
         end
 
@@ -90,4 +98,3 @@ module Retryable
     end
   end
 end
-

data/lib/retryable/configuration.rb

@@ -7,7 +7,8 @@ module Retryable
       :matching,
       :on,
       :sleep,
-      :tries
+      :tries,
+      :not
     ].freeze
 
     attr_accessor :ensure
@@ -16,6 +17,7 @@ module Retryable
     attr_accessor :on
     attr_accessor :sleep
     attr_accessor :tries
+    attr_accessor :not
 
     attr_accessor :enabled
 
@@ -28,6 +30,7 @@ module Retryable
       @on           = StandardError
       @sleep        = 1
       @tries        = 2
+      @not          = []
 
       @enabled     = true
     end

data/lib/retryable/version.rb

@@ -2,7 +2,7 @@ module Retryable
   class Version
     MAJOR = 2 unless defined? Retryable::Version::MAJOR
     MINOR = 0 unless defined? Retryable::Version::MINOR
-    PATCH = 1 unless defined? Retryable::Version::PATCH
+    PATCH = 2 unless defined? Retryable::Version::PATCH
 
     class << self
 

data/spec/lib/retryable_spec.rb

@@ -115,4 +115,18 @@ RSpec.describe 'Retryable.retryable' do
 
     expect(@raised).to eq("this is fun!")
   end
+
+  it 'does not retry on :not exception' do
+    expect do
+      count_retryable(:not => RuntimeError ) { |tries, ex| raise RuntimeError if tries < 1 }
+    end.to raise_error RuntimeError
+    expect(@try_count).to eq(1)
+  end
+
+  it 'gives precidence for :not over :on' do
+    expect do
+      count_retryable(:sleep => 0, :tries => 3, :on => StandardError, :not => IndexError ) { |tries, ex| raise tries >= 1 ? IndexError : StandardError }
+    end.to raise_error IndexError
+    expect(@try_count).to eq(2)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retryable
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Nikita Fedyashev
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Retryable#retryable, allow for retrying of code blocks.