r4r 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e8cc23b4bbeffc3de5242dd46b931fede16d2cf
-  data.tar.gz: a8f14815d31138185257f7530d3474735f745b56
+  metadata.gz: 0d6643a7272b11d76ca1ad8d07062701cffa82c4
+  data.tar.gz: 7244f2d374c6d2d2680a79faf807bc5da68bf637
 SHA512:
-  metadata.gz: cef0721f973c4c62dd206299c331451b280c65881e4278d6b2887bc405910b1c2efc0a9cc4694d8addd029967f034fd2cb18311f02fe5ad48f36c1b1bd7ffa8c
-  data.tar.gz: 0e48e06286d0e6093fbaf7d66027decafe10d2fa668363c30c345362735bba7ddb45ed45abee15cce03ba5bdab20bb90e7120df958ec31cc5268fc1166b69899
+  metadata.gz: d85b7fb04f29bc17c742ec0cdea068fee2f250722f9256cceac200f275ff88375dec86868986072ca5e4dc00868dafc6d03d56d77ad487a83ddd105013eaab69
+  data.tar.gz: df29416b7c07ed01297765d99436de81c95a806a87bd95fc17d07615b6dcb2debc8830cc4ed946fd3ce3c758008fbdf2e9f621748ab839922077558f7b12f74d

data/.circleci/config.yml

@@ -7,22 +7,11 @@ shared_ghpages: &shared_ghpages
 
   steps:
     - checkout
-    # Download and cache dependencies
-    - restore_cache:
-        keys:
-          - v1-dependencies-{{ .Environment.CIRCLE_STAGE }}-{{ checksum "Gemfile.lock" }}
-          - v1-dependencies-
-
     - run:
         name: install dependencies
         command: |
           bundle install --jobs=4 --retry=3 --path vendor/bundle
 
-    - save_cache:
-        paths:
-          - ./vendor/bundle
-        key: v1-dependencies-{{ .Environment.CIRCLE_STAGE }}-{{ checksum "Gemfile.lock" }}
-
     - add-ssh-keys:
         fingerprints:
           - "af:38:77:24:f4:c6:33:f2:74:60:e5:cc:76:0e:a7:ad"
@@ -42,21 +31,11 @@ shared_ruby_build: &shared_ruby_build
   steps:
     - checkout
     # Download and cache dependencies
-    - restore_cache:
-        keys:
-          - v1-dependencies-{{ .Environment.CIRCLE_STAGE }}-{{ checksum "Gemfile.lock" }}
-          - v1-dependencies-
-
     - run:
         name: install dependencies
         command: |
           bundle install --jobs=4 --retry=3 --path vendor/bundle
 
-    - save_cache:
-        paths:
-          - ./vendor/bundle
-        key: v1-dependencies-{{ .Environment.CIRCLE_STAGE }}-{{ checksum "Gemfile.lock" }}
-
     - run:
         name: compile
         command: |
@@ -88,10 +67,14 @@ jobs:
     <<: *shared_ruby_build
     docker:
       - image: ruby:2.4
+  ruby25:
+    <<: *shared_ruby_build
+    docker:
+      - image: ruby:2.5
   ghpages:
     <<: *shared_ghpages
     docker:
-      - image: ruby:2.4
+      - image: ruby:2.5
 
 workflows:
   version: 2
@@ -99,10 +82,12 @@ workflows:
     jobs:
       - ruby22
       - ruby24
+      - ruby25
       - ghpages:
           requires:
             - ruby22
             - ruby24
+            - ruby25
           filters:
             branches:
               only: master

data/.gitignore

@@ -10,3 +10,4 @@
 /html/
 /test/reports/
 /docs/
+Gemfile.lock

data/bin/ghpages

@@ -1,9 +1,10 @@
 #!/bin/bash
 
-set -ex
+set -e
 
 git diff-index --quiet HEAD -- || (
   echo "Uncommitted changes detected"
+  git diff-index HEAD
   exit 1
 )
 

data/lib/r4r/non_retriable_error.rb

@@ -0,0 +1,34 @@
+module R4r
+  # An error raises when retry was failed.
+  #
+  class NonRetriableError < RuntimeError
+    attr_reader :cause
+
+    KIND_LIMIT_REACHED      = 0
+    KIND_REJECTED_BY_POLICY = 1
+    KIND_BUDGET_EXHAUSTED   = 2
+
+    # @param [String] message an error message
+    # @param [Exception] cause a error cause
+    def initialize(message:, kind:,  cause:)
+      super(message)
+      @cause = cause
+      @kind = kind
+    end
+
+    # Is error limit reached
+    def limit_reached?
+      @kind == KIND_LIMIT_REACHED
+    end
+
+    # Is error was rejected by policy
+    def rejected_by_policy?
+      @kind == KIND_REJECTED_BY_POLICY
+    end
+
+    # Is error budget exhausted
+    def budget_exhausted?
+      @kind == KIND_BUDGET_EXHAUSTED
+    end
+  end
+end

data/lib/r4r/retry.rb

@@ -1,18 +1,4 @@
 module R4r
-
-  # An error raises when retry was failed.
-  #
-  class NonRetriableError < RuntimeError
-    attr_reader :cause
-
-    # @param [String] message an error message
-    # @param [Exception] cause a error cause
-    def initialize(message:, cause:)
-      super(message)
-      @cause = cause
-    end
-  end
-
   # Decorator that wrap blocks and call it within retries.
   #
   # @attr [Array[Float]] backoff
@@ -72,15 +58,27 @@ module R4r
           raise err if err.is_a?(NonRetriableError)
 
           if (num_retry + 1 == @backoff.size)
-            raise NonRetriableError.new(message: "Retry limit [#{@backoff.size}] reached: #{err}", cause: err)
+            raise NonRetriableError.new(
+              message: "Retry limit [#{@backoff.size}] reached: #{err}",
+              kind: NonRetriableError::KIND_LIMIT_REACHED,
+              cause: err
+            )
           end
 
           unless @policy.call(error: err, num_retry: num_retry)
-            raise NonRetriableError.new(message: "An error was rejected by policy: #{err}", cause: err)
+            raise NonRetriableError.new(
+              message: "An error was rejected by policy: #{err}",
+              kind: NonRetriableError::KIND_REJECTED_BY_POLICY,
+              cause: err
+            )
           end
 
           unless @budget.try_withdraw
-            raise NonRetriableError.new(message: "Budget was exhausted: #{err}", cause: err)
+            raise NonRetriableError.new(
+              message: "Budget was exhausted: #{err}",
+              kind: NonRetriableError::KIND_BUDGET_EXHAUSTED,
+              cause: err
+            )
           end
         end
 

data/lib/r4r/version.rb

@@ -1,3 +1,3 @@
 module R4r
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/r4r.rb

@@ -9,9 +9,7 @@ require "r4r/ring_bits"
 require "r4r/windowed_adder"
 require "r4r/token_bucket"
 
+require 'r4r/non_retriable_error'
 require "r4r/retry_budget"
 require "r4r/retry_policy"
 require "r4r/retry"
-
-module R4r
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r4r
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -120,7 +120,6 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -134,6 +133,7 @@ files:
 - ext/r4r/system_clock_ext/system_clock_ext.c
 - lib/r4r.rb
 - lib/r4r/clock.rb
+- lib/r4r/non_retriable_error.rb
 - lib/r4r/retry.rb
 - lib/r4r/retry_budget.rb
 - lib/r4r/retry_policy.rb

data/Gemfile.lock

@@ -1,39 +0,0 @@
-PATH
-  remote: .
-  specs:
-    r4r (0.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ansi (1.5.0)
-    builder (3.2.3)
-    minitest (5.10.3)
-    minitest-ci (3.3.0)
-      minitest (>= 5.0.6)
-    minitest-reporters (1.1.19)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    rake (11.3.0)
-    rake-compiler (1.0.4)
-      rake
-    ruby-progressbar (1.9.0)
-    yard (0.9.12)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.15)
-  minitest (~> 5.0)
-  minitest-ci (~> 3.3)
-  minitest-reporters (~> 1.1)
-  r4r!
-  rake (~> 11.0)
-  rake-compiler (~> 1.0)
-  yard (~> 0.9)
-
-BUNDLED WITH
-   1.16.0