eventmachine 1.0.0.beta.1 → 1.0.0.beta.2

data/ext/eventmachine.h

@@ -97,7 +97,6 @@ extern "C" {
 	float evma_get_heartbeat_interval();
 	int evma_set_heartbeat_interval(float);
 
-	const unsigned long evma__write_file (const char *filename);
 	const unsigned long evma_popen (char * const*cmd_strings);
 
 	const unsigned long evma_watch_filename (const char *fname);

data/ext/extconf.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'mkmf'
 
 def check_libs libs = [], fatal = false
@@ -12,12 +13,63 @@ def add_define(name)
   $defs.push("-D#{name}")
 end
 
+##
+# OpenSSL:
+
+# override append_library, so it actually appends (instead of prepending)
+# this fixes issues with linking ssl, since libcrypto depends on symbols in libssl
+def append_library(libs, lib)
+  libs + " " + format(LIBARG, lib)
+end
+
+def manual_ssl_config
+  ssl_libs_heads_args = {
+    :unix => [%w[ssl crypto], %w[openssl/ssl.h openssl/err.h]],
+    :mswin => [%w[ssleay32 libeay32], %w[openssl/ssl.h openssl/err.h]],
+  }
+
+  dc_flags = ['ssl']
+  dc_flags += ["#{ENV['OPENSSL']}/include", ENV['OPENSSL']] if /linux/ =~ RUBY_PLATFORM and ENV['OPENSSL']
+
+  libs, heads = case RUBY_PLATFORM
+  when /mswin/    ; ssl_libs_heads_args[:mswin]
+  else              ssl_libs_heads_args[:unix]
+  end
+  dir_config(*dc_flags)
+  check_libs(libs) and check_heads(heads)
+end
+
+if ENV['CROSS_COMPILING']
+  openssl_dir = File.expand_path("~/.rake-compiler/builds/openssl-1.0.0a/")
+  if File.exists?(openssl_dir)
+    FileUtils.mkdir_p Dir.pwd+"/openssl/"
+    FileUtils.cp Dir[openssl_dir+"/include/openssl/*.h"], Dir.pwd+"/openssl/", :verbose => true
+    FileUtils.cp Dir[openssl_dir+"/lib*.a"], Dir.pwd, :verbose => true
+    $INCFLAGS << " -I#{Dir.pwd}" # for the openssl headers
+  else
+    STDERR.puts
+    STDERR.puts "**************************************************************************************"
+    STDERR.puts "**** Cross-compiled OpenSSL not found"
+    STDERR.puts "**** Run: hg clone http://bitbucket.org/ged/ruby-pg && cd ruby-pg && rake openssl_libs"
+    STDERR.puts "**************************************************************************************"
+    STDERR.puts
+  end
+end
+
+# Try to use pkg_config first, fixes #73
+if pkg_config('openssl') || manual_ssl_config
+  add_define "WITH_SSL"
+else
+  add_define "WITHOUT_SSL"
+end
+
 add_define 'BUILD_FOR_RUBY'
 add_define 'HAVE_RBTRAP' if have_var('rb_trap_immediate', ['ruby.h', 'rubysig.h'])
 add_define "HAVE_TBR" if have_func('rb_thread_blocking_region')# and have_macro('RUBY_UBF_IO', 'ruby.h')
 add_define "HAVE_INOTIFY" if inotify = have_func('inotify_init', 'sys/inotify.h')
 add_define "HAVE_OLD_INOTIFY" if !inotify && have_macro('__NR_inotify_init', 'sys/syscall.h')
 add_define 'HAVE_WRITEV' if have_func('writev', 'sys/uio.h')
+
 have_func('rb_thread_check_ints')
 have_func('rb_time_new')
 
@@ -81,19 +133,6 @@ when /darwin/
 when /linux/
   add_define 'HAVE_EPOLL' if have_func('epoll_create', 'sys/epoll.h')
 
-  # Original epoll test is inadequate because 2.4 kernels have the header
-  # but not the code.
-  # add_define 'HAVE_EPOLL' if have_header('sys/epoll.h')
-  # if have_header('sys/epoll.h')
-  #   File.open("hasEpollTest.c", "w") {|f|
-  #     f.puts "#include <sys/epoll.h>"
-  #     f.puts "int main() { epoll_create(1024); return 0;}"
-  #   }
-  #   (e = system( "gcc hasEpollTest.c -o hasEpollTest " )) and (e = $?.to_i)
-  #   `rm -f hasEpollTest.c hasEpollTest`
-  #   add_define 'HAVE_EPOLL' if e == 0
-  # end
-
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
 
@@ -105,38 +144,6 @@ else
   CONFIG['LDSHARED'] = "$(CXX) -shared"
 end
 
-# OpenSSL:
-
-def manual_ssl_config
-  ssl_libs_heads_args = {
-    :unix => [%w[ssl crypto], %w[openssl/ssl.h openssl/err.h]],
-    :darwin => [%w[ssl crypto C], %w[openssl/ssl.h openssl/err.h]],
-    # openbsd and linux:
-    :crypto_hack => [%w[crypto ssl crypto], %w[openssl/ssl.h openssl/err.h]],
-    :mswin => [%w[ssleay32 libeay32], %w[openssl/ssl.h openssl/err.h]],
-  }
-
-  dc_flags = ['ssl']
-  dc_flags += ["#{ENV['OPENSSL']}/include", ENV['OPENSSL']] if /linux/ =~ RUBY_PLATFORM
-
-  libs, heads = case RUBY_PLATFORM
-  when /mswin/    ; ssl_libs_heads_args[:mswin]
-  when /mingw/    ; ssl_libs_heads_args[:unix]
-  when /darwin/   ; ssl_libs_heads_args[:darwin]
-  when /openbsd/  ; ssl_libs_heads_args[:crypto_hack]
-  when /linux/    ; ssl_libs_heads_args[:crypto_hack]
-  else              ssl_libs_heads_args[:unix]
-  end
-  dir_config(*dc_flags)
-  check_libs(libs) and check_heads(heads)
-end
-
-# Try to use pkg_config first, fixes #73
-if pkg_config('openssl') || manual_ssl_config
-  add_define "WITH_SSL"
-else
-  add_define "WITHOUT_SSL"
-end
 
 # solaris c++ compiler doesn't have make_pair()
 TRY_LINK.sub!('$(CC)', '$(CXX)')
@@ -147,4 +154,4 @@ add_define 'HAVE_MAKE_PAIR' if try_link(<<SRC, '-lstdc++')
 SRC
 TRY_LINK.sub!('$(CXX)', '$(CC)')
 
-create_makefile "rubyeventmachine"
+create_makefile "rubyeventmachine"

data/ext/project.h

@@ -147,13 +147,9 @@ extern "C" {
 
 #include "binder.h"
 #include "em.h"
-#include "epoll.h"
-#include "sigs.h"
 #include "ed.h"
-#include "files.h"
 #include "page.h"
 #include "ssl.h"
 #include "eventmachine.h"
-#include "eventmachine_cpp.h"
 
 #endif // __Project__H_

data/ext/rubymain.cpp

@@ -737,18 +737,6 @@ static VALUE t_setuid_string (VALUE self, VALUE username)
 
 
 
-/*************
-t__write_file
-*************/
-
-static VALUE t__write_file (VALUE self, VALUE filename)
-{
-	const unsigned long f = evma__write_file (StringValuePtr (filename));
-	if (!f)
-		rb_raise (rb_eRuntimeError, "file not opened");
-	return ULONG2NUM (f);
-}
-
 /**************
 t_invoke_popen
 **************/
@@ -1172,9 +1160,6 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "get_heartbeat_interval", (VALUE(*)(...))t_get_heartbeat_interval, 0);
 	rb_define_module_function (EmModule, "set_heartbeat_interval", (VALUE(*)(...))t_set_heartbeat_interval, 1);
 
-	// Provisional:
-	rb_define_module_function (EmModule, "_write_file", (VALUE(*)(...))t__write_file, 1);
-
 	rb_define_module_function (EmModule, "get_peername", (VALUE(*)(...))t_get_peername, 1);
 	rb_define_module_function (EmModule, "get_sockname", (VALUE(*)(...))t_get_sockname, 1);
 	rb_define_module_function (EmModule, "get_subprocess_pid", (VALUE(*)(...))t_get_subprocess_pid, 1);

data/lib/em/pure_ruby.rb

@@ -1007,6 +1007,7 @@ module EventMachine
   end
 end
 
-#--------------------------------------------------------------
-
+# load base EM api on top, now that we have the underlying pure ruby
+# implementation defined
+require 'eventmachine'
 

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.0.0.beta.1"
+  VERSION = "1.0.0.beta.2"
 end

data/lib/eventmachine.rb

@@ -1,6 +1,8 @@
 if RUBY_PLATFORM =~ /java/
   require 'java'
   require 'jeventmachine'
+elsif defined?(EventMachine.library_type) and EventMachine.library_type == :pure_ruby
+  # assume 'em/pure_ruby' was loaded already
 else
   begin
     require 'rubyeventmachine'

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

data/tasks/doc.rake

@@ -0,0 +1,30 @@
+rdoc_task_type = begin
+  require 'rdoc/task'
+  RDoc::Task
+rescue LoadError
+  require 'rake/rdoctask'
+  Rake::RDocTask
+end
+
+df = begin; require 'rdoc/rdoc'; require 'rdoc/generator/darkfish'; true; rescue LoadError; end
+
+rdtask = rdoc_task_type.new do |rd|
+  rd.title = GEMSPEC.name
+  rd.rdoc_dir = 'rdoc'
+  rd.main = "README"
+  rd.rdoc_files.include("lib/**/*.rb", *GEMSPEC.extra_rdoc_files)
+  rd.rdoc_files.exclude(*%w(lib/em/version lib/emva lib/evma/ lib/pr_eventmachine lib/jeventmachine))
+  rd.template = 'darkfish' if df
+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

data/tasks/package.rake

@@ -0,0 +1,85 @@
+require 'rake/gempackagetask'
+require 'rake/extensiontask'
+require 'rake/javaextensiontask'
+
+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'
+    setup_cross_compilation(ext)
+  end
+  Rake::ExtensionTask.new("fastfilereaderext", GEMSPEC) do |ext|
+    ext.ext_dir = 'ext/fastfilereader'
+    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'
+  ENV['CXX'] = 'i386-mingw32-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,6 @@
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.pattern = 'tests/**/test_*.rb'
+  t.warning = true
+end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 1
-  version: 1.0.0.beta.1
+  - 2
+  version: 1.0.0.beta.2
 platform: ruby
 authors: 
 - Francis Cianfrocca
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-13 00:00:00 -06:00
+date: 2010-11-13 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,32 +81,22 @@ files:
 - ext/binder.cpp
 - ext/binder.h
 - ext/cmain.cpp
-- ext/cplusplus.cpp
 - ext/ed.cpp
 - ext/ed.h
 - ext/em.cpp
 - ext/em.h
-- ext/emwin.cpp
-- ext/emwin.h
-- ext/epoll.cpp
-- ext/epoll.h
 - ext/eventmachine.h
-- ext/eventmachine_cpp.h
 - ext/extconf.rb
 - ext/fastfilereader/extconf.rb
 - ext/fastfilereader/mapper.cpp
 - ext/fastfilereader/mapper.h
 - ext/fastfilereader/rubymain.cpp
-- ext/files.cpp
-- ext/files.h
 - ext/kb.cpp
 - ext/page.cpp
 - ext/page.h
 - ext/pipe.cpp
 - ext/project.h
 - ext/rubymain.cpp
-- ext/sigs.cpp
-- ext/sigs.h
 - ext/ssl.cpp
 - ext/ssl.h
 - java/.classpath
@@ -116,18 +106,6 @@ files:
 - java/src/com/rubyeventmachine/EventableChannel.java
 - java/src/com/rubyeventmachine/EventableDatagramChannel.java
 - java/src/com/rubyeventmachine/EventableSocketChannel.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
-- java/src/com/rubyeventmachine/tests/TestDatagrams.java
-- java/src/com/rubyeventmachine/tests/TestServers.java
-- java/src/com/rubyeventmachine/tests/TestTimers.java
 - lib/em/buftok.rb
 - lib/em/callback.rb
 - lib/em/channel.rb
@@ -163,15 +141,12 @@ files:
 - lib/em/timers.rb
 - lib/em/version.rb
 - lib/eventmachine.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
 - setup.rb
 - tasks/cpp.rake_example
+- tasks/doc.rake
+- tasks/package.rake
+- tasks/test.rake
 - tests/client.crt
 - tests/client.key
 - tests/test_attach.rb
@@ -231,10 +206,6 @@ rdoc_options:
 - -x
 - lib/em/version
 - -x
-- lib/emva
-- -x
-- lib/evma/
-- -x
 - lib/jeventmachine
 require_paths: 
 - lib