arachni-reactor 0.1.0.beta3 → 0.1.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5989fe0374a4304051e3721c67783a8b879ff637
-  data.tar.gz: fff4c26e3ee024205bf7946dbe5b28bb341fd8b2
+  metadata.gz: 07cb101ec43a769f658e301e43ba0ff218d5c4a3
+  data.tar.gz: 45a67ca1fef76ca161b5a3f216e260bd8c7c1494
 SHA512:
-  metadata.gz: 22c792fe5cf32aa57e084cda14df281f9eb2faa059f79f97c71c008ec4c08f6070eb4332e6fdd33861f1e1a488cac66235edc4d573392d558d7deec0ac675702
-  data.tar.gz: ce944f7922fa5d6034a79c37e3d85cadca8dde0f6595760727049bea3a624ea305ed1fa1a790cc729c8168c9486599bfd0bc358ad68f3248a425285376d05449
+  metadata.gz: c50a6d170e2e1ec78b6e5fb7b1216273aee8ee33df92e2d70c7ec8bfcf2ac9635cc9b8a45b8b2423494c4935450a23ab20f7b9b5b7ae298424dcc763217d4284
+  data.tar.gz: 6beda8054a8dd07ba2b20eba5213e473c95954fb9b3d37aae9b63f955c3938bfbd06cad11bf704086e34ffa71ecaa16ceda8369db6c6e478ba62906635ff0019

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # ChangeLog
 
+## Version 0.1.0.beta4
+
+- `Reactor`
+    - `#running?`: Return `false` if the Reactor thread is dead.
+    - Added `#on_error`, for exception handling callbacks.
+- All tasks can now receive arguments.
+
 ## Version 0.1.0.beta3 _(August 20, 2014)_
 
 - `Connection::TLS#socket_accept`: Return `nil` on error.

data/README.md

@@ -3,7 +3,7 @@
 <table>
     <tr>
         <th>Version</th>
-        <td>0.1.0.beta2</td>
+        <td>0.1.0.beta4</td>
     </tr>
     <tr>
         <th>Github page</th>

data/lib/arachni/reactor.rb

@@ -140,6 +140,7 @@ class Reactor
         @thread      = nil
         @tasks       = Tasks.new
 
+        @error_handlers = Tasks.new
         @shutdown_tasks = Tasks.new
         @done_signal    = ::Queue.new
     end
@@ -278,7 +279,7 @@ class Reactor
     # @return   [Bool]
     #   `true` if the {Reactor} is {#run running}, `false` otherwise.
     def running?
-        !!thread
+        thread && thread.alive?
     end
 
     # Stops the {Reactor} {#run loop} {#schedule as soon as possible}.
@@ -305,10 +306,18 @@ class Reactor
         block.call if block_given?
 
         loop do
-            @tasks.call
+            begin
+                @tasks.call
+            rescue => e
+                @error_handlers.call( e )
+            end
             break if @stop
 
-            process_connections
+            begin
+                process_connections
+            rescue => e
+                @error_handlers.call( e )
+            end
             break if @stop
 
             @ticks += 1
@@ -337,7 +346,11 @@ class Reactor
         fail_if_running
 
         Thread.new do
-            run(&block)
+            begin
+                run(&block)
+            rescue => e
+                @error_handlers.call( e )
+            end
         end
 
         sleep 0.1 while !running?
@@ -372,6 +385,17 @@ class Reactor
         end
     end
 
+    # @param    [Block] block
+    #   Passes exceptions raised in the Reactor {#thread} to a
+    #   {Tasks::Persistent task}.
+    #
+    # @raise    (see #fail_if_not_running)
+    def on_error( &block )
+        fail_if_not_running
+        @error_handlers << Tasks::Persistent.new( &block )
+        nil
+    end
+
     # @param    [Block] block
     #   Schedules a {Tasks::Persistent task} to be run at each tick.
     #

data/lib/arachni/reactor/tasks.rb

@@ -92,8 +92,8 @@ class Tasks
     # {Base#call Calls} all tasks.
     #
     # @return   [Tasks] `self`
-    def call
-        @tasks.dup.each(&:call)
+    def call( *args )
+        @tasks.dup.each { |t| t.call *args }
         self
     end
 

data/lib/arachni/reactor/tasks/base.rb

@@ -26,10 +26,10 @@ class Base
         @task = task
     end
 
-    # Calls the {#initialize configured} task and passes `self` to it.
+    # Calls the {#initialize configured} task and passes `args` and self` to it.
     #
     # @abstract
-    def call
+    def call( *args )
         fail NotImplementedError
     end
 
@@ -48,8 +48,8 @@ class Base
 
     private
 
-    def call_task
-        @task.call self
+    def call_task( *args )
+        @task.call *([self] + args)
     end
 
 end

data/lib/arachni/reactor/tasks/delayed.rb

@@ -22,10 +22,10 @@ class Delayed < Periodic
     # @return   [Object, nil]
     #   Return value of the configured task or `nil` if it's not
     #   {#interval time} yet.
-    def call
+    def call( *args )
         return if !call?
 
-        call_task.tap { done }
+        call_task( *args ).tap { done }
     end
 
 end

data/lib/arachni/reactor/tasks/one_off.rb

@@ -19,8 +19,8 @@ class OneOff < Base
     #
     # @return   [Object]
     #   Return value of the task.
-    def call
-        call_task.tap { done }
+    def call( *args )
+        call_task( *args ).tap { done }
     end
 
 end

data/lib/arachni/reactor/tasks/periodic.rb

@@ -36,11 +36,11 @@ class Periodic < Persistent
     # @return   [Object, nil]
     #   Return value of the configured task or `nil` if it's not
     #   {#interval time} yet.
-    def call
+    def call( *args )
         return if !call?
         calculate_next
 
-        super
+        super( *args )
     end
 
     private

data/lib/arachni/reactor/tasks/persistent.rb

@@ -20,8 +20,8 @@ class Persistent < Base
     #
     # @return   [Object]
     #   Return value of the task.
-    def call
-        call_task
+    def call( *args )
+        call_task( *args )
     end
 
 end

data/lib/arachni/reactor/version.rb

@@ -9,7 +9,7 @@
 module Arachni
 class Reactor
 
-    VERSION = '0.1.0.beta3'
+    VERSION = '0.1.0.beta4'
 
 end
 end

data/spec/arachni/reactor/tasks/delayed_spec.rb

@@ -49,6 +49,21 @@ describe Arachni::Reactor::Tasks::Delayed do
                 task.should receive(:done)
                 task.call while called < 1
             end
+
+            context 'when arguments have been provided' do
+                it 'passes them to the task' do
+                    called = nil
+                    task = described_class.new( interval ) do |_, s1, s2|
+                        called = [s1, s2]
+                    end
+
+                    list << task
+
+                    task.call( :stuff1, :stuff2 ) while !called
+
+                    called.should == [:stuff1, :stuff2]
+                end
+            end
         end
     end
 end

data/spec/arachni/reactor/tasks/one_off_spec.rb

@@ -47,5 +47,20 @@ describe Arachni::Reactor::Tasks::OneOff do
             task.should receive(:done)
             task.call
         end
+
+        context 'when arguments have been provided' do
+            it 'passes them to the task' do
+                got = nil
+                callable = proc do |_, arg|
+                    got = arg
+                end
+
+                task = described_class.new(&callable)
+                list << task
+
+                task.call :stuff
+                got.should == :stuff
+            end
+        end
     end
 end

data/spec/arachni/reactor/tasks/periodic_spec.rb

@@ -36,5 +36,20 @@ describe Arachni::Reactor::Tasks::Periodic do
                 (Time.now - time).round(2).should == 1.25
             end
         end
+
+        context 'when arguments have been provided' do
+            it 'passes them to the task' do
+                called = nil
+                task = described_class.new( interval ) do |_, s1, s2|
+                    called = [s1, s2]
+                end
+
+                list << task
+
+                task.call( :stuff1, :stuff2 ) while !called
+
+                called.should == [:stuff1, :stuff2]
+            end
+        end
     end
 end

data/spec/arachni/reactor/tasks/persistent_spec.rb

@@ -35,5 +35,20 @@ describe Arachni::Reactor::Tasks::Persistent do
 
             task.call
         end
+
+        context 'when arguments have been provided' do
+            it 'passes them to the task' do
+                got = nil
+                callable = proc do |_, arg|
+                    got = arg
+                end
+
+                task = described_class.new(&callable)
+                list << task
+
+                task.call :stuff
+                got.should == :stuff
+            end
+        end
     end
 end

data/spec/arachni/reactor/tasks_spec.rb

@@ -132,5 +132,24 @@ describe Arachni::Reactor::Tasks do
         it 'returns self' do
             subject.call.should == subject
         end
+
+        context 'when arguments have been provided' do
+            it 'passes them to the tasks' do
+                called_one = nil
+                called_two = nil
+
+                subject << described_class::Persistent.new do |_, arg|
+                    called_one = arg
+                end
+                subject << described_class::Persistent.new do |_, arg|
+                    called_two = arg
+                end
+
+                subject.call( :stuff )
+
+                called_one.should == :stuff
+                called_two.should == :stuff
+            end
+        end
     end
 end

data/spec/support/shared/reactor.rb

@@ -198,6 +198,33 @@ shared_examples_for 'Arachni::Reactor' do
         end
     end
 
+    describe '#on_error' do
+        it 'sets a task to be passed raised exceptions' do
+            run_reactor_in_thread
+
+            e = nil
+            subject.on_error do |_, error|
+                e = error
+            end
+
+            subject.next_tick do
+                raise
+            end
+
+            sleep 0.1 while !e
+
+            e.should be_kind_of RuntimeError
+        end
+
+        context 'when the reactor is not running' do
+            it "raises #{klass::Error::NotRunning}" do
+                expect do
+                    subject.next_tick{}
+                end.to raise_error klass::Error::NotRunning
+            end
+        end
+    end
+
     describe '#on_shutdown' do
         it 'calls the given blocks during shutdown' do
             subject.run_in_thread
@@ -483,6 +510,25 @@ shared_examples_for 'Arachni::Reactor' do
                 subject.should_not be_running
             end
         end
+
+        context 'when the reactor thread has been killed' do
+            it 'returns false' do
+                run_reactor_in_thread
+
+                Timeout.timeout 10 do
+                    sleep 0.1 while !subject.running?
+                end
+
+                subject.should be_running
+                subject.thread.kill
+
+                Timeout.timeout 10 do
+                    sleep 0.1 while subject.thread.alive?
+                end
+
+                subject.should_not be_running
+            end
+        end
     end
 
     describe '#stop' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arachni-reactor
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta3
+  version: 0.1.0.beta4
 platform: ruby
 authors:
 - Tasos Laskos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Arachni::Reactor is a simple, lightweight, pure-Ruby implementation of the Reactor