eventmachine 1.0.9.1-java → 1.2.0.1-java

data/tests/test_ssl_verify.rb

@@ -6,6 +6,21 @@ class TestSslVerify < Test::Unit::TestCase
     $cert_from_file = File.read($dir+'client.crt')
   end
 
+  module ClientNoCert
+    def connection_completed
+      start_tls()
+    end
+
+    def ssl_handshake_completed
+      $client_handshake_completed = true
+      close_connection
+    end
+
+    def unbind
+      EM.stop_event_loop
+    end
+  end
+
   module Client
     def connection_completed
       start_tls(:private_key_file => $dir+'client.key', :cert_chain_file => $dir+'client.crt')
@@ -52,6 +67,35 @@ class TestSslVerify < Test::Unit::TestCase
     end
   end
 
+  module FailServerNoPeerCert
+    def post_init
+      start_tls(:verify_peer => true, :fail_if_no_peer_cert => true)
+    end
+
+    def ssl_verify_peer(cert)
+      raise "Verify peer should not get called for a client without a certificate"
+    end
+
+    def ssl_handshake_completed
+      $server_handshake_completed = true
+    end
+  end
+
+  def test_fail_no_peer_cert
+    omit_unless(EM.ssl?)
+    omit_if(rbx?)
+
+    $client_handshake_completed, $server_handshake_completed = false, false
+
+    EM.run {
+      EM.start_server("127.0.0.1", 16784, FailServerNoPeerCert)
+      EM.connect("127.0.0.1", 16784, ClientNoCert)
+    }
+
+    assert(!$client_handshake_completed)
+    assert(!$server_handshake_completed)
+  end
+
   def test_accept_server
     omit_unless(EM.ssl?)
     omit_if(rbx?)

data/tests/test_system.rb

@@ -9,6 +9,8 @@ class TestSystem < Test::Unit::TestCase
   end
 
   def test_system
+    omit_if(windows?)
+
     result = nil
     status = nil
     EM.run {
@@ -23,6 +25,8 @@ class TestSystem < Test::Unit::TestCase
   end
 
   def test_system_with_string
+    omit_if(windows?)
+
     result = nil
     status = nil
     EM.run {

data/tests/test_unbind_reason.rb

@@ -20,12 +20,14 @@ class TestUnbindReason < Test::Unit::TestCase
           EM.stop
         end
       }
-      conn.pending_connect_timeout = 0.1
+      conn.pending_connect_timeout = TIMEOUT_INTERVAL
     }
     assert_equal Errno::ETIMEDOUT, error
   end
 
   def test_connect_refused
+    pend('FIXME: this test is broken on Windows') if windows?
+
     error = nil
     EM.run {
       EM.connect '127.0.0.1', 12388, Module.new{ |m|
@@ -39,6 +41,8 @@ class TestUnbindReason < Test::Unit::TestCase
   end
 
   def test_optional_argument
+    pend('FIXME: this test is broken on Windows') if windows?
+
     conn = nil
     EM.run {
       conn = EM.connect '127.0.0.1', 12388, StubConnection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine
 version: !ruby/object:Gem::Version
-  version: 1.0.9.1
+  version: 1.2.0.1
 platform: java
 authors:
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.5
   name: rake-compiler
   prerelease: false
   type: :development
@@ -38,22 +38,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.5.2
-  name: yard
+        version: 0.5.1
+  name: rake-compiler-dock
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.5.2
-description: |-
+        version: 0.5.1
+description: |
   EventMachine implements a fast, single-threaded engine for arbitrary network
   communications. It's extremely easy to use in Ruby. EventMachine wraps all
   interactions with IP sockets, allowing programs to concentrate on the
@@ -86,15 +86,10 @@ extra_rdoc_files:
 - docs/old/SPAWNED_PROCESSES
 - docs/old/TODO
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
 - GNU
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - docs/DocumentationGuidesIndex.md
 - docs/GettingStarted.md
 - docs/old/ChangeLog
@@ -109,7 +104,6 @@ files:
 - docs/old/SMTP
 - docs/old/SPAWNED_PROCESSES
 - docs/old/TODO
-- eventmachine.gemspec
 - examples/guides/getting_started/01_eventmachine_echo_server.rb
 - examples/guides/getting_started/02_eventmachine_echo_server_that_recognizes_exit_command.rb
 - examples/guides/getting_started/03_simple_chat_server.rb
@@ -193,11 +187,11 @@ files:
 - lib/eventmachine.rb
 - lib/jeventmachine.rb
 - lib/rubyeventmachine.jar
-- rakelib/cpp.rake_example
 - rakelib/package.rake
 - rakelib/test.rake
 - tests/client.crt
 - tests/client.key
+- tests/dhparam.pem
 - tests/em_test_helper.rb
 - tests/test_attach.rb
 - tests/test_basic.rb
@@ -211,6 +205,7 @@ files:
 - tests/test_error_handler.rb
 - tests/test_exc.rb
 - tests/test_file_watch.rb
+- tests/test_fork.rb
 - tests/test_futures.rb
 - tests/test_get_sock_opt.rb
 - tests/test_handler_check.rb
@@ -219,6 +214,8 @@ files:
 - tests/test_httpclient2.rb
 - tests/test_idle_connection.rb
 - tests/test_inactivity_timeout.rb
+- tests/test_ipv4.rb
+- tests/test_ipv6.rb
 - tests/test_iterator.rb
 - tests/test_kb.rb
 - tests/test_line_protocol.rb
@@ -246,7 +243,11 @@ files:
 - tests/test_smtpserver.rb
 - tests/test_spawn.rb
 - tests/test_ssl_args.rb
+- tests/test_ssl_dhparam.rb
+- tests/test_ssl_ecdh_curve.rb
+- tests/test_ssl_extensions.rb
 - tests/test_ssl_methods.rb
+- tests/test_ssl_protocols.rb
 - tests/test_ssl_verify.rb
 - tests/test_stomp.rb
 - tests/test_system.rb
@@ -258,7 +259,7 @@ files:
 homepage: http://rubyeventmachine.com
 licenses:
 - Ruby
-- GPL
+- GPL-2.0
 metadata: {}
 post_install_message:
 rdoc_options:
@@ -283,9 +284,89 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: eventmachine
+rubyforge_project:
 rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Ruby/EventMachine library
-test_files: []
+test_files:
+- examples/guides/getting_started/01_eventmachine_echo_server.rb
+- examples/guides/getting_started/02_eventmachine_echo_server_that_recognizes_exit_command.rb
+- examples/guides/getting_started/03_simple_chat_server.rb
+- examples/guides/getting_started/04_simple_chat_server_step_one.rb
+- examples/guides/getting_started/05_simple_chat_server_step_two.rb
+- examples/guides/getting_started/06_simple_chat_server_step_three.rb
+- examples/guides/getting_started/07_simple_chat_server_step_four.rb
+- examples/guides/getting_started/08_simple_chat_server_step_five.rb
+- examples/old/ex_channel.rb
+- examples/old/ex_queue.rb
+- examples/old/ex_tick_loop_array.rb
+- examples/old/ex_tick_loop_counter.rb
+- examples/old/helper.rb
+- tests/client.crt
+- tests/client.key
+- tests/dhparam.pem
+- tests/em_test_helper.rb
+- tests/test_attach.rb
+- tests/test_basic.rb
+- tests/test_channel.rb
+- tests/test_completion.rb
+- tests/test_connection_count.rb
+- tests/test_connection_write.rb
+- tests/test_defer.rb
+- tests/test_deferrable.rb
+- tests/test_epoll.rb
+- tests/test_error_handler.rb
+- tests/test_exc.rb
+- tests/test_file_watch.rb
+- tests/test_fork.rb
+- tests/test_futures.rb
+- tests/test_get_sock_opt.rb
+- tests/test_handler_check.rb
+- tests/test_hc.rb
+- tests/test_httpclient.rb
+- tests/test_httpclient2.rb
+- tests/test_idle_connection.rb
+- tests/test_inactivity_timeout.rb
+- tests/test_ipv4.rb
+- tests/test_ipv6.rb
+- tests/test_iterator.rb
+- tests/test_kb.rb
+- tests/test_line_protocol.rb
+- tests/test_ltp.rb
+- tests/test_ltp2.rb
+- tests/test_many_fds.rb
+- tests/test_next_tick.rb
+- tests/test_object_protocol.rb
+- tests/test_pause.rb
+- tests/test_pending_connect_timeout.rb
+- tests/test_pool.rb
+- tests/test_process_watch.rb
+- tests/test_processes.rb
+- tests/test_proxy_connection.rb
+- tests/test_pure.rb
+- tests/test_queue.rb
+- tests/test_resolver.rb
+- tests/test_running.rb
+- tests/test_sasl.rb
+- tests/test_send_file.rb
+- tests/test_servers.rb
+- tests/test_set_sock_opt.rb
+- tests/test_shutdown_hooks.rb
+- tests/test_smtpclient.rb
+- tests/test_smtpserver.rb
+- tests/test_spawn.rb
+- tests/test_ssl_args.rb
+- tests/test_ssl_dhparam.rb
+- tests/test_ssl_ecdh_curve.rb
+- tests/test_ssl_extensions.rb
+- tests/test_ssl_methods.rb
+- tests/test_ssl_protocols.rb
+- tests/test_ssl_verify.rb
+- tests/test_stomp.rb
+- tests/test_system.rb
+- tests/test_threaded_resource.rb
+- tests/test_tick_loop.rb
+- tests/test_timers.rb
+- tests/test_ud.rb
+- tests/test_unbind_reason.rb

data/.gitignore

@@ -1,21 +0,0 @@
-pkg
-rdoc
-Makefile
-
-*.bundle
-*.dll
-*.so
-*.jar
-*.class
-*.o
-*.log
-*.def
-*.pdb
-*.dSYM
-java/src/.project
-*.rbc
-Gemfile.lock
-
-.yardoc/*
-doc/*
-

data/.travis.yml

@@ -1,22 +0,0 @@
-script: bundle exec rake compile test
-env:
-  global:
-    - TESTOPTS=-v
-language: ruby
-sudo: false
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - rbx
-  - jruby
-matrix:
-  allow_failures:
-    - rvm: rbx
-    - rvm: jruby
-  include:
-    - rvm: 2.0.0
-      os: osx

data/.yardopts

@@ -1,7 +0,0 @@
---no-private
---protected
---markup="markdown" lib/**/*.rb
---main README.md
---exclude jeventmachine --exclude pure_ruby
--
-docs/*.md

data/Gemfile

@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gemspec

data/Rakefile

@@ -1,20 +0,0 @@
-require 'rubygems'
-GEMSPEC = Gem::Specification.load('eventmachine.gemspec')
-
-require 'rake/clean'
-task :clobber => :clean
-
-desc "Build eventmachine, then run tests."
-task :default => [:compile, :test]
-
-desc 'Generate documentation'
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do |t|
-    t.files   = ['lib/**/*.rb', '-', 'docs/*.md']
-    t.options = ['--main', 'README.md', '--no-private']
-    t.options = ['--exclude', 'lib/jeventmachine', '--exclude', 'lib/pr_eventmachine']
-  end
-rescue LoadError
-  task :yard do puts "Please install yard first!"; end
-end

data/eventmachine.gemspec

@@ -1,38 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
-require "em/version"
-
-
-Gem::Specification.new do |s|
-  s.name = 'eventmachine'
-  s.version = EventMachine::VERSION
-  s.homepage = 'http://rubyeventmachine.com'
-  s.rubyforge_project = 'eventmachine'
-  s.licenses = ["Ruby", "GPL"]
-
-  s.authors = ["Francis Cianfrocca", "Aman Gupta"]
-  s.email   = ["garbagecat10@gmail.com", "aman@tmm1.net"]
-
-  s.files = `git ls-files`.split("\n")
-  s.extensions = ["ext/extconf.rb", "ext/fastfilereader/extconf.rb"]
-
-  s.add_development_dependency 'test-unit', '~> 2.0'
-  s.add_development_dependency 'rake-compiler', '~> 0.8.3'
-  s.add_development_dependency 'yard', ">= 0.8.5.2"
-  s.add_development_dependency 'bluecloth' unless RUBY_PLATFORM =~ /java/
-
-  s.summary = 'Ruby/EventMachine library'
-  s.description = "EventMachine implements a fast, single-threaded engine for arbitrary network
-communications. It's extremely easy to use in Ruby. EventMachine wraps all
-interactions with IP sockets, allowing programs to concentrate on the
-implementation of network protocols. It can be used to create both network
-servers and clients. To create a server or client, a Ruby program only needs
-to specify the IP address and port, and provide a Module that implements the
-communications protocol. Implementations of several standard network protocols
-are provided with the package, primarily to serve as examples. The real goal
-of EventMachine is to enable programs to easily interface with other programs
-using TCP/IP, especially if custom protocols are required."
-
-  s.rdoc_options = ["--title", "EventMachine", "--main", "README.md", "-x", "lib/em/version", "-x", "lib/jeventmachine"]
-  s.extra_rdoc_files = ["README.md"] + `git ls-files -- docs/*`.split("\n")
-end

data/rakelib/cpp.rake_example

@@ -1,77 +0,0 @@
-# EventMachine C++ Rakefile Stab Case
-# TODO : track header files as a build dependency...
-# TODO : cross platform support
-# TODO : configure style functionality
-namespace :cpp do
-
-  require 'rake/clean'
-
-  # *nix only atm...
-  module Cpp
-    class <<self
-      def cpp; "g++"; end
-      def archive; "ar"; end
-      def compile file, output, includes=nil, flags=nil
-        sh %{#{cpp} #{file} #{includes} #{flags} -c -o #{output}}
-      end
-      def link file, output, libs=nil, flags=nil
-        sh %{#{cpp} #{file} #{libs} #{flags} -o #{output}}
-      end
-      def static output, files
-        sh %{#{archive} cr #{output} #{files}}
-      end
-    end
-  end
-
-  module EmConfig
-    Path = ENV['EVENTMACHINE_SOURCE'] || 'ext'
-    Sources = FileList["#{Path}/*.cpp"]
-    Sources.delete_if { |s| /ruby/ =~ s }
-    Compiled = Sources.sub(%r{^#{Path}/(.*)\.cpp}, "#{Path}/\\1.o")
-
-    Flags = "-O2 -pipe -fno-common -DOS_UNIX -DWITHOUT_SSL"
-    Includes = ""
-    Libs = ''
-  end
-  CLEAN.include(EmConfig::Compiled)
-
-  rule %r{^#{EmConfig::Path}/.*\.o$} => [proc { |targ| 
-    targ.sub(%r{^#{EmConfig::Path}/(.*)\.o$}, "#{EmConfig::Path}/\\1.cpp")
-    }] do |t|
-    Cpp.compile t.source, t.name, EmConfig::Includes, EmConfig::Flags
-  end
-
-  file "#{EmConfig::Path}/libeventmachine.a" => EmConfig::Compiled do |t|
-    Cpp.static t.name, EmConfig::Compiled
-  end
-  CLEAN.include("#{EmConfig::Path}/libeventmachine.a")
-
-  module AppConfig
-    Appname = 'echo_em'
-    Sources = FileList['*.cpp']
-    Compiled = Sources.sub(%r{^(.*)\.cpp}, '\\1.o')
-
-    Flags = ["", EmConfig::Flags].join(' ')
-    Includes = ["-I. -I#{EmConfig::Path}", EmConfig::Includes].join(' ')
-    Libs = ["-L#{EmConfig::Path} -leventmachine", EmConfig::Libs].join(' ')
-  end
-  CLEAN.include(AppConfig::Compiled)
-  CLEAN.include(AppConfig::Appname)
-
-  rule %r{^.*\.o$} => [proc { |targ| 
-    targ.sub(%r{^(.*)\.o$}, '\\1.cpp')
-    }] do |t|
-    Cpp.compile t.source, t.name, AppConfig::Includes, AppConfig::Flags
-  end
-
-  file AppConfig::Appname => ["#{EmConfig::Path}/libeventmachine.a", AppConfig::Compiled] do |t|
-    Cpp.link AppConfig::Compiled, t.name, AppConfig::Libs, AppConfig::Flags
-  end
-
-  task :build => AppConfig::Appname
-
-  task :run => AppConfig::Appname do
-    sh "./#{AppConfig::Appname}"
-  end
-
-end