respawn 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d12952077bf536b30a67272ea992ebd5771ce9e265efde7c0b02587b8f59178
-  data.tar.gz: 18a6f35a14f93916cefb09ca6d94e41b3aa54e87d5deae0600c12f9d350ce087
+  metadata.gz: b9ce4db696ee967e602013fa85f37caf81b7bff5afa2fb7af1b12c6ba548a336
+  data.tar.gz: 9461debe887911b3256159d94fe156d89e1c0c10e80f3e30f2fbbef18bb7ddb3
 SHA512:
-  metadata.gz: 65526d3bc42433e41091b96e624f3e4ef0459f97d90a314dac3173facbc9aaec977bf61a6513a2c47efd1ee77943ec81a1078fe05ff160cef90cc0f6f94a5dc8
-  data.tar.gz: 2b68c30c68067006925c45250d27d42ed1acd5eae1565d398055ade4804a8a4aece5b2d00ec946adad3649361157d8de6245b95867366c55936ad86c6c0760c9
+  metadata.gz: c11d9f8166b63a5e2f73f856b8fbff47104159e9ef2be89ca9914d5bf5ea8a52d85a996f49ed9016082ac35074970aa7427b9dd399ea755090fcb39d9d817810
+  data.tar.gz: 2c5264cfe13032166e06e4c6d6f009399f487b44c27dfa6766e66e231a958f7007c0bb685bafb42ae47309ce93d053d179d4e0a0509f55d74b3b8d4ceb99426e

data/lib/respawn/exception_detector.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Respawn
+  class ExceptionDetector
+    PREDEFINED_EXCEPTIONS = [
+      EOFError,
+      Errno::ECONNABORTED,
+      Errno::ECONNRESET,
+      Errno::EHOSTUNREACH,
+    ].freeze
+
+    DYNAMIC_EXCEPTIONS = [
+      "SocketError",
+      "Faraday::ConnectionFailed",
+      "Faraday::TimeoutError",
+      "Faraday::ClientError",
+      "Faraday::ServerError",
+      "Net::OpenTimeout",
+      "Net::ReadTimeout",
+      "OpenSSL::SSL::SSLError",
+      "OpenURI::HTTPError",
+    ].freeze
+
+    def self.call(...)
+      new(...).call
+    end
+
+    def call
+      PREDEFINED_EXCEPTIONS + dynamic_exceptions
+    end
+
+    def dynamic_exceptions
+      DYNAMIC_EXCEPTIONS.filter_map do
+        Object.const_get(it) if Object.const_defined?(it)
+      end
+    end
+  end
+end

data/lib/respawn/handler.rb

@@ -0,0 +1,32 @@
+module Respawn
+  class Handler
+    def initialize(onfail)
+      self.onfail = onfail
+      self.retry_number = 0
+      # self.predicates = []
+    end
+
+    # def predicate(&block)
+    #   self.predicates << block
+    # end
+
+    def define(&block)
+      return if self.block
+
+      if onfail != :handler
+        raise Try::Error, "Cannot define a block unless onfail is :handler"
+      end
+
+      self.block = block
+    end
+
+    attr_accessor :onfail, :retry_number
+
+    attr_reader :block
+
+    private
+
+    attr_accessor :onfail, :predicates
+    attr_writer :block
+  end
+end

data/lib/respawn/notifier_detector.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Respawn
+  class NotifierDetector
+    def self.call(...)
+      new(...).call
+    end
+
+    def call
+      detect_notifier
+    end
+
+    private
+
+    def detect_notifier
+      if defined?(TestNotifier)
+        TestNotifier.method(:call)
+      elsif defined?(::Sentry)
+        Sentry.method(:capture_exception)
+      elsif defined?(::Airbrake)
+        :airbrake
+      elsif defined?(::Bugsnag)
+        :bugsnag
+      elsif defined?(::Rollbar)
+        :rollbar
+      else
+        proc {}
+      end
+    end
+  end
+end

data/lib/respawn/predicate.rb

@@ -0,0 +1,4 @@
+module Respawn
+  class Predicate
+  end
+end

data/lib/respawn/setup.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Respawn
+  Setup =
+    Data.define(
+      :notifier,
+      :cause,
+      :predicate,
+    )
+end

data/lib/respawn/try.rb

@@ -6,22 +6,6 @@ module Respawn
   class Try
     class Error < StandardError; end
 
-    COMMON_NETWORK_EXCEPTIONS = [
-      EOFError,
-      defined?(SocketError) && SocketError,
-      Errno::ECONNABORTED,
-      Errno::ECONNRESET,
-      Errno::EHOSTUNREACH,
-      # Faraday::ConnectionFailed,
-      # Faraday::TimeoutError,
-      # Faraday::ClientError,
-      # Faraday::ServerError,
-      # Net::OpenTimeout,
-      # Net::ReadTimeout,
-      # OpenSSL::SSL::SSLError,
-      # OpenURI::HTTPError,
-    ].compact.freeze
-
     ONFAIL = [
       :notify,
       :nothing,
@@ -29,37 +13,31 @@ module Respawn
       :handler,
     ].freeze
 
-    class Handler
-      attr_accessor :block
-
-      def define(&block)
-        self.block = block
-      end
-    end
-
-    class NullHandler
-      def define(&)
-        raise Error, "Cannot define a block unless onfail is :handler"
-      end
-    end
-
     def self.call(*, **, &)
       new(*, **).call(&)
     end
 
-    def initialize(*exceptions, tries: 5, onfail: :notify, wait: 0.5, env: nil)
-      self.exceptions = parse_exceptions(exceptions)
+    def initialize(*exceptions, predicate: [], tries: 5, onfail: :notify, wait: 0.5, env: nil)
+      self.predicate = predicate
+      self.exceptions = parse_exceptions(exceptions) + [PredicateError]
       self.tries = tries
       self.onfail = ONFAIL.zip(ONFAIL).to_h.fetch(onfail)
       self.wait = wait
-      self.handler = handler_for(onfail)
+      self.handler = Handler.new(onfail)
       self.env = env || Environment.new(default_environment)
     end
 
     def call
-      yield(handler)
+      yield(handler).tap do |result|
+        Array(predicate).each.with_index do |condition, index|
+          if condition.call(result)
+            raise PredicateError, "Predicate #{condition.inspect} matched the result"
+          end
+        end
+      end
     rescue *exceptions => e
       self.tries = tries - 1
+      handler.retry_number += 1
 
       if tries.positive?
         Kernel.sleep(wait) unless env.test?
@@ -71,7 +49,7 @@ module Respawn
 
     private
 
-    attr_accessor :exceptions, :tries, :onfail, :wait, :handler, :env
+    attr_accessor :exceptions, :tries, :onfail, :wait, :handler, :env, :predicate
 
     def default_environment
       ENV.fetch("RUBY_ENV") do
@@ -81,18 +59,10 @@ module Respawn
       end
     end
 
-    def handler_for(onfail)
-      if onfail == :handler
-        Handler.new
-      else
-        NullHandler.new
-      end
-    end
-
     def perform_fail(exception)
       case onfail
       in :notify
-        # Sentry.capture_exception(exception)
+        Respawn.default_setup.notifier.call(exception)
       in :nothing
         nil
       in :raise
@@ -105,7 +75,7 @@ module Respawn
     def parse_exceptions(list)
       list.flat_map do |exception|
         if exception == :network_errors
-          COMMON_NETWORK_EXCEPTIONS
+          Respawn.default_setup.cause
 
         # This comparision will raise an error if the exception is not
         # a class, which is what we want.

data/lib/respawn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Respawn
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/respawn.rb

@@ -2,14 +2,28 @@
 
 require "zeitwerk"
 
+loader = Zeitwerk::Loader.for_gem
+loader.setup
+loader.eager_load
+
 module Respawn
   class Error < StandardError; end
+  class PredicateError < StandardError; end
 
   def self.try(...)
     Try.call(...)
   end
-end
 
-loader = Zeitwerk::Loader.for_gem
-loader.setup
-loader.eager_load
+  # Postpone the actuall setup until the first use of the method, to make
+  # sure that all the dependencies are loaded and all constants are already
+  # available.
+
+  def self.default_setup
+    @_default_setup ||=
+      Setup.new(
+        notifier: NotifierDetector.call,
+        cause: ExceptionDetector.call,
+        predicate: [],
+      )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: respawn
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Mariusz Drozdziel
@@ -9,6 +9,20 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +58,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/respawn.rb
+- lib/respawn/exception_detector.rb
+- lib/respawn/handler.rb
+- lib/respawn/notifier_detector.rb
+- lib/respawn/predicate.rb
+- lib/respawn/setup.rb
 - lib/respawn/try.rb
 - lib/respawn/version.rb
 homepage: https://github.com/marzdrel/respawn