patiently_try 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78e0754b4d341a4aa9b2774d0f21537aff3f6b25
-  data.tar.gz: 049c95a74e26aa87acab6017a19052a8f9403432
+  metadata.gz: a67075f35f07ddcedf9b7bd67747901250c6bae7
+  data.tar.gz: b4adc86463ad4338aa75c974520d84be69a6d4d7
 SHA512:
-  metadata.gz: 0cc1c84c04f16a5931539092e67f7c948c949b4868fc32873e685049f019d6878fcf876849dc9c6612e2bd3cc2e6b2cbcdaca5ebacf82154b560fe71a8763557
-  data.tar.gz: f8cad3534ecffd68a9bbfba948ae61b43e096a44288bcd985ed64dea3be9825cbff9b68a0f6e25e68fda8b77bd28228d16bd0a298d42632efbc661533abe4136
+  metadata.gz: e1e0f7d03d5aa818e02a5594a93eef480c60a326d4ccbbbd3bdd19814603ae6fbcaa9e821b789921db76246f5f36d30e5d3498a07815c4748bddea10b2e5f188
+  data.tar.gz: 53a35d48517d0a9882783d4f6febfec314f00a57cea2fc76a205ffa69b70f885917cd91a20287bf418a89578b4c704f96ff05e49999a5454b1e842fe581434f8

data/.travis.yml

@@ -1,5 +1,16 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=c64783cbfb92f2f65f706d60f15269d7113dcc39a4824bbfb1be0569c26ea266
 sudo: false
 language: ruby
 rvm:
   - 2.3.1
 before_install: gem install bundler -v 1.12.2
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - bundle exec rspec
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/README.md

@@ -1,5 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/patiently_try.svg)](https://badge.fury.io/rb/patiently_try)
 [![Build Status](https://travis-ci.org/Ninigi/patiently_try.svg?branch=master)](https://travis-ci.org/Ninigi/patiently_try)
+[![Maintainability](https://api.codeclimate.com/v1/badges/f9046959d31212330821/maintainability)](https://codeclimate.com/github/Ninigi/patiently_try/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/f9046959d31212330821/test_coverage)](https://codeclimate.com/github/Ninigi/patiently_try/test_coverage)
 
 # PatientlyTry
 

data/lib/patiently_try.rb

@@ -2,36 +2,69 @@ require "patiently_try/version"
 
 module PatientlyTry
   def patiently_try(opts = {})
-    retries         = opts[:retries] || 100
-    wait            = opts[:wait] || 0
-    catch_errors    = Array(opts[:catch] || StandardError)
-    excluded_errors = Array(opts[:raise_if_caught])
-    logging         = opts[:logging].nil? ? true : opts[:logging]
-    try             = 0
+    opts = _parse_opts(opts)
+    try  = 0
 
     begin
       yield
-    rescue *(catch_errors) => e
+    rescue *(opts[:catch]) => e
       try += 1
 
-      _log_error(e) if logging
+      _rescue_or_raise(e, try, opts)
 
-      if try >= retries || _rescued_but_excluded?(e, excluded_errors)
-        _log_backtrace(e) if logging
-        raise e
-      end
+      _wait(opts[:wait])
+      retry
+    end
+  end
+
+  private
 
-      _log_retry(e) if logging
+  def _rescue_or_raise(e, try, opts)
+    if opts[:logging]
+      _rescue_or_raise_with_logging(e, try, opts)
+    else
+      _rescue_or_raise_without_logging(e, try, opts)
+    end
+  end
 
-      sleep wait if wait && wait > 0
+  def _rescue_or_raise_with_logging(e, try, opts)
+    _log_error(e) if opts[:logging]
 
-      retry
+    if _should_raise?(e, try, opts)
+      _log_backtrace(e) if opts[:logging]
+      raise e
     end
+
+    _log_retry(try, opts[:retries]) if opts[:logging]
   end
 
-  private
+  def _rescue_or_raise_without_logging(e, try, opts)
+    raise e if _should_raise?(e, try, opts)
+  end
+
+  def _should_raise?(e, try, opts)
+    _exceeded_retries?(try, opts[:retries]) || _rescued_but_excluded?(e, opts[:raise_if_caught])
+  end
+
+  def _parse_opts(opts)
+    {
+      catch:           Array(opts[:catch] || StandardError),
+      raise_if_caught: Array(opts[:raise_if_caught]),
+      wait:            opts[:wait].to_i,
+      logging:         opts[:logging].nil? ? true : opts[:logging],
+      retries:         opts[:retries] || 100
+    }
+  end
+
+  def _wait(wait_time)
+    sleep wait_time if wait_time > 0
+  end
+
+  def _exceeded_retries?(try, retries)
+    try >= retries
+  end
 
-  def _log_retry
+  def _log_retry(try, retries)
     puts "Retrying (#{try}/#{retries})"
   end
 

data/lib/patiently_try/version.rb

@@ -1,3 +1,3 @@
 module PatientlyTry
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patiently_try
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Fabian Zitter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler