multiple_man 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 546b5d63fbc985f621b1b5c891aa7cdbc93bab8b
-  data.tar.gz: 0201b5a619231469deb7dc5213be502dda2c0fe8
+  metadata.gz: 8b0b5340cba015cfbf0a2a43f04283743415bf2f
+  data.tar.gz: 541a5bc2ba571cc2d915508b6ba12e70c58a9e14
 SHA512:
-  metadata.gz: 175d5be3b1a35cc18447d0be840d6a7615f5992f62650d62a054eed9288201629bf6646b8e257fc5bcd1549cf2ddc19cba7a17accb7d9b283679358e301b1bae
-  data.tar.gz: 230e1bedf174de89182ab379e4e1ec93b1f1d8863bd42b214dbd43d23001337d815a03b0276bd97a3220beb12c570cb8bead859d2a1a4361e335579cc4625d1f
+  metadata.gz: 3ef57043bd9b127e7418b5f6935ed3589d71919f1a740b4d658a0d04e9025af6d73fb467a5414d6b44cd8a2340f1ff2efe18de6ecf25fa63731506c21dcdfe63
+  data.tar.gz: 192d47727ed9dd2b881351d9eac3eb2c0fcc66e145ef56f9dcbb07f7b71cbb4257a25e7afbc2a9ac6ebf240424d4c142e3a740877cd0e62bb3aea7da874c81bd

data/README.md

@@ -195,26 +195,6 @@ MyModel.multiple_man_publish(:seed)
 
 3. Stop the seeder rake task when all of your messages have been processed. You can check your RabbitMQ server
 
-## Upgrading to 1.0
-
-The major change is that MultipleMan will no longer create a queue per listener.
-There is only 1 queue that will have multiple bindings to the exchange so that
-you have a chance to maintain causal consistency.
-
-Assuming you are using vanilla MultipleMan you will need to run both the
-regular worker and the new 'transition_worker' for a short period. The
-transitional worker will connect to your old queues, unbind them and allow them
-to drain. Once the queues are empty you can safely shut the transitional worker
-down and delete the old queues.
-
-So for example if you use a Procfile:
-
-```
-multiple_man_worker: rake multiple_man:worker
-# Temporary until old queues are drained
-transition_worker: rake multiple_man:transition_worker
-```
-
 ## Contributing
 
 1. Fork it

data/lib/multiple_man/consumers/general.rb

@@ -14,7 +14,7 @@ module MultipleMan
         MultipleMan.logger.debug "Starting listeners."
         create_bindings
 
-        queue.subscribe(manual_ack: true) do |delivery_info, meta_data, payload|
+        queue.subscribe(block: true, manual_ack: true) do |delivery_info, meta_data, payload|
           MultipleMan.logger.debug "Processing message for #{delivery_info.routing_key}."
           message = JSON.parse(payload).with_indifferent_access
           receive(delivery_info, meta_data, message)

data/lib/multiple_man/runner.rb

@@ -1,19 +1,6 @@
 require 'forwardable'
 
 module MultipleMan
-  def self.trap_signals!
-    return if @signals_trapped
-
-    @signals_trapped = true
-
-    handler = proc do |signal|
-      puts "received #{Signal.signame(signal)}"
-      exit
-    end
-
-    %w(INT QUIT TERM).each { |signal| Signal.trap(signal, handler) }
-  end
-
   class Runner
     extend Forwardable
 
@@ -26,11 +13,9 @@ module MultipleMan
     end
 
     def run
-      MultipleMan.trap_signals!
       preload_framework!
       channel.prefetch(prefetch_size)
       build_listener.listen
-      sleep
     end
 
     private

data/lib/multiple_man/tasks/worker.rake

@@ -8,29 +8,4 @@ namespace :multiple_man do
   task seed: :environment do
     MultipleMan::Runner.new(mode: :seed).run
   end
-
-  desc 'Run transitional worker'
-  task transition_worker: :environment do
-    Rails.application.eager_load! if defined?(Rails)
-
-    topic = MultipleMan.configuration.topic_name
-    app_name = MultipleMan.configuration.app_name
-    channel = MultipleMan::Connection.connection.create_channel
-    channel.prefetch(MultipleMan.configuration.prefetch_size)
-
-    MultipleMan.configuration.listeners.each do |listener|
-      queue_name = listener.respond_to?(:queue_name) ?
-                     listener.queue_name :
-                     "#{topic}.#{app_name}.#{listener.listen_to}"
-
-      next unless MultipleMan::Connection.connection.queue_exists?(queue_name)
-      queue = channel.queue(queue_name, durable: true, auto_delete: false)
-
-      MultipleMan::Consumers::Transitional.new(subscription: listener, queue: queue, topic: topic).listen
-    end
-
-    MultipleMan.trap_signals!
-    sleep
-  end
-
 end

data/lib/multiple_man/version.rb

@@ -1,3 +1,3 @@
 module MultipleMan
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/spec/consumers/general_spec.rb

@@ -29,7 +29,7 @@ describe MultipleMan::Consumers::General do
 
     expect(queue).to receive(:bind).with('some-topic', routing_key: subscriptions.first.routing_key).ordered
     expect(queue).to receive(:bind).with('some-topic', routing_key: subscriptions.last.routing_key).ordered
-    expect(queue).to receive(:subscribe).with(manual_ack: true).ordered
+    expect(queue).to receive(:subscribe).with(block: true, manual_ack: true).ordered
 
     subject = described_class.new(subscribers: subscriptions, queue: queue, topic: 'some-topic')
 

data/spec/consumers/seed_spec.rb

@@ -17,7 +17,7 @@ describe MultipleMan::Consumers::Seed do
     queue = double(Bunny::Queue, channel: channel)
 
     expect(queue).to receive(:bind).with('some-topic', routing_key: "multiple_man.seed.SomeClass")
-    expect(queue).to receive(:subscribe).with(manual_ack: true)
+    expect(queue).to receive(:subscribe).with(block: true, manual_ack: true)
 
     subject = described_class.new(subscribers: [listener1.new], queue: queue, topic: 'some-topic')
     subject.listen

data/spec/runner_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe MultipleMan::Runner do
+  let(:mock_channel) { double("Channel", prefetch: true, queue: true) }
+  let(:mock_connection) { double("Connection", create_channel: mock_channel) }
+  let(:mock_consumer) { double("Consumer", listen: true) }
+
+  it 'boots app and listens on new channel' do
+    expect(MultipleMan::Connection).to receive(:connection).and_return(mock_connection)
+    expect(MultipleMan::Consumers::General).to receive(:new).and_return(mock_consumer)
+
+    expect(mock_consumer).to receive(:listen)
+
+    runner = described_class.new(mode: :general)
+    runner.run
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Ryan Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -153,6 +153,7 @@ files:
 - spec/model_publisher_spec.rb
 - spec/payload_generator_spec.rb
 - spec/routing_key_spec.rb
+- spec/runner_spec.rb
 - spec/spec_helper.rb
 - spec/subscribers/base_spec.rb
 - spec/subscribers/model_subscriber_spec.rb
@@ -198,6 +199,7 @@ test_files:
 - spec/model_publisher_spec.rb
 - spec/payload_generator_spec.rb
 - spec/routing_key_spec.rb
+- spec/runner_spec.rb
 - spec/spec_helper.rb
 - spec/subscribers/base_spec.rb
 - spec/subscribers/model_subscriber_spec.rb