stapfen 1.4.2 → 1.4.3

data/Gemfile

@@ -8,4 +8,5 @@ group :development do
   gem 'rake'
   gem 'rspec', '~> 2.11'
   gem 'guard-rspec'
+  gem 'debugger'
 end

data/lib/stapfen/version.rb

@@ -1,3 +1,3 @@
 module Stapfen
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end

data/lib/stapfen/worker.rb

@@ -10,7 +10,6 @@ module Stapfen
 
     class << self
       attr_accessor :configuration, :consumers, :logger, :destructor
-      attr_accessor :workers
     end
 
     # Instantiate a new +Worker+ instance and run it
@@ -61,20 +60,37 @@ module Stapfen
       @@workers
     end
 
+    # Invoke +exit_cleanly+ on each of the registered Worker instances that
+    # this class is keeping track of
+    #
+    # @return [Boolean] Whether or not we've exited/terminated cleanly
+    def self.exit_cleanly
+      return false if workers.empty?
+
+      cleanly = true
+      workers.each do |w|
+        begin
+          w.exit_cleanly
+        rescue StandardError => ex
+          $stderr.write("Failure while exiting cleanly #{ex.inspect}\n#{ex.backtrace}")
+          cleanly = false
+        end
+      end
+
+      return cleanly
+    end
+
     # Utility method to set up the proper worker signal handlers
     def self.handle_signals
       return if @@signals_handled
 
       Signal.trap(:INT) do
-        @@workers.each do |w|
-          w.exit_cleanly
-        end
+        self.exit_cleanly
         exit!
       end
+
       Signal.trap(:TERM) do
-        @@workers.each do |w|
-          w.exit_cleanly
-        end
+        self.exit_cleanly
       end
 
       @@signals_handled = true

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '../lib'))
 
 require 'stapfen'
+require 'debugger'

data/spec/worker_spec.rb

@@ -32,6 +32,47 @@ describe Stapfen::Worker do
     end
 
 
+    describe '#exit_cleanly' do
+      subject(:result) { worker.exit_cleanly }
+
+      context 'with no worker classes' do
+        it { should be_false }
+      end
+
+      context 'with a single worker class' do
+        let(:w) { double('Fake worker instance') }
+
+        before :each do
+          worker.class_variable_set(:@@workers, [w])
+        end
+
+        it "should execute the worker's #exit_cleanly method" do
+          w.should_receive(:exit_cleanly)
+          expect(result).to be_true
+        end
+
+        it "should return false if the worker's #exit_cleanly method" do
+          w.should_receive(:exit_cleanly).and_raise(StandardError)
+          expect(result).to be_false
+        end
+      end
+
+      context 'with multiple worker classes' do
+        let(:w1) { double('Fake Worker 1') }
+        let(:w2) { double('Fake Worker 2') }
+
+        before :each do
+          worker.class_variable_set(:@@workers, [w1, w2])
+        end
+
+        it 'should invoke both #exit_cleanly methods' do
+          w1.should_receive(:exit_cleanly)
+          w2.should_receive(:exit_cleanly)
+          expect(result).to be_true
+        end
+      end
+    end
+
     describe 'consume' do
       it 'should raise an error if no block is passed' do
         expect {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stapfen
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stomp
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1191286362645180657
+      hash: -1405776487740339593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1191286362645180657
+      hash: -1405776487740339593
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25