tretry 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f933d5081600c123053375007affe0de256d65786552eeed9f795df3db5a587
-  data.tar.gz: 97cb722fc297493e9e62df7f95aec8307f7d21904f56ec39d327426c200d8103
+  metadata.gz: 7ec5ecfe155371b1b3c9698118b3d1d01c6136125c94dc136925ae1473e234a6
+  data.tar.gz: 497ed8ab7b1bff0ae9f9c5025fab65b086459f6aa55b73fdfaf624a8a62ef875
 SHA512:
-  metadata.gz: 6d8a9a03e39478b6174012c927e9356f63c2728d9362747f0e3345ee0d5173047e30c317d0ae67e8a3c928203d3a0f4eceedad64433faf74a738dadf881263a2
-  data.tar.gz: a9af5b8ae687177475cf3aff52a6157dc8647676bc7519ccc01fadc98799166e12b6a5c030cf2f629ce2fee3bc08e7db58aedc9782783e16e95e9fea680c98c3
+  metadata.gz: f28e16cff32efb56d911ad726f2f23d8d8aebe1ad602ca364b9321caf67fc793528afe73a828ae97c5c503163a348aa38ef3dab8c9ac18a28644be68097db052
+  data.tar.gz: c40a00b1dbb9afa773e438dfdef671d4a614f5da4b852266ac80d6d1e6595238d14c688c6c4586cbffd7a383568aa233f52126c9b2aa99dec712278f57d99624

data/Rakefile

@@ -3,8 +3,8 @@ require "bundler"
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.warn e.message
+  $stderr.warn "Run `bundle install` to install missing gems"
   exit e.status_code
 end
 require "rake"
@@ -20,4 +20,4 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :default => :spec
+task default: :spec

data/lib/tretry.rb

@@ -1,9 +1,8 @@
-#A library for doing retries in Ruby with timeouts, analysis of errors, waits between tries and more.
+# A library for doing retries in Ruby with timeouts, analysis of errors, waits between tries and more.
 class Tretry
   autoload :Result, "#{__dir__}/tretry/result"
 
-  attr_reader :fails
-  attr_accessor :timeout, :tries, :wait
+  attr_accessor :error, :errors, :exit, :fails, :interrupt, :return_error, :timeout, :tries, :wait
 
   #===Runs a block of code a given amount of times until it succeeds.
   #===Examples
@@ -18,68 +17,70 @@ class Tretry
   end
 
   def initialize(errors: nil, exit: true, interrupt: true, return_error: nil, timeout: nil, tries: 3, wait: nil)
-    @errors = errors
-    @exit = exit
-    @fails = []
-    @interrupt = interrupt
+    self.errors = errors
+    self.exit = exit
+    self.fails = []
+    self.interrupt = interrupt
     @before_retry = []
-    @return_error = return_error
-    @timeout = timeout
-    @tries = tries
-    @wait = wait
+    self.return_error = return_error
+    self.timeout = timeout
+    self.tries = tries
+    self.wait = wait
   end
 
   def before_retry(&block)
     @before_retry << block
   end
 
-  def try(&block)
+  def try(&block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     raise "No block given." unless block
+
     @block = block
 
-    @tries.times do |count|
+    tries.times do |count|
       @count = count
 
       unless first_try?
         # Sleep for a given amount of time if the 'wait'-argument is given.
-        sleep(@wait) if @wait
+        sleep(wait) if wait
 
-        call_before_retry(error: @error)
-        @error = nil
+        call_before_retry(error: error)
+        self.error = nil
       end
 
       begin
         # If a timeout-argument has been given, then run the code through the timeout.
-        if @timeout
+        if timeout
           try_with_timeout
         else
           # Else call block normally.
           @res = @block.call
           @dobreak = true
         end
-      rescue Exception => e
+      rescue Exception => e # rubocop:disable Lint/RescueException
         handle_error(e)
       end
 
       if @doraise
-        if @return_error
-          @fails << {error: @error}
+        if return_error
+          fails << {error: error}
+
           return Tretry::Result.new(
-            fails: @fails,
+            fails: fails,
             error: true
           )
-        else
-          raise @error
         end
-      elsif @error
-        @fails << {error: @error}
+
+        raise error
+      elsif error
+        fails << {error: error}
       end
 
       break if @dobreak
     end
 
     Tretry::Result.new(
-      fails: @fails,
+      fails: fails,
       result: @res,
       error: false
     )
@@ -88,29 +89,27 @@ class Tretry
 private
 
   def try_with_timeout
-    begin
-      require "timeout"
-      Timeout.timeout(@timeout) do
-        @res = @block.call
-        @dobreak = true
-      end
-    rescue Timeout::Error => e
-      handle_error(e)
+    require "timeout"
+    Timeout.timeout(timeout) do
+      @res = @block.call
+      @dobreak = true
     end
+  rescue Timeout::Error => e
+    handle_error(e)
   end
 
-  def handle_error(e)
-    if e.class == Interrupt
-      raise e if @interrupt
-    elsif e.class == SystemExit
-      raise e if @exit
-    elsif last_try? || @errors&.include?(e.class)
-      @doraise = e
-    elsif @errors&.include?(e.class)
+  def handle_error(error) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    if error.instance_of?(Interrupt)
+      raise error if interrupt
+    elsif error.instance_of?(SystemExit)
+      raise error if self.exit
+    elsif last_try? || (errors && !errors.include?(error.class))
+      @doraise = error
+    elsif errors&.include?(error.class) # rubocop:disable Lint/EmptyConditionalBody
       # Given error was in the :errors-array - do nothing. Maybe later it should be logged and returned in a stats-hash or something? - knj
     end
 
-    @error = e
+    self.error = error
   end
 
   def call_before_retry(args)
@@ -120,10 +119,10 @@ private
   end
 
   def last_try?
-    (@count + 1) >= @tries
+    (@count + 1) >= tries
   end
 
   def first_try?
-    @count == 0
+    @count.zero?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tretry
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kasper Stöckel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.11.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A library for doing retries in Ruby with timeouts, analysis of errors,
   waits between tries and more.
 email: k@spernj.org
@@ -51,7 +93,8 @@ files:
 homepage: http://github.com/kaspernj/tretry
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -60,14 +103,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A library for doing retries in Ruby with timeouts, analysis of errors, waits