nio4r 1.2.1-java → 2.0.0-java

data/spec/nio/selectables/pipe_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 RSpec.describe "IO.pipe" do
@@ -6,6 +8,7 @@ RSpec.describe "IO.pipe" do
   let :unreadable_subject do
     pair.first
   end
+
   let :readable_subject do
     pipe, peer = pair
     peer << "data"
@@ -15,8 +18,9 @@ RSpec.describe "IO.pipe" do
   let :writable_subject do
     pair.last
   end
+
   let :unwritable_subject do
-    reader, pipe = IO.pipe
+    _reader, pipe = pair
 
     # HACK: On OS X 10.8, this str must be larger than PIPE_BUF. Otherwise,
     #      the write is atomic and select() will return writable but write()

data/spec/nio/selectables/ssl_socket_spec.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "openssl"
 
-RSpec.describe OpenSSL::SSL::SSLSocket, if: RUBY_VERSION >= "1.9.0" do
-  let(:tcp_port) { 34_567 }
+RSpec.describe OpenSSL::SSL::SSLSocket do
+  let(:addr) { "localhost" }
+  let(:port) { next_available_tcp_port }
 
   let(:ssl_key) { OpenSSL::PKey::RSA.new(1024) }
 
@@ -29,8 +32,8 @@ RSpec.describe OpenSSL::SSL::SSLSocket, if: RUBY_VERSION >= "1.9.0" do
   end
 
   let :readable_subject do
-    server = TCPServer.new("localhost", tcp_port)
-    client = TCPSocket.open("localhost", tcp_port)
+    server = TCPServer.new(addr, port)
+    client = TCPSocket.open(addr, port)
     peer = server.accept
 
     ssl_peer = OpenSSL::SSL::SSLSocket.new(peer, ssl_server_context)
@@ -52,8 +55,8 @@ RSpec.describe OpenSSL::SSL::SSLSocket, if: RUBY_VERSION >= "1.9.0" do
   end
 
   let :unreadable_subject do
-    server = TCPServer.new("localhost", tcp_port + 1)
-    client = TCPSocket.new("localhost", tcp_port + 1)
+    server = TCPServer.new(addr, port)
+    client = TCPSocket.new(addr, port)
     peer = server.accept
 
     ssl_peer = OpenSSL::SSL::SSLSocket.new(peer, ssl_server_context)
@@ -72,8 +75,8 @@ RSpec.describe OpenSSL::SSL::SSLSocket, if: RUBY_VERSION >= "1.9.0" do
   end
 
   let :writable_subject do
-    server = TCPServer.new("localhost", tcp_port + 2)
-    client = TCPSocket.new("localhost", tcp_port + 2)
+    server = TCPServer.new(addr, port)
+    client = TCPSocket.new(addr, port)
     peer = server.accept
 
     ssl_peer = OpenSSL::SSL::SSLSocket.new(peer, ssl_server_context)
@@ -92,8 +95,8 @@ RSpec.describe OpenSSL::SSL::SSLSocket, if: RUBY_VERSION >= "1.9.0" do
   end
 
   let :unwritable_subject do
-    server = TCPServer.new("localhost", tcp_port + 3)
-    client = TCPSocket.open("localhost", tcp_port + 3)
+    server = TCPServer.new(addr, port)
+    client = TCPSocket.new(addr, port)
     peer = server.accept
 
     ssl_peer = OpenSSL::SSL::SSLSocket.new(peer, ssl_server_context)
@@ -140,8 +143,8 @@ RSpec.describe OpenSSL::SSL::SSLSocket, if: RUBY_VERSION >= "1.9.0" do
   let :pair do
     pending "figure out why newly created sockets are selecting readable immediately"
 
-    server = TCPServer.new("localhost", tcp_port + 4)
-    client = TCPSocket.open("localhost", tcp_port + 4)
+    server = TCPServer.new(addr, port)
+    client = TCPSocket.new(addr, port)
     peer = server.accept
 
     ssl_peer = OpenSSL::SSL::SSLSocket.new(peer, ssl_server_context)

data/spec/nio/selectables/tcp_socket_spec.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 RSpec.describe TCPSocket do
-  port_offset = 0
-  let(:tcp_port) { 12_345 + (port_offset += 1) }
+  let(:addr) { "127.0.0.1" }
+  let(:port) { next_available_tcp_port }
 
   let :readable_subject do
-    server = TCPServer.new("localhost", tcp_port)
-    sock = TCPSocket.open("localhost", tcp_port)
+    server = TCPServer.new(addr, port)
+    sock = TCPSocket.new(addr, port)
     peer = server.accept
     peer << "data"
     sock
   end
 
   let :unreadable_subject do
-    TCPServer.new("localhost", tcp_port)
-    sock = TCPSocket.new("localhost", tcp_port)
+    TCPServer.new(addr, port)
+    sock = TCPSocket.new(addr, port)
 
     # Sanity check to make sure we actually produced an unreadable socket
     if select([sock], [], [], 0)
@@ -25,21 +27,25 @@ RSpec.describe TCPSocket do
   end
 
   let :writable_subject do
-    TCPServer.new("localhost", tcp_port)
-    TCPSocket.new("localhost", tcp_port)
+    TCPServer.new(addr, port)
+    TCPSocket.new(addr, port)
   end
 
   let :unwritable_subject do
-    server = TCPServer.new("localhost", tcp_port)
-    sock = TCPSocket.open("localhost", tcp_port)
-    peer = server.accept
+    server = TCPServer.new(addr, port)
+    sock = TCPSocket.new(addr, port)
 
-    begin
+    # TODO: close this socket
+    _peer = server.accept
+
+    loop do
       sock.write_nonblock "X" * 1024
-      _, writers = select [], [sock], [], 0
-    end while writers && writers.include?(sock)
+      _, writers = Kernel.select([], [sock], [], 0)
 
-    # I think the kernel might manage to drain its buffer a bit even after
+      break unless writers && writers.include?(sock)
+    end
+
+    # HAX: I think the kernel might manage to drain its buffer a bit even after
     # the socket first goes unwritable. Attempt to sleep past this and then
     # attempt to write again
     sleep 0.1
@@ -59,8 +65,8 @@ RSpec.describe TCPSocket do
   end
 
   let :pair do
-    server = TCPServer.new("localhost", tcp_port)
-    client = TCPSocket.open("localhost", tcp_port)
+    server = TCPServer.new(addr, port)
+    client = TCPSocket.new(addr, port)
     [client, server.accept]
   end
 
@@ -69,20 +75,25 @@ RSpec.describe TCPSocket do
   it_behaves_like "an NIO bidirectional stream"
 
   context :connect do
-    it "selects writable when connected" do
-      selector = NIO::Selector.new
-      server = TCPServer.new("127.0.0.1", tcp_port)
-
-      client = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-      monitor = selector.register(client, :w)
-
-      expect do
-        client.connect_nonblock Socket.sockaddr_in(tcp_port, "127.0.0.1")
-      end.to raise_exception Errno::EINPROGRESS
-
-      expect(selector.select(0.001)).to include monitor
-      result = client.getsockopt(::Socket::SOL_SOCKET, ::Socket::SO_ERROR)
-      expect(result.unpack("i").first).to be_zero
+    it "selects writable when connected", retry: 5 do # retry: Flaky on OS X
+      begin
+        server = TCPServer.new(addr, port)
+        selector = NIO::Selector.new
+
+        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)
+        end.to raise_exception Errno::EINPROGRESS
+
+        expect(selector.select(0.001)).to include monitor
+        result = client.getsockopt(::Socket::SOL_SOCKET, ::Socket::SO_ERROR)
+        expect(result.unpack("i").first).to be_zero
+      ensure
+        server.close rescue nil
+        selector.close rescue nil
+      end
     end
   end
 end

data/spec/nio/selectables/udp_socket_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 RSpec.describe UDPSocket do

data/spec/nio/selector_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "timeout"
 
@@ -11,6 +13,12 @@ RSpec.describe NIO::Selector do
   let(:reader) { pair.first }
   let(:writer) { pair.last }
 
+  context "backend" do
+    it "knows its backend" do
+      expect(subject.backend).to be_a Symbol
+    end
+  end
+
   context "register" do
     it "registers IO objects" do
       monitor = subject.register(reader, :r)
@@ -43,9 +51,7 @@ RSpec.describe NIO::Selector do
 
   it "reports if it is empty" do
     expect(subject).to be_empty
-
-    monitor = subject.register(reader, :r)
-
+    subject.register(reader, :r)
     expect(subject).not_to be_empty
   end
 
@@ -96,7 +102,7 @@ RSpec.describe NIO::Selector do
 
       thread = Thread.new do
         started_at = Time.now
-        expect(subject.select).to be_nil
+        expect(subject.select).to eq []
         Time.now - started_at
       end
 

data/spec/spec_helper.rb

@@ -1,9 +1,30 @@
+# frozen_string_literal: true
+
 require "coveralls"
 Coveralls.wear!
 
-require "rubygems"
-require "bundler/setup"
 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.1) { TCPSocket.new("localhost", $current_tcp_port) }
+    rescue Errno::ECONNREFUSED
+      break $current_tcp_port
+    end
 
-RSpec.configure(&:disable_monkey_patching!)
+    sock.close
+  end
+end

data/spec/support/selectable_examples.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 RSpec.shared_context "an NIO selectable" do
   let(:selector) { NIO::Selector.new }
 
-  it "selects readable objects" do
+  it "selects readable objects", retry: 5 do # retry: Flaky on OS X
     monitor = selector.register(readable_subject, :r)
     ready = selector.select(0)
     expect(ready).to be_an Enumerable
@@ -9,7 +11,7 @@ RSpec.shared_context "an NIO selectable" do
   end
 
   it "does not select unreadable objects" do
-    monitor = selector.register(unreadable_subject, :r)
+    selector.register(unreadable_subject, :r)
     expect(selector.select(0)).to be_nil
   end
 
@@ -21,7 +23,7 @@ RSpec.shared_context "an NIO selectable" do
   end
 
   it "does not select unwritable objects" do
-    monitor = selector.register(unwritable_subject, :w)
+    selector.register(unwritable_subject, :w)
     expect(selector.select(0)).to be_nil
   end
 end
@@ -49,8 +51,8 @@ RSpec.shared_context "an NIO bidirectional stream" do
   let(:stream)   { pair.first }
   let(:peer)     { pair.last }
 
-  it "selects readable and writable" do
-    monitor = selector.register(readable_subject, :rw)
+  it "selects readable and writable", retry: 5 do # retry: Flaky on OS X
+    selector.register(readable_subject, :rw)
     selector.select(0) do |m|
       expect(m.readiness).to eq(:rw)
     end

data/tasks/extension.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined? JRUBY_VERSION
   require "rake/javaextensiontask"
   Rake::JavaExtensionTask.new("nio4r_ext") do |ext|

data/tasks/rspec.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new

data/tasks/rubocop.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rubocop/rake_task"
 
 RuboCop::RakeTask.new

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: java
 authors:
 - Tony Arcieri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -26,21 +26,21 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
   type: :development
-description: New IO for Ruby
+description: Cross-platform asynchronous I/O primitives for scalable network clients and servers. Inspired by the Java NIO API, but simplified for ease-of-use.
 email:
-- tony.arcieri@gmail.com
+- bascule@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -48,10 +48,11 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -71,14 +72,19 @@ files:
 - 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
 - ext/nio4r/monitor.c
 - ext/nio4r/nio4r.h
 - ext/nio4r/nio4r_ext.c
+- ext/nio4r/org/nio4r/ByteBuffer.java
+- ext/nio4r/org/nio4r/Monitor.java
 - ext/nio4r/org/nio4r/Nio4r.java
+- ext/nio4r/org/nio4r/Selector.java
 - ext/nio4r/selector.c
 - lib/nio.rb
+- lib/nio/bytebuffer.rb
 - lib/nio/monitor.rb
 - lib/nio/selector.rb
 - lib/nio/version.rb
@@ -86,6 +92,7 @@ files:
 - logo.png
 - nio4r.gemspec
 - spec/nio/acceptables_spec.rb
+- spec/nio/bytebuffer_spec.rb
 - spec/nio/monitor_spec.rb
 - spec/nio/selectables/pipe_spec.rb
 - spec/nio/selectables/ssl_socket_spec.rb
@@ -97,7 +104,7 @@ files:
 - tasks/extension.rake
 - tasks/rspec.rake
 - tasks/rubocop.rake
-homepage: https://github.com/celluloid/nio4r
+homepage: https://github.com/socketry/nio4r
 licenses:
 - MIT
 metadata: {}
@@ -109,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -117,12 +124,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
-summary: NIO provides a high performance selector API for monitoring IO objects
+summary: New IO for Ruby
 test_files:
 - spec/nio/acceptables_spec.rb
+- spec/nio/bytebuffer_spec.rb
 - spec/nio/monitor_spec.rb
 - spec/nio/selectables/pipe_spec.rb
 - spec/nio/selectables/ssl_socket_spec.rb
@@ -131,4 +139,3 @@ test_files:
 - spec/nio/selector_spec.rb
 - spec/spec_helper.rb
 - spec/support/selectable_examples.rb
-has_rdoc: