tries 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 61181357d15ed1c01e9fff117ef6e64d5c6d4ae1
-  data.tar.gz: 06dd565ca5158e5102d00e972b777863d3dc361c
+SHA256:
+  metadata.gz: d193d0d7a484d18a5547a11721670dbf6f84bdd9fafcf6969ec98f4fc114c6ac
+  data.tar.gz: faae79f6f420ff3a2d4a08aa5c2daadb78fc71ddb37f82feaf22c7e4b29f4ef1
 SHA512:
-  metadata.gz: 4434eb20bb7e2ca1bcdabf9dbfd2c4b26f48d53727c8f0aefde1d6d84e6dc3e851e7a598f3dbc37622842c0ab334f95bd6c8a3cdf229b9e7f65610546d63729f
-  data.tar.gz: 1d54e37a1a3625af236d0b4d7f7685018062cd4e6d4f40fa33d4a3185b4cfe4302734b0b41fce134276ece4a9cba1ddb3002f42661b583ee9fc012cbcdfda2d5
+  metadata.gz: 91a392538f78b1524f258e7890b6d0b26890f663d12decf2477f6f33940a91dd8e03a8f0d767580baa0448be5c0b832441f5eef8bde3a29aa7021c90ee6839ae
+  data.tar.gz: 13695ccfd9c78d735a3b95971cafe23c909e1a983be8a3ea4d1344ba5132c0f29e453f8fc10468368fa64ba286e7d6f487481db5f324ae041d8d9bec21396d75

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+before_install:
+  - gem update --system
+  - gem update bundler
+sudo: false

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', cli: '--drb --profile', all_after_pass: false do
+guard 'rspec', all_on_start: true, all_after_pass: true do
   # Specs
   watch(%r(^spec/.+_spec\.rb$))
   watch('spec/spec_helper.rb')       { 'spec' }

data/README.md

@@ -1,9 +1,7 @@
 # Tries
 
 [![Gem Version](https://badge.fury.io/rb/tries.png)](http://badge.fury.io/rb/tries)
-[![Build Status](https://secure.travis-ci.org/krautcomputing/tries.png)](http://travis-ci.org/krautcomputing/tries)
-[![Dependency Status](https://gemnasium.com/krautcomputing/tries.png)](https://gemnasium.com/krautcomputing/tries)
-[![Code Climate](https://codeclimate.com/github/krautcomputing/tries.png)](https://codeclimate.com/github/krautcomputing/tries)
+[![Build Status](https://secure.travis-ci.org/manuelmeurer/tries.png)](http://travis-ci.org/manuelmeurer/tries)
 
 Solidify your code and retry on petty exceptions.
 
@@ -11,8 +9,6 @@ Tries lets you retry a block of code multiple times, which is convenient for exa
 
 You can specify exactly how often the block of code is retried and which exceptions are caught.
 
-Read the accompanying [blog post](http://www.krautcomputing.com/blog/2012/12/19/new-gem-tries/).
-
 ## Requirements
 
 Ruby >= 1.9.2
@@ -54,8 +50,8 @@ def method_that_raises_exception
   puts "Counter is #{@error_counter}"
 
   case @error_counter
-  when 1 then raise FooError
-  when 2 then raise FooError
+  when 1 then raise FooError, 'retry'
+  when 2 then raise FooError, 'retry'
   when 3 then raise BarError
   when 4 then raise StandardError
   end
@@ -106,6 +102,19 @@ end
 # => StandardError
 ```
 
+### Rescue error on condition
+
+```ruby
+3.tries if: ->(error) { error.message == 'retry' } do
+  method_that_raises_exception
+end
+
+# => Counter is 1
+# => Counter is 2
+# => Counter is 3
+# => BarError
+```
+
 ### Delay execution after error
 
 `delay` is in seconds, fractions are possible
@@ -231,3 +240,7 @@ end
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Support
+
+If you like this project, consider [buying me a coffee](https://www.buymeacoffee.com/279lcDtbF)! :)

data/lib/tries.rb

@@ -15,13 +15,16 @@ class Integer
     exception_classes = Array(options[:on] || StandardError)
     delay             = options[:delay]
     incremental       = options[:incremental]
+    condition         = options[:if]
 
     begin
       return yield
     rescue *exception_classes => exception
+      raise exception if condition && !condition.call(exception)
       next_delay = calculate_delay(delay, attempts, incremental) if delay
-      Tries.configuration.on_error.call(exception, attempts, next_delay) if Tries.configuration.on_error
-      options[:on_error].call(exception, attempts, next_delay) if options[:on_error]
+      [Tries.configuration.on_error, options[:on_error]].compact.each do |on_error_callback|
+        on_error_callback.call(exception, attempts, next_delay)
+      end
       Kernel.sleep next_delay if delay
       retry if (attempts += 1) <= self
     end
@@ -30,8 +33,9 @@ class Integer
   end
 
   private
-  def calculate_delay(delay, attempts, incremental)
-    return delay unless incremental
-    (delay * attempts * 100).round.to_f / 100
-  end
+
+    def calculate_delay(delay, attempts, incremental)
+      return delay unless incremental
+      (delay * attempts * 100).round.to_f / 100
+    end
 end

data/lib/tries/version.rb

@@ -1,3 +1,3 @@
 module Tries
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'tries'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'

data/spec/tries/tries_spec.rb

@@ -64,7 +64,7 @@ describe Tries do
 
     context 'static delay' do
       it 'sleeps the specified delay' do
-        Kernel.should_receive(:sleep).with(0.1).exactly(2).times
+        expect(Kernel).to receive(:sleep).with(0.1).exactly(2).times
 
         begin
           3.tries on: FooError, delay: delay do
@@ -77,9 +77,9 @@ describe Tries do
 
     context 'incremental delay' do
       it 'sleeps incrementally' do
-        Kernel.should_receive(:sleep).with(0.1).ordered
-        Kernel.should_receive(:sleep).with(0.2).ordered
-        Kernel.should_receive(:sleep).with(0.3).ordered
+        expect(Kernel).to receive(:sleep).with(0.1).ordered
+        expect(Kernel).to receive(:sleep).with(0.2).ordered
+        expect(Kernel).to receive(:sleep).with(0.3).ordered
 
         begin
           3.tries on: [FooError, BarError], delay: delay, incremental: true do
@@ -98,9 +98,9 @@ describe Tries do
         Tries.configure do |config|
           config.on_error = global_on_error
         end
-        global_on_error.should_receive(:call).with(an_instance_of(FooError), 1, 0.1).ordered
-        global_on_error.should_receive(:call).with(an_instance_of(FooError), 2, 0.2).ordered
-        global_on_error.should_receive(:call).with(an_instance_of(BarError), 3, 0.3).ordered
+        expect(global_on_error).to receive(:call).with(an_instance_of(FooError), 1, 0.1).ordered
+        expect(global_on_error).to receive(:call).with(an_instance_of(FooError), 2, 0.2).ordered
+        expect(global_on_error).to receive(:call).with(an_instance_of(BarError), 3, 0.3).ordered
         begin
           3.tries on: [FooError, BarError], delay: 0.1, incremental: true do
             raise_foo_foo_bar_bar_standard
@@ -113,9 +113,9 @@ describe Tries do
     context 'when a local callback is set' do
       it 'calls the local callback with the correct parameters' do
         local_on_error = Proc.new {}
-        local_on_error.should_receive(:call).with(an_instance_of(FooError), 1, 0.1).ordered
-        local_on_error.should_receive(:call).with(an_instance_of(FooError), 2, 0.2).ordered
-        local_on_error.should_receive(:call).with(an_instance_of(BarError), 3, 0.3).ordered
+        expect(local_on_error).to receive(:call).with(an_instance_of(FooError), 1, 0.1).ordered
+        expect(local_on_error).to receive(:call).with(an_instance_of(FooError), 2, 0.2).ordered
+        expect(local_on_error).to receive(:call).with(an_instance_of(BarError), 3, 0.3).ordered
         begin
           3.tries on: [FooError, BarError], delay: 0.1, incremental: true, on_error: local_on_error do
             raise_foo_foo_bar_bar_standard
@@ -128,12 +128,12 @@ describe Tries do
     context 'when both a global and a local callback are set' do
       it 'calls both callbacks with the correct parameters in the correct order' do
         local_on_error, global_on_error = Proc.new {}, Proc.new {}
-        global_on_error.should_receive(:call).with(an_instance_of(FooError), 1, 0.1).ordered
-        local_on_error.should_receive(:call).with(an_instance_of(FooError), 1, 0.1).ordered
-        global_on_error.should_receive(:call).with(an_instance_of(FooError), 2, 0.2).ordered
-        local_on_error.should_receive(:call).with(an_instance_of(FooError), 2, 0.2).ordered
-        global_on_error.should_receive(:call).with(an_instance_of(BarError), 3, 0.3).ordered
-        local_on_error.should_receive(:call).with(an_instance_of(BarError), 3, 0.3).ordered
+        expect(global_on_error).to receive(:call).with(an_instance_of(FooError), 1, 0.1).ordered
+        expect(local_on_error).to receive(:call).with(an_instance_of(FooError), 1, 0.1).ordered
+        expect(global_on_error).to receive(:call).with(an_instance_of(FooError), 2, 0.2).ordered
+        expect(local_on_error).to receive(:call).with(an_instance_of(FooError), 2, 0.2).ordered
+        expect(global_on_error).to receive(:call).with(an_instance_of(BarError), 3, 0.3).ordered
+        expect(local_on_error).to receive(:call).with(an_instance_of(BarError), 3, 0.3).ordered
         Tries.configure do |config|
           config.on_error = global_on_error
         end

data/tries.gemspec

@@ -9,11 +9,11 @@ Gem::Specification.new do |gem|
   gem.name          = 'tries'
   gem.version       = Tries::VERSION
   gem.platform      = Gem::Platform::RUBY
-  gem.authors       = ['Manuel Meurer']
+  gem.author        = 'Manuel Meurer'
   gem.email         = 'manuel@krautcomputing.com'
   gem.summary       = 'Solidify your code and retry on petty exceptions'
   gem.description   = 'Solidify your code and retry on petty exceptions'
-  gem.homepage      = 'https://github.com/krautcomputing/tries'
+  gem.homepage      = ''
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
@@ -22,9 +22,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_development_dependency 'rake', '>= 0.9.0'
-  gem.add_development_dependency 'rspec', '~> 2.13.0'
-  gem.add_development_dependency 'rb-fsevent', '~> 0.9.2'
-  gem.add_development_dependency 'guard-rspec', '~> 2.5.0'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'rb-fsevent', '~> 0.9'
+  gem.add_development_dependency 'guard-rspec', '~> 4.2'
   # Listen >= 2.0.0 only works with Ruby >= 1.9.3
   gem.add_development_dependency 'listen', '< 2.0.0' if RUBY_VERSION < '1.9.3'
   gem.add_runtime_dependency 'gem_config', '~> 0.2'

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: tries
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: gem_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 description: Solidify your code and retry on petty exceptions
@@ -86,8 +86,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -98,7 +98,7 @@ files:
 - spec/spec_helper.rb
 - spec/tries/tries_spec.rb
 - tries.gemspec
-homepage: https://github.com/krautcomputing/tries
+homepage: ''
 licenses:
 - MIT
 metadata: {}
@@ -108,21 +108,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Solidify your code and retry on petty exceptions
 test_files:
 - spec/spec_helper.rb
 - spec/tries/tries_spec.rb
-has_rdoc: