cool.io 1.4.1-x86-mingw32 → 1.4.4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6642bffcf0b40c0f50f0e8429748e4deda9988b
-  data.tar.gz: 8d90a3f730addf0a28bfb5f4a4d5e2a39b8cc4fa
+  metadata.gz: f5d948e37a0e1e67a5cc3c5ea1ce245978b49d53
+  data.tar.gz: b2e5066e7e85a8e3953fec44e48cbfb95475a85b
 SHA512:
-  metadata.gz: 4599d50e5cae6df39e5ed72e0410eb322ffa36747d34c7fde13655dfca4831dfd2d95d9a5158fee846150c73cd478ec8241b52caf74e9371c4711e674189ac3e
-  data.tar.gz: d2c3277b5fce654234033ad3a97d60c94ab8e1b80d2ed8cc7300fed171ba89ac04ed933db919d1d94245530437af1deab9568b1cbc5c9bcf19e1cc5c280f6be6
+  metadata.gz: fa5d5fa45b27b83b1a6a208c18564313115bd92e3dfd0b6a6fe20bac25ee35e8f57ddc47d0d68c242cecbf7a5c5a167350a613133df3c69966c23553172dd758
+  data.tar.gz: 8d5ac92a7adad338669cffcb4c9d02c2e70cf4e85f167ad5fbc8f248086176f1af7a30130c5d7f03b51fdecf2683eef3d10ee802a443f599d9049f4e27458508

data/.travis.yml

@@ -1,13 +1,17 @@
 language: ruby
 
+sudo: false
+
 rvm:
   - 1.9.3
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - ruby-head
   - rbx
 
 matrix:
   allow_failures:
+    - rvm: ruby-head
     - rvm: rbx

data/CHANGES.md

@@ -1,3 +1,19 @@
+1.4.4
+-----
+
+* Suppress lots of warnings
+
+1.4.3
+-----
+
+* Use accept instead of accept_nonblock on Windows to avoid thundering held problem
+* Fix compilation error on Solaris and Ruby 2.3.0
+
+1.4.2
+-----
+
+* Add unexpected object info to attach exception message
+
 1.4.1
 -----
 

data/Rakefile

@@ -49,7 +49,7 @@ namespace :build do
     require 'rake_compiler_dock'
     RakeCompilerDock.sh <<-CROSS
       bundle
-      rake cross native gem RUBY_CC_VERSION='2.0.0:2.1.6:2.2.2'
+      rake cross native gem RUBY_CC_VERSION='2.0.0:2.1.6:2.2.2:2.3.0'
     CROSS
   end
 end

data/appveyor.yml

@@ -0,0 +1,18 @@
+---
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem --version
+  - bundle install
+build: off
+test_script:
+  - bundle exec rake -rdevkit
+
+environment:
+  matrix:
+    - ruby_version: "200"
+    - ruby_version: "200-x64"
+    - ruby_version: "21"
+    - ruby_version: "21-x64"
+    - ruby_version: "22"
+    - ruby_version: "22-x64"

data/cool.io.gemspec

@@ -2,11 +2,6 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "cool.io/version"
 
-module Cool
-  # Allow Coolio module to be referenced as Cool.io
-  def self.io; Coolio; end
-end
-
 Gem::Specification.new do |s|
   s.name        = "cool.io"
   s.version     = Coolio::VERSION
@@ -21,9 +16,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_development_dependency "rake-compiler", "~> 0.9.5"
-  s.add_development_dependency "rake-compiler-dock", "~> 0.4.3"
+  s.add_development_dependency "rake-compiler-dock", "~> 0.5.1"
   s.add_development_dependency "rspec", ">= 2.13.0"
   s.add_development_dependency "rdoc", ">= 3.6.0"
 end

data/ext/cool.io/extconf.rb

@@ -42,6 +42,11 @@ else
   end
 end
 
+if RUBY_PLATFORM =~ /solaris/
+  # libev/ev.c requires NSIG which is undefined if _XOPEN_SOURCE is defined
+  $defs << '-D__EXTENSIONS__'
+end
+
 $LIBS << ' ' << libs.join(' ')
 
 dir_config('cool.io_ext')

data/ext/cool.io/loop.c

@@ -18,7 +18,6 @@ static VALUE Coolio_Loop_allocate(VALUE klass);
 static void Coolio_Loop_mark(struct Coolio_Loop *loop);
 static void Coolio_Loop_free(struct Coolio_Loop *loop);
 
-static VALUE Coolio_Loop_initialize(VALUE self);
 static VALUE Coolio_Loop_ev_loop_new(VALUE self, VALUE flags);
 static VALUE Coolio_Loop_run_once(int argc, VALUE *argv, VALUE self);
 static VALUE Coolio_Loop_run_nonblock(VALUE self);
@@ -43,8 +42,7 @@ void Init_coolio_loop()
   mCoolio = rb_define_module("Coolio");
   cCoolio_Loop = rb_define_class_under(mCoolio, "Loop", rb_cObject);
   rb_define_alloc_func(cCoolio_Loop, Coolio_Loop_allocate);
- 
-  rb_define_method(cCoolio_Loop, "initialize", Coolio_Loop_initialize, 0);
+
   rb_define_private_method(cCoolio_Loop, "ev_loop_new", Coolio_Loop_ev_loop_new, 1);
   rb_define_method(cCoolio_Loop, "run_once", Coolio_Loop_run_once, -1);
   rb_define_method(cCoolio_Loop, "run_nonblock", Coolio_Loop_run_nonblock, 0);
@@ -79,11 +77,6 @@ static void Coolio_Loop_free(struct Coolio_Loop *loop)
   xfree(loop);
 }
 
-static VALUE Coolio_Loop_initialize(VALUE self)
-{
-  return Coolio_Loop_ev_loop_new(self, INT2NUM(0));
-}
-
 /* Wrapper for populating a Coolio_Loop struct with a new event loop */
 static VALUE Coolio_Loop_ev_loop_new(VALUE self, VALUE flags)
 {

data/ext/cool.io/stat_watcher.c

@@ -116,8 +116,8 @@ static VALUE Coolio_StatWatcher_attach(VALUE self, VALUE loop)
   struct Coolio_Loop *loop_data;
   struct Coolio_Watcher *watcher_data;
 
-	if(!rb_obj_is_kind_of(loop, cCoolio_Loop))
-		rb_raise(rb_eArgError, "expected loop to be an instance of Coolio::Loop");
+  if(!rb_obj_is_kind_of(loop, cCoolio_Loop))
+    rb_raise(rb_eArgError, "expected loop to be an instance of Coolio::Loop, not %s", RSTRING_PTR(rb_inspect(loop)));
 
   Data_Get_Struct(loop, struct Coolio_Loop, loop_data);
   Data_Get_Struct(self, struct Coolio_Watcher, watcher_data);

data/ext/cool.io/timer_watcher.c

@@ -95,8 +95,8 @@ static VALUE Coolio_TimerWatcher_attach(VALUE self, VALUE loop)
   struct Coolio_Loop *loop_data;
   struct Coolio_Watcher *watcher_data;
     
-	if(!rb_obj_is_kind_of(loop, cCoolio_Loop))
-		rb_raise(rb_eArgError, "expected loop to be an instance of Coolio::Loop");
+  if(!rb_obj_is_kind_of(loop, cCoolio_Loop))
+    rb_raise(rb_eArgError, "expected loop to be an instance of Coolio::Loop, not %s", RSTRING_PTR(rb_inspect(loop)));
 
   Data_Get_Struct(loop, struct Coolio_Loop, loop_data);
   Data_Get_Struct(self, struct Coolio_Watcher, watcher_data);

data/ext/cool.io/watcher.h

@@ -12,7 +12,7 @@
   struct Coolio_Loop *loop_data; \
   \
   if(!rb_obj_is_kind_of(loop, cCoolio_Loop)) \
-    rb_raise(rb_eArgError, "expected loop to be an instance of Coolio::Loop"); \
+    rb_raise(rb_eArgError, "expected loop to be an instance of Coolio::Loop, not %s", RSTRING_PTR(rb_inspect(loop))); \
   \
   Data_Get_Struct(watcher, struct Coolio_Watcher, watcher_data); \
   Data_Get_Struct(loop, struct Coolio_Loop, loop_data); \

data/lib/cool.io/dns_resolver.rb

@@ -168,7 +168,7 @@ module Coolio
       return unless rcode == 0
 
       # Extract the question and answer counts
-      qdcount, ancount = message[4..7].unpack('nn').map { |n| n.to_i }
+      qdcount, _ancount = message[4..7].unpack('nn').map { |n| n.to_i }
 
       # We only asked one question
       return unless qdcount == 1

data/lib/cool.io/listener.rb

@@ -40,19 +40,31 @@ module Coolio
     #########
 
     # Coolio callback for handling new connections
-    def on_readable
-      begin
-        on_connection @listen_socket.accept_nonblock
-      rescue Errno::EAGAIN, Errno::ECONNABORTED
-        # EAGAIN can be triggered here if the socket is shared between
-        # multiple processes and a thundering herd is woken up to accept
-        # one connection, only one process will get the connection and
-        # the others will be awoken.
-        # ECONNABORTED is documented in accept() manpages but modern TCP
-        # stacks with syncookies and/or accept()-filtering for DoS
-        # protection do not see it.  In any case this error is harmless
-        # and we should instead spend our time with clients that follow
-        # through on connection attempts.
+    unless RUBY_PLATFORM =~ /mingw|mswin/
+      def on_readable
+        begin
+          on_connection @listen_socket.accept_nonblock
+        rescue Errno::EAGAIN, Errno::ECONNABORTED
+          # EAGAIN can be triggered here if the socket is shared between
+          # multiple processes and a thundering herd is woken up to accept
+          # one connection, only one process will get the connection and
+          # the others will be awoken.
+          # ECONNABORTED is documented in accept() manpages but modern TCP
+          # stacks with syncookies and/or accept()-filtering for DoS
+          # protection do not see it.  In any case this error is harmless
+          # and we should instead spend our time with clients that follow
+          # through on connection attempts.
+        end
+      end
+    else
+      def on_readable
+        begin
+          # In Windows, accept_nonblock() with multiple processes
+          # causes thundering herd problem.
+          # To avoid this, we need to use accept().
+          on_connection @listen_socket.accept
+        rescue Errno::EAGAIN, Errno::ECONNABORTED
+        end
       end
     end
   end

data/lib/cool.io/meta.rb

@@ -32,6 +32,7 @@ module Coolio
     def event_callback(*methods)
       methods.each do |method|
         module_eval <<-EOD
+          remove_method "#{method}"
           def #{method}(*args, &block)
             if block
               @#{method}_callback = block

data/lib/cool.io/socket.rb

@@ -27,6 +27,7 @@ module Coolio
 
     watcher_delegate :@_connector
 
+    remove_method :attach
     def attach(evloop)
       raise RuntimeError, "connection failed" if @_failed
 

data/lib/cool.io/version.rb

@@ -1,5 +1,5 @@
 module Coolio
-  VERSION = "1.4.1"
+  VERSION = "1.4.4"
   
   def self.version
     VERSION

data/spec/stat_watcher_spec.rb

@@ -70,7 +70,11 @@ describe Cool.io::StatWatcher do
   end
 
   it "should raise when the handler does not take 2 parameters" do
-    class MyStatWatcher < Cool.io::StatWatcher; def on_change; end; end
+    class MyStatWatcher < Cool.io::StatWatcher
+      remove_method :on_change
+      def on_change
+      end
+    end
     expect { watcher.accessed }.to raise_error(ArgumentError)
   end
 

data/spec/tcp_server_spec.rb

@@ -72,10 +72,10 @@ ensure
 end
 
 def test_run_once_timeout(timeout = TIMEOUT)
+  @data = ""
   reactor = Coolio::Loop.new
   server = Cool.io::TCPServer.new(HOST, PORT, MyConnection, method(:on_message))
   reactor.attach(server)
-  running = true
   thread = Thread.new { reactor.run_once(timeout) }
   sleep timeout
   server.detach
@@ -198,7 +198,7 @@ describe Coolio::TCPServer do
         end
         def on_read(data)
           @cb.call data
-          size = write(data + "fff")
+          _size = write(data + "fff")
         end
       end
       

data/spec/unix_listener_spec.rb

@@ -10,7 +10,7 @@ describe Cool.io::UNIXListener, :env => :exclude_win do
   end
 
   it "creates a new UNIXListener" do
-    listener = Cool.io::UNIXListener.new(@tmp.path)
+    _listener = Cool.io::UNIXListener.new(@tmp.path)
     expect(File.socket?(@tmp.path)).to eq(true)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cool.io
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.4
 platform: x86-mingw32
 authors:
 - Tony Arcieri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +84,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- appveyor.yml
 - cool.io.gemspec
 - examples/callbacked_echo_server.rb
 - examples/dslified_echo_client.rb
@@ -130,6 +131,8 @@ files:
 - lib/2.1/iobuffer_ext.so
 - lib/2.2/cool.io_ext.so
 - lib/2.2/iobuffer_ext.so
+- lib/2.3/cool.io_ext.so
+- lib/2.3/iobuffer_ext.so
 - lib/cool.io.rb
 - lib/cool.io/async_watcher.rb
 - lib/cool.io/custom_require.rb
@@ -175,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A cool framework for doing high performance I/O in Ruby