hutch 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a331137bca776d401e85057a0caa84922dda9d1d
-  data.tar.gz: c677873d07dfad4a6be14574d413e3870febb1bd
+  metadata.gz: 121ef2c74885824fb6289f89e89e55cb2e83f577
+  data.tar.gz: de5ed49d8ad6e020bdfde9e5b39ecadda276dedf
 SHA512:
-  metadata.gz: dd21d047618cf83c463b7064042270d2886d7cc232c9d1234b542912e37e7250f8a700fb47fcdc62f31ab61789a4fc3f89f3946387187081d0c705f0024d0ffe
-  data.tar.gz: bee9c047725370823d44a5a392e1544559998d70c36b7b084d6ba7f8cf93907f822d2ce935c024d51a3c4cfb567d1a68ab402bde62b30f497a67d4df85edac43
+  metadata.gz: 81050d31cea806c918a51a952c8b1b695c384f0d0dd7beb1a89e01af2183c5fdfcc819a62289f7de4afa3a8ddfbb7df1801e935fae4904404e4aee1cf66e34e4
+  data.tar.gz: 0008ef900bf621471fee3cbd4e5c753d3c9d271f3c6fe2f18971586d6c72477f1862dfa55131a3a4b98e0cf0acdfb3d2396d7f54007c76c4fded7067abdc0329

data/.gitignore

@@ -7,3 +7,4 @@ Gemfile.lock
 coverage
 .yardoc
 doc
+gemfiles/Gemfile.*.lock

data/.rspec

@@ -0,0 +1 @@
+--order random

data/.travis.yml

@@ -1,17 +1,21 @@
 language: ruby
 cache: bundler
-rvm:
-  - "2.3.0"
-  - "2.2"
-  - "2.1"
-  - "2.0"
-  - "jruby-9.0.0.0"
-
-sudo: false
+before_install: gem i bundler
+matrix:
+  include:
+    - rvm: 2.3.0
+      gemfile: gemfiles/Gemfile.activesupport5
+    - rvm: 2.2
+      gemfile: gemfiles/Gemfile.activesupport4
+    - rvm: 2.1
+      gemfile: gemfiles/Gemfile.activesupport4
+    - rvm: 2.0
+      gemfile: gemfiles/Gemfile.activesupport4
+    - rvm: jruby-9.1.5.0
+      jdk: oraclejdk8
+      gemfile: gemfiles/Gemfile.activesupport5
+      env:
+        - JRUBY_OPTS='--debug'
 
 services:
   - rabbitmq
-
-matrix:
-  allow_failures:
-    - rvm: jruby-9.0.0.0

data/CHANGELOG.md

@@ -1,9 +1,26 @@
 ## 0.23.0 — (unreleased)
 
-No changes yet.
+This release contains a **breaking change** in the error
+handlers interface.
 
+### All Message Properties Passed to Error Handlers
 
-## 0.22.0 — June 7th, 2016
+Previously error handlers were provided a message ID as first
+argument to `ErrorHandler#handle`. Now it is a hash of all message
+properties.
+
+This is a **breaking public API change**. If you do not use custom
+error handlers, you are not affected.
+
+Contributed by Pierre-Louis Gottfrois.
+
+GH issue: [hutch#238](https://github.com/gocardless/hutch/pull/238)
+
+### Opbeat Error Handler
+
+Contributed by Olle Jonsson.
+
+## 0.22.1 — June 7th, 2016
 
 ### Message Payload is Reported to Sentry
 

data/Gemfile

@@ -4,16 +4,25 @@ gemspec
 
 group :development do
   gem "rake"
-  gem "guard", "~> 0.8.8"
-  gem "guard-rspec", "~> 0.5.4"
+  gem "guard", "~> 2.14", platform: :mri_23
+  gem "guard-rspec", "~> 4.7", platform: :mri_23
+
+  gem "yard", "~> 0.9"
+  gem 'kramdown', "> 0", platform: :jruby
+  gem "redcarpet", "> 0", platform: :mri
+  gem "github-markup", "> 0"
 end
 
 group :development, :test do
+  gem "rspec", "~> 3.0"
+  gem "simplecov", "~> 0.12"
+
   gem "sentry-raven"
   gem "honeybadger"
-  gem "coveralls", require: false
+  gem "coveralls", "~> 0.8.15", require: false
   gem "newrelic_rpm"
-  gem "airbrake", "~> 4.0"
+  gem "airbrake", "~> 5.0"
+  gem "opbeat", "~> 3.0.9"
 end
 
 group :development, :darwin do

data/Guardfile

@@ -1,5 +1,14 @@
-guard 'rspec', :version => 2, :cli => '--color --format doc' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb') { "spec" }
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
 end

data/README.md

@@ -3,10 +3,10 @@
 Hutch is a Ruby library for enabling asynchronous inter-service communication
 in a service-oriented architecture, using RabbitMQ.
 
-[![Gem Version](https://badge.fury.io/rb/hutch.png)](http://badge.fury.io/rb/hutch)
-[![Build Status](https://travis-ci.org/gocardless/hutch.png?branch=master)](https://travis-ci.org/gocardless/hutch)
-[![Dependency Status](https://gemnasium.com/gocardless/hutch.png)](https://gemnasium.com/gocardless/hutch)
-[![Code Climate](https://codeclimate.com/github/gocardless/hutch.png)](https://codeclimate.com/github/gocardless/hutch)
+[![Gem Version](https://badge.fury.io/rb/hutch.svg)](http://badge.fury.io/rb/hutch)
+[![Build Status](https://travis-ci.org/gocardless/hutch.svg?branch=master)](https://travis-ci.org/gocardless/hutch)
+[![Dependency Status](https://gemnasium.com/gocardless/hutch.svg)](https://gemnasium.com/gocardless/hutch)
+[![Code Climate](https://codeclimate.com/github/gocardless/hutch.svg)](https://codeclimate.com/github/gocardless/hutch)
 
 To install with RubyGems:
 
@@ -317,6 +317,20 @@ Known configuration parameters are:
  * `write_timeout`: Bunny's socket write timeout (default: `11`)
  * `tracer`: tracer to use to track message processing
 
+### Environment variables
+
+The file configuration options mentioned above can also be passed in via environment variables, using the `HUTCH_` prefix, eg.
+
+ * `connection_timeout` → `HUTCH_CONNECTION_TIMEOUT`.
+
+### Configuration precedence
+
+In order from lowest to highest precedence:
+
+0. Default values
+0. `HUTCH_*` environment variables
+0. Configuration file
+0. Explicit settings through `Hutch::Config.set`
 
 ## Supported RabbitMQ Versions
 

data/gemfiles/Gemfile.activesupport4

@@ -0,0 +1,2 @@
+eval_gemfile File.expand_path('../../Gemfile', __FILE__)
+gem 'activesupport', '~> 4.0'

data/gemfiles/Gemfile.activesupport5

@@ -0,0 +1,2 @@
+eval_gemfile File.expand_path('../../Gemfile', __FILE__)
+gem 'activesupport', '>= 4.0'

data/hutch.gemspec

@@ -6,22 +6,18 @@ Gem::Specification.new do |gem|
     gem.add_runtime_dependency 'march_hare', '>= 2.16.0'
   else
     gem.platform = Gem::Platform::RUBY
-    gem.add_runtime_dependency 'bunny', '>= 2.3.1'
+    gem.add_runtime_dependency 'bunny', '>= 2.6.0'
   end
   gem.add_runtime_dependency 'carrot-top', '~> 0.0.7'
-  gem.add_runtime_dependency 'multi_json', '~> 1.11.2'
-  gem.add_runtime_dependency 'activesupport', '>= 3.0'
-  gem.add_development_dependency 'rspec', '~> 3.0'
-  gem.add_development_dependency 'simplecov', '~> 0.7.1'
-  gem.add_development_dependency 'yard', '~> 0.8'
-  gem.add_development_dependency 'redcarpet', '> 0'
-  gem.add_development_dependency 'github-markup', '> 0'
+  gem.add_runtime_dependency 'multi_json', '~> 1.12'
+  gem.add_runtime_dependency 'activesupport'
 
   gem.name = 'hutch'
   gem.summary = 'Easy inter-service communication using RabbitMQ.'
   gem.description = 'Hutch is a Ruby library for enabling asynchronous ' +
                     'inter-service communication using RabbitMQ.'
   gem.version = Hutch::VERSION.dup
+  gem.required_ruby_version = '>= 2.0'
   gem.authors = ['Harry Marr']
   gem.email = ['developers@gocardless.com']
   gem.homepage = 'https://github.com/gocardless/hutch'

data/lib/hutch/broker.rb

@@ -245,6 +245,7 @@ module Hutch
     end
 
     private
+
     def api_config
       @api_config ||= OpenStruct.new.tap do |config|
         config.host = @config[:mq_api_host]

data/lib/hutch/config.rb

@@ -134,9 +134,12 @@ module Hutch
     ALL_KEYS = @boolean_keys + @number_keys + @string_keys
 
     def self.initialize(params = {})
-      @config = default_config
-      @config.merge!(env_based_config).merge!(params)
-      define_methods
+      unless @config
+        @config = default_config
+        define_methods
+        @config.merge!(env_based_config)
+      end
+      @config.merge!(params)
       @config
     end
 
@@ -191,8 +194,8 @@ module Hutch
     end
 
     def self.get(attr)
-      check_attr(attr)
-      user_config[attr]
+      check_attr(attr.to_sym)
+      user_config[attr.to_sym]
     end
 
     def self.key_for(attr)
@@ -213,8 +216,8 @@ module Hutch
     end
 
     def self.set(attr, value)
-      check_attr(attr)
-      user_config[attr] = value
+      check_attr(attr.to_sym)
+      user_config[attr.to_sym] = value
     end
 
     class << self
@@ -264,3 +267,4 @@ module Hutch
     end
   end
 end
+Hutch::Config.initialize

data/lib/hutch/error_handlers.rb

@@ -4,5 +4,6 @@ module Hutch
     autoload :Sentry,      'hutch/error_handlers/sentry'
     autoload :Honeybadger, 'hutch/error_handlers/honeybadger'
     autoload :Airbrake,    'hutch/error_handlers/airbrake'
+    autoload :Opbeat,      'hutch/error_handlers/opbeat'
   end
 end

data/lib/hutch/error_handlers/airbrake.rb

@@ -6,20 +6,30 @@ module Hutch
     class Airbrake
       include Logging
 
-      def handle(message_id, payload, consumer, ex)
+      def handle(properties, payload, consumer, ex)
+        message_id = properties.message_id
         prefix = "message(#{message_id || '-'}): "
         logger.error prefix + "Logging event to Airbrake"
         logger.error prefix + "#{ex.class} - #{ex.message}"
-        ::Airbrake.notify_or_ignore(ex, {
-          :error_class => ex.class.name,
-          :error_message => "#{ ex.class.name }: #{ ex.message }",
-          :backtrace => ex.backtrace,
-          :parameters => {
-            :payload => payload,
-            :consumer => consumer,
-          },
-          :cgi_data => ENV.to_hash,
-        })
+
+        if ::Airbrake.respond_to?(:notify_or_ignore)
+          ::Airbrake.notify_or_ignore(ex, {
+            error_class: ex.class.name,
+            error_message: "#{ ex.class.name }: #{ ex.message }",
+            backtrace: ex.backtrace,
+            parameters: {
+              payload: payload,
+              consumer: consumer,
+            },
+            cgi_data: ENV.to_hash,
+          })
+        else
+          ::Airbrake.notify(ex, {
+            payload: payload,
+            consumer: consumer,
+            cgi_data: ENV.to_hash,
+          })
+        end
       end
     end
   end

data/lib/hutch/error_handlers/honeybadger.rb

@@ -6,7 +6,8 @@ module Hutch
     class Honeybadger
       include Logging
 
-      def handle(message_id, payload, consumer, ex)
+      def handle(properties, payload, consumer, ex)
+        message_id = properties.message_id
         prefix = "message(#{message_id || '-'}): "
         logger.error prefix + "Logging event to Honeybadger"
         logger.error prefix + "#{ex.class} - #{ex.message}"

data/lib/hutch/error_handlers/logger.rb

@@ -5,7 +5,8 @@ module Hutch
     class Logger
       include Logging
 
-      def handle(message_id, payload, consumer, ex)
+      def handle(properties, payload, consumer, ex)
+        message_id = properties.message_id
         prefix = "message(#{message_id || '-'}): "
         logger.error prefix + "error in consumer '#{consumer}'"
         logger.error prefix + "#{ex.class} - #{ex.message}"

data/lib/hutch/error_handlers/opbeat.rb

@@ -0,0 +1,24 @@
+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/error_handlers/sentry.rb

@@ -12,7 +12,8 @@ module Hutch
         end
       end
 
-      def handle(message_id, payload, consumer, ex)
+      def handle(properties, payload, consumer, ex)
+        message_id = properties.message_id
         prefix = "message(#{message_id || '-'}): "
         logger.error prefix + "Logging event to Sentry"
         logger.error prefix + "#{ex.class} - #{ex.message}"

data/lib/hutch/version.rb

@@ -1,4 +1,4 @@
 module Hutch
-  VERSION = '0.22.1'.freeze
+  VERSION = '0.23.0'.freeze
 end
 

data/lib/hutch/waiter.rb

@@ -4,7 +4,7 @@ module Hutch
   class Waiter
     include Logging
 
-    SHUTDOWN_SIGNALS = %w(QUIT TERM INT)
+    SHUTDOWN_SIGNALS = %w(QUIT TERM INT).keep_if { |s| Signal.list.keys.include? s }.freeze
 
     def self.wait_until_signaled
       new.wait_until_signaled

data/lib/hutch/worker.rb

@@ -9,8 +9,6 @@ module Hutch
   class Worker
     include Logging
 
-    SHUTDOWN_SIGNALS = %w(QUIT TERM INT)
-
     def initialize(broker, consumers, setup_procs)
       @broker        = broker
       self.consumers = consumers
@@ -70,16 +68,16 @@ module Hutch
       @broker.ack(delivery_info.delivery_tag)
     rescue => ex
       acknowledge_error(delivery_info, properties, @broker, ex)
-      handle_error(properties.message_id, payload, consumer, ex)
+      handle_error(properties, payload, consumer, ex)
     end
 
     def with_tracing(klass)
       Hutch::Config[:tracer].new(klass)
     end
 
-    def handle_error(message_id, payload, consumer, ex)
+    def handle_error(*args)
       Hutch::Config[:error_handlers].each do |backend|
-        backend.handle(message_id, payload, consumer, ex)
+        backend.handle(*args)
       end
     end
 

data/spec/hutch/broker_spec.rb

@@ -2,8 +2,16 @@ require 'spec_helper'
 require 'hutch/broker'
 
 describe Hutch::Broker do
-  let(:config) { Hutch::Config.initialize(client_logger: Hutch::Logging.logger) }
-  subject(:broker) { Hutch::Broker.new(config) }
+  before do
+    Hutch::Config.initialize(client_logger: Hutch::Logging.logger)
+    @config = Hutch::Config.to_hash
+  end
+  let!(:config) { @config }
+  after do
+    Hutch::Config.instance_variable_set(:@config, nil)
+    Hutch::Config.initialize
+  end
+  let(:broker) { Hutch::Broker.new(config) }
 
   describe '#connect' do
     before { allow(broker).to receive(:set_up_amqp_connection) }
@@ -195,7 +203,7 @@ describe Hutch::Broker do
       after  { broker.disconnect }
 
       describe '#api_client' do
-        subject { super().api_client }
+        subject { broker.api_client }
         it { is_expected.to be_a CarrotTop }
       end
     end
@@ -321,12 +329,12 @@ describe Hutch::Broker do
 
       it 'publishes to the exchange' do
         expect(broker.exchange).to receive(:publish).once
-        broker.publish('test.key', 'message')
+        broker.publish('test.key', {key: "value"})
       end
 
       it 'sets default properties' do
         expect(broker.exchange).to receive(:publish).with(
-          JSON.dump("message"),
+          JSON.dump({key: "value"}),
           hash_including(
             persistent: true,
             routing_key: 'test.key',
@@ -334,12 +342,12 @@ describe Hutch::Broker do
           )
         )
 
-        broker.publish('test.key', 'message')
+        broker.publish('test.key', {key: "value"})
       end
 
       it 'allows passing message properties' do
         expect(broker.exchange).to receive(:publish).once
-        broker.publish('test.key', 'message', {expiration: "2000", persistent: false})
+        broker.publish('test.key', {key: "value"}, {expiration: "2000", persistent: false})
       end
 
       context 'when there are global properties' do
@@ -350,8 +358,8 @@ describe Hutch::Broker do
 
           it 'merges the properties' do
             expect(broker.exchange).
-              to receive(:publish).with('"message"', hash_including(app_id: 'app'))
-            broker.publish('test.key', 'message')
+              to receive(:publish).with('{"key":"value"}', hash_including(app_id: 'app'))
+            broker.publish('test.key', {key: "value"})
           end
         end
 
@@ -362,8 +370,8 @@ describe Hutch::Broker do
 
           it 'calls the proc and merges the properties' do
             expect(broker.exchange).
-              to receive(:publish).with('"message"', hash_including(app_id: 'app'))
-            broker.publish('test.key', 'message')
+              to receive(:publish).with('{"key":"value"}', hash_including(app_id: 'app'))
+            broker.publish('test.key', {key: "value"})
           end
         end
       end
@@ -372,13 +380,13 @@ describe Hutch::Broker do
         it 'does not wait for confirms on the channel', adapter: :bunny do
           expect_any_instance_of(Bunny::Channel).
             to_not receive(:wait_for_confirms)
-          broker.publish('test.key', 'message')
+          broker.publish('test.key', {key: "value"})
         end
 
         it 'does not wait for confirms on the channel', adapter: :march_hare do
           expect_any_instance_of(MarchHare::Channel).
             to_not receive(:wait_for_confirms)
-          broker.publish('test.key', 'message')
+          broker.publish('test.key', {key: "value"})
         end
       end
 
@@ -392,13 +400,13 @@ describe Hutch::Broker do
         it 'waits for confirms on the channel', adapter: :bunny do
           expect_any_instance_of(Bunny::Channel).
             to receive(:wait_for_confirms)
-          broker.publish('test.key', 'message')
+          broker.publish('test.key', {key: "value"})
         end
 
         it 'waits for confirms on the channel', adapter: :march_hare do
           expect_any_instance_of(MarchHare::Channel).
             to receive(:wait_for_confirms)
-          broker.publish('test.key', 'message')
+          broker.publish('test.key', {key: "value"})
         end
       end
     end
@@ -407,13 +415,13 @@ describe Hutch::Broker do
       before { broker.set_up_amqp_connection; broker.disconnect }
 
       it 'raises an exception' do
-        expect { broker.publish('test.key', 'message') }.
+        expect { broker.publish('test.key', {key: "value"}) }.
           to raise_exception(Hutch::PublishError)
       end
 
       it 'logs an error' do
         expect(broker.logger).to receive(:error)
-        broker.publish('test.key', 'message') rescue nil
+        broker.publish('test.key', {key: "value"}) rescue nil
       end
     end
   end

data/spec/hutch/config_spec.rb

@@ -5,9 +5,14 @@ describe Hutch::Config do
   let(:new_value) { 'not-localhost' }
 
   before do
+    Hutch::Config.instance_variable_set(:@config, nil)
     Hutch::Config.initialize
   end
 
+  after do
+    Hutch::Config.instance_variable_set(:@config, nil)
+  end
+
   describe '.get' do
     context 'for valid attributes' do
       subject { Hutch::Config.get(:mq_host) }
@@ -18,9 +23,7 @@ describe Hutch::Config do
 
       context 'with an overridden value' do
         before do
-          allow(Hutch::Config).to receive_messages(
-            user_config: { mq_host: new_value }
-          )
+          Hutch::Config.set(:mq_host, new_value)
         end
 
         it { is_expected.to eq(new_value) }
@@ -161,4 +164,24 @@ YAML
       end
     end
   end
+
+  context 'developer ergonomics' do
+    it 'will accept strings and symbols as config keys' do
+      expect(Hutch::Config.get(:mq_host)).to eq '127.0.0.1'
+      expect(Hutch::Config.get('mq_host')).to eq '127.0.0.1'
+    end
+
+    describe 'it will not overwrite existing config' do
+      it 'with defaults' do
+        expect(Hutch::Config.get(:mq_host)).to eq '127.0.0.1'
+        Hutch::Config.initialize
+
+        Hutch::Config.set(:mq_host, 'example2.com')
+
+        expect(Hutch::Config.get(:mq_host)).to eq 'example2.com'
+        Hutch::Config.initialize
+        expect(Hutch::Config.get(:mq_host)).to eq 'example2.com'
+      end
+    end
+  end
 end

data/spec/hutch/error_handlers/airbrake_spec.rb

@@ -14,21 +14,17 @@ describe Hutch::ErrorHandlers::Airbrake do
 
     it "logs the error to Airbrake" do
       message_id = "1"
+      properties = OpenStruct.new(message_id: message_id)
       payload = "{}"
       consumer = double
       ex = error
       message = {
-        :error_class => ex.class.name,
-        :error_message => "#{ ex.class.name }: #{ ex.message }",
-        :backtrace => ex.backtrace,
-        :parameters => {
-          :payload => payload,
-          :consumer => consumer,
-        },
-        :cgi_data => ENV.to_hash,
+        payload: payload,
+        consumer: consumer,
+        cgi_data: ENV.to_hash,
       }
-      expect(::Airbrake).to receive(:notify_or_ignore).with(ex, message)
-      error_handler.handle(message_id, payload, consumer, ex)
+      expect(::Airbrake).to receive(:notify).with(ex, message)
+      error_handler.handle(properties, payload, consumer, ex)
     end
   end
 end

data/spec/hutch/error_handlers/honeybadger_spec.rb

@@ -14,6 +14,7 @@ describe Hutch::ErrorHandlers::Honeybadger do
 
     it "logs the error to Honeybadger" do
       message_id = "1"
+      properties = OpenStruct.new(message_id: message_id)
       payload = "{}"
       consumer = double
       ex = error
@@ -30,7 +31,7 @@ describe Hutch::ErrorHandlers::Honeybadger do
           }
       }
       expect(::Honeybadger).to receive(:notify_or_ignore).with(message)
-      error_handler.handle(message_id, payload, consumer, ex)
+      error_handler.handle(properties, payload, consumer, ex)
     end
   end
 end

data/spec/hutch/error_handlers/logger_spec.rb

@@ -4,12 +4,14 @@ describe Hutch::ErrorHandlers::Logger do
   let(:error_handler) { Hutch::ErrorHandlers::Logger.new }
 
   describe '#handle' do
+    let(:properties) { OpenStruct.new(message_id: "1") }
+    let(:payload) { "{}" }
     let(:error) { double(message: "Stuff went wrong", class: "RuntimeError",
                        backtrace: ["line 1", "line 2"]) }
 
     it "logs three separate lines" do
       expect(Hutch::Logging.logger).to receive(:error).exactly(3).times
-      error_handler.handle("1", "{}", double, error)
+      error_handler.handle(properties, payload, double, error)
     end
   end
 end

data/spec/hutch/error_handlers/opbeat_spec.rb

@@ -0,0 +1,22 @@
+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/hutch/error_handlers/sentry_spec.rb

@@ -4,6 +4,8 @@ describe Hutch::ErrorHandlers::Sentry do
   let(:error_handler) { Hutch::ErrorHandlers::Sentry.new }
 
   describe '#handle' do
+    let(:properties) { OpenStruct.new(message_id: "1") }
+    let(:payload) { "{}" }
     let(:error) do
       begin
         raise "Stuff went wrong"
@@ -13,8 +15,8 @@ describe Hutch::ErrorHandlers::Sentry do
     end
 
     it "logs the error to Sentry" do
-      expect(Raven).to receive(:capture_exception).with(error, extra: { payload: "{}" })
-      error_handler.handle("1", "{}", double, error)
+      expect(Raven).to receive(:capture_exception).with(error, extra: { payload: payload })
+      error_handler.handle(properties, payload, double, error)
     end
   end
 end

data/spec/hutch/waiter_spec.rb

@@ -12,7 +12,11 @@ RSpec.describe Hutch::Waiter do
       end
     end
 
-    %w(QUIT TERM INT).each do |signal|
+    described_class::SHUTDOWN_SIGNALS.each do |signal|
+      # JRuby does not support QUIT:
+      # The signal QUIT is in use by the JVM and will not work correctly on this platform
+      next if signal == 'QUIT' && defined?(JRUBY_VERSION)
+
       context "a #{signal} signal is received" do
         it "logs that hutch is stopping" do
           expect(Hutch::Logging.logger).to receive(:info)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hutch
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: carrot-top
   requirement: !ruby/object:Gem::Requirement
@@ -44,96 +44,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: github-markup
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 description: Hutch is a Ruby library for enabling asynchronous inter-service communication
@@ -146,6 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -157,6 +88,8 @@ files:
 - bin/hutch
 - examples/consumer.rb
 - examples/producer.rb
+- gemfiles/Gemfile.activesupport4
+- gemfiles/Gemfile.activesupport5
 - hutch.gemspec
 - lib/hutch.rb
 - lib/hutch/acknowledgements/base.rb
@@ -172,6 +105,7 @@ files:
 - lib/hutch/error_handlers/airbrake.rb
 - lib/hutch/error_handlers/honeybadger.rb
 - lib/hutch/error_handlers/logger.rb
+- lib/hutch/error_handlers/opbeat.rb
 - lib/hutch/error_handlers/sentry.rb
 - lib/hutch/exceptions.rb
 - lib/hutch/logging.rb
@@ -194,6 +128,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/sentry_spec.rb
 - spec/hutch/logger_spec.rb
 - spec/hutch/message_spec.rb
@@ -223,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -231,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Easy inter-service communication using RabbitMQ.
@@ -243,6 +178,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/sentry_spec.rb
 - spec/hutch/logger_spec.rb
 - spec/hutch/message_spec.rb
@@ -251,4 +187,3 @@ test_files:
 - spec/hutch/worker_spec.rb
 - spec/hutch_spec.rb
 - spec/spec_helper.rb
-has_rdoc: