adrian 1.0.1 → 1.1.0

data/lib/adrian/dispatcher.rb

@@ -5,10 +5,11 @@ module Adrian
     attr_reader :running
 
     def initialize(options = {})
-      @failure_handler = FailureHandler.new
-      @stop_when_done  = !!options[:stop_when_done]
-      @sleep           = options[:sleep] || 0.5
-      @options         = options
+      @failure_handler     = FailureHandler.new
+      @stop_when_done      = !!options[:stop_when_done]
+      @stop_when_signalled = options.fetch(:stop_when_signalled, true)
+      @sleep               = options[:sleep] || 0.5
+      @options             = options
     end
 
     def on_failure(*exceptions)
@@ -20,6 +21,7 @@ module Adrian
     end
 
     def start(queue, worker_class)
+      trap_stop_signals if @stop_when_signalled
       @running = true
 
       while @running do
@@ -39,6 +41,11 @@ module Adrian
       @running = false
     end
 
+    def trap_stop_signals
+      Signal.trap('TERM') { stop }
+      Signal.trap('INT')  { stop }
+    end
+
     def delegate_work(item, worker_class)
       worker = worker_class.new(item)
       worker.report_to(self)

data/lib/adrian/version.rb

@@ -1,3 +1,3 @@
 module Adrian
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/test/dispatcher_test.rb

@@ -3,37 +3,53 @@ require_relative 'test_helper'
 describe Adrian::Dispatcher do
   before do
     $done_items = []
-    @q = Adrian::ArrayQueue.new
+    @q          = Adrian::ArrayQueue.new
     @dispatcher = Adrian::Dispatcher.new(:stop_when_done => true)
+    @worker     = TestWorker
+  end
+
+  class TestWorker
+
+    def initialize(item)
+      @item       = item
+      @done_items = []
+    end
+
+    def perform
+      $done_items << [@boss, @item.value]
+    end
+
+    def report_to(boss)
+      @boss = boss
+    end
+
   end
 
   describe "work delegation" do
     it "should instantiate an instance of the worker for each item and ask it to perform" do
-      worker = Class.new do
-        def initialize(item)
-          @item = item
-        end
-
-        def perform
-          $done_items << [@boss, @item.value]
-        end
-
-        def report_to(boss)
-          @boss = boss
-        end
-      end
-
       @q.push(1)
       @q.push(2)
       @q.push(3)
 
-      @dispatcher.start(@q, worker)
+      @dispatcher.start(@q, @worker)
 
       $done_items.must_equal([[@dispatcher, 1], [@dispatcher, 2], [@dispatcher, 3]])
     end
   end
 
   describe "work evaluation" do
+
+    it "stops when receiving a termination signal" do
+      @dispatcher = Adrian::Dispatcher.new(:stop_when_done => false)
+      dispatch_thread = Thread.new { @dispatcher.start(@q, @worker) }
+      sleep(0.1)
+      assert_equal true, @dispatcher.running
+
+      Process.kill('TERM', Process.pid)
+      assert_equal false, @dispatcher.running
+      dispatch_thread.exit
+    end
+
     it "should use the failure handler to handle the result" do
       @dispatcher.on_failure(RuntimeError) do |item, worker, exception|
         @q.push(item)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adrian
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: