eventmachine 0.12.8 → 0.12.10

data/tests/test_pending_connect_timeout.rb

@@ -0,0 +1,48 @@
+$:.unshift "../lib"
+require 'eventmachine'
+require 'test/unit'
+
+class TestPendingConnectTimeout < Test::Unit::TestCase
+
+  def test_default
+    $timeout = nil
+    EM.run {
+      c = EM.connect("127.0.0.1", 54321)
+      $timeout = c.pending_connect_timeout
+      EM.stop
+    }
+
+    assert_equal(20.0, $timeout)
+  end
+
+  def test_set_and_get
+    $timeout = nil
+    EM.run {
+      c = EM.connect("1.2.3.4", 54321)
+      c.pending_connect_timeout = 2.5
+      $timeout = c.pending_connect_timeout
+      EM.stop
+    }
+
+    assert_equal(2.5, $timeout)
+  end
+
+  module TimeoutHandler
+    def unbind
+      EM.stop
+    end
+  end
+
+  def test_for_real
+    $timeout = nil
+    EM.run {
+      EM.heartbeat_interval = 0.1
+      $start = Time.now
+      c = EM.connect("1.2.3.4", 54321, TimeoutHandler)
+      c.pending_connect_timeout = 5
+    }
+
+    assert_in_delta(5, (Time.now - $start), 0.3)
+  end
+
+end

data/tests/test_ssl_args.rb

@@ -9,18 +9,29 @@ module EventMachine
     class <<self
       alias set_tls_parms_old set_tls_parms
       alias start_tls_old start_tls
-      def set_tls_parms *args; end
-      def start_tls *args; end
+      begin
+        old, $VERBOSE = $VERBOSE, nil
+        def set_tls_parms *args; end
+        def start_tls *args; end
+      ensure
+        $VERBOSE = old
+      end
     end
   end
-  
+
   def self._clear_mocks
     class <<self
-      alias set_tls_parms set_tls_parms_old
-      alias start_tls start_tls_old
+      begin
+        old, $VERBOSE = $VERBOSE, nil
+        alias set_tls_parms set_tls_parms_old
+        alias start_tls start_tls_old
+      ensure
+        $VERBOSE = old
+      end
     end
   end
 end
+
   
 
 class TestSslArgs < Test::Unit::TestCase

data/tests/test_timers.rb

@@ -74,6 +74,17 @@ class TestTimers < Test::Unit::TestCase
     assert( x == 4 )
   end
 
+  def test_add_periodic_timer
+    x = 0
+    EM.run {
+      t = EM.add_periodic_timer(0.1) do
+        x += 1
+        EM.stop  if x == 4
+      end
+      assert t.respond_to?(:cancel)
+    }
+  end
+
   def test_periodic_timer_cancel
     x = 0
     EventMachine.run {
@@ -84,6 +95,16 @@ class TestTimers < Test::Unit::TestCase
     assert( x == 0 )
   end
 
+  def test_add_periodic_timer_cancel
+    x = 0
+    EventMachine.run {
+      pt = EM.add_periodic_timer(0.25) { x += 1 }
+      EM.cancel_timer(pt)
+      EM.add_timer(0.5) { EM.stop }
+    }
+    assert( x == 0 )
+  end
+
   def test_periodic_timer_self_cancel
     x = 0
     EventMachine.run {
@@ -104,7 +125,7 @@ class TestTimers < Test::Unit::TestCase
   #
   def test_timer_change_max_outstanding
     ten_thousand_timers = proc {
-      10000.times {
+      10001.times {
         EM.add_timer(5) {}
       }
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.12.8
+  version: 0.12.10
 platform: ruby
 authors: 
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-22 00:00:00 -07:00
+date: 2009-10-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -88,17 +88,17 @@ files:
 - ext/ssl.h
 - java/.classpath
 - java/.project
-- java/src/com/rubyeventmachine/Application.java
-- java/src/com/rubyeventmachine/Connection.java
-- java/src/com/rubyeventmachine/ConnectionFactory.java
-- java/src/com/rubyeventmachine/DefaultConnectionFactory.java
 - java/src/com/rubyeventmachine/EmReactor.java
 - java/src/com/rubyeventmachine/EmReactorException.java
 - java/src/com/rubyeventmachine/EventableChannel.java
 - java/src/com/rubyeventmachine/EventableDatagramChannel.java
 - java/src/com/rubyeventmachine/EventableSocketChannel.java
-- java/src/com/rubyeventmachine/PeriodicTimer.java
-- java/src/com/rubyeventmachine/Timer.java
+- java/src/com/rubyeventmachine/application/Application.java
+- java/src/com/rubyeventmachine/application/Connection.java
+- java/src/com/rubyeventmachine/application/ConnectionFactory.java
+- java/src/com/rubyeventmachine/application/DefaultConnectionFactory.java
+- java/src/com/rubyeventmachine/application/PeriodicTimer.java
+- java/src/com/rubyeventmachine/application/Timer.java
 - java/src/com/rubyeventmachine/tests/ApplicationTest.java
 - java/src/com/rubyeventmachine/tests/ConnectTest.java
 - java/src/com/rubyeventmachine/tests/EMTest.java
@@ -127,6 +127,7 @@ files:
 - lib/em/protocols/saslauth.rb
 - lib/em/protocols/smtpclient.rb
 - lib/em/protocols/smtpserver.rb
+- lib/em/protocols/socks4.rb
 - lib/em/protocols/stomp.rb
 - lib/em/protocols/tcptest.rb
 - lib/em/queue.rb
@@ -144,9 +145,7 @@ files:
 - lib/jeventmachine.rb
 - lib/pr_eventmachine.rb
 - setup.rb
-- tasks/cpp.rake
-- tasks/project.rake
-- tasks/tests.rake
+- tasks/cpp.rake_example
 - tests/client.crt
 - tests/client.key
 - tests/test_attach.rb
@@ -160,6 +159,7 @@ files:
 - tests/test_exc.rb
 - tests/test_file_watch.rb
 - tests/test_futures.rb
+- tests/test_get_sock_opt.rb
 - tests/test_handler_check.rb
 - tests/test_hc.rb
 - tests/test_httpclient.rb
@@ -170,6 +170,8 @@ files:
 - tests/test_ltp2.rb
 - tests/test_next_tick.rb
 - tests/test_object_protocol.rb
+- tests/test_pause.rb
+- tests/test_pending_connect_timeout.rb
 - tests/test_process_watch.rb
 - tests/test_processes.rb
 - tests/test_proxy_connection.rb
@@ -227,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: eventmachine
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Ruby/EventMachine library

data/tasks/project.rake

@@ -1,79 +0,0 @@
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/clean'
-
-# monkey bitchin' for windows stuffs...
-module FileUtils
-  # If any of these methods ever clobber, try removing them.
-  # Hopefully they'll do something semantically similar.
-  abort "Err: #{__FILE__}:#{__LINE__} monkey patch windows? clobbers!" unless instance_methods.grep(/windows\?/).empty?
-  abort "Err: #{__FILE__}:#{__LINE__} monkey patch sudo clobbers!" unless instance_methods.grep(/sudo/).empty?
-  abort "Err: #{__FILE__}:#{__LINE__} monkey patch gem_cmd clobbers!" unless instance_methods.grep(/gem_cmd/).empty?
-  def windows?; RUBY_PLATFORM =~ /mswin|mingw/; end
-  def sudo(cmd)
-    if windows? || (require 'etc'; Etc.getpwuid.uid == 0)
-      sh cmd
-    else
-      sh "sudo #{cmd}"
-    end
-  end
-  def gem_cmd(action, name, *args)
-    rb = Gem.ruby rescue nil
-    rb ||= (require 'rbconfig'; File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']))
-    sudo "#{rb} -r rubygems -e 'require %{rubygems/gem_runner}; Gem::GemRunner.new.run(%w{#{action} #{name} #{args.join(' ')}})'"
-  end
-end
-
-
-# Setup our packaging tasks, we're just jacking the builtins.
-Rake::GemPackageTask.new(Spec) do |pkg|
-  pkg.need_tar, pkg.need_tar_gz, pkg.need_zip = true, true, true if Package
-  pkg.gem_spec = Spec
-end
-Rake::Task[:clean].enhance [:clobber_package]
-
-# Only generate rdoc if the spec says so, again, jack the builtins.
-if Spec.has_rdoc
-  Rake::RDocTask.new do |rd|
-    rd.title = Spec.name
-    rd.rdoc_dir = 'rdoc'
-    rd.main = "README"
-    rd.rdoc_files.include("lib/**/*.rb", *Spec.extra_rdoc_files)
-    rd.rdoc_files.exclude(*%w(lib/em/version lib/emva lib/evma/ lib/pr_eventmachine lib/jeventmachine))
-  end
-  Rake::Task[:clean].enhance [:clobber_rdoc]
-
-  desc 'Generate and open documentation'
-  task :docs => :rdoc do
-    case RUBY_PLATFORM
-    when /darwin/       ; sh 'open rdoc/index.html'
-    when /mswin|mingw/  ; sh 'start rdoc\index.html'
-    else 
-      sh 'firefox rdoc/index.html'
-    end
-  end
-end
-
-if Spec.default_executable
-  desc "Run #{Spec.default_executable}"
-  task :run do ruby File.join(Spec.bindir, Spec.default_executable) end
-end
-
-require 'rubygems'
-
-desc 'Install gem (and sudo if required)'
-task :install => :package do 
-  gem_cmd(:install, "pkg/#{Spec.name}-#{Spec.version}.gem")
-end
-
-desc 'Uninstall gem (and sudo if required)'
-task :uninstall do
-  gem_cmd(:uninstall, "#{Spec.name}", "-v=#{Spec.version}")
-end
-
-# Find an scm's store directory, if we do, make a task to commit to it only
-# after running all the tests (successfully).
-if scm = %w(git svn bzr hg).find { |d| File.directory? ".#{d}" }
-  desc "Run tests then commit to #{scm}"
-  task :commit => :test do sh "#{scm} commit" end
-end

data/tasks/tests.rake

@@ -1,193 +0,0 @@
-# This is used by several rake tasks, that parameterize the
-# behavior so we can use the same tests to test both the
-# extension and non-extension versions.
-def run_tests t, libr = :cascade, test_files="test_*.rb"
-  require 'test/unit/testsuite'
-  require 'test/unit/ui/console/testrunner'
-  require 'tests/testem'
-  
-  base_dir = File.expand_path(File.dirname(__FILE__) + '/../') + '/'
-  
-  runner = Test::Unit::UI::Console::TestRunner
-  
-  $eventmachine_library = libr
-  EmTestRunner.run(test_files)
-  
-  suite = Test::Unit::TestSuite.new($name)
-
-  ObjectSpace.each_object(Class) do |testcase|
-    suite << testcase.suite if testcase < Test::Unit::TestCase
-  end
-
-  runner.run(suite)
-end
-
-desc "Run tests for #{Spec.name}."
-task :test do |t|
-  # run_tests t
-  # Rake +/ friends leave threads, etc, less stable test runs.
-  ruby "-Ilib -Iext -Iext/fastfilereader -Ijava tests/testem.rb #{'-v' if ENV['VERBOSE']}"
-end
-
-namespace :test do
-  desc "Run tests for #{Spec.name}."
-  task :partial do |t|
-    lib = RUBY_PLATFORM =~ /java/ ? :java : :extension
-    run_tests t, lib, [
-      "test_basic.rb",
-      "test_epoll.rb",
-      "test_errors.rb",
-      "test_error_handler.rb",
-      "test_eventables.rb",
-      "test_exc.rb",
-      "test_futures.rb",
-      "test_hc.rb",
-      "test_httpclient2.rb",
-      "test_httpclient.rb",
-      "test_kb.rb",
-      "test_ltp2.rb",
-      "test_ltp.rb",
-      "test_next_tick.rb",
-      "test_processes.rb",
-      "test_pure.rb",
-      "test_running.rb",
-      "test_sasl.rb",
-      "test_send_file.rb",
-      "test_servers.rb",
-      "test_smtpclient.rb",
-      "test_smtpserver.rb",
-      "test_spawn.rb",
-      "test_timers.rb",
-      "test_ud.rb",
-    ].map { |tf| "tests/#{tf}" }
-  end
-  
-  desc "Run java tests for #$name."
-  task :testjava do |t|
-    run_tests t, :java
-  end
-
-  desc "Run pure-ruby tests for #$name."
-  task :testpr do |t|
-    run_tests t, :pure_ruby
-  end
-
-  desc "Run extension tests for #$name."
-  task :testext do |t|
-    run_tests t, :extension
-  end
-
-  desc "PROVISIONAL: run tests for user-defined events"
-  task :ud do |t|
-    run_tests t, :extension, "test_ud.rb"
-  end
-
-  desc "PROVISIONAL: run tests for line/text protocol handler"
-  task :ltp do |t|
-    run_tests t, :extension, "test_ltp*.rb"
-  end
-
-  desc "PROVISIONAL: run tests for header/content protocol handler"
-  task :hc do |t|
-    run_tests t, :extension, "test_hc.rb"
-  end
-
-  desc "PROVISIONAL: run tests for exceptions"
-  task :exc do |t|
-    run_tests t, :extension, "test_exc.rb"
-  end
-
-  desc "Test protocol handlers"
-  task :protocols => [ :hc, :ltp ]
-
-
-  desc "Test HTTP client"
-  task :httpclient do |t|
-    run_tests t, :extension, "test_httpclient.rb"
-  end
-
-  desc "Test HTTP client2"
-  task :httpclient2 do |t|
-    run_tests t, :extension, "test_httpclient2.rb"
-  end
-
-  desc "Test futures"
-  task :futures do |t|
-    run_tests t, :extension, "test_future*.rb"
-  end
-
-  desc "Test Timers"
-  task :timers do |t|
-    run_tests t, :extension, "test_timer*.rb"
-  end
-
-  desc "Test Next Tick"
-  task :next_tick do |t|
-    run_tests t, :extension, "test_next_tick*.rb"
-  end
-
-  desc "Test Epoll"
-  task :epoll do |t|
-    run_tests t, :extension, "test_epoll*.rb"
-  end
-
-  desc "Test Servers"
-  task :servers do |t|
-    run_tests t, :extension, "test_servers*.rb"
-  end
-
-  desc "Test Basic"
-  task :basic do |t|
-    run_tests t, :extension, "test_basic*.rb"
-  end
-
-  desc "Test Send File"
-  task :send_file do |t|
-    run_tests t, :extension, "test_send_file*.rb"
-  end
-
-  desc "Test Running"
-  task :running do |t|
-    run_tests t, :extension, "test_running*.rb"
-  end
-
-  desc "Test Keyboard Events"
-  task :keyboard do |t|
-    run_tests t, :extension, "test_kb*.rb"
-  end
-
-  desc "Test Spawn"
-  task :spawn do |t|
-    run_tests t, :extension, "test_spawn*.rb"
-  end
-
-  desc "Test SMTP"
-  task :smtp do |t|
-    run_tests t, :extension, "test_smtp*.rb"
-  end
-
-  desc "Test Errors"
-  task :errors do |t|
-    run_tests t, :extension, "test_errors*.rb"
-  end
-
-  desc "Test Pure Ruby"
-  task :pure do |t|
-    run_tests t, :extension, "test_pure*.rb"
-  end
-
-  desc "Test Processes"
-  task :processes do |t|
-    run_tests t, :extension, "test_process*.rb"
-  end
-
-  desc "Test SASL"
-  task :sasl do |t|
-    run_tests t, :java, "test_sasl*.rb"
-  end
-  
-  desc "Test Attach"
-  task :attach do |t|
-    run_tests t, :extension, "test_attach*.rb"
-  end
-end