arachni-rpc-em 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# ChangeLog
+
+## Version 0.1.2 _(Under development)_
+
+- Code cleanup
+- Client retries on Errno::ECONNREFUSED

data/README.md

@@ -2,7 +2,7 @@
 <table>
     <tr>
         <th>Version</th>
-        <td>0.1.1</td>
+        <td>0.1.2</td>
     </tr>
     <tr>
         <th>Github page</th>
@@ -14,7 +14,7 @@
     </tr>
     <tr>
        <th>Author</th>
-       <td><a href="mailto:tasos.laskos@gmail.com">Tasos</a> "<a href="mailto:zapotek@segfault.gr">Zapotek</a>" <a href="mailto:tasos.laskos@gmail.com">Laskos</a></td>
+       <td><a href="mailto:tasos.laskos@gmail.com">Tasos "Zapotek" Laskos</a></td>
     </tr>
     <tr>
         <th>Twitter</th>
@@ -22,7 +22,7 @@
     </tr>
     <tr>
         <th>Copyright</th>
-        <td>2011</td>
+        <td>2011-2012</td>
     </tr>
     <tr>
         <th>License</th>
@@ -33,7 +33,6 @@
 ## Synopsis
 
 Arachni-RPC EM is an implementation of the <a href="http://github.com/Arachni/arachni-rpc">Arachni-RPC</a> protocol using EventMachine and provides both a server and a client. <br/>
-It is under development and will ultimately form the basis for <a href="http://arachni.segfault.gr">Arachni</a>'s Grid infrastructure.
 
 ## Features
 
@@ -66,13 +65,6 @@ If you want to clone the repository and work with the source code:
 
 ## Running the Specs
 
-In order to run the specs you must first fire up 2 sample servers like so:
-
-    ruby spec/servers/basic.rb
-    ruby spec/servers/with_ssl_primitives.rb
-
-Then:
-
     rake spec
 
 ## Bug reports/Feature requests

data/Rakefile

@@ -7,17 +7,21 @@
 =end
 
 require 'rubygems'
-require 'rspec'
-require 'rspec/core/rake_task'
-
 require File.expand_path( File.dirname( __FILE__ ) ) + '/lib/arachni/rpc/em/version'
 
-RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+begin
+    require 'rspec'
+    require 'rspec/core/rake_task'
+
+    RSpec::Core::RakeTask.new
+rescue LoadError => e
+    puts 'If you want to run the tests please install rspec first:'
+    puts '  gem install rspec'
 end
 
-desc "Generate docs"
+task default: [ :spec ]
 
+desc "Generate docs"
 task :docs do
 
     outdir = "../arachni-rpc-pages"
@@ -32,39 +36,22 @@ task :docs do
     sh "rm -rf .yard*"
 end
 
-
-#
-# Cleans reports and logs
-#
 desc "Cleaning..."
 task :clean do
     sh "rm *.gem || true"
 end
 
-
-
-#
-# Building
-#
 desc "Build the arachni-rpc-em gem."
 task :build => [ :clean ] do
     sh "gem build arachni-rpc-em.gemspec"
 end
 
-
-#
-# Installing
-#
 desc "Build and install the arachni gem."
 task :install  => [ :build ] do
 
     sh "gem install arachni-rpc-em-#{Arachni::RPC::EM::VERSION}.gem"
 end
 
-
-#
-# Publishing
-#
 desc "Push a new version to Gemcutter"
 task :publish => [ :build ] do
 

data/lib/arachni/rpc/em.rb

@@ -16,9 +16,10 @@ require 'arachni/rpc'
 require 'yaml'
 YAML::ENGINE.yamler = 'syck'
 
-require File.join( File.expand_path( File.dirname( __FILE__ ) ), 'em', 'connection_utilities' )
-require File.join( File.expand_path( File.dirname( __FILE__ ) ), 'em', 'ssl' )
-require File.join( File.expand_path( File.dirname( __FILE__ ) ), 'em', 'protocol' )
-require File.join( File.expand_path( File.dirname( __FILE__ ) ), 'em', 'server' )
-require File.join( File.expand_path( File.dirname( __FILE__ ) ), 'em', 'client' )
-require File.join( File.expand_path( File.dirname( __FILE__ ) ), 'em', 'em' )
+dir = File.expand_path( File.dirname( __FILE__ ) )
+require File.join( dir, 'em', 'connection_utilities' )
+require File.join( dir, 'em', 'ssl' )
+require File.join( dir, 'em', 'protocol' )
+require File.join( dir, 'em', 'server' )
+require File.join( dir, 'em', 'client' )
+require File.join( dir, 'em', 'em' )

data/lib/arachni/rpc/em/client.rb

@@ -19,13 +19,9 @@ module EM
 # - asynchronous and synchronous requests
 # - handling remote asynchronous calls that require a block
 #
-# @author: Tasos "Zapotek" Laskos
-#                                      <tasos.laskos@gmail.com>
-#                                      <zapotek@segfault.gr>
-# @version: 0.1
+# @author: Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
 #
 class Client
-
     include ::Arachni::RPC::Exceptions
 
     #
@@ -34,17 +30,20 @@ class Client
     # It's responsible for TLS, storing and calling callbacks as well as
     # serializing, transmitting and receiving objects.
     #
-    # @author: Tasos "Zapotek" Laskos
-    #                                      <tasos.laskos@gmail.com>
-    #                                      <zapotek@segfault.gr>
-    # @version: 0.1
+    # @author: Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
     #
     class Handler < EventMachine::Connection
         include ::Arachni::RPC::EM::Protocol
         include ::Arachni::RPC::EM::ConnectionUtilities
 
+        DEFAULT_TRIES = 9
+
         def initialize( opts )
             @opts = opts
+            @max_retries = @opts[:max_retries] || DEFAULT_TRIES
+            @opts[:tries] ||= 0
+            @tries = @opts[:tries]
+
             @status = :idle
 
             @request = nil
@@ -59,11 +58,14 @@ class Client
         def unbind( reason )
             end_ssl
 
-            if @request && @request.callback && @status != :done
-                e = Arachni::RPC::Exceptions::ConnectionError.new( "Connection closed [#{reason}]" )
-                @request.callback.call( e )
+            if @request && @request.callback && status != :done
+                if reason == Errno::ECONNREFUSED && retry?
+                    retry_request
+                else
+                    e = Arachni::RPC::Exceptions::ConnectionError.new( "Connection closed [#{reason}]" )
+                    @request.callback.call( e )
+                end
             end
-
             @status = :closed
         end
 
@@ -81,32 +83,43 @@ class Client
         # @param    [Arachni::RPC::EM::Response]    res
         #
         def receive_response( res )
+            @status = :done
 
             if exception?( res )
                 res.obj = Arachni::RPC::Exceptions.from_response( res )
             end
 
+
             if cb = @request.callback
 
-                callback = Proc.new {
-                    |obj|
+                callback = Proc.new do |obj|
                     cb.call( obj )
-
-                    @status = :done
                     close_connection
-                }
+                end
 
                 if @request.defer?
                     # the callback might block a bit so tell EM to put it in a thread
-                    ::EM.defer {
-                        callback.call( res.obj )
-                    }
+                    ::EM.defer { callback.call( res.obj ) }
                 else
                     callback.call( res.obj )
                 end
             end
         end
 
+        def retry_request
+            opts = @opts.dup
+            opts[:tries] += 1
+            EventMachine::Timer.new( 0.1 ){
+                sleep( 0.1 )
+                close_connection
+                ::EM.connect( opts[:host], opts[:port], self.class, opts ).send_request( @request )
+            }
+        end
+
+        def retry?
+            @tries < @max_retries
+        end
+
         # @param    [Arachni::RPC::EM::Response]    res
         def exception?( res )
             res.obj.is_a?( Hash ) && res.obj['exception'] ? true : false
@@ -149,6 +162,8 @@ class Client
     #        # http://eventmachine.rubyforge.org/EventMachine/Protocols/ObjectProtocol.html#M000369
     #        :serializer => Marshal,
     #
+    #        :max_retries => 0,
+    #
     #        #
     #        # In order to enable peer verification one must first provide
     #        # the following:
@@ -164,14 +179,13 @@ class Client
     # @param    [Hash]  opts
     #
     def initialize( opts )
-
         begin
-            @opts  = opts.merge( :role => :client )
+            @opts  = opts.merge( role: :client )
             @token = @opts[:token]
 
             @host, @port = @opts[:host], @opts[:port]
 
-            Arachni::RPC::EM.ensure_em_running!
+            Arachni::RPC::EM.ensure_em_running
         rescue EventMachine::ConnectionError => e
             exc = ConnectionError.new( e.to_s + " for '#{@k}'." )
             exc.set_backtrace( e.backtrace )
@@ -199,22 +213,21 @@ class Client
     #    res = server.call( 'handler.method', arg1, arg2 )
     #
     # @param    [String]    msg     in the form of <i>handler.method</i>
-    # @param    [Array]     args    collection of argumenta to be passed to the method
+    # @param    [Array]     args    collection of arguments to be passed to the method
     # @param    [Proc]      &block
     #
     def call( msg, *args, &block )
-
         req = Request.new(
-            :message  => msg,
-            :args     => args,
-            :callback => block,
-            :token    => @token
+            message:  msg,
+            args:     args,
+            callback: block,
+            token:    @token
         )
 
         if block_given?
             call_async( req )
         else
-            return call_sync( req )
+            call_sync( req )
         end
     end
 
@@ -232,28 +245,24 @@ class Client
     end
 
     def call_sync( req )
-
         ret = nil
+
         # if we're in the Reactor thread use a Fiber and if we're not
         # use a Thread
         if !::EM::reactor_thread?
             t = Thread.current
-            call_async( req ) {
-                |obj|
+            call_async( req ) do |obj|
                 t.wakeup
                 ret = obj
-            }
+            end
             sleep
         else
             # Fibers do not work across threads so don't defer the callback
             # once the Handler gets to it
-            req.do_not_defer!
+            req.do_not_defer
 
             f = Fiber.current
-            call_async( req ) {
-                |obj|
-                f.resume( obj )
-            }
+            call_async( req ) { |obj| f.resume( obj ) }
 
             begin
                 ret = Fiber.yield
@@ -268,7 +277,7 @@ class Client
         end
 
         raise ret if ret.is_a?( Exception )
-        return ret
+        ret
     end
 
 end

data/lib/arachni/rpc/em/connection_utilities.rb

@@ -13,10 +13,7 @@ module EM
 #
 # Helper methods to be included in EventMachine::Connection classes
 #
-# @author: Tasos "Zapotek" Laskos
-#                                      <tasos.laskos@gmail.com>
-#                                      <zapotek@segfault.gr>
-# @version: 0.1
+# @author: Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
 #
 module ConnectionUtilities
 

data/lib/arachni/rpc/em/em.rb

@@ -12,59 +12,32 @@ module RPC
 #
 # Provides some convenient methods for EventMachine's Reactor.
 #
-# @author: Tasos "Zapotek" Laskos
-#                                      <tasos.laskos@gmail.com>
-#                                      <zapotek@segfault.gr>
-# @version: 0.1
+# @author: Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
 #
 module EM
 
-module Synchrony
-
-    def run( &block )
-        @@root_f = Fiber.new {
-            block.call
-        }.resume
-    end
-
-    extend self
-
-end
+    module Synchrony
+        def run( &block )
+            Fiber.new{ block.call }.resume
+        end
 
-    #
-    # Inits method variables for the Reactor tasks and its Mutex.
-    #
-    def init
-        @@reactor_tasks_mutex ||= Mutex.new
-        @@reactor_tasks ||= []
+        extend self
     end
 
     #
-    # Adds a block in the Reactor.
+    # Schedules a block to be run in the EM reactor.
     #
-    # @param    [Proc]    &block    block to be included in the Reactor loop
+    # @param    [Proc]    &block
     #
-    def add_to_reactor( &block )
-
-        self.init
-
-        # if we're already in the Reactor thread just run the block straight up.
-        if ::EM::reactor_thread?
-            block.call
-        else
-            @@reactor_tasks_mutex.lock
-            @@reactor_tasks << block
-
-            ensure_em_running!
-            @@reactor_tasks_mutex.unlock
-        end
-
+    def schedule( &block )
+        ensure_em_running
+        ::EM.schedule( &block )
     end
 
     #
     # Blocks until the Reactor stops running
     #
-    def block!
+    def block
         # beware of deadlocks, we can't join our own thread
         ::EM.reactor_thread.join if ::EM.reactor_thread && !::EM::reactor_thread?
     end
@@ -72,28 +45,20 @@ end
     #
     # Puts the Reactor in its own thread and runs it.
     #
-    # It also runs all blocks sent to {#add_to_reactor}.
-    #
-    def ensure_em_running!
-        self.init
-
+    def ensure_em_running
         if !::EM::reactor_running?
-            q = Queue.new
 
             Thread.new do
                 ::EM::run do
-
                     ::EM.error_handler do |e|
                         $stderr.puts "Exception raised during event loop: " +
                         "#{e.message} (#{e.class})\n#{(e.backtrace ||
                             [])[0..5].join("\n")}"
                     end
-
-                    @@reactor_tasks.each { |task| task.call }
-                    q << true
                 end
             end
-            q.pop
+
+            sleep 0.1 while !::EM.reactor_running?
         end
     end
 

data/lib/arachni/rpc/em/protocol.rb

@@ -13,10 +13,7 @@ module EM
 #
 # Provides helper transport methods for {Message} transmission.
 #
-# @author: Tasos "Zapotek" Laskos
-#                                      <tasos.laskos@gmail.com>
-#                                      <zapotek@segfault.gr>
-# @version: 0.1
+# @author: Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
 #
 module Protocol
     include ::Arachni::RPC::EM::SSL
@@ -73,9 +70,7 @@ module Protocol
     # @param    [Arachni::RPC::EM::Message]    msg
     #
     def send_message( msg )
-        ::EM.schedule {
-            send_object( msg.prepare_for_tx )
-        }
+        ::EM.schedule { send_object( msg.prepare_for_tx ) }
     end
     alias :send_request  :send_message
     alias :send_response :send_message
@@ -128,7 +123,7 @@ module Protocol
         data = serializer.dump( obj )
         packed = [data.bytesize, data].pack( 'Na*' )
 
-        while( packed )
+        while packed
             if packed.bytesize > MAX_CHUNK_SIZE
                 send_data( packed.slice!( 0, MAX_CHUNK_SIZE ) )
             else

data/lib/arachni/rpc/em/server.rb

@@ -19,13 +19,9 @@ module EM
 # - asynchronous and synchronous requests
 # - handling asynchronous methods that require a block
 #
-# @author: Tasos "Zapotek" Laskos
-#                                      <tasos.laskos@gmail.com>
-#                                      <zapotek@segfault.gr>
-# @version: 0.1
+# @author: Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
 #
 class Server
-
     include ::Arachni::RPC::Exceptions
 
     #
@@ -36,13 +32,9 @@ class Server
     #
     # It also handles and forwards exceptions.
     #
-    # @author: Tasos "Zapotek" Laskos
-    #                                      <tasos.laskos@gmail.com>
-    #                                      <zapotek@segfault.gr>
-    # @version: 0.1
+    # @author: Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
     #
     class Proxy < EventMachine::Connection
-
         include ::Arachni::RPC::EM::Protocol
         include ::Arachni::RPC::Exceptions
         include ::Arachni::RPC::EM::ConnectionUtilities
@@ -156,7 +148,7 @@ class Server
                     msg + " [on behalf of #{peer_ip_addr}]"
                 }
 
-                raise( InvalidToken.new( msg ) )
+                raise InvalidToken.new( msg )
             end
         end
 
@@ -269,11 +261,10 @@ class Server
         @methods[name] = Set.new # no lookup overhead please :)
         @async_methods[name] = Set.new
 
-        obj.class.public_instance_methods( false ).each {
-            |method|
+        obj.class.public_instance_methods( false ).each do |method|
             @methods[name] << method.to_s
             @async_methods[name] << method.to_s if async_check( obj.method( method ) )
-        }
+        end
     end
 
     #
@@ -292,10 +283,8 @@ class Server
     # Runs the server and blocks.
     #
     def run
-        Arachni::RPC::EM.add_to_reactor {
-            start
-        }
-        Arachni::RPC::EM.block!
+        Arachni::RPC::EM.schedule { start }
+        Arachni::RPC::EM.block
     end
 
     #
@@ -338,21 +327,20 @@ class Server
         if !res.async?
             res.obj = @objects[obj_name].send( meth_name.to_sym, *args )
         else
-            @objects[obj_name].send( meth_name.to_sym, *args ){
-                |obj|
+            @objects[obj_name].send( meth_name.to_sym, *args ) do |obj|
                 res.obj = obj
                 connection.send_response( res )
-            }
+            end
         end
 
-        return res
+        res
     end
 
     #
     # @return   [TrueClass]
     #
     def alive?
-        return true
+        true
     end
 
     #
@@ -365,7 +353,7 @@ class Server
 
         # don't die before returning
         EventMachine::add_timer( wait_for ) { ::EM.stop }
-        return true
+        true
     end
 
     private
@@ -375,11 +363,8 @@ class Server
     end
 
     def async_check( method )
-        @async_checks.each {
-            |check|
-            return true if check.call( method )
-        }
-        return false
+        @async_checks.each { |check| return true if check.call( method ) }
+        false
     end
 
 
@@ -399,7 +384,6 @@ class Server
 
     def parse_expr( expr )
         parts = expr.to_s.split( '.' )
-
         # method name, object name
         [ parts.pop, parts.join( '.' ) ]
     end

data/lib/arachni/rpc/em/ssl.rb

@@ -40,13 +40,9 @@ module EM
 #
 # @see https://gist.github.com/1151454
 #
-# @author: Tasos "Zapotek" Laskos
-#                                      <tasos.laskos@gmail.com>
-#                                      <zapotek@segfault.gr>
-# @version: 0.1
+# @author: Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
 #
 module SSL
-
     include ::Arachni::RPC::EM::ConnectionUtilities
 
     #
@@ -58,13 +54,11 @@ module SSL
 
         ssl_opts = {}
         if ssl_opts?
-
             ssl_opts = {
-                    :private_key_file => @opts[:ssl_pkey],
-                    :cert_chain_file  => @opts[:ssl_cert],
-                    :verify_peer      => true
-                }
-
+                private_key_file: @opts[:ssl_pkey],
+                cert_chain_file:  @opts[:ssl_cert],
+                verify_peer:      true
+            }
             @last_seen_cert = nil
         end
 
@@ -110,7 +104,7 @@ module SSL
             end
         end
 
-        return @ca_store
+        @ca_store
     end
 
     #
@@ -119,7 +113,6 @@ module SSL
     # @see http://eventmachine.rubyforge.org/EventMachine/Connection.html#M000271
     #
     def ssl_verify_peer( cert_string )
-
         cert = OpenSSL::X509::Certificate.new( cert_string )
 
         # Some servers send the same certificate multiple times. I'm not even
@@ -134,12 +127,12 @@ module SSL
             ca_store.add_cert( @last_seen_cert ) if !@last_seen_cert.root?
 
             @verified_peer = true
-            return true
+            true
         else
             log( :error, 'SSL',
                 "#{ca_store.error_string.capitalize} ['#{peer_ip_addr}']."
             )
-            return false
+            false
         end
     end
 

data/lib/arachni/rpc/em/version.rb

@@ -9,7 +9,7 @@
 module Arachni
 module RPC
 module EM
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
 end
 end
 end

data/spec/arachni/rpc/em/client_spec.rb

@@ -3,11 +3,8 @@ require File.join( File.expand_path( File.dirname( __FILE__ ) ), '../../../', 's
 describe Arachni::RPC::EM::Client do
 
     before( :all ) do
-        @arg = [
-            'one',
-            2,
-            { :three => 3 },
-            [ 4 ]
+        @arg = [ 'one', 2,
+            { :three => 3 }, [ 4 ]
         ]
     end
 
@@ -27,37 +24,32 @@ describe Arachni::RPC::EM::Client do
             end
 
             it "should be able to perform asynchronous calls" do
-                start_client( rpc_opts ).call( 'test.foo', @arg ) {
-                    |res|
+                start_client( rpc_opts ).call( 'test.foo', @arg ) do |res|
                     @arg.should == res
                     ::EM.stop
-                }
-                Arachni::RPC::EM.block!
+                end
+                Arachni::RPC::EM.block
             end
         end
 
         context "when run inside the Reactor loop" do
 
             it "should be able to perform synchronous calls" do
-                ::EM.run do
-
+                ::EM.run {
                     ::Arachni::RPC::EM::Synchrony.run do
                         @arg.should == start_client( rpc_opts ).call( 'test.foo', @arg )
                         ::EM.stop
                     end
-                end
+                }
             end
 
             it "should be able to perform asynchronous calls" do
-                ::EM.run do
-
-                    start_client( rpc_opts ).call( 'test.foo', @arg ) {
-                        |res|
+                ::EM.run {
+                    start_client( rpc_opts ).call( 'test.foo', @arg ) do |res|
                         res.should == @arg
                         ::EM.stop
-                    }
-
-                end
+                    end
+                }
             end
 
         end
@@ -72,12 +64,11 @@ describe Arachni::RPC::EM::Client do
 
         it "should be able to properly forward synchronous calls" do
             test = Arachni::RPC::RemoteObjectMapper.new( start_client( rpc_opts ), 'test' )
-            test.foo( @arg ) {
-                |res|
+            test.foo( @arg ) do |res|
                 res.should == @arg
                 ::EM.stop
-            }
-            Arachni::RPC::EM.block!
+            end
+            Arachni::RPC::EM.block
         end
     end
 
@@ -85,30 +76,27 @@ describe Arachni::RPC::EM::Client do
         context 'when performing asynchronous calls' do
 
             it "should be returned when requesting inexistent objects" do
-                start_client( rpc_opts ).call( 'bar.foo' ) {
-                    |res|
+                start_client( rpc_opts ).call( 'bar.foo' ) do |res|
                     res.rpc_invalid_object_error?.should be_true
                     ::EM.stop
-                }
-                Arachni::RPC::EM.block!
+                end
+                Arachni::RPC::EM.block
             end
 
             it "should be returned when requesting inexistent or non-public methods" do
-                start_client( rpc_opts ).call( 'test.bar' ) {
-                    |res|
+                start_client( rpc_opts ).call( 'test.bar' ) do |res|
                     res.rpc_invalid_method_error?.should be_true
                     ::EM.stop
-                }
-                Arachni::RPC::EM.block!
+                end
+                Arachni::RPC::EM.block
             end
 
             it "should be returned when there's a remote exception" do
-                start_client( rpc_opts ).call( 'test.foo' ) {
-                    |res|
+                start_client( rpc_opts ).call( 'test.foo' ) do |res|
                     res.rpc_remote_exception?.should be_true
                     ::EM.stop
-                }
-                Arachni::RPC::EM.block!
+                end
+                Arachni::RPC::EM.block
             end
 
         end
@@ -146,35 +134,30 @@ describe Arachni::RPC::EM::Client do
     it "should be able to retain stability and consistency under heavy load" do
         client = start_client( rpc_opts )
 
-        n    = 1000
+        n    = 400
         cnt  = 0
 
         mismatches = []
 
-        n.times {
-            |i|
-            client.call( 'test.foo', i ) {
-                |res|
-
+        n.times do |i|
+            client.call( 'test.foo', i ) do |res|
                 cnt += 1
-
                 mismatches << [i, res] if i != res
                 ::EM.stop if cnt == n || !mismatches.empty?
-            }
-        }
-
-        Arachni::RPC::EM.block!
+            end
+        end
 
+        Arachni::RPC::EM.block
+        cnt.should > 0
         mismatches.should be_empty
     end
 
     it "should throw error when connecting to inexistent server" do
-        start_client( rpc_opts.merge( :port => 9999 ) ).call( 'test.foo', @arg ) {
-            |res|
+        start_client( rpc_opts.merge( :port => 9999 ) ).call( 'test.foo', @arg ) do |res|
             res.rpc_connection_error?.should be_true
             ::EM.stop
-        }
-        Arachni::RPC::EM.block!
+        end
+        Arachni::RPC::EM.block
     end
 
     context "when using valid SSL primitives" do
@@ -187,24 +170,22 @@ describe Arachni::RPC::EM::Client do
 
     context "when using invalid SSL primitives" do
         it "should not be able to establish a connection" do
-            start_client( rpc_opts_with_invalid_ssl_primitives ).call( 'test.foo', @arg ){
-                |res|
+            start_client( rpc_opts_with_invalid_ssl_primitives ).call( 'test.foo', @arg ) do |res|
                 res.rpc_connection_error?.should be_true
                 ::EM.stop
-            }
-            Arachni::RPC::EM.block!
+            end
+            Arachni::RPC::EM.block
         end
     end
 
     context "when using mixed SSL primitives" do
         it "should not be able to establish a connection" do
-            start_client( rpc_opts_with_mixed_ssl_primitives ).call( 'test.foo', @arg ){
-                |res|
+            start_client( rpc_opts_with_mixed_ssl_primitives ).call( 'test.foo', @arg ) do |res|
                 res.rpc_connection_error?.should be_true
                 res.rpc_ssl_error?.should be_true
                 ::EM.stop
-            }
-            Arachni::RPC::EM.block!
+            end
+            Arachni::RPC::EM.block
         end
     end
 

data/spec/arachni/rpc/em/server_spec.rb

@@ -8,8 +8,8 @@ end
 describe Arachni::RPC::EM::Server do
 
     before( :all ) do
-        @opts = rpc_opts.merge( :port => 7333 )
-        @server, t = start_server( @opts )
+        @opts = rpc_opts.merge( port: 7333 )
+        @server = start_server( @opts, true )
     end
 
     describe "#initialize" do

data/spec/servers/basic.rb

@@ -1,3 +1,6 @@
 require_relative 'server'
 
-start_server( rpc_opts )[1].join
+$stdout.reopen( '/dev/null', 'w' )
+$stderr.reopen( '/dev/null', 'w' )
+
+start_server( rpc_opts )

data/spec/servers/server.rb

@@ -10,11 +10,42 @@
 
 $cwd = cwd = File.expand_path( File.dirname( __FILE__ ) )
 require File.join( cwd, '../../lib/arachni/rpc/', 'em' )
-require File.join( cwd, '../', 'spec_helper' )
+
+def rpc_opts
+    {
+        host:       'localhost',
+        port:       7331,
+        token:      'superdupersecret',
+        serializer: Marshal,
+    }
+end
+
+def rpc_opts_with_ssl_primitives
+    rpc_opts.merge(
+        port:     7332,
+        ssl_ca:   cwd + '/pems/cacert.pem',
+        ssl_pkey: cwd + '/pems/client/key.pem',
+        ssl_cert: cwd + '/pems/client/cert.pem'
+    )
+end
+
+def rpc_opts_with_invalid_ssl_primitives
+    rpc_opts_with_ssl_primitives.merge(
+        ssl_pkey: cwd + '/pems/client/foo-key.pem',
+        ssl_cert: cwd + '/pems/client/foo-cert.pem'
+    )
+end
+
+def rpc_opts_with_mixed_ssl_primitives
+    rpc_opts_with_ssl_primitives.merge(
+        ssl_pkey: cwd + '/pems/client/key.pem',
+        ssl_cert: cwd + '/pems/client/foo-cert.pem'
+    )
+end
 
 class Parent
     def foo( arg )
-        return arg
+        arg
     end
 end
 
@@ -23,39 +54,21 @@ class Test < Parent
     # in order to make inherited methods accessible you've got to explicitly
     # make them public
     private :foo
-    public :foo
+    public  :foo
 
     #
     # Uses EventMachine to call the block asynchronously
     #
     def async_foo( arg, &block )
-        ::EM.schedule {
-            ::EM.defer {
-                block.call( arg ) if block_given?
-            }
-        }
+        ::EM.schedule { ::EM.defer { block.call( arg ) if block_given? } }
     end
 
 end
 
 def start_server( opts, do_not_start = false )
-
     server = Arachni::RPC::EM::Server.new( opts )
-
-    server.add_async_check {
-        |method|
-        #
-        # Must return 'true' for async and 'false' for sync.
-        #
-        # Very simple check here...
-        #
-        'async' ==  method.name.to_s.split( '_' )[0]
-    }
-
+    server.add_async_check { |method| method.name.to_s.start_with?( 'async_' ) }
     server.add_handler( 'test', Test.new )
-
-    t = nil
-    t = Thread.new { server.run } if !do_not_start
-
-    return server, t
+    server.run if !do_not_start
+    server
 end

data/spec/servers/with_ssl_primitives.rb

@@ -1,5 +1,8 @@
 require_relative 'server'
 
+$stdout.reopen( '/dev/null', 'w' )
+$stderr.reopen( '/dev/null', 'w' )
+
 cwd = File.expand_path( File.dirname( __FILE__ ) )
 opts = rpc_opts.merge(
     :port       => 7332,
@@ -8,4 +11,4 @@ opts = rpc_opts.merge(
     :ssl_cert   => cwd + '/../pems/server/cert.pem'
 )
 
-start_server( opts )[1].join
+start_server( opts )

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-
+require 'rspec'
 require 'timeout'
 
 def cwd
@@ -8,39 +8,35 @@ end
 require File.join( cwd, '../lib/arachni/rpc/', 'em' )
 require File.join( cwd, 'servers', 'server' )
 
-def rpc_opts
-    {
-        :host  => 'localhost',
-        :port  => 7331,
-        :token => 'superdupersecret',
-        :serializer => Marshal,
-    }
-end
-
-def rpc_opts_with_ssl_primitives
-    rpc_opts.merge(
-        :port       => 7332,
-        :ssl_ca     => cwd + '/pems/cacert.pem',
-        :ssl_pkey   => cwd + '/pems/client/key.pem',
-        :ssl_cert   => cwd + '/pems/client/cert.pem'
-    )
+def start_client( opts )
+    Arachni::RPC::EM::Client.new( opts )
 end
 
-def rpc_opts_with_invalid_ssl_primitives
-    rpc_opts_with_ssl_primitives.merge(
-        :ssl_pkey   => cwd + '/pems/client/foo-key.pem',
-        :ssl_cert   => cwd + '/pems/client/foo-cert.pem'
-    )
+def quiet_fork( &block )
+    fork {
+        $stdout.reopen( '/dev/null', 'w' )
+        $stderr.reopen( '/dev/null', 'w' )
+        block.call
+    }
 end
 
-def rpc_opts_with_mixed_ssl_primitives
-    rpc_opts_with_ssl_primitives.merge(
-        :ssl_pkey   => cwd + '/pems/client/key.pem',
-        :ssl_cert   => cwd + '/pems/client/foo-cert.pem'
-    )
+def quiet_spawn( file )
+    Process.spawn 'ruby ' + file
 end
 
-
-def start_client( opts )
-    Arachni::RPC::EM::Client.new( opts )
+server_pids = []
+RSpec.configure do |config|
+    config.color = true
+    config.add_formatter :documentation
+
+    config.before( :suite ) do
+        server_pids << quiet_spawn( File.join( cwd, 'servers', 'basic.rb' ) )
+        server_pids << quiet_spawn( File.join( cwd, 'servers', 'with_ssl_primitives.rb' ) )
+        server_pids.each { |pid| Process.detach( pid ) }
+        sleep 2
+    end
+
+    config.after( :suite ) do
+        server_pids.each { |pid| Process.kill( 'KILL', pid ) }
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arachni-rpc-em
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &17576520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *17576520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.4
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &17576020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +37,28 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17576020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: arachni-rpc
-  requirement: &17575540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *17575540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 description: ! "        EventMachine-based client and server implementation of Arachni-RPC
   supporting\n        TLS encryption, asynchronous and synchronous requests and\n
   \       capable of handling remote asynchronous calls that require a block.\n"
@@ -59,33 +74,32 @@ files:
 - Rakefile
 - LICENSE.md
 - CHANGELOG.md
-- lib/arachni/rpc/em.rb
-- lib/arachni/rpc/em/protocol.rb
-- lib/arachni/rpc/em/ssl.rb
 - lib/arachni/rpc/em/version.rb
-- lib/arachni/rpc/em/connection_utilities.rb
 - lib/arachni/rpc/em/em.rb
 - lib/arachni/rpc/em/client.rb
 - lib/arachni/rpc/em/server.rb
+- lib/arachni/rpc/em/protocol.rb
+- lib/arachni/rpc/em/connection_utilities.rb
+- lib/arachni/rpc/em/ssl.rb
+- lib/arachni/rpc/em.rb
+- examples/client.EM.run.rb
 - examples/client.rb
 - examples/server.rb
-- examples/client.EM.run.rb
-- spec/servers/with_ssl_primitives.rb
-- spec/servers/basic.rb
-- spec/servers/server.rb
-- spec/spec_helper.rb
-- spec/arachni/rpc/em/server_spec.rb
-- spec/arachni/rpc/em/ssl_spec.rb
-- spec/arachni/rpc/em/em_spec.rb
-- spec/arachni/rpc/em/client_spec.rb
 - spec/pems/cacert.pem
 - spec/pems/server/key.pem
 - spec/pems/server/cert.pem
-- spec/pems/client/key.pem
 - spec/pems/client/foo-cert.pem
 - spec/pems/client/foo-key.pem
+- spec/pems/client/key.pem
 - spec/pems/client/cert.pem
-- spec/spec.opts
+- spec/arachni/rpc/em/em_spec.rb
+- spec/arachni/rpc/em/server_spec.rb
+- spec/arachni/rpc/em/client_spec.rb
+- spec/arachni/rpc/em/ssl_spec.rb
+- spec/spec_helper.rb
+- spec/servers/server.rb
+- spec/servers/basic.rb
+- spec/servers/with_ssl_primitives.rb
 homepage: https://github.com/Arachni/arachni-rpc
 licenses: []
 post_install_message: 
@@ -107,28 +121,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The RPC client and server used by the Arachni WebAppSec scanner Grid.
 test_files:
-- examples/client.rb
-- examples/server.rb
-- examples/client.EM.run.rb
-- spec/servers/with_ssl_primitives.rb
-- spec/servers/basic.rb
-- spec/servers/server.rb
-- spec/spec_helper.rb
-- spec/arachni/rpc/em/server_spec.rb
-- spec/arachni/rpc/em/ssl_spec.rb
-- spec/arachni/rpc/em/em_spec.rb
-- spec/arachni/rpc/em/client_spec.rb
 - spec/pems/cacert.pem
 - spec/pems/server/key.pem
 - spec/pems/server/cert.pem
-- spec/pems/client/key.pem
 - spec/pems/client/foo-cert.pem
 - spec/pems/client/foo-key.pem
+- spec/pems/client/key.pem
 - spec/pems/client/cert.pem
-- spec/spec.opts
-has_rdoc: 
+- spec/arachni/rpc/em/em_spec.rb
+- spec/arachni/rpc/em/server_spec.rb
+- spec/arachni/rpc/em/client_spec.rb
+- spec/arachni/rpc/em/ssl_spec.rb
+- spec/spec_helper.rb
+- spec/servers/server.rb
+- spec/servers/basic.rb
+- spec/servers/with_ssl_primitives.rb

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---backtrace