hutch 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d93317d6750bca3658656b8b919dbdf9b277cf5
-  data.tar.gz: ce7f0b6bad0ea3764e13e634f764285f75927bdf
+  metadata.gz: 85403719cdd5fb675886fc2dd6a830a544b3f8ea
+  data.tar.gz: ca485c1fe62a41867f634d46a45798570b3d441f
 SHA512:
-  metadata.gz: 6f39fa63c8d77ea71444ab25cfd599bfc89ad9e8c222323f69b322e66a179347fec7c1afb100b5575af08d1a6522af1d2e4adeef827c40f825313e76640482d9
-  data.tar.gz: d3c94ca6c2720fa3fd4197f408dc8832f9f904941dbd1cc556e13efae7b0768b2ab1be0c58159676cce4b78c0c5ccac9e15f8a55c780d6d251b0b42f54a55161
+  metadata.gz: 0ff8d4d207f98acadd27035454a23aa50119076621b01b71fa21d342df02ff67574454f0b26374a60a2b04d941d1b170a6dfd420d12136abb404a17990ab5ea7
+  data.tar.gz: 62fef649721ee040dd1555310a6cd6338da4d00807ab5a6f41cb940e131df919a97e3dc173b2c2a4a9bfff311bce5835f1d37652472229470353c7787af407f7

data/.travis.yml

@@ -1,11 +1,17 @@
 language: ruby
+cache: bundler
 rvm:
+  - "2.3.0"
   - "2.2"
   - "2.1"
   - "2.0"
   - "jruby-9.0.0.0"
+
+sudo: false
+
 services:
   - rabbitmq
+
 matrix:
   allow_failures:
     - rvm: jruby-9.0.0.0

data/CHANGELOG.md

@@ -1,4 +1,23 @@
-## 0.20.0 — (unreleased)
+## 0.21.0 — (unreleased)
+
+### JRuby Compatibility Restored
+
+Contributed by Jesper Josefsson.
+
+### More Reliable Rails app Detection
+
+Rails application detection now won't produce false positives
+for applications that include `config/environment.rb`. Instead,
+`bin/rails` and `script/rails` are used.
+
+Contributed by @bisusubedi.
+
+### Refactoring
+
+Contributed by Jesper Josefsson and Olle Jonsson.
+
+
+## 0.20.0 — November 16th, 2015
 
 ### Hutch::Exception includes Bunny::Exception
 
@@ -50,7 +69,8 @@ GH issue: [#177](https://github.com/gocardless/hutch/pull/177).
 
 `:mq_exchange_options` is a new config option that can be used
 to provide a hash of exchange attributes (durable, auto-delete).
-The options will be passed directly to Bunny.
+The options will be passed directly to Bunny (or March Hare, when
+running on JRuby).
 
 Contributed by Derek Kastner.
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014 GoCardless
+Copyright (c) 2013-2016 GoCardless
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.md

@@ -314,7 +314,7 @@ Known configuration parameters are:
  * `heartbeat`: [RabbitMQ heartbeat timeout](http://rabbitmq.com/heartbeats.html) (default: `30`)
  * `connection_timeout`: Bunny's socket open timeout (default: `11`)
  * `read_timeout`: Bunny's socket read timeout (default: `11`)
- * `write_timemout`: Bunny's socket write timeout (default: `11`)
+ * `write_timeout`: Bunny's socket write timeout (default: `11`)
  * `tracer`: tracer to use to track message processing
 
 

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.11.0'
+    gem.add_runtime_dependency 'march_hare', '>= 2.16.0'
   else
     gem.platform = Gem::Platform::RUBY
-    gem.add_runtime_dependency 'bunny', '>= 2.2.1'
+    gem.add_runtime_dependency 'bunny', '>= 2.2.2'
   end
   gem.add_runtime_dependency 'carrot-top', '~> 0.0.7'
   gem.add_runtime_dependency 'multi_json', '~> 1.11.2'

data/lib/hutch/broker.rb

@@ -294,7 +294,7 @@ module Hutch
         params[:automatically_recover] = true
         params[:network_recovery_interval] = 1
 
-        params[:client_logger] = @config[:client_logger] if @config[:client_logger]
+        params[:logger] = @config[:client_logger] if @config[:client_logger]
       end
     end
 

data/lib/hutch/cli.rb

@@ -42,8 +42,8 @@ module Hutch
           # Need to add '.' to load path for relative requires
           $LOAD_PATH << '.'
           require path
-        rescue LoadError
-          logger.fatal "could not load file '#{path}'"
+        rescue LoadError => e
+          logger.fatal "could not load file '#{path}': #{e}"
           return false
         ensure
           # Clean up load path
@@ -65,9 +65,12 @@ module Hutch
     def load_rails_app(path)
       # path should point to the app's top level directory
       if File.directory?(path)
-        # Smells like a Rails app if it's got a config/environment.rb file
+        # Smells like a Rails app if it's got a script/rails or bin/rails file
+        is_rails_app = ['script/rails', 'bin/rails'].any? do |file|
+          File.exist?(File.expand_path(File.join(path, file)))
+        end
         rails_path = File.expand_path(File.join(path, 'config/environment.rb'))
-        if File.exists?(rails_path)
+        if is_rails_app && File.exist?(rails_path)
           logger.info "found rails project (#{path}), booting app"
           ENV['RACK_ENV'] ||= ENV['RAILS_ENV'] || 'development'
           require rails_path

data/lib/hutch/exceptions.rb

@@ -1,8 +1,12 @@
-require "bunny/exceptions"
-
 module Hutch
-  # Bunny::Exception inherits from StandardError
-  class Exception < Bunny::Exception; end
+  if defined?(JRUBY_VERSION)
+    require 'march_hare/exceptions'
+    class Exception < MarchHare::Exception; end
+  else
+    require "bunny/exceptions"
+    # Bunny::Exception inherits from StandardError
+    class Exception < Bunny::Exception; end
+  end
   class ConnectionError < Exception; end
   class AuthenticationError < Exception; end
   class WorkerSetupError < Exception; end

data/lib/hutch/version.rb

@@ -1,4 +1,4 @@
 module Hutch
-  VERSION = '0.20.0'.freeze
+  VERSION = '0.21.0'.freeze
 end
 

data/lib/hutch/worker.rb

@@ -8,6 +8,8 @@ module Hutch
   class Worker
     include Logging
 
+    SHUTDOWN_SIGNALS = %w(QUIT TERM INT)
+
     def initialize(broker, consumers)
       @broker        = broker
       self.consumers = consumers
@@ -42,7 +44,7 @@ module Hutch
     # gracefully. Forceful shutdowns are very bad!
     def register_signal_handlers
       Thread.main[:signal_queue] = []
-      %w(QUIT TERM INT).keep_if { |s| Signal.list.keys.include? s }.map(&:to_sym).each do |sig|
+      supported_shutdown_signals.each do |sig|
         # This needs to be reentrant, so we queue up signals to be handled
         # in the run loop, rather than acting on signals here
         trap(sig) do
@@ -103,25 +105,22 @@ module Hutch
     # Called internally when a new messages comes in from RabbitMQ. Responsible
     # for wrapping up the message and passing it to the consumer.
     def handle_message(consumer, delivery_info, properties, payload)
-      broker = @broker
-      begin
-        serializer = consumer.get_serializer || Hutch::Config[:serializer]
-        logger.info {
-          spec   = serializer.binary? ? "#{payload.bytesize} bytes" : "#{payload}"
-          "message(#{properties.message_id || '-'}): " +
-          "routing key: #{delivery_info.routing_key}, " +
-          "consumer: #{consumer}, " +
-          "payload: #{spec}"
-        }
-
-        message = Message.new(delivery_info, properties, payload, serializer)
-        consumer_instance = consumer.new.tap { |c| c.broker, c.delivery_info = @broker, delivery_info }
-        with_tracing(consumer_instance).handle(message)
-        broker.ack(delivery_info.delivery_tag)
-      rescue StandardError => ex
-        acknowledge_error(delivery_info, properties, broker, ex)
-        handle_error(properties.message_id, payload, consumer, ex)
-      end
+      serializer = consumer.get_serializer || Hutch::Config[:serializer]
+      logger.info {
+        spec   = serializer.binary? ? "#{payload.bytesize} bytes" : "#{payload}"
+        "message(#{properties.message_id || '-'}): " +
+        "routing key: #{delivery_info.routing_key}, " +
+        "consumer: #{consumer}, " +
+        "payload: #{spec}"
+      }
+
+      message = Message.new(delivery_info, properties, payload, serializer)
+      consumer_instance = consumer.new.tap { |c| c.broker, c.delivery_info = @broker, delivery_info }
+      with_tracing(consumer_instance).handle(message)
+      @broker.ack(delivery_info.delivery_tag)
+    rescue => ex
+      acknowledge_error(delivery_info, properties, @broker, ex)
+      handle_error(properties.message_id, payload, consumer, ex)
     end
 
     def with_tracing(klass)
@@ -152,5 +151,11 @@ module Hutch
     def error_acknowledgements
       Hutch::Config[:error_acknowledgements]
     end
+
+    private
+
+    def supported_shutdown_signals
+      SHUTDOWN_SIGNALS.keep_if { |s| Signal.list.keys.include? s }.map(&:to_sym)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hutch
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2016-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: carrot-top
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,6 @@ files:
 - README.md
 - Rakefile
 - bin/hutch
-- circle.yml
 - examples/consumer.rb
 - examples/producer.rb
 - hutch.gemspec

data/circle.yml

@@ -1,3 +0,0 @@
-machine:
-  services:
-    - rabbitmq-server