eventmachine 0.12.4 → 0.12.6

data/tasks/tests.rake

@@ -37,6 +37,7 @@ namespace :test do
       "test_basic.rb",
       "test_epoll.rb",
       "test_errors.rb",
+      "test_error_handler.rb",
       "test_eventables.rb",
       "test_exc.rb",
       "test_futures.rb",

data/tests/test_attach.rb

@@ -33,7 +33,7 @@ class TestAttach < Test::Unit::TestCase
   end
 
   class EchoClient < EM::Connection
-    def connection_completed
+    def initialize
       $sock.write("abc\n")
     end
 
@@ -63,4 +63,21 @@ class TestAttach < Test::Unit::TestCase
     assert_equal $sock.readline, "def\n"
   end
 
-end
+
+  module PipeWatch
+    def notify_readable
+      $read = $r.readline
+      EM.stop
+    end
+  end
+
+  def test_attach_pipe
+    EM.run{
+      $r, $w = IO.pipe
+      EM.attach $r, PipeWatch
+      $w.write("ghi\n")
+    }
+
+    assert_equal $read, "ghi\n"
+  end
+end

data/tests/test_basic.rb

@@ -148,7 +148,7 @@ class TestBasic < Test::Unit::TestCase
   end
 
   def xxx_test_unbind_error
-	  assert_raise( RuntimeError ) {
+	  assert_raises( RuntimeError ) {
 		  EM.run {
 			  EM.start_server TestHost, TestPort
 			  EM.connect TestHost, TestPort, UnbindError
@@ -184,7 +184,7 @@ class TestBasic < Test::Unit::TestCase
   # This test causes issues, the machine becomes unreleasable after 
   # release_machine suffers an exception in event_callback.
   def xxx_test_post_init_error
-	  assert_raise( EventMachine::ConnectionNotBound ) {
+	  assert_raises( EventMachine::ConnectionNotBound ) {
 		  EM.run {
 		  	EM::Timer.new(1) {EM.stop}
 			EM.start_server TestHost, TestPort

data/tests/test_connection_count.rb

@@ -0,0 +1,45 @@
+$:.unshift "../lib"
+require 'eventmachine'
+require 'test/unit'
+
+class TestConnectionCount < Test::Unit::TestCase
+  def test_idle_connection_count
+    EM.run {
+      $count = EM.connection_count
+      EM.stop_event_loop
+    }
+
+    assert_equal(0, $count)
+  end
+
+  module Client
+    def connection_completed
+      EM.next_tick{
+        $client_connected = EM.connection_count
+        EM.stop
+      }
+    end
+  end
+
+  module Server
+    def post_init
+      $server_connected = EM.connection_count
+    end
+  end
+
+  def test_with_some_connections
+    EM.run {
+      EM.start_server("127.0.0.1", 9999, Server)
+      $initial = EM.connection_count
+      EM.next_tick{
+        $server_started = EM.connection_count
+        EM.connect("127.0.0.1", 9999, Client)
+      }
+    }
+
+    assert_equal(0, $initial)
+    assert_equal(1, $server_started)
+    assert_equal(2, $server_connected)
+    assert_equal(3, $client_connected)
+  end
+end

data/tests/test_error_handler.rb

@@ -0,0 +1,35 @@
+$:.unshift "../lib"
+require 'eventmachine'
+require 'test/unit'
+
+class TestErrorHandler < Test::Unit::TestCase
+  def test_error_handler
+    error = nil
+    EM.error_handler{ |e|
+      error = e
+      EM.error_handler(nil)
+      EM.stop
+    }
+
+    assert_nothing_raised do
+      EM.run{
+        EM.add_timer(0){
+          raise 'test'
+        }
+      }
+    end
+
+    assert_equal error.class, RuntimeError
+    assert_equal error.message, 'test'
+  end
+
+  def test_without_error_handler
+    assert_raise RuntimeError do
+      EM.run{
+        EM.add_timer(0){
+          raise 'test'
+        }
+      }
+    end
+  end
+end

data/tests/test_errors.rb

@@ -42,14 +42,14 @@ class TestErrors < Test::Unit::TestCase
 	def setup
 	end
 
-	def teardown
+	def obsolete_teardown
 		# Calling #set_runtime_error_hook with no block restores the
 		# default handling of runtime_errors.
 		#
 		EM.set_runtime_error_hook
 	end
 
-	def test_a
+	def test_no_tests_stub
 	end
 
 	# EM has a default handler for RuntimeErrors that are emitted from
@@ -59,7 +59,7 @@ class TestErrors < Test::Unit::TestCase
 	# run.
 	#
 	def obsolete_test_unhandled_error
-		assert_raise( RuntimeError ) {
+		assert_raises( RuntimeError ) {
 			EM.run {
 				EM.add_timer(0) {raise "AAA"}
 			}

data/tests/test_exc.rb

@@ -38,7 +38,7 @@ class TestSomeExceptions < Test::Unit::TestCase
     # because the machine wasn't cleaned up properly.
 
     def test_a
-	assert_raise(RuntimeError) {
+	assert_raises(RuntimeError) {
 	    EventMachine.run {
 		raise "some exception"
 	    }
@@ -46,7 +46,7 @@ class TestSomeExceptions < Test::Unit::TestCase
     end
 
     def test_b
-	assert_raise(RuntimeError) {
+	assert_raises(RuntimeError) {
 	    EventMachine.run {
 		raise "some exception"
 	    }

data/tests/test_handler_check.rb

@@ -0,0 +1,37 @@
+$:.unshift "../lib"
+require 'eventmachine'
+require 'test/unit'
+
+class TestHandlerCheck < Test::Unit::TestCase
+
+  class Foo < EM::Connection; end;
+  module TestModule; end;
+
+  def test_with_correct_class
+    assert_nothing_raised do
+      EM.run {
+        EM.connect("127.0.0.1", 80, Foo)
+        EM.stop_event_loop
+      }
+    end
+  end
+
+  def test_with_incorrect_class
+    assert_raise(ArgumentError) do
+      EM.run {
+        EM.connect("127.0.0.1", 80, String)
+        EM.stop_event_loop
+      }
+    end
+  end
+
+  def test_with_module
+    assert_nothing_raised do
+      EM.run {
+        EM.connect("127.0.0.1", 80, TestModule)
+        EM.stop_event_loop
+      }
+    end
+  end
+
+end

data/tests/test_httpclient2.rb

@@ -60,7 +60,7 @@ class TestHttpClient2 < Test::Unit::TestCase
 	def test_bad_port
 		EM.run {
 			EM.start_server Localhost, Localport, TestServer
-			assert_raise( ArgumentError ) {
+			assert_raises( ArgumentError ) {
 				EM::P::HttpClient2.connect Localhost, "xxx"
 			}
 			EM.stop

data/tests/test_kb.rb

@@ -54,8 +54,8 @@ class TestKeyboardEvents < Test::Unit::TestCase
 	  EM.run {
 		  EM.open_keyboard KbHandler
 		  EM::Timer.new(1) { EM.stop }
-	  }
-  end if $stdout.tty? # don't run the test unless it stands a chance of validity.
+	  } if $stdout.tty? # don't run the test unless it stands a chance of validity.
+  end
 
 end
 

data/tests/test_next_tick.rb

@@ -68,6 +68,13 @@ class TestNextTick < Test::Unit::TestCase
 		}
 	end
 
+	def test_pre_run_queue
+		x = false
+		EM.next_tick { EM.stop; x = true }
+		EM.run { EM.add_timer(0.2) { EM.stop } }
+		assert x
+	end
+
 	# We now support an additional parameter for EM#run.
 	# You can pass two procs to EM#run now. The first is executed as the normal
 	# run block. The second (if given) is scheduled for execution after the

data/tests/test_processes.rb

@@ -52,5 +52,44 @@ class TestProcesses < Test::Unit::TestCase
 		assert( ls.length > 0)
 	end
 
+  def setup
+    $out = nil
+    $status = nil
+  end
+
+  def test_em_system
+    EM.run{
+      EM.system('ls'){ |out,status| $out, $status = out, status; EM.stop }
+    }
+
+    assert( $out.length > 0 )
+    assert_equal($status.exitstatus, 0)
+    assert_equal($status.class, Process::Status)
+  end
+
+  def test_em_system_with_proc
+    EM.run{
+      EM.system('ls', proc{ |out,status| $out, $status = out, status; EM.stop })
+    }
+
+    assert( $out.length > 0 )
+    assert_equal($status.exitstatus, 0)
+    assert_equal($status.class, Process::Status)
+  end
+
+  def test_em_system_with_two_procs
+    EM.run{
+      EM.system('sh', proc{ |process|
+        process.send_data("echo hello\n")
+        process.send_data("exit\n")
+      }, proc{ |out,status|
+        $out = out
+        $status = status
+        EM.stop
+      })
+    }
+
+    assert_equal($out, "hello\n")
+  end
 end
 

data/tests/test_pure.rb

@@ -64,11 +64,11 @@ class TestPure < Test::Unit::TestCase
       }
   end
   def test_exception_1
-    assert_raise( RuntimeError ) { run_exception }
+    assert_raises( RuntimeError ) { run_exception }
   end
   def test_exception_2
 		ex_class = RUBY_PLATFORM == 'java' ? NativeException : RuntimeError
-    assert_raise( ex_class ) { run_exception }
+    assert_raises( ex_class ) { run_exception }
   end
 
 

data/tests/test_send_file.rb

@@ -92,7 +92,7 @@ class TestSendFile < Test::Unit::TestCase
 		data = ''
 
 		ex_class = RUBY_PLATFORM == 'java' ? NativeException : RuntimeError
-    assert_raise( ex_class ) {
+    assert_raises( ex_class ) {
 			EM.run {
 				EM.start_server TestHost, TestPort, TestModule
 				EM.add_timer(2) {EM.stop} # avoid hanging in case of error

data/tests/test_ssl_args.rb

@@ -41,13 +41,13 @@ class TestSslArgs < Test::Unit::TestCase
     # associate_callback_target is a pain! (build!)
     conn = EventMachine::Connection.new('foo')
     
-    assert_raise(EventMachine::FileNotFoundException) do
+    assert_raises(EventMachine::FileNotFoundException) do
       conn.start_tls(:private_key_file => priv_file)
     end
-    assert_raise(EventMachine::FileNotFoundException) do
+    assert_raises(EventMachine::FileNotFoundException) do
       conn.start_tls(:cert_chain_file => cert_file)
     end
-    assert_raise(EventMachine::FileNotFoundException) do
+    assert_raises(EventMachine::FileNotFoundException) do
       conn.start_tls(:private_key_file => priv_file, :cert_chain_file => cert_file)
     end
   end

data/tests/test_ssl_methods.rb

@@ -0,0 +1,50 @@
+$:.unshift "../lib"
+require 'eventmachine'
+require 'test/unit'
+
+class TestSSLMethods < Test::Unit::TestCase
+
+  module ServerHandler
+
+    def post_init
+      start_tls
+    end
+
+    def ssl_handshake_completed
+      $server_called_back = true
+      $server_cert_value = get_peer_cert
+    end
+
+  end
+
+  module ClientHandler
+
+    def post_init
+      start_tls
+    end
+
+    def ssl_handshake_completed
+      $client_called_back = true
+      $client_cert_value = get_peer_cert
+      EM.stop_event_loop
+    end
+
+  end
+
+  def test_ssl_methods
+    $server_called_back, $client_called_back = false, false
+    $server_cert_value, $client_cert_value = nil, nil
+
+    EM.run {
+      EM.start_server("127.0.0.1", 9999, ServerHandler)
+      EM.connect("127.0.0.1", 9999, ClientHandler)
+    }
+
+    assert($server_called_back)
+    assert($client_called_back)
+
+    assert($server_cert_value.is_a?(NilClass))
+    assert($client_cert_value.is_a?(String))
+  end
+
+end

data/tests/test_timers.rb

@@ -122,7 +122,7 @@ class TestTimers < Test::Unit::TestCase
 				ten_thousand_timers.call
 			else
 			  begin
-  				assert_raise( RuntimeError ) {
+  				assert_raises( RuntimeError ) {
   					ten_thousand_timers.call
   				}
   			rescue Object
@@ -134,7 +134,9 @@ class TestTimers < Test::Unit::TestCase
 		}
 
     assert(!EM.reactor_running?, 'Reactor running when it should not be.')
+    assert( EM.get_max_timers != 10001 )
     EM.set_max_timers( 10001 )
+    assert( EM.get_max_timers == 10001 )
 
 		EM.run {
 			ten_thousand_timers.call

data/web/whatis

@@ -0,0 +1,7 @@
+EventMachine is a library for Ruby, C++, and Java programs. It provides event-driven I/O using the Reactor pattern.
+
+EventMachine is designed to simultaneously meet two key needs:
+- Extremely high scalability, performance and stability for the most demanding production environments; and
+- An API that <i>eliminates</i> the complexities of high-performance threaded network programming, allowing engineers to concentrate on their application logic.
+
+This unique combination makes EventMachine a premier choice for designers of critical networked applications, including web servers and proxies, email and IM production systems, authentication/authorization processors, and many more.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.12.4
+  version: 0.12.6
 platform: ruby
 authors: 
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-08 00:00:00 -08:00
+date: 2009-03-07 23:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -18,7 +18,8 @@ email: garbagecat10@gmail.com
 executables: []
 
 extensions: 
-- Rakefile
+- ext/extconf.rb
+- ext/fastfilereader/extconf.rb
 extra_rdoc_files: 
 - docs/ChangeLog
 - docs/COPYING
@@ -36,67 +37,24 @@ extra_rdoc_files:
 - docs/SPAWNED_PROCESSES
 - docs/TODO
 files: 
+- .gitignore
 - Rakefile
-- tests/test_attach.rb
-- tests/test_basic.rb
-- tests/test_defer.rb
-- tests/test_epoll.rb
-- tests/test_errors.rb
-- tests/test_eventables.rb
-- tests/test_exc.rb
-- tests/test_futures.rb
-- tests/test_hc.rb
-- tests/test_httpclient.rb
-- tests/test_httpclient2.rb
-- tests/test_kb.rb
-- tests/test_ltp.rb
-- tests/test_ltp2.rb
-- tests/test_next_tick.rb
-- tests/test_processes.rb
-- tests/test_pure.rb
-- tests/test_running.rb
-- tests/test_sasl.rb
-- tests/test_send_file.rb
-- tests/test_servers.rb
-- tests/test_smtpclient.rb
-- tests/test_smtpserver.rb
-- tests/test_spawn.rb
-- tests/test_ssl_args.rb
-- tests/test_timers.rb
-- tests/test_ud.rb
-- tests/testem.rb
-- lib/em
-- lib/em/deferrable.rb
-- lib/em/eventable.rb
-- lib/em/future.rb
-- lib/em/messages.rb
-- lib/em/processes.rb
-- lib/em/spawnable.rb
-- lib/em/streamer.rb
-- lib/eventmachine.rb
-- lib/eventmachine_version.rb
-- lib/evma
-- lib/evma/callback.rb
-- lib/evma/container.rb
-- lib/evma/factory.rb
-- lib/evma/protocol.rb
-- lib/evma/reactor.rb
-- lib/evma.rb
-- lib/jeventmachine.rb
-- lib/pr_eventmachine.rb
-- lib/protocols
-- lib/protocols/buftok.rb
-- lib/protocols/header_and_content.rb
-- lib/protocols/httpcli2.rb
-- lib/protocols/httpclient.rb
-- lib/protocols/line_and_text.rb
-- lib/protocols/linetext2.rb
-- lib/protocols/postgres.rb
-- lib/protocols/saslauth.rb
-- lib/protocols/smtpclient.rb
-- lib/protocols/smtpserver.rb
-- lib/protocols/stomp.rb
-- lib/protocols/tcptest.rb
+- docs/COPYING
+- docs/ChangeLog
+- docs/DEFERRABLES
+- docs/EPOLL
+- docs/GNU
+- docs/INSTALL
+- docs/KEYBOARD
+- docs/LEGAL
+- docs/LIGHTWEIGHT_CONCURRENCY
+- docs/PURE_RUBY
+- docs/README
+- docs/RELEASE_NOTES
+- docs/SMTP
+- docs/SPAWNED_PROCESSES
+- docs/TODO
+- eventmachine.gemspec
 - ext/binder.cpp
 - ext/binder.h
 - ext/cmain.cpp
@@ -112,7 +70,6 @@ files:
 - ext/eventmachine.h
 - ext/eventmachine_cpp.h
 - ext/extconf.rb
-- ext/fastfilereader
 - ext/fastfilereader/extconf.rb
 - ext/fastfilereader/mapper.cpp
 - ext/fastfilereader/mapper.h
@@ -129,9 +86,8 @@ files:
 - ext/sigs.h
 - ext/ssl.cpp
 - ext/ssl.h
-- java/src
-- java/src/com
-- java/src/com/rubyeventmachine
+- java/.classpath
+- java/.project
 - java/src/com/rubyeventmachine/Application.java
 - java/src/com/rubyeventmachine/Connection.java
 - java/src/com/rubyeventmachine/ConnectionFactory.java
@@ -142,32 +98,80 @@ files:
 - java/src/com/rubyeventmachine/EventableDatagramChannel.java
 - java/src/com/rubyeventmachine/EventableSocketChannel.java
 - java/src/com/rubyeventmachine/PeriodicTimer.java
-- java/src/com/rubyeventmachine/tests
+- java/src/com/rubyeventmachine/Timer.java
 - java/src/com/rubyeventmachine/tests/ApplicationTest.java
 - java/src/com/rubyeventmachine/tests/ConnectTest.java
 - java/src/com/rubyeventmachine/tests/EMTest.java
 - java/src/com/rubyeventmachine/tests/TestDatagrams.java
 - java/src/com/rubyeventmachine/tests/TestServers.java
 - java/src/com/rubyeventmachine/tests/TestTimers.java
-- java/src/com/rubyeventmachine/Timer.java
+- lib/em/deferrable.rb
+- lib/em/eventable.rb
+- lib/em/future.rb
+- lib/em/messages.rb
+- lib/em/processes.rb
+- lib/em/spawnable.rb
+- lib/em/streamer.rb
+- lib/eventmachine.rb
+- lib/eventmachine_version.rb
+- lib/evma.rb
+- lib/evma/callback.rb
+- lib/evma/container.rb
+- lib/evma/factory.rb
+- lib/evma/protocol.rb
+- lib/evma/reactor.rb
+- lib/jeventmachine.rb
+- lib/pr_eventmachine.rb
+- lib/protocols/buftok.rb
+- lib/protocols/header_and_content.rb
+- lib/protocols/httpcli2.rb
+- lib/protocols/httpclient.rb
+- lib/protocols/line_and_text.rb
+- lib/protocols/linetext2.rb
+- lib/protocols/memcache.rb
+- lib/protocols/postgres.rb
+- lib/protocols/saslauth.rb
+- lib/protocols/smtpclient.rb
+- lib/protocols/smtpserver.rb
+- lib/protocols/stomp.rb
+- lib/protocols/tcptest.rb
+- setup.rb
 - tasks/cpp.rake
 - tasks/project.rake
 - tasks/tests.rake
-- docs/ChangeLog
-- docs/COPYING
-- docs/DEFERRABLES
-- docs/EPOLL
-- docs/GNU
-- docs/INSTALL
-- docs/KEYBOARD
-- docs/LEGAL
-- docs/LIGHTWEIGHT_CONCURRENCY
-- docs/PURE_RUBY
-- docs/README
-- docs/RELEASE_NOTES
-- docs/SMTP
-- docs/SPAWNED_PROCESSES
-- docs/TODO
+- tests/test_attach.rb
+- tests/test_basic.rb
+- tests/test_connection_count.rb
+- tests/test_defer.rb
+- tests/test_epoll.rb
+- tests/test_error_handler.rb
+- tests/test_errors.rb
+- tests/test_eventables.rb
+- tests/test_exc.rb
+- tests/test_futures.rb
+- tests/test_handler_check.rb
+- tests/test_hc.rb
+- tests/test_httpclient.rb
+- tests/test_httpclient2.rb
+- tests/test_kb.rb
+- tests/test_ltp.rb
+- tests/test_ltp2.rb
+- tests/test_next_tick.rb
+- tests/test_processes.rb
+- tests/test_pure.rb
+- tests/test_running.rb
+- tests/test_sasl.rb
+- tests/test_send_file.rb
+- tests/test_servers.rb
+- tests/test_smtpclient.rb
+- tests/test_smtpserver.rb
+- tests/test_spawn.rb
+- tests/test_ssl_args.rb
+- tests/test_ssl_methods.rb
+- tests/test_timers.rb
+- tests/test_ud.rb
+- tests/testem.rb
+- web/whatis
 has_rdoc: true
 homepage: http://rubyeventmachine.com
 post_install_message: