nio4r 2.3.1 → 2.5.3

data/spec/nio/selectables/tcp_socket_spec.rb

@@ -4,19 +4,22 @@ require "spec_helper"
 
 RSpec.describe TCPSocket do
   let(:addr) { "127.0.0.1" }
-  let(:port) { next_available_tcp_port }
 
   let :readable_subject do
-    server = TCPServer.new(addr, port)
-    sock = TCPSocket.new(addr, port)
+    server = TCPServer.new(addr, 0)
+    sock = TCPSocket.new(addr, server.local_address.ip_port)
     peer = server.accept
-    peer << "data"
+
+    peer << "Xdata"
+    peer.flush
+    sock.read(1)
+
     sock
   end
 
   let :unreadable_subject do
-    TCPServer.new(addr, port)
-    sock = TCPSocket.new(addr, port)
+    server = TCPServer.new(addr, 0)
+    sock = TCPSocket.new(addr, server.local_address.ip_port)
 
     # Sanity check to make sure we actually produced an unreadable socket
     pending "Failed to produce an unreadable socket" if select([sock], [], [], 0)
@@ -25,13 +28,13 @@ RSpec.describe TCPSocket do
   end
 
   let :writable_subject do
-    TCPServer.new(addr, port)
-    TCPSocket.new(addr, port)
+    server = TCPServer.new(addr, 0)
+    TCPSocket.new(addr, server.local_address.ip_port)
   end
 
   let :unwritable_subject do
-    server = TCPServer.new(addr, port)
-    sock = TCPSocket.new(addr, port)
+    server = TCPServer.new(addr, 0)
+    sock = TCPSocket.new(addr, server.local_address.ip_port)
 
     # TODO: close this socket
     _peer = server.accept
@@ -61,8 +64,8 @@ RSpec.describe TCPSocket do
   end
 
   let :pair do
-    server = TCPServer.new(addr, port)
-    client = TCPSocket.new(addr, port)
+    server = TCPServer.new(addr, 0)
+    client = TCPSocket.new(addr, server.local_address.ip_port)
     [client, server.accept]
   end
 
@@ -71,19 +74,22 @@ RSpec.describe TCPSocket do
   it_behaves_like "an NIO bidirectional stream"
 
   context :connect do
-    it "selects writable when connected", retry: 5 do # retry: Flaky on OS X
+    include_context NIO::Selector
+
+    it "selects writable when connected" do
       begin
-        server = TCPServer.new(addr, port)
-        selector = NIO::Selector.new
+        server = TCPServer.new(addr, 0)
 
         client = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
         monitor = selector.register(client, :w)
 
         expect do
-          client.connect_nonblock Socket.sockaddr_in(port, addr)
+          client.connect_nonblock server.local_address
         end.to raise_exception Errno::EINPROGRESS
 
-        expect(selector.select(0.001)).to include monitor
+        ready = selector.select(1)
+
+        expect(ready).to include monitor
         result = client.getsockopt(::Socket::SOL_SOCKET, ::Socket::SO_ERROR)
         expect(result.unpack("i").first).to be_zero
       ensure

data/spec/nio/selectables/udp_socket_spec.rb

@@ -6,32 +6,37 @@ RSpec.describe UDPSocket, if: !defined?(JRUBY_VERSION) do
   let(:udp_port) { 23_456 }
 
   let :readable_subject do
-    sock = UDPSocket.new
-    sock.bind("127.0.0.1", udp_port)
+    server = UDPSocket.new
+    server.bind("127.0.0.1", 0)
 
     peer = UDPSocket.new
-    peer.send("hi there", 0, "127.0.0.1", udp_port)
+    peer.send("hi there", 0, "127.0.0.1", server.local_address.ip_port)
 
-    sock
+    server
   end
 
   let :unreadable_subject do
     sock = UDPSocket.new
-    sock.bind("127.0.0.1", udp_port + 1)
+    sock.bind("127.0.0.1", 0)
     sock
   end
 
   let :writable_subject do
+    server = UDPSocket.new
+    server.bind("127.0.0.1", 0)
+
     peer = UDPSocket.new
-    peer.connect "127.0.0.1", udp_port
+    peer.connect("127.0.0.1", server.local_address.ip_port)
+
     cntr = 0
     begin
       peer.send("X" * 1024, 0)
       cntr += 1
       t = select [], [peer], [], 0
-    rescue Errno::ECONNREFUSED => ex
-      skip "Couln't make writable UDPSocket subject: #{ex.class}: #{ex}"
+    rescue Errno::ECONNREFUSED => e
+      skip "Couldn't make writable UDPSocket subject: #{e.class}: #{e}"
     end while t && t[1].include?(peer) && cntr < 5
+
     peer
   end
 

data/spec/nio/selector_spec.rb

@@ -3,12 +3,6 @@
 require "spec_helper"
 require "timeout"
 
-# Timeouts should be at least this precise (in seconds) to pass the tests
-# Typical precision should be better than this, but if it's worse it will fail
-# the tests
-TIMEOUT_PRECISION = 0.1
-
-# rubocop:disable Metrics/BlockLength
 RSpec.describe NIO::Selector do
   let(:pair)   { IO.pipe }
   let(:reader) { pair.first }
@@ -22,10 +16,12 @@ RSpec.describe NIO::Selector do
   end
 
   context "#initialize" do
-    it "allows explicitly specifying a backend" do
+    it "allows explicitly specifying a backend" do |example|
       backend = described_class.backends.first
       selector = described_class.new(backend)
       expect(selector.backend).to eq backend
+
+      example.reporter.message "Supported backends: #{described_class.backends}"
     end
 
     it "raises ArgumentError if given an invalid backend" do
@@ -38,8 +34,10 @@ RSpec.describe NIO::Selector do
   end
 
   context "backend" do
-    it "knows its backend" do
+    it "knows its backend" do |example|
       expect(subject.backend).to be_a Symbol
+
+      example.reporter.message "Current backend: #{subject.backend}"
     end
   end
 
@@ -73,6 +71,15 @@ RSpec.describe NIO::Selector do
     expect(monitor).to be_closed
   end
 
+  it "allows deregistering closed IO objects" do
+    subject.register(reader, :r)
+    reader.close
+
+    expect do
+      subject.deregister(reader)
+    end.not_to raise_error
+  end
+
   it "reports if it is empty" do
     expect(subject).to be_empty
     subject.register(reader, :r)
@@ -96,31 +103,43 @@ RSpec.describe NIO::Selector do
   end
 
   context "timeouts" do
-    it "waits for a timeout when selecting" do
+    let(:select_precision) {0.2}
+    let(:timeout) {2.0}
+    let(:payload) {"hi there"}
+
+    it "waits for timeout when selecting from empty selector" do
+      started_at = Time.now
+      expect(subject.select(timeout)).to be_nil
+      expect(Time.now - started_at).to be_within(select_precision).of(timeout)
+    end
+
+    it "waits for a timeout when selecting with reader" do
       monitor = subject.register(reader, :r)
 
-      payload = "hi there"
       writer << payload
 
-      timeout = 0.5
       started_at = Time.now
       expect(subject.select(timeout)).to include monitor
-      expect(Time.now - started_at).to be_within(TIMEOUT_PRECISION).of(0)
+      expect(Time.now - started_at).to be_within(select_precision).of(0)
       reader.read_nonblock(payload.size)
 
       started_at = Time.now
       expect(subject.select(timeout)).to be_nil
-      expect(Time.now - started_at).to be_within(TIMEOUT_PRECISION).of(timeout)
+      expect(Time.now - started_at).to be_within(select_precision).of(timeout)
     end
 
     it "raises ArgumentError if given a negative timeout" do
       subject.register(reader, :r)
 
-      expect { subject.select(-1) }.to raise_exception(ArgumentError)
+      expect do
+        subject.select(-1)
+      end.to raise_exception(ArgumentError)
     end
   end
 
   context "wakeup" do
+    let(:select_precision) {0.2}
+
     it "wakes up if signaled to from another thread" do
       subject.register(reader, :r)
 
@@ -134,7 +153,7 @@ RSpec.describe NIO::Selector do
       sleep timeout
       subject.wakeup
 
-      expect(thread.value).to be_within(TIMEOUT_PRECISION).of(timeout)
+      expect(thread.value).to be_within(select_precision).of(timeout)
     end
 
     it "raises IOError if asked to wake up a closed selector" do
@@ -215,4 +234,3 @@ RSpec.describe NIO::Selector do
     expect(subject).to be_closed
   end
 end
-# rubocop:enable Metrics/BlockLength

data/spec/spec_helper.rb

@@ -5,26 +5,14 @@ Coveralls.wear!
 
 require "nio"
 require "support/selectable_examples"
-require "rspec/retry"
 
 RSpec.configure do |config|
   config.disable_monkey_patching!
-  config.verbose_retry = true
-  config.display_try_failure_messages = true
-end
-
-$current_tcp_port = 10_000
-
-def next_available_tcp_port
-  loop do
-    $current_tcp_port += 1
 
-    begin
-      sock = Timeout.timeout(0.5) { TCPSocket.new("127.0.0.1", $current_tcp_port) }
-    rescue Errno::ECONNREFUSED, Timeout::Error
-      break $current_tcp_port
-    end
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = ".rspec_status"
 
-    sock.close
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
   end
 end

data/spec/support/selectable_examples.rb

@@ -1,11 +1,21 @@
 # frozen_string_literal: true
 
+RSpec.shared_context NIO::Selector do
+  let(:selector) {@selector = NIO::Selector.new}
+
+  after(:each) do
+    if defined?(@selector)
+      @selector.close
+    end
+  end
+end
+
 RSpec.shared_context "an NIO selectable" do
-  let(:selector) { NIO::Selector.new }
+  include_context NIO::Selector
 
-  it "selects readable objects", retry: 5 do # retry: Flaky on OS X
+  it "selects readable objects" do
     monitor = selector.register(readable_subject, :r)
-    ready = selector.select(0)
+    ready = selector.select(1)
     expect(ready).to be_an Enumerable
     expect(ready).to include monitor
   end
@@ -17,25 +27,29 @@ RSpec.shared_context "an NIO selectable" do
 
   it "selects writable objects" do
     monitor = selector.register(writable_subject, :w)
-    ready = selector.select(0)
+    ready = selector.select(1)
     expect(ready).to be_an Enumerable
     expect(ready).to include monitor
   end
 
   it "does not select unwritable objects" do
     selector.register(unwritable_subject, :w)
-    expect(selector.select(0)).to be_nil
+    ready = selector.select(0)
+    expect(ready).to be_nil
   end
 end
 
-RSpec.shared_context "an NIO selectable stream" do
-  let(:selector) { NIO::Selector.new }
+RSpec.shared_context "an NIO selectable stream" do |is_tls13|
+  include_context NIO::Selector
+
   let(:stream)   { pair.first }
   let(:peer)     { pair.last }
 
   it "selects readable when the other end closes" do
     monitor = selector.register(stream, :r)
-    expect(selector.select(0)).to be_nil
+    unless is_tls13
+      expect(selector.select(1)).to be_nil
+    end
 
     peer.close
     # Wait and give the TCP session time to close
@@ -44,22 +58,28 @@ RSpec.shared_context "an NIO selectable stream" do
 end
 
 RSpec.shared_context "an NIO bidirectional stream" do
-  let(:selector) { NIO::Selector.new }
-  let(:stream)   { pair.first }
-  let(:peer)     { pair.last }
+  include_context NIO::Selector
+
+  let(:stream) {pair.first}
+  let(:peer) {pair.last}
 
-  it "selects readable and writable", retry: 5 do # retry: Flaky on OS X
+  it "selects readable and writable" do
     selector.register(readable_subject, :rw)
-    selector.select(0) do |m|
-      expect(m.readiness).to eq(:rw)
+
+    selector.select(1) do |monitor|
+      expect(monitor.readiness).to eq(:rw)
     end
+
+    readable_subject.close
   end
+
   it "keeps readiness after the selectable has been closed" do
     selector.register(readable_subject, :rw)
-    selector.select(0) do |m|
-      expect(m.readiness).to eq(:rw)
+
+    selector.select(1) do |monitor|
+      expect(monitor.readiness).to eq(:rw)
       readable_subject.close
-      expect(m.readiness).to eq(:rw)
+      expect(monitor.readiness).to eq(:rw)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.5.3
 platform: ruby
 authors:
 - Tony Arcieri
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,33 +47,30 @@ extensions:
 - ext/nio4r/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/workflow.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - Guardfile
-- LICENSE.txt
 - README.md
 - Rakefile
-- appveyor.yml
 - examples/echo_server.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README
-- ext/libev/README.embed
 - ext/libev/ev.c
 - ext/libev/ev.h
 - ext/libev/ev_epoll.c
 - ext/libev/ev_kqueue.c
+- ext/libev/ev_linuxaio.c
 - ext/libev/ev_poll.c
 - ext/libev/ev_port.c
 - ext/libev/ev_select.c
 - ext/libev/ev_vars.h
 - ext/libev/ev_win32.c
 - ext/libev/ev_wrap.h
-- ext/libev/test_libev_win32.c
 - ext/nio4r/bytebuffer.c
 - ext/nio4r/extconf.rb
 - ext/nio4r/libev.h
@@ -92,6 +89,9 @@ files:
 - lib/nio/version.rb
 - logo.png
 - nio4r.gemspec
+- rakelib/extension.rake
+- rakelib/rspec.rake
+- rakelib/rubocop.rake
 - spec/nio/acceptables_spec.rb
 - spec/nio/bytebuffer_spec.rb
 - spec/nio/monitor_spec.rb
@@ -102,14 +102,16 @@ files:
 - spec/nio/selector_spec.rb
 - spec/spec_helper.rb
 - spec/support/selectable_examples.rb
-- tasks/extension.rake
-- tasks/rspec.rake
-- tasks/rubocop.rake
 homepage: https://github.com/socketry/nio4r
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/socketry/nio4r/issues
+  changelog_uri: https://github.com/socketry/nio4r/blob/master/CHANGES.md
+  documentation_uri: https://www.rubydoc.info/gems/nio4r/2.5.3
+  source_code_uri: https://github.com/socketry/nio4r/tree/v2.5.3
+  wiki_uri: https://github.com/socketry/nio4r/wiki
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,16 +119,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: New IO for Ruby
 test_files: