cool.io 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ed51c0fcb16152e1701478f796fcfa8a02bfb17b913ec3398fad6845fdc405d
-  data.tar.gz: 9ee69e4eaebc4ea779817a0212a1cc2de3ddaa455a7b881757e0a0df5574b0ab
+  metadata.gz: bc38746b7a17648d787378a1a186e213cc2b5470d0158a282d0a49653368557e
+  data.tar.gz: 192da5f1cbdf25ed7c242f5096ab9339287eafefc709226d625e78741bdd28b6
 SHA512:
-  metadata.gz: a0c8c358607429e50d2f65e54792f31b60b81137b543e62fe6add5e02412d736bd2f38d6b17088e82de3efa6edb22965b67b7272de711089064632823aee6ce6
-  data.tar.gz: '098896359667045cbee494f2efa0bb440b925df84c116143273f37cebd89049d053061fe9e9c76f07664c905c7ed7eed79cb9585f3147503c701b638c9064e87'
+  metadata.gz: cf443a3b3105db121df46f9066160f392a238d989a901a4eee2fcf2797a404784db51e97478188a191603d4869044b160ec287934cc5efc603ce822e56413aef
+  data.tar.gz: d8c4ebce45323df6b46cc36c20a16c30c041643021b2f75e9823f6df2d19b78793256cc084c49cb666c3cc9a6a8268f3cfe3bb0d10e8874d26d74cf86a966815

data/.github/workflows/test.yaml

@@ -0,0 +1,51 @@
+name: Test
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+env:
+  CONSOLE_OUTPUT: XTerm
+
+jobs:
+  test:
+    name: ${{matrix.ruby}} on ${{matrix.os}}
+    runs-on: ${{matrix.os}}-latest
+    continue-on-error: ${{matrix.experimental}}
+    
+    strategy:
+      matrix:
+        os:
+          - ubuntu
+          - macos
+        
+        ruby:
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "head"
+        
+        experimental: [false]
+        
+        # include:
+        #   - os: ubuntu
+        #     ruby: truffleruby
+        #     experimental: true
+        #   - os: ubuntu
+        #     ruby: jruby
+        #     experimental: true
+        #   - os: ubuntu
+        #     ruby: head
+        #     experimental: true
+    
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true
+    
+    - name: Run tests
+      timeout-minutes: 2
+      run: bundle exec rake

data/CHANGES.md

@@ -1,3 +1,8 @@
+1.7.1
+-----
+
+* Set fallback local loopback address by default for Windows environment
+
 1.7.0
 -----
 

data/README.md

@@ -1,8 +1,6 @@
 Cool.io
 =======
 
-### If you are interested in Celluloid based IO framework, please check out [Celluloid::IO](http://github.com/celluloid/celluloid-io)
-
 Cool.io is an event library for Ruby, built on the libev event library which 
 provides a cross-platform interface to high performance system calls .  This 
 includes the epoll system call for Linux, the kqueue system call for BSDs and 
@@ -14,8 +12,9 @@ applications.
 
 You can include Cool.io in your programs with:
 
-	require 'cool.io'
-
+```ruby
+require 'cool.io'
+```
 
 Anatomy
 -------
@@ -91,29 +90,31 @@ Example Program
 
 Cool.io provides a Sinatra-like DSL for authoring event-driven programs:
 
-    require 'cool.io'
-    require 'cool.io/dsl'
+```ruby
+require 'cool.io'
+require 'cool.io/dsl'
 
-    ADDR = '127.0.0.1'
-    PORT = 4321
+ADDR = '127.0.0.1'
+PORT = 4321
 
-    cool.io.connection :echo_server_connection do
-      on_connect do
-        puts "#{remote_addr}:#{remote_port} connected"
-      end
+cool.io.connection :echo_server_connection do
+  on_connect do
+    puts "#{remote_addr}:#{remote_port} connected"
+  end
 
-      on_close do
-        puts "#{remote_addr}:#{remote_port} disconnected"
-      end
+  on_close do
+    puts "#{remote_addr}:#{remote_port} disconnected"
+  end
 
-      on_read do |data|
-        write data
-      end
-    end
+  on_read do |data|
+    write data
+  end
+end
 
-    puts "Echo server listening on #{ADDR}:#{PORT}"
-    cool.io.server ADDR, PORT, :echo_server_connection
-    cool.io.run
+puts "Echo server listening on #{ADDR}:#{PORT}"
+cool.io.server ADDR, PORT, :echo_server_connection
+cool.io.run
+```
     
 This creates a new connection class called :echo_server_connection and defines
 a set of callbacks for when various events occur.
@@ -131,29 +132,31 @@ Using Cool.io subclasses directly
 Below is an example of how to write an echo server using a subclass instead of
 the DSL:
 
-	require 'cool.io'
-	HOST = 'localhost'
-	PORT = 4321
+```ruby
+require 'cool.io'
+HOST = 'localhost'
+PORT = 4321
 
-	class EchoServerConnection < Cool.io::TCPSocket
-	  def on_connect
-	    puts "#{remote_addr}:#{remote_port} connected"
-	  end
+class EchoServerConnection < Cool.io::TCPSocket
+  def on_connect
+    puts "#{remote_addr}:#{remote_port} connected"
+  end
 
-	  def on_close
-	    puts "#{remote_addr}:#{remote_port} disconnected"
-	  end
+  def on_close
+    puts "#{remote_addr}:#{remote_port} disconnected"
+  end
 
-	  def on_read(data)
-	    write data
-	  end
-	end
+  def on_read(data)
+    write data
+  end
+end
 
-	server = Cool.io::TCPServer.new(HOST, PORT, EchoServerConnection)
-	server.attach(Cool.io::Loop.default)
+server = Cool.io::TCPServer.new(HOST, PORT, EchoServerConnection)
+server.attach(Cool.io::Loop.default)
 
-	puts "Echo server listening on #{HOST}:#{PORT}"
-	Cool.io::Loop.default.run
+puts "Echo server listening on #{HOST}:#{PORT}"
+Cool.io::Loop.default.run
+```
 
 Here a new observer type (EchoServerConnection) is made by subclassing an
 existing one and adding new implementations to existing event handlers.

data/Rakefile

@@ -48,7 +48,7 @@ namespace :build do
   task :windows do
     require 'rake_compiler_dock'
     RakeCompilerDock.sh <<-CROSS
-      bundle && bundle exec rake cross native gem RUBY_CC_VERSION='2.7.0:2.6.0:2.5.0:2.4.0'
+      bundle && bundle exec rake cross native gem RUBY_CC_VERSION='3.0.0:2.7.0:2.6.0:2.5.0:2.4.0'
     CROSS
   end
 end

data/ext/cool.io/extconf.rb

@@ -4,6 +4,7 @@ libs = []
 
 $defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}"
 
+have_func('rb_io_descriptor')
 have_func('rb_thread_blocking_region')
 have_func('rb_thread_call_without_gvl')
 have_func('rb_thread_alone')

data/ext/cool.io/iowatcher.c

@@ -65,11 +65,6 @@ static VALUE Coolio_IOWatcher_initialize(int argc, VALUE *argv, VALUE self)
   char *flags_str;
   int events;
   struct Coolio_Watcher *watcher_data;
-#if HAVE_RB_IO_T
-  rb_io_t *fptr;
-#else
-  OpenFile *fptr;
-#endif
 
   rb_scan_args(argc, argv, "11", &io, &flags);
 
@@ -88,10 +83,20 @@ static VALUE Coolio_IOWatcher_initialize(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eArgError, "invalid event type: '%s' (must be 'r', 'w', or 'rw')", flags_str);
 
   Data_Get_Struct(self, struct Coolio_Watcher, watcher_data);
-  GetOpenFile(rb_convert_type(io, T_FILE, "IO", "to_io"), fptr);
+  io = rb_convert_type(io, T_FILE, "IO", "to_io");
 
   watcher_data->dispatch_callback = Coolio_IOWatcher_dispatch_callback;
+#ifdef HAVE_RB_IO_DESCRIPTOR
+  ev_io_init(&watcher_data->event_types.ev_io, Coolio_IOWatcher_libev_callback, rb_io_descriptor(io), events);
+#else
+#if defined(HAVE_RB_IO_T)
+  rb_io_t *fptr;
+#else
+  OpenFile *fptr;
+#endif
+  GetOpenFile(io, fptr);
   ev_io_init(&watcher_data->event_types.ev_io, Coolio_IOWatcher_libev_callback, FPTR_TO_FD(fptr), events);
+#endif
   watcher_data->event_types.ev_io.data = (void *)self;
 
   return Qnil;

data/ext/iobuffer/extconf.rb

@@ -1,6 +1,7 @@
 require 'mkmf'
 
 dir_config("iobuffer")
+have_func("rb_io_descriptor")
 have_library("c", "main")
 if have_macro("HAVE_RB_IO_T", "ruby/io.h")
   have_struct_member("rb_io_t", "fd", "ruby/io.h")

data/ext/iobuffer/iobuffer.c

@@ -378,17 +378,22 @@ IO_Buffer_read_from(VALUE self, VALUE io)
 {
     struct buffer  *buf;
     int             ret;
-#if HAVE_RB_IO_T
+#if defined(HAVE_RB_IO_T) || defined(HAVE_RB_IO_DESCRIPTOR)
     rb_io_t        *fptr;
 #else
     OpenFile       *fptr;
 #endif
 
     Data_Get_Struct(self, struct buffer, buf);
-    GetOpenFile(rb_convert_type(io, T_FILE, "IO", "to_io"), fptr);
+    io = rb_convert_type(io, T_FILE, "IO", "to_io");
+    GetOpenFile(io, fptr);
     rb_io_set_nonblock(fptr);
 
+#ifdef HAVE_RB_IO_DESCRIPTOR
+    ret = buffer_read_from(buf, rb_io_descriptor(io));
+#else
     ret = buffer_read_from(buf, FPTR_TO_FD(fptr));
+#endif
     return ret == -1 ? Qnil : INT2NUM(ret);
 }
 
@@ -404,17 +409,22 @@ static VALUE
 IO_Buffer_write_to(VALUE self, VALUE io)
 {
     struct buffer  *buf;
-#if HAVE_RB_IO_T
+#if defined(HAVE_RB_IO_T) || defined(HAVE_RB_IO_DESCRIPTOR)
     rb_io_t        *fptr;
 #else
     OpenFile       *fptr;
 #endif
 
     Data_Get_Struct(self, struct buffer, buf);
-    GetOpenFile(rb_convert_type(io, T_FILE, "IO", "to_io"), fptr);
+    io = rb_convert_type(io, T_FILE, "IO", "to_io");
+    GetOpenFile(io, fptr);
     rb_io_set_nonblock(fptr);
 
+#ifdef HAVE_RB_IO_DESCRIPTOR
+    return INT2NUM(buffer_write_to(buf, rb_io_descriptor(io)));
+#else
     return INT2NUM(buffer_write_to(buf, FPTR_TO_FD(fptr)));
+#endif
 }
 
 /*

data/ext/libev/ev.c

@@ -3768,7 +3768,7 @@ rb_thread_unsafe_dangerous_crazy_blocking_region_end(...);
 #if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
         poll_args.loop = loop;
         poll_args.waittime = waittime;
-        rb_thread_call_without_gvl(ev_backend_poll, (void *)&poll_args, RUBY_UBF_IO, 0);
+        rb_thread_call_without_gvl((void *)ev_backend_poll, (void *)&poll_args, RUBY_UBF_IO, 0);
 #else
          backend_poll (EV_A_ waittime);
 #endif

data/lib/cool.io/dns_resolver.rb

@@ -49,6 +49,15 @@ module Coolio
           entries.each { |e| hosts[e] ||= addr }
         end
       end
+      unless hosts.key?("localhost")
+        # On Windows, there is a case that hosts file doesn't have entry by default
+        # and preferred IPv4/IPv6 behavior may be changed by registry key [1], so
+        # "localhost" should be resolved by getaddrinfo.
+        # (first[3] means preferred resolved IP address ::1 or 127.0.0.1)
+        # [1] https://docs.microsoft.com/en-us/troubleshoot/windows-server/networking/configure-ipv6-in-windows
+        require "socket"
+        hosts["localhost"] = ::Socket.getaddrinfo("localhost", nil).first[3]
+      end
 
       hosts[host]
     end

data/lib/cool.io/version.rb

@@ -1,5 +1,5 @@
 module Coolio
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
   
   def self.version
     VERSION

data/spec/dns_spec.rb

@@ -19,6 +19,7 @@ end
 describe "DNS" do
   before :each do
     @loop = Cool.io::Loop.new
+    @preferred_localhost_address = ::Socket.getaddrinfo("localhost", nil).first[3]
   end
   
   it "connects to valid domains" do
@@ -40,4 +41,18 @@ describe "DNS" do
       @loop.run
     end.to raise_error(WontResolve)
   end
+
+  it "resolve localhost even though hosts is empty" do
+    Tempfile.open("empty") do |file|
+      expect( Coolio::DNSResolver.hosts("localhost", file.path)).to eq @preferred_localhost_address
+    end
+  end
+
+  it "resolve missing localhost even though hosts entries exist" do
+    Tempfile.open("empty") do |file|
+      file.puts("127.0.0.1 example.internal")
+      file.flush
+      expect( Coolio::DNSResolver.hosts("localhost", file.path)).to eq @preferred_localhost_address
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cool.io
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -78,6 +78,7 @@ extensions:
 - ext/iobuffer/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yaml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A cool framework for doing high performance I/O in Ruby