hutch 0.24.0 → 1.0.0

data/spec/hutch/error_handlers/sentry_spec.rb

@@ -19,4 +19,19 @@ describe Hutch::ErrorHandlers::Sentry do
       error_handler.handle(properties, payload, double, error)
     end
   end
+
+  describe '#handle_setup_exception' do
+    let(:error) do
+      begin
+        raise "Stuff went wrong during setup"
+      rescue RuntimeError => err
+        err
+      end
+    end
+
+    it "logs the error to Sentry" do
+      expect(Raven).to receive(:capture_exception).with(error)
+      error_handler.handle_setup_exception(error)
+    end
+  end
 end

data/spec/hutch/waiter_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Hutch::Waiter do
       end
     end
 
-    context 'a TERM signal is received' do
+    context 'a TERM signal is received', if: !defined?(JRUBY_VERSION) do
       it 'logs that hutch is stopping' do
         expect(Hutch::Logging.logger).to receive(:info)
           .with('caught SIGTERM, stopping hutch...')
@@ -32,7 +32,7 @@ RSpec.describe Hutch::Waiter do
       end
     end
 
-    context 'a INT signal is received' do
+    context 'a INT signal is received', if: !defined?(JRUBY_VERSION) do
       it 'logs that hutch is stopping' do
         expect(Hutch::Logging.logger).to receive(:info)
           .with('caught SIGINT, stopping hutch...')

data/spec/hutch/worker_spec.rb

@@ -97,7 +97,7 @@ describe Hutch::Worker do
       it 'requeues the message' do
         allow(consumer_instance).to receive(:process).and_raise('failed')
         requeuer = double
-        allow(requeuer).to receive(:handle).ordered { |delivery_info, properties, broker, e|
+        allow(requeuer).to receive(:handle) { |delivery_info, properties, broker, e|
           broker.requeue delivery_info.delivery_tag
           true
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hutch
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: '2.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: '2.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: carrot-top
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +67,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +77,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 description: Hutch is a Ruby library for enabling asynchronous inter-service communication
   using RabbitMQ.
 email:
@@ -91,6 +97,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/ci/before_build.sh
+- bin/ci/install_on_debian.sh
 - bin/hutch
 - examples/consumer.rb
 - examples/producer.rb
@@ -107,9 +115,10 @@ files:
 - lib/hutch/consumer.rb
 - lib/hutch/error_handlers.rb
 - lib/hutch/error_handlers/airbrake.rb
+- lib/hutch/error_handlers/base.rb
 - lib/hutch/error_handlers/honeybadger.rb
 - lib/hutch/error_handlers/logger.rb
-- lib/hutch/error_handlers/opbeat.rb
+- lib/hutch/error_handlers/rollbar.rb
 - lib/hutch/error_handlers/sentry.rb
 - lib/hutch/exceptions.rb
 - lib/hutch/logging.rb
@@ -120,7 +129,6 @@ files:
 - lib/hutch/tracers.rb
 - lib/hutch/tracers/newrelic.rb
 - lib/hutch/tracers/null_tracer.rb
-- lib/hutch/tracers/opbeat.rb
 - lib/hutch/version.rb
 - lib/hutch/waiter.rb
 - lib/hutch/worker.rb
@@ -133,7 +141,7 @@ files:
 - spec/hutch/error_handlers/airbrake_spec.rb
 - spec/hutch/error_handlers/honeybadger_spec.rb
 - spec/hutch/error_handlers/logger_spec.rb
-- spec/hutch/error_handlers/opbeat_spec.rb
+- spec/hutch/error_handlers/rollbar_spec.rb
 - spec/hutch/error_handlers/sentry_spec.rb
 - spec/hutch/logger_spec.rb
 - spec/hutch/message_spec.rb
@@ -142,7 +150,6 @@ files:
 - spec/hutch/worker_spec.rb
 - spec/hutch_spec.rb
 - spec/spec_helper.rb
-- spec/tracers/opbeat_spec.rb
 - templates/default/class/html/settings.erb
 - templates/default/class/setup.rb
 - templates/default/fulldoc/html/css/hutch.css
@@ -164,15 +171,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Easy inter-service communication using RabbitMQ.
@@ -184,7 +190,7 @@ test_files:
 - spec/hutch/error_handlers/airbrake_spec.rb
 - spec/hutch/error_handlers/honeybadger_spec.rb
 - spec/hutch/error_handlers/logger_spec.rb
-- spec/hutch/error_handlers/opbeat_spec.rb
+- spec/hutch/error_handlers/rollbar_spec.rb
 - spec/hutch/error_handlers/sentry_spec.rb
 - spec/hutch/logger_spec.rb
 - spec/hutch/message_spec.rb
@@ -193,4 +199,3 @@ test_files:
 - spec/hutch/worker_spec.rb
 - spec/hutch_spec.rb
 - spec/spec_helper.rb
-- spec/tracers/opbeat_spec.rb

data/lib/hutch/error_handlers/opbeat.rb

@@ -1,24 +0,0 @@
-require 'hutch/logging'
-require 'opbeat'
-
-module Hutch
-  module ErrorHandlers
-    class Opbeat
-      include Logging
-
-      def initialize
-        unless ::Opbeat.respond_to?(:report)
-          raise "The Opbeat error handler requires Opbeat >= 3.0"
-        end
-      end
-
-      def handle(properties, payload, consumer, ex)
-        message_id = properties.message_id
-        prefix = "message(#{message_id || '-'}):"
-        logger.error "#{prefix} Logging event to Opbeat"
-        logger.error "#{prefix} #{ex.class} - #{ex.message}"
-        ::Opbeat.report(ex, extra: { payload: payload })
-      end
-    end
-  end
-end

data/lib/hutch/tracers/opbeat.rb

@@ -1,37 +0,0 @@
-require 'opbeat'
-
-module Hutch
-  module Tracers
-    # Tracer for Opbeat, which traces each message processed.
-    class Opbeat
-      KIND = 'messaging.hutch'.freeze
-
-      # @param klass [Consumer] Consumer instance (!)
-      def initialize(klass)
-        @klass = klass
-      end
-
-      # @param message [Message]
-      def handle(message)
-        ::Opbeat.transaction(sig, KIND, extra: extra_from(message)) do
-          @klass.process(message)
-        end.done(true)
-      end
-
-      private
-
-      def sig
-        @klass.class.name
-      end
-
-      def extra_from(message)
-        {
-          body: message.body.to_s,
-          message_id: message.message_id,
-          timestamp: message.timestamp,
-          routing_key: message.routing_key
-        }
-      end
-    end
-  end
-end

data/spec/hutch/error_handlers/opbeat_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe Hutch::ErrorHandlers::Opbeat do
-  let(:error_handler) { Hutch::ErrorHandlers::Opbeat.new }
-
-  describe '#handle' do
-    let(:properties) { OpenStruct.new(message_id: "1") }
-    let(:payload) { "{}" }
-    let(:error) do
-      begin
-        raise "Stuff went wrong"
-      rescue RuntimeError => err
-        err
-      end
-    end
-
-    it "logs the error to Opbeat" do
-      expect(Opbeat).to receive(:report).with(error, extra: { payload: payload })
-      error_handler.handle(properties, payload, double, error)
-    end
-  end
-end

data/spec/tracers/opbeat_spec.rb

@@ -1,44 +0,0 @@
-require 'hutch/message'
-require 'hutch/serializers/identity'
-require 'hutch/tracers'
-
-RSpec.describe Hutch::Tracers::Opbeat do
-  let(:consumer) { double('the-consumer') }
-
-  subject(:tracer) { described_class.new(consumer) }
-
-  let(:message) do
-    Hutch::Message.new(double('the-delivery-info', routing_key: 'foo.bar',
-                                                   exchange: 'foo'),
-                       double('the-properties', message_id: 'the-id',
-                                                timestamp: 'the-time'),
-                       double('the-payload', to_s: 'the-body'),
-                       Hutch::Serializers::Identity)
-  end
-
-  it 'formats messages as extra information' do
-    expected_extra = {
-      body: 'the-body',
-      message_id: 'the-id',
-      timestamp: 'the-time',
-      routing_key: 'foo.bar'
-    }
-    expect(Opbeat).to receive(:transaction).with(anything,
-                                           'messaging.hutch',
-                                           extra: expected_extra) {
-                                             double('done-callback', done: true)
-                                           }
-
-    tracer.handle(message)
-  end
-
-  it 'presents consumer class name as Opbeat tracing signature' do
-    expect(Opbeat).to receive(:transaction).with(consumer.class.name,
-                                           'messaging.hutch',
-                                           anything) {
-                                             double('done-callback', done: true)
-                                           }
-
-    tracer.handle(message)
-  end
-end