nio4r 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 339fc3cc040e41d266a9f83ab155d903294fcdc5
-  data.tar.gz: 8872185b3bfadc884b36b65ea1a17a2c082d7090
+  metadata.gz: 40a72f524510c03062dc6c3dbf8a6a20236b1f25
+  data.tar.gz: 0378f2eeeb4ab372da04f9a2f1010d4847c85587
 SHA512:
-  metadata.gz: 73083b74bdcb581449b5b0534209fdd9b1c08059ee946eaf9f8155d72605030c127046a7819d4ed325e0bf3e525c4aec81a41c00b55077f9e5b4629dd147d931
-  data.tar.gz: 44eb8368129b34cfb8780b98334ff8a67029d1751fdfc756ee761cb19c975f55a95c5166a251dba88ea7f587a3441f19650dcb13d936d88c60f847bda9c20d1d
+  metadata.gz: 02c255084b29eccedf83860ece30471660af81abcf294cc332cd86816c963ff53e81d1fa4ed7f84108e33762775b08fbf124877452690dfe4755d23cb5788bf4
+  data.tar.gz: 6b5e34b3863e6cfe1311f4aed6706de099cc09371a2fb8a6439c6a5f164afa2511a18cf0086abded3541770561342c0d6a58ad4e96aaa6b5d7021e66054f1bbe

data/CHANGES.md

@@ -1,7 +1,12 @@
+1.2.1 (2016-01-31)
+------------------
+* Fix bug in the JRuby backend which cases indefinite blocking when small
+  timeout values are passed to the selector
+
 1.2.0 (2015-12-22)
 ------------------
 * Add NIO::Monitor#interests= API for changing interests. Contributed by
-  @UpeksheJay as a Google Summer of Code project.
+  Upekshe Jayasekera as a Google Summer of Code project.
 * Update to libev 4.22
 
 1.1.1 (2015-07-17)

data/Gemfile

@@ -1,7 +1,15 @@
 source "https://rubygems.org"
 
+gemspec
+
 gem "jruby-openssl" if defined? JRUBY_VERSION
-gem "coveralls", require: false
 
-# Specify your gem's dependencies in nio4r.gemspec
-gemspec
+group :development do
+  gem "rake-compiler"
+end
+
+group :test do
+  gem "rspec",     "~> 3.0"
+  gem "rubocop",   "0.36.0"
+  gem "coveralls", require: false
+end

data/README.md

@@ -1,9 +1,10 @@
 ![nio4r](https://raw.github.com/celluloid/nio4r/master/logo.png)
 ===============
-[![Gem Version](https://badge.fury.io/rb/nio4r.png)](http://rubygems.org/gems/nio4r)
-[![Build Status](https://secure.travis-ci.org/celluloid/nio4r.png?branch=master)](http://travis-ci.org/celluloid/nio4r)
-[![Code Climate](https://codeclimate.com/github/celluloid/nio4r.png)](https://codeclimate.com/github/celluloid/nio4r)
-[![Coverage Status](https://coveralls.io/repos/celluloid/nio4r/badge.png?branch=master)](https://coveralls.io/r/celluloid/nio4r)
+[![Gem Version](https://badge.fury.io/rb/nio4r.svg)](http://rubygems.org/gems/nio4r)
+[![Build Status](https://secure.travis-ci.org/celluloid/nio4r.svg?branch=master)](http://travis-ci.org/celluloid/nio4r)
+[![Code Climate](https://codeclimate.com/github/celluloid/nio4r.svg)](https://codeclimate.com/github/celluloid/nio4r)
+[![Coverage Status](https://coveralls.io/repos/celluloid/nio4r/badge.svg?branch=master)](https://coveralls.io/r/celluloid/nio4r)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/celluloid/nio4r/blob/master/LICENSE.txt)
 
 nio4r: New IO for Ruby.
 
@@ -137,6 +138,7 @@ if you aren't concerned with thread safety, or you're within a #select
 block:
 
 - ***#interests***: what this monitor is interested in (:r, :w, or :rw)
+- ***#interests=***: change the current interests for a monitor (to :r, :w, or :rw)
 - ***#readiness***: what I/O operations the monitored object is ready for
 - ***#readable?***: was the IO readable last time it was selected?
 - ***#writable?***: was the IO writable last time it was selected?
@@ -187,8 +189,8 @@ however this is not the case today.
 License
 -------
 
-Copyright (c) 2011-2015 Tony Arcieri. Distributed under the MIT License.
+Copyright (c) 2011-2016 Tony Arcieri. Distributed under the MIT License.
 See LICENSE.txt for further details.
 
-Includes libev 4.19. Copyright (c) 2009-2014 Marc Alexander Lehmann.
+Includes libev 4.22. Copyright (c) 2007-2015 Marc Alexander Lehmann.
 Distributed under the BSD license. See ext/libev/LICENSE for details.

data/ext/nio4r/org/nio4r/Nio4r.java

@@ -287,7 +287,12 @@ public class Nio4r implements Library {
                     } else if(t < 0) {
                         throw runtime.newArgumentError("time interval must be positive");
                     } else {
-                        result = this.selector.select((long)(t * 1000));
+                        long timeoutMilliSeconds = (long)(t * 1000);
+                        if(timeoutMilliSeconds == 0) {
+                          result = this.selector.selectNow();
+                        } else {
+                          result = this.selector.select(timeoutMilliSeconds);
+                        }
                     }
                 }
                 context.getThread().afterBlockingCall();

data/lib/nio.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thread"
 require "socket"
 require "nio/version"
@@ -16,7 +18,7 @@ end
 if ENV["NIO4R_PURE"] == "true" || (Gem.win_platform? && !defined?(JRUBY_VERSION))
   require "nio/monitor"
   require "nio/selector"
-  NIO::ENGINE = "ruby"
+  NIO::ENGINE = "ruby".freeze
 else
   require "nio4r_ext"
 
@@ -24,8 +26,8 @@ else
     require "java"
     require "jruby"
     org.nio4r.Nio4r.new.load(JRuby.runtime, false)
-    NIO::ENGINE = "java"
+    NIO::ENGINE = "java".freeze
   else
-    NIO::ENGINE = "libev"
+    NIO::ENGINE = "libev".freeze
   end
 end

data/lib/nio/monitor.rb

@@ -39,7 +39,7 @@ module NIO
     def writable?
       readiness == :w || readiness == :rw
     end
-    alias_method :writeable?, :writable?
+    alias writeable? writable?
 
     # Is this monitor closed?
     def closed?

data/lib/nio/selector.rb

@@ -78,11 +78,7 @@ module NIO
 
         ready_writers.each do |io|
           monitor = @selectables[io]
-          if monitor.readiness == :r
-            monitor.readiness = :rw
-          else
-            monitor.readiness = :w
-          end
+          monitor.readiness = (monitor.readiness == :r) ? :rw : :w
           selected_monitors << monitor
         end
 

data/lib/nio/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NIO
-  VERSION = "1.2.0"
+  VERSION = "1.2.1".freeze
 end

data/nio4r.gemspec

@@ -23,8 +23,6 @@ Gem::Specification.new do |gem|
     gem.extensions = ["ext/nio4r/extconf.rb"]
   end
 
-  gem.add_development_dependency "rake-compiler"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "rubocop"
+  gem.add_development_dependency "bundler"
 end

data/spec/nio/selector_spec.rb

@@ -1,4 +1,5 @@
 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
@@ -115,6 +116,16 @@ RSpec.describe NIO::Selector do
   end
 
   context "select" do
+    it "does not block on super small precision intervals" do
+      wait_interval = 1e-4
+
+      expect do
+        Timeout.timeout(2) do
+          subject.select(wait_interval)
+        end
+      end.not_to raise_error
+    end
+
     it "selects IO objects" do
       writer << "ohai"
       unready = IO.pipe.first

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,21 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,7 +117,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: NIO provides a high performance selector API for monitoring IO objects