eventmachine-maglev- 0.12.10 → 1.0.0.beta.4

data/lib/jeventmachine.rb

@@ -28,7 +28,7 @@
 # which is a garden-variety Ruby-extension glue module.
 
 require 'java'
-require 'em_reactor'
+require 'rubyeventmachine'
 require 'socket'
 
 java_import java.io.FileDescriptor
@@ -59,17 +59,27 @@ SocketChannel.send :include, JavaFields
 module EventMachine
   # TODO: These event numbers are defined in way too many places.
   # DRY them up.
+  # @private
   TimerFired = 100
+  # @private
   ConnectionData = 101
+  # @private
   ConnectionUnbound = 102
+  # @private
   ConnectionAccepted = 103
+  # @private
   ConnectionCompleted = 104
+  # @private
   LoopbreakSignalled = 105
+  # @private
   ConnectionNotifyReadable = 106
+  # @private
   ConnectionNotifyWritable = 107
+  # @private
   SslHandshakeCompleted = 108
 
   # Exceptions that are defined in rubymain.cpp
+  class ConnectionError < RuntimeError; end
   class ConnectionNotBound < RuntimeError; end
   class UnknownTimerFired < RuntimeError; end
   class Unsupported < RuntimeError; end
@@ -117,7 +127,7 @@ module EventMachine
     @em.sendData sig, data.to_java_bytes
   end
   def self.send_datagram sig, data, length, address, port
-    @em.sendDatagram sig, data, length, address, port
+    @em.sendDatagram sig, data.to_java_bytes, length, address, port
   end
   def self.connect_server server, port
     bind_connect_server nil, nil, server, port
@@ -131,6 +141,10 @@ module EventMachine
   def self.set_comm_inactivity_timeout sig, interval
     @em.setCommInactivityTimeout sig, interval
   end
+  def self.set_pending_connect_timeout sig, val
+  end
+  def self.set_heartbeat_interval val
+  end
   def self.start_tls sig
     @em.startTls sig
   end
@@ -186,9 +200,10 @@ module EventMachine
   end
   def self.get_peername sig
     if peer = @em.getPeerName(sig)
-      Socket.pack_sockaddr_in *peer
+      Socket.pack_sockaddr_in(*peer)
     end
   end
+  # @private
   def self.attach_fd fileno, watch_mode
     # 3Aug09: We could pass in the actual SocketChannel, but then it would be modified (set as non-blocking), and
     # we would need some logic to make sure detach_fd below didn't clobber it. For now, we just always make a new
@@ -248,6 +263,13 @@ module EventMachine
     @em.getConnectionCount
   end
 
+  def self.set_tls_parms(sig, params)
+  end
+  def self.start_tls(sig)
+  end
+  def self.send_file_data(sig, filename)
+  end
+
   class Connection
     def associate_callback_target sig
       # No-op for the time being

data/tasks/package.rake

@@ -0,0 +1,98 @@
+require 'rake/gempackagetask'
+begin
+  require 'rake/extensiontask'
+  require 'rake/javaextensiontask'
+rescue LoadError => e
+  puts <<-MSG
+rake-compiler gem seems to be missing. Please install it with
+
+  gem install rake-compiler
+
+(add sudo if necessary).
+  MSG
+end
+
+Rake::GemPackageTask.new(GEMSPEC) do |pkg|
+end
+
+if RUBY_PLATFORM =~ /java/
+  Rake::JavaExtensionTask.new("rubyeventmachine", GEMSPEC) do |ext|
+    ext.ext_dir = 'java/src'
+  end
+else
+  def setup_cross_compilation(ext)
+    unless RUBY_PLATFORM =~ /mswin|mingw/
+      ext.cross_compile = true
+      ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+
+      # inject 1.8/1.9 pure-ruby entry point
+      ext.cross_compiling do |spec|
+        spec.files += ["lib/#{ext.name}.rb"]
+      end
+    end
+  end
+
+  Rake::ExtensionTask.new("rubyeventmachine", GEMSPEC) do |ext|
+    ext.ext_dir = 'ext'
+    ext.source_pattern = '*.{h,c,cpp}'
+    setup_cross_compilation(ext)
+  end
+  Rake::ExtensionTask.new("fastfilereaderext", GEMSPEC) do |ext|
+    ext.ext_dir = 'ext/fastfilereader'
+    ext.source_pattern = '*.{h,c,cpp}'
+    setup_cross_compilation(ext)
+  end
+end
+
+# Setup shim files that require 1.8 vs 1.9 extensions in win32 bin gems
+%w[ rubyeventmachine fastfilereaderext ].each do |filename|
+  file("lib/#{filename}.rb") do |t|
+    File.open(t.name, 'wb') do |f|
+      f.write <<-eoruby
+  RUBY_VERSION =~ /(\\d+.\\d+)/
+  require "\#{$1}/#{File.basename(t.name, '.rb')}"
+      eoruby
+    end
+    at_exit{ FileUtils.rm t.name if File.exists?(t.name) }
+  end
+end
+
+task :cross_cxx do
+  ENV['CROSS_COMPILING'] = 'yes'
+  require 'rake/extensioncompiler'
+  ENV['CXX'] = "#{Rake::ExtensionCompiler.mingw_host}-g++"
+end
+
+if Rake::Task.task_defined?(:cross)
+  task :cross => 'lib/rubyeventmachine.rb'
+  task :cross => 'lib/fastfilereaderext.rb'
+  task :cross => :cross_cxx
+end
+
+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
+
+Rake::Task[:clean].enhance [:clobber_package]
+
+namespace :gem do
+  desc 'Install gem (and sudo if required)'
+  task :install => :package do
+    gem_cmd(:install, "pkg/#{GEMSPEC.name}-#{GEMSPEC.version}.gem")
+  end
+
+  desc 'Uninstall gem (and sudo if required)'
+  task :uninstall do
+    gem_cmd(:uninstall, "#{GEMSPEC.name}", "-v=#{GEMSPEC.version}")
+  end
+end

data/tasks/test.rake

@@ -0,0 +1,8 @@
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "tests"
+  t.libs << "lib"
+  t.pattern = 'tests/**/test_*.rb'
+  t.warning = true
+end

data/tests/em_test_helper.rb

@@ -0,0 +1,64 @@
+require 'eventmachine'
+require 'test/unit'
+require 'rbconfig'
+require 'socket'
+
+class Test::Unit::TestCase
+  class EMTestTimeout < StandardError ; end
+
+  def setup_timeout(timeout = TIMEOUT_INTERVAL)
+    EM.schedule {
+      EM.add_timer(timeout) {
+        raise EMTestTimeout, "Test was cancelled after #{timeout} seconds."
+      }
+    }
+  end
+
+  def port_in_use?(port, host="127.0.0.1")
+    s = TCPSocket.new(host, port)
+    s.close
+    s
+  rescue Errno::ECONNREFUSED
+    false
+  end
+
+  def next_port
+    @@port ||= 9000
+    begin
+      @@port += 1
+    end while port_in_use?(@@port)
+
+    @@port
+  end
+
+  def exception_class
+    jruby? ? NativeException : RuntimeError
+  end
+
+  module PlatformHelper
+    # http://blog.emptyway.com/2009/11/03/proper-way-to-detect-windows-platform-in-ruby/
+    def windows?
+      RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+    end
+
+    # http://stackoverflow.com/questions/1342535/how-can-i-tell-if-im-running-from-jruby-vs-ruby/1685970#1685970
+    def jruby?
+      defined? JRUBY_VERSION
+    end
+  end
+
+  include PlatformHelper
+  extend PlatformHelper
+
+  # Tests run significantly slower on windows. YMMV
+  TIMEOUT_INTERVAL = windows? ? 1 : 0.25
+
+  def silent
+    backup, $VERBOSE = $VERBOSE, nil
+    begin
+      yield
+    ensure
+      $VERBOSE = backup
+    end
+  end
+end

data/tests/test_attach.rb

@@ -1,31 +1,7 @@
-# $Id$
-#
-#----------------------------------------------------------------------------
-#
-# Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
-# Gmail: blackhedd
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 1) the GNU General Public License
-# as published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version; or 2) Ruby's License.
-#
-# See the file COPYING for complete licensing information.
-#
-#---------------------------------------------------------------------------
-#
-
-$:.unshift "../lib"
-require 'eventmachine'
+require 'em_test_helper'
 require 'socket'
-require 'test/unit'
-
 
 class TestAttach < Test::Unit::TestCase
-
-  Host = "127.0.0.1"
-  Port = 9550
-
   class EchoServer < EM::Connection
     def receive_data data
       send_data data
@@ -33,37 +9,51 @@ class TestAttach < Test::Unit::TestCase
   end
 
   class EchoClient < EM::Connection
-    def initialize
+    def initialize socket
       self.notify_readable = true
-      $sock.write("abc\n")
+      @socket = socket
+      @socket.write("abc\n")
     end
 
     def notify_readable
-      $read = $sock.readline
+      $read = @socket.readline
       $fd = detach
     end
 
     def unbind
       EM.next_tick do
-        $sock.write("def\n")
-        EM.add_timer(0.5){ EM.stop }
+        @socket.write("def\n")
+        EM.add_timer(0.1) { EM.stop }
       end
     end
   end
 
+  def setup
+    @port = next_port
+    $read, $r, $w, $fd = nil
+  end
+
+  def teardown
+    [$r, $w].each do |io|
+      io.close rescue nil
+    end
+  end
+
   def test_attach
-    EM.run{
-      EM.start_server Host, Port, EchoServer
-      $sock = TCPSocket.new Host, Port
-      EM.watch $sock, EchoClient
+    socket = nil
+
+    EM.run {
+      EM.start_server "127.0.0.1", @port, EchoServer
+      socket = TCPSocket.new "127.0.0.1", @port
+      EM.watch socket, EchoClient, socket
     }
 
     assert_equal $read, "abc\n"
-    unless defined? JRuby # jruby filenos are not real
-      assert_equal $fd, $sock.fileno
+    unless jruby? # jruby filenos are not real
+      assert_equal $fd, socket.fileno
     end
-    assert_equal false, $sock.closed?
-    assert_equal $sock.readline, "def\n"
+    assert_equal false, socket.closed?
+    assert_equal socket.readline, "def\n"
   end
 
   module PipeWatch
@@ -86,41 +76,51 @@ class TestAttach < Test::Unit::TestCase
   end
 
   def test_set_readable
+    before, after = nil
+
     EM.run{
       $r, $w = IO.pipe
-      c = EM.watch $r, PipeWatch do |c|
-        c.notify_readable = false
+      c = EM.watch $r, PipeWatch do |con|
+        con.notify_readable = false
       end
 
       EM.next_tick{
-        $before = c.notify_readable?
+        before = c.notify_readable?
         c.notify_readable = true
-        $after = c.notify_readable?
+        after = c.notify_readable?
       }
 
       $w.write("jkl\n")
     }
 
-    assert !$before
-    assert $after
+    assert !before
+    assert after
     assert_equal $read, "jkl\n"
   end
 
-  module PipeReader
-    def receive_data data
-      $read = data
-      EM.stop
+  def test_read_write_pipe
+    result = nil
+
+    pipe_reader = Module.new do
+      define_method :receive_data do |data|
+        result = data
+        EM.stop
+      end
     end
-  end
 
-  def test_read_write_pipe
-    EM.run{
-      $r, $w = IO.pipe
-      EM.attach $r, PipeReader
-      writer = EM.attach($w)
+    r,w = IO.pipe
+
+    EM.run {
+      EM.attach r, pipe_reader
+      writer = EM.attach(w)
       writer.send_data 'ghi'
+
+      # XXX: Process will hang in Windows without this line
+      writer.close_connection_after_writing
     }
 
-    assert_equal $read, "ghi"
+    assert_equal "ghi", result
+  ensure
+    [r,w].each {|io| io.close rescue nil }
   end
-end
+end