hutch 0.24.0 → 0.25.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb197fc767359bc60d35790ec650c9c077120d0d
-  data.tar.gz: e1152a8d434fdc9a4752c095ad5fdce4871ffd9e
+  metadata.gz: 720fbfbc59995920a3fa51951df1e692af84a36e
+  data.tar.gz: 30fd95c8766d99b42c6a8a45cf3575dce1219e0b
 SHA512:
-  metadata.gz: c34020a830413a6e970bfae9e59fecdaebbe770aaf7df753a7f263af6d7dc98b0ae4433a4aafc27d9d8f45689168d0b39a64d3ba4086c05187fc7b0e352d9814
-  data.tar.gz: cc24d3e6ab11c4979455c06ba057760b00cffae9dd577a39f4f89bfe7b45a33378c2190362c2d003a5418b3e64238d2997610c8b4f8f52a5287d0765563109ad
+  metadata.gz: 99b267d79bc4497f353cb96735058c770d42545ed76eb4f53033a1518fc809e11fd68dd6e14ab1a17ccf96bdc8a816b9aeba1fd4dee5d03231e701a0d98be3c8
+  data.tar.gz: c3a36d75316070a6bcf163d7ac3e2c0e39e179f34f8e8db2d9ae5dc56fd9b666d931e734ac7352cba143c313835eb28d4659d0fe0569450f1c1ab32e02068ffd

data/.travis.yml

@@ -5,12 +5,12 @@ before_install:
   - gem install bundler
 matrix:
   include:
-    - rvm: 2.4.0
-    - rvm: 2.3.3
-    - rvm: 2.2
+    - rvm: 2.4.1
+    - rvm: 2.3.4
+    - rvm: 2.2.7
     - rvm: 2.1
     - rvm: 2.0
-    - rvm: jruby-9.1.7.0
+    - rvm: jruby-9.1.12.0
       jdk: oraclejdk8
       env:
         - JRUBY_OPTS='--debug'

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 0.24.0 — (unreleased)
+## 0.25.0 — (unreleased)
+
+No changes yet.
+
+
+
+## 0.24.0 — February 1st, 2017
 
 ### Configurable Consumer Prefixes
 

data/README.md

@@ -80,8 +80,8 @@ message[:id]  # => "02ABCXYZ"
 To subscribe to a topic, pass a routing key to `consume` in the class
 definition. To bind to multiple routing keys, simply pass extra routing keys
 in as additional arguments. Refer to the [RabbitMQ docs on topic exchanges
-][topic-docs] for more information about how to use routing keys. Here's an
-example consumer:
+](http://www.rabbitmq.com/tutorials/tutorial-five-ruby.html) for more information
+about how to use routing keys. Here's an example consumer:
 
 ```ruby
 class FailedPaymentConsumer
@@ -120,7 +120,9 @@ class FailedPaymentConsumer
 end
 ```
 
-Custom queue arguments can be found on [this page](https://www.rabbitmq.com/extensions.html).
+This sets the `x-max-length` header. For more details, see the [RabbitMQ
+documentation on Queue Length Limit](https://www.rabbitmq.com/maxlength.html). To find out more
+about custom queue arguments, consult the [RabbitMQ documentation on AMQP Protocol Extensions](https://www.rabbitmq.com/extensions.html). 
 
 Consumers can write to Hutch's log by calling the logger method. The logger method returns
 a [Logger object](http://ruby-doc.org/stdlib-2.1.2/libdoc/logger/rdoc/Logger.html).
@@ -300,8 +302,8 @@ AMQP.connect(host: config[:host]) do |connection|
 end
 ```
 
-If using publisher confirms with amqp gem, see [this issue][pc-issue]
-and [this gist][pc-gist] for more info.
+If using publisher confirms with amqp gem, see [this issue](https://github.com/ruby-amqp/amqp/issues/92)
+and [this gist](https://gist.github.com/3042381) for more info.
 
 ## Configuration
 
@@ -384,241 +386,188 @@ Generate with
     </tr>
   </thead>
   <tbody>
-  
     <tr>
       <td><tt>mq_host</tt></td>
       <td>127.0.0.1</td>
       <td>String</td>
       <td><tt>HUTCH_MQ_HOST</tt></td>
-      <td><p>RabbitMQ hostname</p>
-</td>
+      <td><p>RabbitMQ hostname</p></td>
     </tr>
-  
     <tr>
       <td><tt>mq_exchange</tt></td>
       <td>hutch</td>
       <td>String</td>
       <td><tt>HUTCH_MQ_EXCHANGE</tt></td>
-      <td><p>RabbitMQ Exchange to use for publishing</p>
-</td>
+      <td><p>RabbitMQ Exchange to use for publishing</p></td>
     </tr>
-  
     <tr>
       <td><tt>mq_vhost</tt></td>
       <td>/</td>
       <td>String</td>
       <td><tt>HUTCH_MQ_VHOST</tt></td>
-      <td><p>RabbitMQ vhost to use</p>
-</td>
+      <td><p>RabbitMQ vhost to use</p></td>
     </tr>
-  
     <tr>
       <td><tt>mq_username</tt></td>
       <td>guest</td>
       <td>String</td>
       <td><tt>HUTCH_MQ_USERNAME</tt></td>
-      <td><p>RabbitMQ username to use.</p>
-</td>
+      <td><p>RabbitMQ username to use.</p></td>
     </tr>
-  
     <tr>
       <td><tt>mq_password</tt></td>
       <td>guest</td>
       <td>String</td>
       <td><tt>HUTCH_MQ_PASSWORD</tt></td>
-      <td><p>RabbitMQ password</p>
-</td>
+      <td><p>RabbitMQ password</p></td>
     </tr>
-  
     <tr>
       <td><tt>uri</tt></td>
       <td>nil</td>
       <td>String</td>
       <td><tt>HUTCH_URI</tt></td>
-      <td><p>RabbitMQ URI (takes precedence over MQ username, password, host, port and vhost settings)</p>
-</td>
+      <td><p>RabbitMQ URI (takes precedence over MQ username, password, host, port and vhost settings)</p></td>
     </tr>
-  
     <tr>
       <td><tt>mq_api_host</tt></td>
       <td>127.0.0.1</td>
       <td>String</td>
       <td><tt>HUTCH_MQ_API_HOST</tt></td>
-      <td><p>RabbitMQ HTTP API hostname</p>
-</td>
+      <td><p>RabbitMQ HTTP API hostname</p></td>
     </tr>
-  
     <tr>
       <td><tt>mq_port</tt></td>
       <td>5672</td>
       <td>Number</td>
       <td><tt>HUTCH_MQ_PORT</tt></td>
-      <td><p>RabbitMQ port</p>
-</td>
+      <td><p>RabbitMQ port</p></td>
     </tr>
-  
     <tr>
       <td><tt>mq_api_port</tt></td>
       <td>15672</td>
       <td>Number</td>
       <td><tt>HUTCH_MQ_API_PORT</tt></td>
-      <td><p>RabbitMQ HTTP API port</p>
-</td>
+      <td><p>RabbitMQ HTTP API port</p></td>
     </tr>
-  
     <tr>
       <td><tt>heartbeat</tt></td>
       <td>30</td>
       <td>Number</td>
       <td><tt>HUTCH_HEARTBEAT</tt></td>
-      <td><p><a href="http://rabbitmq.com/heartbeats.html">RabbitMQ heartbeat timeout</a></p>
-</td>
+      <td><p><a href="http://rabbitmq.com/heartbeats.html">RabbitMQ heartbeat timeout</a></p></td>
     </tr>
-  
     <tr>
       <td><tt>channel_prefetch</tt></td>
       <td>0</td>
       <td>Number</td>
       <td><tt>HUTCH_CHANNEL_PREFETCH</tt></td>
-      <td><p>The <tt>basic.qos</tt> prefetch value to use.</p>
-</td>
+      <td><p>The <tt>basic.qos</tt> prefetch value to use.</p></td>
     </tr>
-  
     <tr>
       <td><tt>connection_timeout</tt></td>
       <td>11</td>
       <td>Number</td>
       <td><tt>HUTCH_CONNECTION_TIMEOUT</tt></td>
-      <td><p>Bunny's socket open timeout</p>
-</td>
+      <td><p>Bunny's socket open timeout</p></td>
     </tr>
-  
     <tr>
       <td><tt>read_timeout</tt></td>
       <td>11</td>
       <td>Number</td>
       <td><tt>HUTCH_READ_TIMEOUT</tt></td>
-      <td><p>Bunny's socket read timeout</p>
-</td>
+      <td><p>Bunny's socket read timeout</p></td>
     </tr>
-  
     <tr>
       <td><tt>write_timeout</tt></td>
       <td>11</td>
       <td>Number</td>
       <td><tt>HUTCH_WRITE_TIMEOUT</tt></td>
-      <td><p>Bunny's socket write timeout</p>
-</td>
+      <td><p>Bunny's socket write timeout</p></td>
     </tr>
-  
     <tr>
       <td><tt>graceful_exit_timeout</tt></td>
       <td>11</td>
       <td>Number</td>
       <td><tt>HUTCH_GRACEFUL_EXIT_TIMEOUT</tt></td>
-      <td><p>FIXME: DOCUMENT THIS</p>
-</td>
+      <td><p>FIXME: DOCUMENT THIS</p></td>
     </tr>
-  
     <tr>
       <td><tt>consumer_pool_size</tt></td>
       <td>1</td>
       <td>Number</td>
       <td><tt>HUTCH_CONSUMER_POOL_SIZE</tt></td>
-      <td><p>Bunny consumer work pool size</p>
-</td>
+      <td><p>Bunny consumer work pool size</p></td>
     </tr>
-  
     <tr>
       <td><tt>mq_tls</tt></td>
       <td>false</td>
       <td>Boolean</td>
       <td><tt>HUTCH_MQ_TLS</tt></td>
-      <td><p>Should TLS be used?</p>
-</td>
+      <td><p>Should TLS be used?</p></td>
     </tr>
-  
     <tr>
       <td><tt>mq_verify_peer</tt></td>
       <td>true</td>
       <td>Boolean</td>
       <td><tt>HUTCH_MQ_VERIFY_PEER</tt></td>
-      <td><p>Should SSL certificate be verified?</p>
-</td>
+      <td><p>Should SSL certificate be verified?</p></td>
     </tr>
-  
     <tr>
       <td><tt>mq_api_ssl</tt></td>
       <td>false</td>
       <td>Boolean</td>
       <td><tt>HUTCH_MQ_API_SSL</tt></td>
-      <td><p>Should SSL be used for the RabbitMQ API?</p>
-</td>
+      <td><p>Should SSL be used for the RabbitMQ API?</p></td>
     </tr>
-  
     <tr>
       <td><tt>autoload_rails</tt></td>
       <td>true</td>
       <td>Boolean</td>
       <td><tt>HUTCH_AUTOLOAD_RAILS</tt></td>
-      <td><p>Should the current Rails app directory be required?</p>
-</td>
+      <td><p>Should the current Rails app directory be required?</p></td>
     </tr>
-  
     <tr>
       <td><tt>daemonise</tt></td>
       <td>false</td>
       <td>Boolean</td>
       <td><tt>HUTCH_DAEMONISE</tt></td>
-      <td><p>Should the Hutch runner process daemonise?</p>
-</td>
+      <td><p>Should the Hutch runner process daemonise?</p></td>
     </tr>
-  
     <tr>
       <td><tt>publisher_confirms</tt></td>
       <td>false</td>
       <td>Boolean</td>
       <td><tt>HUTCH_PUBLISHER_CONFIRMS</tt></td>
-      <td><p>Should RabbitMQ publisher confirms be enabled?</p>
-</td>
+      <td><p>Should RabbitMQ publisher confirms be enabled?</p></td>
     </tr>
-  
     <tr>
       <td><tt>force_publisher_confirms</tt></td>
       <td>false</td>
       <td>Boolean</td>
       <td><tt>HUTCH_FORCE_PUBLISHER_CONFIRMS</tt></td>
-      <td><p>Enables publisher confirms, forces Hutch::Broker#wait_for_confirms for</p>
-</td>
+      <td><p>Enables publisher confirms, forces Hutch::Broker#wait_for_confirms for</p></td>
     </tr>
-  
     <tr>
       <td><tt>enable_http_api_use</tt></td>
       <td>true</td>
       <td>Boolean</td>
       <td><tt>HUTCH_ENABLE_HTTP_API_USE</tt></td>
-      <td><p>Should the RabbitMQ HTTP API be used?</p>
-</td>
+      <td><p>Should the RabbitMQ HTTP API be used?</p></td>
     </tr>
-  
     <tr>
       <td><tt>consumer_pool_abort_on_exception</tt></td>
       <td>false</td>
       <td>Boolean</td>
       <td><tt>HUTCH_CONSUMER_POOL_ABORT_ON_EXCEPTION</tt></td>
-      <td><p>Should Bunny's consumer work pool threads abort on exception.</p>
-</td>
+      <td><p>Should Bunny's consumer work pool threads abort on exception.</p></td>
     </tr>
-
     <tr>
       <td><tt>consumer_tag_prefix</tt></td>
       <td>hutch</td>
       <td>String</td>
       <td><tt>HUTCH_CONSUMER_TAG_PREFIX</tt></td>
-      <td><p>Prefix displayed on the consumers tags.</p>
-</td>
+      <td><p>Prefix displayed on the consumers tags.</p></td>
     </tr>
-  
   </tbody>
 </table>
 

data/hutch.gemspec

@@ -3,10 +3,10 @@ require File.expand_path('../lib/hutch/version', __FILE__)
 Gem::Specification.new do |gem|
   if defined?(JRUBY_VERSION)
     gem.platform = 'java'
-    gem.add_runtime_dependency 'march_hare', '>= 2.22.0'
+    gem.add_runtime_dependency 'march_hare', '>= 3.0.0'
   else
     gem.platform = Gem::Platform::RUBY
-    gem.add_runtime_dependency 'bunny', '>= 2.6.3'
+    gem.add_runtime_dependency 'bunny', '>= 2.7.0'
   end
   gem.add_runtime_dependency 'carrot-top', '~> 0.0.7'
   gem.add_runtime_dependency 'multi_json', '~> 1.12'

data/lib/hutch/cli.rb

@@ -72,8 +72,8 @@ module Hutch
         end
         rails_path = File.expand_path(File.join(path, 'config/environment.rb'))
         if is_rails_app && File.exist?(rails_path)
-          logger.info "found rails project (#{path}), booting app"
           ENV['RACK_ENV'] ||= ENV['RAILS_ENV'] || 'development'
+          logger.info "found rails project (#{path}), booting app in #{ENV['RACK_ENV']} environment"
           require rails_path
           ::Rails.application.eager_load!
           return true

data/lib/hutch/error_handlers/honeybadger.rb

@@ -3,6 +3,7 @@ require 'honeybadger'
 
 module Hutch
   module ErrorHandlers
+    # Error handler for the Honeybadger.io service
     class Honeybadger
       include Logging
 
@@ -11,18 +12,23 @@ module Hutch
         prefix = "message(#{message_id || '-'}):"
         logger.error "#{prefix} Logging event to Honeybadger"
         logger.error "#{prefix} #{ex.class} - #{ex.message}"
-        ::Honeybadger.notify_or_ignore(
-          :error_class => ex.class.name,
-          :error_message => "#{ ex.class.name }: #{ ex.message }",
-          :backtrace => ex.backtrace,
-          :context => {
-            :message_id => message_id,
-            :consumer => consumer
-          },
-          :parameters => {
-            :payload => payload
-          }
-        )
+        notify_honeybadger(error_class: ex.class.name,
+                           error_message: "#{ex.class.name}: #{ex.message}",
+                           backtrace: ex.backtrace,
+                           context: { message_id: message_id,
+                                      consumer: consumer },
+                           parameters: { payload: payload })
+      end
+
+      # Wrap API to support 3.0.0+
+      #
+      # @see https://github.com/honeybadger-io/honeybadger-ruby/blob/master/CHANGELOG.md#300---2017-02-06
+      def notify_honeybadger(message)
+        if ::Honeybadger.respond_to?(:notify_or_ignore)
+          ::Honeybadger.notify_or_ignore(message)
+        else
+          ::Honeybadger.notify(message.merge(force: true))
+        end
       end
     end
   end

data/lib/hutch/version.rb

@@ -1,4 +1,4 @@
 module Hutch
-  VERSION = '0.24.0'.freeze
+  VERSION = '0.25.0-rc1'.freeze
 end
 

data/spec/hutch/error_handlers/honeybadger_spec.rb

@@ -30,7 +30,7 @@ describe Hutch::ErrorHandlers::Honeybadger do
             :payload => payload
           }
       }
-      expect(::Honeybadger).to receive(:notify_or_ignore).with(message)
+      expect(error_handler).to receive(:notify_honeybadger).with(message)
       error_handler.handle(properties, payload, consumer, ex)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hutch
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0.pre.rc1
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: carrot-top
   requirement: !ruby/object:Gem::Requirement
@@ -167,12 +167,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Easy inter-service communication using RabbitMQ.