nio4r 1.1.0 → 1.2.0

data/spec/nio/selectables/ssl_socket_spec.rb

@@ -1,20 +1,20 @@
-require 'spec_helper'
-require 'openssl'
+require "spec_helper"
+require "openssl"
 
-describe OpenSSL::SSL::SSLSocket, :if => RUBY_VERSION >= "1.9.0" do
-  let(:tcp_port) { 34567 }
+RSpec.describe OpenSSL::SSL::SSLSocket, if: RUBY_VERSION >= "1.9.0" do
+  let(:tcp_port) { 34_567 }
 
   let(:ssl_key) { OpenSSL::PKey::RSA.new(1024) }
 
   let(:ssl_cert) do
-    name = OpenSSL::X509::Name.new([%w[CN localhost]])
+    name = OpenSSL::X509::Name.new([%w(CN localhost)])
     OpenSSL::X509::Certificate.new.tap do |cert|
       cert.version = 2
       cert.serial = 1
       cert.issuer = name
       cert.subject = name
       cert.not_before = Time.now
-      cert.not_after = Time.now + (365 * 24 *60 *60)
+      cert.not_after = Time.now + (365 * 24 * 60 * 60)
       cert.public_key = ssl_key.public_key
 
       cert.sign(ssl_key, OpenSSL::Digest::SHA1.new)
@@ -114,8 +114,8 @@ describe OpenSSL::SSL::SSLSocket, :if => RUBY_VERSION >= "1.9.0" do
       expect(count).not_to eq(0)
     rescue IO::WaitReadable, IO::WaitWritable
       pending "SSL will report writable but not accept writes"
-      raise if(writers.include? ssl_client)
-    end while writers and writers.include? ssl_client
+      raise if writers.include? ssl_client
+    end while writers && writers.include?(ssl_client)
 
     # 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
@@ -124,15 +124,15 @@ describe OpenSSL::SSL::SSLSocket, :if => RUBY_VERSION >= "1.9.0" do
 
     # Once more for good measure!
     begin
-#        ssl_client.write_nonblock "X" * 1024
+      #        ssl_client.write_nonblock "X" * 1024
       loop { ssl_client.write_nonblock "X" * 1024 }
     rescue OpenSSL::SSL::SSLError
     end
 
     # Sanity check to make sure we actually produced an unwritable socket
-#      if select([], [ssl_client], [], 0)
-#        pending "Failed to produce an unwritable socket"
-#      end
+    #      if select([], [ssl_client], [], 0)
+    #        pending "Failed to produce an unwritable socket"
+    #      end
 
     ssl_client
   end

data/spec/nio/selectables/tcp_socket_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe TCPSocket do
+RSpec.describe TCPSocket do
   port_offset = 0
-  let(:tcp_port) { 12345 + (port_offset += 1) }
+  let(:tcp_port) { 12_345 + (port_offset += 1) }
 
   let :readable_subject do
     server = TCPServer.new("localhost", tcp_port)
@@ -37,7 +37,7 @@ describe TCPSocket do
     begin
       sock.write_nonblock "X" * 1024
       _, writers = select [], [sock], [], 0
-    end while writers and writers.include? sock
+    end while writers && writers.include?(sock)
 
     # 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
@@ -71,18 +71,18 @@ describe TCPSocket do
   context :connect do
     it "selects writable when connected" do
       selector = NIO::Selector.new
-      server = TCPServer.new('127.0.0.1', tcp_port)
+      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')
+        client.connect_nonblock Socket.sockaddr_in(tcp_port, "127.0.0.1")
       end.to raise_exception Errno::EINPROGRESS
 
-      expect(selector.select(0)).to include monitor
+      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
+      expect(result.unpack("i").first).to be_zero
     end
   end
 end

data/spec/nio/selectables/udp_socket_spec.rb

@@ -1,21 +1,21 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe UDPSocket do
-  let(:udp_port) { 23456 }
+RSpec.describe UDPSocket do
+  let(:udp_port) { 23_456 }
 
   let :readable_subject do
     sock = UDPSocket.new
-    sock.bind('localhost', udp_port)
+    sock.bind("localhost", udp_port)
 
     peer = UDPSocket.new
-    peer.send("hi there", 0, 'localhost', udp_port)
+    peer.send("hi there", 0, "localhost", udp_port)
 
     sock
   end
 
   let :unreadable_subject do
     sock = UDPSocket.new
-    sock.bind('localhost', udp_port + 1)
+    sock.bind("localhost", udp_port + 1)
     sock
   end
 

data/spec/nio/selector_spec.rb

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require "spec_helper"
 
 # 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
 
-describe NIO::Selector do
+RSpec.describe NIO::Selector do
   let(:pair)   { IO.pipe }
   let(:reader) { pair.first }
   let(:writer) { pair.last }
@@ -117,7 +117,7 @@ describe NIO::Selector do
   context "select" do
     it "selects IO objects" do
       writer << "ohai"
-      unready, _ = IO.pipe
+      unready = IO.pipe.first
 
       reader_monitor  = subject.register(reader, :r)
       unready_monitor = subject.register(unready, :r)
@@ -147,7 +147,7 @@ describe NIO::Selector do
       readable2, writer = IO.pipe
       writer << "ohai"
 
-      unreadable, _ = IO.pipe
+      unreadable = IO.pipe.first
 
       monitor1 = subject.register(readable1, :r)
       monitor2 = subject.register(readable2, :r)
@@ -161,6 +161,12 @@ describe NIO::Selector do
       expect(readables).to include monitor2
       expect(readables).not_to include monitor3
     end
+
+    it "raises IOError if asked to select on a closed selector" do
+      subject.close
+
+      expect { subject.select(0) }.to raise_exception IOError
+    end
   end
 
   it "closes" do

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
-require 'coveralls'
+require "coveralls"
 Coveralls.wear!
 
-require 'rubygems'
-require 'bundler/setup'
-require 'nio'
-require 'support/selectable_examples'
+require "rubygems"
+require "bundler/setup"
+require "nio"
+require "support/selectable_examples"
+
+RSpec.configure(&:disable_monkey_patching!)

data/spec/support/selectable_examples.rb

@@ -1,4 +1,4 @@
-shared_context "an NIO selectable" do
+RSpec.shared_context "an NIO selectable" do
   let(:selector) { NIO::Selector.new }
 
   it "selects readable objects" do
@@ -26,25 +26,25 @@ shared_context "an NIO selectable" do
   end
 end
 
-shared_context "an NIO selectable stream" do
+RSpec.shared_context "an NIO selectable stream" do
   let(:selector) { NIO::Selector.new }
   let(:stream)   { pair.first }
   let(:peer)     { pair.last }
 
   it "selects readable when the other end closes" do
     # hax: this test is broken for OpenSSL sockets
-    skip 'broken for SSL ;_;' if peer.is_a? OpenSSL::SSL::SSLSocket
+    skip "broken for SSL ;_;" if peer.is_a? OpenSSL::SSL::SSLSocket
 
     monitor = selector.register(stream, :r)
     expect(selector.select(0)).to be_nil
 
     peer.close
-    #Wait and give the TCP session time to close
+    # Wait and give the TCP session time to close
     expect(selector.select(0.1)).to include monitor
   end
 end
 
-shared_context "an NIO bidirectional stream" do
+RSpec.shared_context "an NIO bidirectional stream" do
   let(:selector) { NIO::Selector.new }
   let(:stream)   { pair.first }
   let(:peer)     { pair.last }

data/tasks/extension.rake

@@ -1,11 +1,11 @@
 if defined? JRUBY_VERSION
-  require 'rake/javaextensiontask'
-  Rake::JavaExtensionTask.new('nio4r_ext') do |ext|
-    ext.ext_dir = 'ext/nio4r'
+  require "rake/javaextensiontask"
+  Rake::JavaExtensionTask.new("nio4r_ext") do |ext|
+    ext.ext_dir = "ext/nio4r"
   end
 else
-  require 'rake/extensiontask'
-  Rake::ExtensionTask.new('nio4r_ext') do |ext|
-    ext.ext_dir = 'ext/nio4r'
+  require "rake/extensiontask"
+  Rake::ExtensionTask.new("nio4r_ext") do |ext|
+    ext.ext_dir = "ext/nio4r"
   end
-end
+end

data/tasks/rspec.rake

@@ -1,7 +1,7 @@
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new
 
 RSpec::Core::RakeTask.new(:rcov) do |task|
-    task.rcov = true
+  task.rcov = true
 end

data/tasks/rubocop.rake

@@ -0,0 +1,3 @@
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: New IO for Ruby
 email:
 - tony.arcieri@gmail.com
@@ -62,6 +76,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
@@ -108,6 +124,7 @@ files:
 - spec/support/selectable_examples.rb
 - tasks/extension.rake
 - tasks/rspec.rake
+- tasks/rubocop.rake
 homepage: https://github.com/celluloid/nio4r
 licenses:
 - MIT
@@ -128,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: NIO provides a high performance selector API for monitoring IO objects
@@ -142,4 +159,3 @@ test_files:
 - spec/nio/selector_spec.rb
 - spec/spec_helper.rb
 - spec/support/selectable_examples.rb
-has_rdoc: