arachni-rpc-em 0.1.3 → 0.2

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

@@ -1,4 +1,4 @@
-require File.join( File.expand_path( File.dirname( __FILE__ ) ), '../../../', 'spec_helper' )
+require 'spec_helper'
 
 describe Arachni::RPC::EM do
 end

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

@@ -1,4 +1,4 @@
-require File.join( File.expand_path( File.dirname( __FILE__ ) ), '../../../', 'spec_helper' )
+require 'spec_helper'
 
 class Arachni::RPC::EM::Server
     public :async?, :async_check, :object_exist?, :public_method?
@@ -12,66 +12,118 @@ describe Arachni::RPC::EM::Server do
         @server = start_server( @opts, true )
     end
 
-    describe "#initialize" do
-        it "should be able to properly setup class options" do
+    describe '#initialize' do
+        it 'should be able to properly setup class options' do
             @server.opts.should == @opts
         end
+
+        context 'when passed no connection information' do
+            it 'raises ArgumentError' do
+                begin
+                    described_class.new({})
+                rescue => e
+                    e.should be_kind_of ArgumentError
+                end
+            end
+        end
+
+        context 'when passed a host but not a port' do
+            it 'raises ArgumentError' do
+                begin
+                    described_class.new( host: 'test' )
+                rescue => e
+                    e.should be_kind_of ArgumentError
+                end
+            end
+        end
+
+        context 'when passed a port but not a host' do
+            it 'raises ArgumentError' do
+                begin
+                    described_class.new( port: 9999 )
+                rescue => e
+                    e.should be_kind_of ArgumentError
+                end
+            end
+        end
+
+        context 'when passed an invalid port' do
+            it 'raises ArgumentError' do
+                begin
+                    described_class.new( host: 'tt', port: 'blah' )
+                rescue => e
+                    e.should be_kind_of ArgumentError
+                end
+            end
+        end
     end
 
-    it "should retain the supplied token" do
+    it 'retains the supplied token' do
         @server.token.should == @opts[:token]
     end
 
-    it "should have a Logger" do
+    it 'has a Logger' do
         @server.logger.class.should == ::Logger
     end
 
-    describe "#alive?" do
+    describe '#alive?' do
         subject { @server.alive? }
         it { should == true }
     end
 
-    describe "#async?" do
-
-        it "should return true for async methods" do
-            @server.async?( 'test', 'async_foo' ).should be_true
+    describe '#async?' do
+        context 'when a method is async' do
+            it 'returns true' do
+                @server.async?( 'test', 'async_foo' ).should be_true
+            end
         end
 
-        it "should return false for sync methods" do
-            @server.async?( 'test', 'foo' ).should be_false
+        context 'when a method is sync' do
+            it 'returns false' do
+                @server.async?( 'test', 'foo' ).should be_false
+            end
         end
     end
 
-    describe "#async_check" do
-
-        it "should return true for async methods" do
-            @server.async_check( Test.new.method( :async_foo ) ).should be_true
+    describe '#async_check' do
+        context 'when a method is async' do
+            it 'returns true' do
+                @server.async_check( Test.new.method( :async_foo ) ).should be_true
+            end
         end
 
-        it "should return false for sync methods" do
-            @server.async_check( Test.new.method( :foo ) ).should be_false
+        context 'when a method is sync' do
+            it 'returns false' do
+                @server.async_check( Test.new.method( :foo ) ).should be_false
+            end
         end
     end
 
-    describe "#object_exist?" do
-
-        it "should return true for valid objects" do
-            @server.object_exist?( 'test' ).should be_true
+    describe '#object_exist?' do
+        context 'when an object exists' do
+            it 'returns true' do
+                @server.object_exist?( 'test' ).should be_true
+            end
         end
 
-        it "should return false for inexistent objects" do
-            @server.object_exist?( 'foo' ).should be_false
+        context 'when an object does not exist' do
+            it 'returns false' do
+                @server.object_exist?( 'foo' ).should be_false
+            end
         end
     end
 
-    describe "#public_method?" do
-
-        it "should return true for public methods" do
-            @server.public_method?( 'test', 'foo' ).should be_true
+    describe '#public_method?' do
+        context 'when a method is public' do
+            it 'returns true' do
+                @server.public_method?( 'test', 'foo' ).should be_true
+            end
         end
 
-        it "should return false for inexistent or non-public methods" do
-            @server.public_method?( 'test', 'bar' ).should be_false
+        context 'when a method is non-existent or not public' do
+            it 'returns false' do
+                @server.public_method?( 'test', 'bar' ).should be_false
+            end
         end
     end
 

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

@@ -1,4 +1,4 @@
-require File.join( File.expand_path( File.dirname( __FILE__ ) ), '../../../', 'spec_helper' )
+require 'spec_helper'
 
 class SSL
     include Arachni::RPC::EM::SSL

data/spec/servers/server.rb

@@ -8,8 +8,11 @@
 
 =end
 
-$cwd = cwd = File.expand_path( File.dirname( __FILE__ ) )
-require File.join( cwd, '../../lib/arachni/rpc/', 'em' )
+require_relative '../../lib/arachni/rpc/em'
+
+def pems_path
+    File.expand_path( File.dirname( __FILE__ ) + '/../' )
+end
 
 def rpc_opts
     {
@@ -20,26 +23,34 @@ def rpc_opts
     }
 end
 
+def rpc_opts_with_socket
+    opts = rpc_opts
+    opts.delete( :host )
+    opts.delete( :port )
+
+    opts.merge( socket: '/tmp/arachni-rpc-em-test' )
+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'
+        ssl_ca:   pems_path + '/pems/cacert.pem',
+        ssl_pkey: pems_path + '/pems/client/key.pem',
+        ssl_cert: pems_path + '/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'
+        ssl_pkey: pems_path + '/pems/client/foo-key.pem',
+        ssl_cert: pems_path + '/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'
+        ssl_pkey: pems_path + '/pems/client/key.pem',
+        ssl_cert: pems_path + '/pems/client/foo-cert.pem'
     )
 end
 
@@ -51,16 +62,14 @@ end
 
 class Test < Parent
 
-    # in order to make inherited methods accessible you've got to explicitly
-    # make them public
+    # In order to make inherited methods accessible you've got to explicitly
+    # make them public.
     private :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 { block.call( arg ) if block_given? }
     end
 
 end

data/spec/servers/unix_socket.rb

@@ -0,0 +1,11 @@
+require_relative 'server'
+
+$stdout.reopen( '/dev/null', 'w' )
+$stderr.reopen( '/dev/null', 'w' )
+
+opts = rpc_opts.merge(
+    socket: '/tmp/arachni-rpc-em-test',
+    serializer:          Marshal
+)
+
+start_server( opts )

data/spec/servers/with_fallback.rb

@@ -3,10 +3,9 @@ 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:       7333,
-    serializer: YAML,
+    port:                7333,
+    serializer:          YAML,
     fallback_serializer: Marshal
 )
 

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,

data/spec/spec_helper.rb

@@ -1,12 +1,8 @@
 require 'rspec'
 require 'timeout'
 
-def cwd
-    File.expand_path( File.dirname( __FILE__ ) )
-end
-
-require File.join( cwd, '../lib/arachni/rpc/', 'em' )
-require File.join( cwd, 'servers', 'server' )
+require_relative '../lib/arachni/rpc/em'
+require_relative 'servers/server'
 
 def start_client( opts )
     Arachni::RPC::EM::Client.new( opts )
@@ -14,8 +10,8 @@ end
 
 def quiet_fork( &block )
     fork {
-        $stdout.reopen( '/dev/null', 'w' )
-        $stderr.reopen( '/dev/null', 'w' )
+        #$stdout.reopen( '/dev/null', 'w' )
+        #$stderr.reopen( '/dev/null', 'w' )
         block.call
     }
 end
@@ -30,9 +26,11 @@ RSpec.configure do |config|
     config.add_formatter :documentation
 
     config.before( :suite ) do
+        cwd = File.expand_path( File.dirname( __FILE__ ) )
         server_pids << quiet_spawn( File.join( cwd, 'servers', 'basic.rb' ) )
         server_pids << quiet_spawn( File.join( cwd, 'servers', 'with_ssl_primitives.rb' ) )
         server_pids << quiet_spawn( File.join( cwd, 'servers', 'with_fallback.rb' ) )
+        server_pids << quiet_spawn( File.join( cwd, 'servers', 'unix_socket.rb' ) )
         server_pids.each { |pid| Process.detach( pid ) }
         sleep 2
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arachni-rpc-em
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -59,6 +59,38 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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"
@@ -78,8 +110,10 @@ files:
 - lib/arachni/rpc/em/em.rb
 - lib/arachni/rpc/em/client.rb
 - lib/arachni/rpc/em/server.rb
+- lib/arachni/rpc/em/server/handler.rb
 - lib/arachni/rpc/em/protocol.rb
 - lib/arachni/rpc/em/connection_utilities.rb
+- lib/arachni/rpc/em/client/handler.rb
 - lib/arachni/rpc/em/ssl.rb
 - lib/arachni/rpc/em.rb
 - examples/client.EM.run.rb
@@ -99,6 +133,7 @@ files:
 - spec/spec_helper.rb
 - spec/servers/with_fallback.rb
 - spec/servers/server.rb
+- spec/servers/unix_socket.rb
 - spec/servers/basic.rb
 - spec/servers/with_ssl_primitives.rb
 homepage: https://github.com/Arachni/arachni-rpc-em
@@ -114,12 +149,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2951551250671031886
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2951551250671031886
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -142,5 +183,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/servers/with_fallback.rb
 - spec/servers/server.rb
+- spec/servers/unix_socket.rb
 - spec/servers/basic.rb
 - spec/servers/with_ssl_primitives.rb
+has_rdoc: