Drop Ruby 2.4 support

.rubocop.yml

@@ -11,7 +11,7 @@ inherit_mode:
     - Include
 
 AllCops:
-  TargetRubyVersion: 2.4.0
+  TargetRubyVersion: 2.5
   DisplayCopNames: true
   DisplayStyleGuide: true
   Include:

good_job.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
     "--quiet"
   ]
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.add_dependency "activejob", ">= 5.1.0"
   spec.add_dependency "activerecord", ">= 5.1.0"

lib/good_job/notifier.rb

@@ -98,38 +98,36 @@ def create_pool
 
     def listen
       future = Concurrent::Future.new(args: [@recipients, @pool, @listening], executor: @pool) do |recipients, pool, listening|
-        begin
-          with_listen_connection do |conn|
-            ActiveSupport::Notifications.instrument("notifier_listen.good_job") do
-              conn.async_exec "LISTEN #{CHANNEL}"
-            end
+        with_listen_connection do |conn|
+          ActiveSupport::Notifications.instrument("notifier_listen.good_job") do
+            conn.async_exec "LISTEN #{CHANNEL}"
+          end
 
-            ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-              while pool.running?
-                listening.make_true
-                conn.wait_for_notify(WAIT_INTERVAL) do |channel, _pid, payload|
-                  listening.make_false
-                  next unless channel == CHANNEL
-
-                  ActiveSupport::Notifications.instrument("notifier_notified.good_job", { payload: payload })
-                  parsed_payload = JSON.parse(payload, symbolize_names: true)
-                  recipients.each do |recipient|
-                    target, method_name = recipient.is_a?(Array) ? recipient : [recipient, :call]
-                    target.send(method_name, parsed_payload)
-                  end
-                end
+          ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+            while pool.running?
+              listening.make_true
+              conn.wait_for_notify(WAIT_INTERVAL) do |channel, _pid, payload|
                 listening.make_false
+                next unless channel == CHANNEL
+
+                ActiveSupport::Notifications.instrument("notifier_notified.good_job", { payload: payload })
+                parsed_payload = JSON.parse(payload, symbolize_names: true)
+                recipients.each do |recipient|
+                  target, method_name = recipient.is_a?(Array) ? recipient : [recipient, :call]
+                  target.send(method_name, parsed_payload)
+                end
               end
+              listening.make_false
             end
           end
-        rescue StandardError => e
-          ActiveSupport::Notifications.instrument("notifier_notify_error.good_job", { error: e })
-          raise
-        ensure
-          @listening.make_false
-          ActiveSupport::Notifications.instrument("notifier_unlisten.good_job") do
-            conn.async_exec "UNLISTEN *"
-          end
+        end
+      rescue StandardError => e
+        ActiveSupport::Notifications.instrument("notifier_notify_error.good_job", { error: e })
+        raise
+      ensure
+        @listening.make_false
+        ActiveSupport::Notifications.instrument("notifier_unlisten.good_job") do
+          conn.async_exec "UNLISTEN *"
         end
       end
 

spec/lib/good_job/job_spec.rb

@@ -147,15 +147,13 @@ def perform(result_value = nil, raise_error: false)
             # Similar to Sentry monitor's implementation
             # https://github.com/getsentry/raven-ruby/blob/20b260a6d04e0ca01d5cddbd9728e6fc8ae9a90c/lib/raven/integrations/rails/active_job.rb#L21-L31
             ExampleJob.around_perform do |_job, block|
-              begin
-                block.call
-              rescue StandardError => e
-                next if rescue_with_handler(e)
-
-                raise e
-              ensure
-                nil
-              end
+              block.call
+            rescue StandardError => e
+              next if rescue_with_handler(e)
+
+              raise e
+            ensure
+              nil
             end
           end
 

spec/support/system.rb

@@ -16,11 +16,9 @@ module SystemTestHelpers
     :dismiss_modal,
   ].each do |driver_method|
     define_method(driver_method) do |text = nil, **options, &blk|
-      begin
-        super(text, **options, &blk)
-      rescue Capybara::NotSupportedByDriverError
-        blk.call
-      end
+      super(text, **options, &blk)
+    rescue Capybara::NotSupportedByDriverError
+      blk.call
     end
   end
 end