rubarb 0.2.0 → 0.2.11

data/spec/rubarb/server_spec.rb

@@ -62,12 +62,8 @@ end
 
 describe Rubarb::Server do
 
-  before(:each) do
-    @reactor_thread = nil
-  end
-
   after(:each) do
-    stop_reactor(@reactor_thread) if @reactor_thread
+    sync_stop(@server)
   end
 
   it "has an instance of Rubarb::Id" do
@@ -96,15 +92,15 @@ describe Rubarb::Server do
   end
 
   def connect
-    @reactor_thread = start_reactor
     connected = false
     @server = Rubarb::Server.new("127.0.0.1", 9441, mock("server"))
     @connection = Rubarb::Connection.new("127.0.0.1", 9441, mock("client"))
     EM.schedule do
       @server.start { |client| @client = client }
-      @connection.start { connected = true }
+      EM.next_tick {@connection.start { connected = true } }
     end
-    wait_for { connected }
+    wait_for { connected && @client}
+    connected.should == true
   end
 
   it "sets instance of Rubarb::Id to each connection for connection ids" do
@@ -137,7 +133,6 @@ describe Rubarb::Server do
   end
 
   it "makes two overlapping calls" do
-    @reactor_thread = start_reactor
     connected = false
 
     @server = Rubarb::Server.new("127.0.0.1", 9441, TestApi.new)
@@ -173,7 +168,6 @@ describe Rubarb::Server do
   it "should catch exceptions in starting server" do
     EventMachine.stub!(:start_server).and_raise("EMReactor Exception")
 
-    @reactor_thread = start_reactor
     done = false
 
     @server = Rubarb::Server.new("127.0.0.1", 9441, TestApi.new)

data/spec/spec_helper.rb

@@ -5,21 +5,28 @@ require 'timeout'
 require 'eventmachine'
 
 def start_reactor
-  t = Thread.current
-  reactor = Thread.new do
-    EM.run do
-      t.wakeup
+  main_thread = Thread.current
+  em_thread = Thread.new do
+    EventMachine::run do
+      main_thread.wakeup
     end
   end
-  sleep(4)
-  reactor
+  while !(em_thread.alive? && em_thread.status != "sleep")
+    sleep(0.2)
+  end
+  return em_thread
 end
 
+
 def stop_reactor(reactor)
-  EM::schedule {EM.stop}
+  return unless EM::reactor_running?
+  EM.stop
   reactor.join
+rescue Exception => e
+
 end
 
+
 def wait_for
   Timeout::timeout(5) do
     while !yield
@@ -29,4 +36,18 @@ def wait_for
   rescue Timeout::Error => e
 end
 
+def sync_stop(server)
+  return unless server
+  stopped = false
+  server.stop { stopped = true }
+  wait_for { stopped }
+end
+
+
+Spec::Runner.configure do |config|
+  config.before(:suite) {$reactor_thread = start_reactor}
+  config.after(:suite) {stop_reactor($reactor_thread)}
+end
+
+
 #$DEBUG = true

metadata

@@ -1,55 +1,52 @@
 --- !ruby/object:Gem::Specification 
 name: rubarb
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+    - 0
+    - 2
+    - 11
+  version: 0.2.11
 platform: ruby
 authors: 
-- doug bradbury
+  - doug bradbury
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 -06:00
+date: 2011-02-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 12
-        - 11
-        version: 0.12.11
-  type: :runtime
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 3
+              - 0
+            version: 1.3.0
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: eventmachine
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 0
+              - beta
+              - 2
+            version: 1.0.0.beta.2
+    type: :runtime
+    version_requirements: *id002
 description: |-
   This library uses two socket connections between a client and a server. One is used for request / replies from the
   client to the server.  The other is used for remote calls made from the server to the client.
@@ -63,84 +60,64 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+  - README.md
 files: 
-- .gitignore
-- README
-- Rakefile
-- VERSION
-- examples/client.rb
-- examples/server.rb
-- lib/dkbrpc.rb
-- lib/rubarb.rb
-- lib/rubarb/connection.rb
-- lib/rubarb/connection_error.rb
-- lib/rubarb/connection_id.rb
-- lib/rubarb/default.rb
-- lib/rubarb/fast_message_protocol.rb
-- lib/rubarb/id.rb
-- lib/rubarb/incoming_connection.rb
-- lib/rubarb/insecure_method_call_error.rb
-- lib/rubarb/outgoing_connection.rb
-- lib/rubarb/remote_call.rb
-- lib/rubarb/responder.rb
-- lib/rubarb/server.rb
-- spec/rubarb/connection_failure_spec.rb
-- spec/rubarb/connection_spec.rb
-- spec/rubarb/id_spec.rb
-- spec/rubarb/incoming_connection_spec.rb
-- spec/rubarb/integration_spec.rb
-- spec/rubarb/outgoing_connection_spec.rb
-- spec/rubarb/remote_call_spec.rb
-- spec/rubarb/responder_spec.rb
-- spec/rubarb/server_failure_spec.rb
-- spec/rubarb/server_spec.rb
-- spec/spec_helper.rb
+  - lib/dkbrpc.rb
+  - lib/rubarb.rb
+  - lib/rubarb/connection.rb
+  - lib/rubarb/connection_error.rb
+  - lib/rubarb/connection_id.rb
+  - lib/rubarb/default.rb
+  - lib/rubarb/fast_message_protocol.rb
+  - lib/rubarb/id.rb
+  - lib/rubarb/incoming_connection.rb
+  - lib/rubarb/insecure_method_call_error.rb
+  - lib/rubarb/outgoing_connection.rb
+  - lib/rubarb/remote_call.rb
+  - lib/rubarb/responder.rb
+  - lib/rubarb/server.rb
+  - README.md
 has_rdoc: true
 homepage: http://github.com/dougbradbury/rubarb
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Bidirectional Event Machine Based Remote Procedure Call Library for Ruby
 test_files: 
-- spec/rubarb/connection_failure_spec.rb
-- spec/rubarb/connection_spec.rb
-- spec/rubarb/id_spec.rb
-- spec/rubarb/incoming_connection_spec.rb
-- spec/rubarb/integration_spec.rb
-- spec/rubarb/outgoing_connection_spec.rb
-- spec/rubarb/remote_call_spec.rb
-- spec/rubarb/responder_spec.rb
-- spec/rubarb/server_failure_spec.rb
-- spec/rubarb/server_spec.rb
-- spec/spec_helper.rb
-- examples/client.rb
-- examples/server.rb
+  - examples/client.rb
+  - examples/server.rb
+  - spec/rubarb/connection_failure_spec.rb
+  - spec/rubarb/connection_spec.rb
+  - spec/rubarb/id_spec.rb
+  - spec/rubarb/incoming_connection_spec.rb
+  - spec/rubarb/integration_spec.rb
+  - spec/rubarb/outgoing_connection_spec.rb
+  - spec/rubarb/remote_call_spec.rb
+  - spec/rubarb/responder_spec.rb
+  - spec/rubarb/server_failure_spec.rb
+  - spec/rubarb/server_spec.rb
+  - spec/spec_helper.rb

data/.gitignore

@@ -1,7 +0,0 @@
-dkbrpc.i*
-rubarb.i*
-pkg
-.idea
-*.iml
-.rakeTasks
-*.gemspec

data/README

@@ -1,77 +0,0 @@
-rubaRb
-A Bidirectional Event Machine Based Remote Procedure Call Library for Ruby
-
-This library uses two socket connections between a client and a server.
-One is used for request / replies from the client to the server.
-The other is used for remote calls made from the server to the client.
-
-Each end publishes a single object on which methods can be called by the remote end.
-All calls to the remote objects are asyncronous.  Do not make any blocking calls in
-the published object.  Responses are return by calling the "reply method on the responder object.
-
-Server and Connection object may be created and started outside of EM::run,
-but the Eventmachine reactor must be started somewhere in your application
-
-################################# Server Example #####################################################################
-
-class ServerApi
-  def time(responder)
-    puts "Server received time request"
-    responder.reply(Time.now)
-  end
-end
-
-EM.run do
-  server = Rubarb::Server.new("127.0.0.1", 9441, ServerApi.new)
-
-  connections = {}
-
-  server.start do |client|
-    puts "Connection Made:  #{client}"
-    client.name do |name|
-      connections[name] = client
-      client.errback do
-        puts "Connection Lost:  #{name}"
-        connections.delete(name)
-      end
-
-    end
-
-  end
-
-  EventMachine.add_periodic_timer(1) { puts "Connections:  #{connections.keys.inspect}" }
-
-end
-######################################################################################################################
-
-
-################################# Client Example #####################################################################
-class ClientApi
-  def initialize(name)
-    @name = name
-  end
-  def name(responder)
-    responder.reply(@name)
-  end
-end
-
-EM::run do
-  connection = Rubarb::Connection.new("127.0.0.1", 9441, ClientApi.new(ARGV[0]))
-  connection.errback do |error|
-    puts ("Connection Error:  #{error}")
-  end
-
-  connection.start do
-    connection.time do |response|
-      puts "Server Said it is:  #{response.strftime("%D")}"
-    end
-
-    EventMachine.add_timer(20) do
-      puts "stopping"
-      connection.stop
-      EM::stop
-    end
-  end
-
-end
-######################################################################################################################

data/Rakefile

@@ -1,51 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rubarb"
-    gem.summary = %Q{A Bidirectional Event Machine Based Remote Procedure Call Library for Ruby}
-    gem.description = %Q{This library uses two socket connections between a client and a server. One is used for request / replies from the
-client to the server.  The other is used for remote calls made from the server to the client.
-
-Each end publishes a single object on which
-methods can be called by the remote end.  All calls to the remote objects are asyncronous.  Do not make any blocking
-calls in the published object.  Responses are return by calling the "reply method on the responder object.}
-    
-    gem.email = "doug@8thlight.com"
-    gem.homepage = "http://github.com/dougbradbury/rubarb"
-    gem.authors = ["doug bradbury"]
-    gem.add_development_dependency "rspec", ">= 1.3.0"
-    gem.add_dependency "eventmachine", ">= 0.12.11"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rubarb-gem #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end