hutch 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5cc77d44298bc30b015712a1f15f61cafc5e7c
-  data.tar.gz: bda636946084243afc740b8754672259ca2e4684
+  metadata.gz: fd5acc300bddafcfd792e4c75e5b811a48f629fd
+  data.tar.gz: a95a2cd5d6f68eef43366f41a944a97d0ecd69b5
 SHA512:
-  metadata.gz: 52c095af05f9d3c5f5a902eff935bf1f5056e539b96e009e656a70ecb287da2d3c771bd42f162fadb2bef9ae7752a4eed7a384b1e24d72e91476e511f70a292f
-  data.tar.gz: 67fc947889d0ac2d3eaff59164439f2980489aa922693c6ff1c43f83dbf91126c2b1f1e7c23283ff9cf7da4a2ddcc456bfc2f966d0bc2b320120a92e44974437
+  metadata.gz: 98826378b6171757012a15807bc0e52b88a692a88aa9c14e864969c5dbef49ea45890c50372e58a5dbb4b5179ee9cd12b992e00a4cb16108134d0603b56a0162
+  data.tar.gz: 009ec3387f697af8dd6ea279bbf1260a945d5063d012b7a0970ad7d99a3b5d5a60ca7abc33473f2f494584a77c3a7f63946bea123c7a195e30ef65608dd7c674

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0 - September 24, 2013
+
+- Add `--[no-]autoload-rails` flag to optionally disable the autoloading of
+  Rails apps in the current directory
+
 ## 0.2.1 - September 17, 2013
 
 - Fix inconsistency with `mq-tls` option

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2013 GoCardless
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -94,12 +94,14 @@ $ hutch -h
 usage: hutch [options]
         --mq-host HOST               Set the RabbitMQ host
         --mq-port PORT               Set the RabbitMQ port
+        --mq-tls                     Use TLS for the AMQP connection
         --mq-exchange EXCHANGE       Set the RabbitMQ exchange
         --mq-vhost VHOST             Set the RabbitMQ vhost
+        --mq-username USERNAME       Set the RabbitMQ username
+        --mq-password PASSWORD       Set the RabbitMQ password
         --mq-api-host HOST           Set the RabbitMQ API host
         --mq-api-port PORT           Set the RabbitMQ API port
-        --mq-api-username USERNAME   Set the RabbitMQ API username
-        --mq-api-password PASSWORD   Set the RabbitMQ API password
+        --mq-api-ssl                 Use SSL for the RabbitMQ API
         --require PATH               Require a Rails app or path
     -q, --quiet                      Quiet logging
     -v, --verbose                    Verbose logging

data/lib/hutch/cli.rb

@@ -25,7 +25,7 @@ module Hutch
 
     def load_app
       # Try to load a Rails app in the current directory
-      load_rails_app('.')
+      load_rails_app('.') if Hutch::Config.autoload_rails
       Hutch::Config.require_paths.each do |path|
         # See if each path is a Rails app. If so, try to load it.
         next if load_rails_app(path)
@@ -96,7 +96,7 @@ module Hutch
           Hutch::Config.mq_port = port
         end
 
-        opts.on('--mq-tls', 'Set the RabbitMQ connection to use TLS') do |tls|
+        opts.on('--mq-tls', 'Use TLS for the AMQP connection') do |tls|
           Hutch::Config.mq_tls = tls
         end
 
@@ -127,7 +127,7 @@ module Hutch
           Hutch::Config.mq_api_port = port
         end
 
-        opts.on('--mq-api-ssl', 'Set the RabbitMQ API connection to use SSL') do |api_ssl|
+        opts.on('--mq-api-ssl', 'Use SSL for the RabbitMQ API') do |api_ssl|
           Hutch::Config.mq_api_ssl = api_ssl
         end
 
@@ -135,6 +135,10 @@ module Hutch
           Hutch::Config.require_paths << path
         end
 
+        opts.on('--[no-]autoload-rails', 'Require the current rails app directory') do |autoload_rails|
+          Hutch::Config.autoload_rails = autoload_rails
+        end
+
         opts.on('-q', '--quiet', 'Quiet logging') do
           Hutch::Config.log_level = Logger::WARN
         end
@@ -156,4 +160,3 @@ module Hutch
     end
   end
 end
-

data/lib/hutch/config.rb

@@ -18,6 +18,7 @@ module Hutch
         mq_api_ssl: false,
         log_level: Logger::INFO,
         require_paths: [],
+        autoload_rails: true,
         error_handlers: [Hutch::ErrorHandlers::Logger.new]
       }
     end

data/lib/hutch/version.rb

@@ -1,4 +1,4 @@
 module Hutch
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.0'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hutch
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -79,6 +79,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Guardfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/hutch