multiple_man 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34c76ed50d75d8813d5bfb120ed9b18bdaccaec1
-  data.tar.gz: 29ce2ff4cd58a046a7f5a4dae146ae73412e4030
+  metadata.gz: 7edede56412486d12f76121832ae03ce2a8adcfe
+  data.tar.gz: 0eb18f9ac6bb9ef94e54331e0f5d3e4f8f0d39b3
 SHA512:
-  metadata.gz: 9f6e04e9f08b36cff2353c38d065a206169536852b409b70091dd2054bf40e1d198da9a8f8aa4525569570562a551164fcde4ad109da23db6e577c83f0ae01ad
-  data.tar.gz: 9792ce4da51bc92d5e3f65d803d4bce5e0abb1061bf6cf96104a2a3fc119ec7718def7eb853e542299fddc475e5c6eb1c678b6e64b7d4b2dcd687d043b824a18
+  metadata.gz: 83796fb767f48cd2d82f19389bfb0423fcf8f478a1faaa1d1bca227b52cdca23e69ef807de931a659f3a3ffd0a142daed4812300238c0a79e7fa80ccc11855f0
+  data.tar.gz: 94b64ab2b87b90fad01dde7a3d5a159cc5552f8a995385cb20d37d33357828a105499011bf83f8b5f8749dadf67bb8952d55e1f10395eb8800d1ef300e865417

data/README.md

@@ -17,7 +17,9 @@ It's heavily inspired by Promiscuous, but differs in a few ways:
 
 Add this line to your application's Gemfile:
 
-    gem 'multiple_man'
+```ruby
+gem 'multiple_man'
+```
 
 And then execute:
 
@@ -34,39 +36,41 @@ Or install it yourself as:
 MultipleMan can be configured (ideally inside an initializer) by
 calling MultipleMan.configure like so:
 
-    MultipleMan.configure do |config|
-      # A connection string to your local server. Defaults to localhost.
-      config.connection = "amqp://example.com"
+```ruby
+MultipleMan.configure do |config|
+  # A connection string to your local server. Defaults to localhost.
+  config.connection = "amqp://example.com"
 
-      # The topic name to push to. If you have multiple
-      # multiple man apps, this should be unique per application. Publishers
-      # and subscribers should always use the same topic.
-      config.topic_name = "multiple_man"
+  # The topic name to push to. If you have multiple
+  # multiple man apps, this should be unique per application. Publishers
+  # and subscribers should always use the same topic.
+  config.topic_name = "multiple_man"
 
-      # The application name (used for subscribers) - defaults to your
-      # Rails application name if you're using rails
-      config.app_name = "MyApp"
+  # The application name (used for subscribers) - defaults to your
+  # Rails application name if you're using rails
+  config.app_name = "MyApp"
 
-      # Specify what should happen when MultipleMan
-      # encounters an exception.
-      config.on_error do |exception|
-        ErrorLogger.log(exception)
-      end
+  # Specify what should happen when MultipleMan
+  # encounters an exception.
+  config.on_error do |exception|
+    ErrorLogger.log(exception)
+  end
 
-      # Add opts that go directly to the bunny constructor (Advanced)
-      config.bunny_opts = {
-        tls_ca_certificates: ['/usr/lib/ssl/certs/cacert.pem']
-      }
+  # Add opts that go directly to the bunny constructor (Advanced)
+  config.bunny_opts = {
+    tls_ca_certificates: ['/usr/lib/ssl/certs/cacert.pem']
+  }
 
-      # Add opts that are used when creating the exchange
-      config.exchange_opts = {
-        durable: true
-      }
+  # Add opts that are used when creating the exchange
+  config.exchange_opts = {
+    durable: true
+  }
 
-      # Where you want to log errors to. Should be an instance of Logger
-      # Defaults to the Rails logger (for Rails) or STDOUT otherwise.
-      config.logger = Logger.new(STDOUT)
-    end
+  # Where you want to log errors to. Should be an instance of Logger
+  # Defaults to the Rails logger (for Rails) or STDOUT otherwise.
+  config.logger = Logger.new(STDOUT)
+end
+```
 
 ### A note on errors
 
@@ -85,16 +89,18 @@ cause will be preserved in Exception#cause.
 
 Include this in your model definition:
 
-    class Widget < ActiveRecord::Base
-      include MultipleMan::Publisher
-      publish fields: [:id, :name, :type]
-    end
+```ruby
+class Widget < ActiveRecord::Base
+  include MultipleMan::Publisher
+  publish fields: [:id, :name, :type]
+end
+```
 
 #### In an initializer / config file
 
 Add this to an initializer (i.e. `multiple_man.rb`):
 
-```
+```ruby
 MultipleMan.publish Widget, fields: [:id, :name, :type]
 ```
 
@@ -120,7 +126,7 @@ You can use the following options when publishing:
 
 By default, MultipleMan will publish all of your models whenever you save a model (in an `after_commit` hook). If you need to manually publish models, you can do so with the `multiple_man_publish` method, which acts like a scope on your models, like so:
 
-```
+```ruby
 # Publish all widgets to MultipleMan
 Widget.multiple_man_publish
 
@@ -138,10 +144,12 @@ version of multiple_man_publish that operates on a collection. By calling the in
 
 You can subscribe to a model as follows (in a seperate consumer app):
 
-    class Widget < ActiveRecord::Base
-      include MultipleMan::Subscriber
-      subscribe fields: [:id, :name]
-    end
+```ruby
+class Widget < ActiveRecord::Base
+  include MultipleMan::Subscriber
+  subscribe fields: [:id, :name]
+end
+```
 
 You can pass the following options to the `subscribe` call:
 
@@ -159,7 +167,7 @@ If your publisher specifies an `identifier` option, you *must* include a column
 If you want to do something other than populate a model on MultipleMan messages,
 you can listen for messages and process them however you'd like:
 
-```
+```ruby
 def ListenerClass
   include MultipleMan::Listener
   listen_to 'ModelName'
@@ -189,7 +197,7 @@ rake multiple_man:seed
 
 2. On the publisher side, indicate that your models should be seeded with the following command:
 
-```
+```ruby
 MyModel.multiple_man_publish(:seed)
 ```
 

data/lib/multiple_man/runner.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 
 module MultipleMan
   class Runner
+    class ShutDown < Error; end
     extend Forwardable
 
     MODES = [:general, :seed].freeze
@@ -17,6 +18,8 @@ module MultipleMan
       preload_framework!
       channel.prefetch(prefetch_size)
       build_listener.listen
+    rescue ShutDown
+      connection.close
     end
 
     private
@@ -28,10 +31,8 @@ module MultipleMan
     def trap_signals!
       handler = proc do |signal|
         puts "received #{Signal.signame(signal)}"
-        channel.close
-        connection.close
 
-        exit
+        raise ShutDown
       end
 
       %w(INT QUIT TERM).each { |signal| Signal.trap(signal, handler) }

data/lib/multiple_man/version.rb

@@ -1,3 +1,3 @@
 module MultipleMan
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/spec/runner_spec.rb

@@ -15,26 +15,14 @@ describe MultipleMan::Runner do
   end
 
   context "shutdown" do
-    let(:mock_consumer) { double("Consumer", listen: ->(_){ sleep(1); raise "no interrupt!" }) }
+    let(:connection) { MultipleMan::Connection.connection }
 
-    xit 'closes connections and exits gracefully' do
-      ps = fork do
-        expect(MultipleMan::Connection).to receive(:connection).and_return(mock_connection)
-        expect(MultipleMan::Consumers::General).to receive(:new).and_return(mock_consumer)
+    it 'closes connections and exits gracefully' do
+      MultipleMan::Consumers::General.stub(:new) { Process.kill('INT', 0) }
 
-        expect(mock_channel).to receive(:close)
-        expect(mock_connection).to receive(:close)
+      expect(connection).to receive(:close)
 
-        described_class.new(mode: :general).run
-      end
-
-      sleep 0.01
-
-      Process.kill('INT', ps)
-      a, status = Process.waitpid2(ps)
-      # binding.pry
-
-      expect(status.success?).to be true
+      MultipleMan::Runner.new.run
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Ryan Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny