hutch 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 107ee67686b10db84f9e890b9f0f082a2c155b41
-  data.tar.gz: 23465bcdb425ffdd3fe1411d88e91b5817f8aeb1
+  metadata.gz: 9ad4ea66e507cf8c01b3e402c933223e0c525503
+  data.tar.gz: 736c571f2a6cc790ab2b3dda796a1c29b624ec74
 SHA512:
-  metadata.gz: 8ae2a6b72c937256009cab231cc45b3b63b45e9915cdde0ea1d08408c9b4d9560de053d24bb30f72afdd9e72d1687b39bbfe6cbf5aed6246ff96bba903648616
-  data.tar.gz: 915f42a2056f6449693f5b05ff4ae7645231a1d9a42d94760cfe7548f5bb4bf0ed6cb2bce9c897bea4ee33d8ed1c86295ddc6b4f715e30f2448ac472b351f8b4
+  metadata.gz: d16e7ef03f63fdedf9501bee91dd49e6b5edb03db74e1027d7a0fa1ed140994dd9e545f757484f86441d078271523df98d3d9d9d83156ad33329ca761cfbaae9
+  data.tar.gz: 719bd84eced5c8876a2dbc43b785db900bc7300a091ffb479a6949fb0797ef66eb354a273b438f92ef3932eba07a1e1703dc8c2abed31cea7fd4bbd52f109a83

data/.gitignore

@@ -1,3 +1,6 @@
 .bundle
 hutch-*.gem
 Gemfile.lock
+.ruby-version
+.ruby-gemset
+.idea

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.0 - October 17, 2013
+
+- Support for the `--mq-tls-key` and `--mq-tls-cert` configuration options.
+
 ## 0.4.5 - October 15, 2013
 
 - No exception raised when hutch is run with no consumers. Instead, a warning

data/README.md

@@ -29,7 +29,7 @@ gem install hutch
 To use in a project managed with Bundler:
 
 ``` ruby
-gem "hutch", "~> 0.4.1"
+gem "hutch", "~> 0.5.0"
 ```
 
 ## Overview

data/lib/hutch/broker.rb

@@ -37,11 +37,13 @@ module Hutch
       host, port, vhost = @config[:mq_host], @config[:mq_port]
       username, password = @config[:mq_username], @config[:mq_password]
       vhost, tls = @config[:mq_vhost], @config[:mq_tls]
+      tls_key, tls_cert = @config[:mq_tls_key], @config[:mq_tls_cert]
       protocol = tls ? "amqps://" : "amqp://"
       uri = "#{username}:#{password}@#{host}:#{port}/#{vhost.sub(/^\//, '')}"
       logger.info "connecting to rabbitmq (#{protocol}#{uri})"
 
-      @connection = Bunny.new(host: host, port: port, vhost: vhost, tls: tls,
+      @connection = Bunny.new(host: host, port: port, vhost: vhost,
+                              tls: tls, tls_key: tls_key, tls_cert: tls_cert,
                               username: username, password: password,
                               heartbeat: 1, automatically_recover: true,
                               network_recovery_interval: 1)

data/lib/hutch/cli.rb

@@ -101,6 +101,16 @@ module Hutch
           Hutch::Config.mq_tls = tls
         end
 
+        opts.on('--mq-tls-cert FILE', 'Certificate  for TLS client verification') do |file|
+          abort "Certificate file '#{file}' not found" unless File.exists?(file)
+          Hutch::Config.mq_tls_cert = file
+        end
+
+        opts.on('--mq-tls-key FILE', 'Private key for TLS client verification') do |file|
+          abort "Private key file '#{file}' not found" unless File.exists?(file)
+          Hutch::Config.mq_tls_key = file
+        end
+
         opts.on('--mq-exchange EXCHANGE',
                 'Set the RabbitMQ exchange') do |exchange|
           Hutch::Config.mq_exchange = exchange

data/lib/hutch/config.rb

@@ -14,6 +14,8 @@ module Hutch
         mq_exchange: 'hutch',  # TODO: should this be required?
         mq_vhost: '/',
         mq_tls: false,
+        mq_tls_cert: nil,
+        mq_tls_key: nil,
         mq_username: 'guest',
         mq_password: 'guest',
         mq_api_host: 'localhost',

data/lib/hutch/version.rb

@@ -1,4 +1,4 @@
 module Hutch
-  VERSION = '0.4.5'.freeze
+  VERSION = '0.5.0'.freeze
 end
 

data/spec/hutch/cli_spec.rb

@@ -28,5 +28,53 @@ describe Hutch::CLI do
         end
       end
     end
+
+    context "--mq-tls-key" do
+      context "when the keyfile file does not exist" do
+        let(:file) { "/path/to/nonexistant/file" }
+        before { STDERR.stub(:write) }
+
+        it "bails" do
+          expect {
+            cli.parse_options(["--mq-tls-key=#{file}"])
+          }.to raise_error SystemExit
+        end
+      end
+
+      context "when the keyfile file exists" do
+        let(:file) do
+          Tempfile.new("hutch-test-key.pem").to_path
+        end
+
+        it "sets mq_tls_key to the file" do
+          Hutch::Config.should_receive(:mq_tls_key=)
+          cli.parse_options(["--mq-tls-key=#{file}"])
+        end
+      end
+    end
+
+    context "--mq-tls-cert" do
+      context "when the certfile file does not exist" do
+        let(:file) { "/path/to/nonexistant/file" }
+        before { STDERR.stub(:write) }
+
+        it "bails" do
+          expect {
+            cli.parse_options(["--mq-tls-cert=#{file}"])
+          }.to raise_error SystemExit
+        end
+      end
+
+      context "when the certfile file exists" do
+        let(:file) do
+          Tempfile.new("hutch-test-cert.pem").to_path
+        end
+
+        it "sets mq_tls_cert to the file" do
+          Hutch::Config.should_receive(:mq_tls_cert=)
+          cli.parse_options(["--mq-tls-cert=#{file}"])
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hutch
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny