nio4r 2.5.8 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f8bda8397f00743e7ca6814df9ae0072197fe4a1c9ba49efa74c8b44148ee71
-  data.tar.gz: c3fb1c470e4d378346f67b0c07fb7ffe4fe5527339097297a3b93ac950202d0b
+  metadata.gz: 1572a271d329a29e7168c04b8f3776a41f23f495227a0a41ab9f1cd80233f1d6
+  data.tar.gz: 6c7e944abd93038272299db034c3c67829d093e2ce4a75292eba4c654cd2ae0f
 SHA512:
-  metadata.gz: 51c13b6c08c436b692b0e858abc704d1e682667a302c55e43635a043daf2b26b8faff4ad67c1ea02ca2d619efad776903497b15ad67d2dd22894dd82a598cd49
-  data.tar.gz: '08297c9a051369fd39ad02489ddeb35595f1fbba313c3516d24f60e4e4e46db41307da90075a5a3b11ac377ad410bf908719d585ad1e3ba1b7ba867d520e4c0c'
+  metadata.gz: 78e502f54f1eedeb948c412e9ecc5fa241c082b3ed292d9a50d1acbff76ee499904d70367eccb52db5c513f6bd91ac647846fa6cce6632ca9ba22c5d28a46682
+  data.tar.gz: 992198b186b8186e37bc84da3d89b1ddbae76ae9e8aaa45973111a8a9cd94e80c7b23ed9558449c409079b2b9c6cb1ca9edefa78ef5f8010c43a7c34ee000fc4

data/.github/workflows/workflow.yml

@@ -14,34 +14,48 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, ubuntu-18.04, macos-10.15, windows-2019 ]
-        ruby: [ head, 3.0, 2.7, 2.6, 2.5, 2.4, jruby, truffleruby-head ]
+        os: 
+          - ubuntu-22.04
+          - macos-11
+          - windows-2022
+        ruby:
+          - "2.4"
+          - "2.5"
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "head"
+          - "jruby"
+          - "truffleruby"
         include:
-          - { os: ubuntu-16.04, ruby: 3.0 }
-          - { os: ubuntu-16.04, ruby: 2.4 }
+          - {os: ubuntu-20.04, ruby: "3.2"}
+          - {os: windows-2019, ruby: "3.2"}
+          - {os: windows-2022, ruby: ucrt}
         exclude:
-          - { os: windows-2019, ruby: head  }
-          - { os: windows-2019, ruby: jruby }
-          - { os: windows-2019, ruby: truffleruby-head }
+          - {os: windows-2022, ruby: head}
+          - {os: windows-2022, ruby: jruby}
+          - {os: windows-2022, ruby: truffleruby}
 
     steps:
-      - name: repo checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: load ruby
-        uses: ruby/setup-ruby@v1
+      - name: set JAVA_HOME
+        if: |
+          startsWith(matrix.ruby, 'jruby')
+        shell: bash
+        run:  |
+          echo JAVA_HOME=$JAVA_HOME_11_X64 >> $GITHUB_ENV
+
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{matrix.ruby}}
+          bundler-cache: true
 
-      - name: RubyGems, Bundler Update
-        run: gem update --system --no-document --conservative
-
-      - name: bundle install
-        run: bundle install --path .bundle/gems --without development
-
-      - name: compile
+      - name: Compile
         run: bundle exec rake compile
 
-      - name: test
+      - name: Test
         run: bundle exec rake spec
         timeout-minutes: 10

data/CHANGES.md

@@ -1,3 +1,22 @@
+## 2.5.8 (2021-08-03)
+
+* [#276](https://github.com/socketry/nio4r/pull/276)
+  Fix missing return statement in function returning non-void (issue [#275](https://github.com/socketry/nio4r/pull/275))
+  ([@ioquatix])
+* Remove `guard-rspec` from development dependencies ([@ioquatix])
+
+## 2.5.7 (2021-03-04)
+
+* [#267](https://github.com/socketry/nio4r/pull/267)
+  Don't try to link universal extension
+  ([@ioquatix])
+
+## 2.5.6 (2021-03-04)
+
+* [#268](https://github.com/socketry/nio4r/pull/268)
+  Prefer kqueue when on OSX >= v10.12.2
+  ([@jcmfernandes])
+
 ## 2.5.5 (2021-02-05)
 
 * [#256](https://github.com/socketry/nio4r/pull/256)

data/Gemfile

@@ -11,8 +11,7 @@ group :development do
 end
 
 group :development, :test do
-  gem "coveralls", require: false
-  gem "rake-compiler", require: false
+  gem "rake-compiler", "~> 1.1.9", require: false
   gem "rspec", "~> 3.7", require: false
   gem "rubocop", "0.82.0", require: false
 end

data/README.md

@@ -3,7 +3,6 @@
 [![Gem Version](https://badge.fury.io/rb/nio4r.svg)](http://rubygems.org/gems/nio4r)
 [![Build Status](https://github.com/socketry/nio4r/workflows/nio4r/badge.svg?branch=master&event=push)](https://github.com/socketry/nio4r/actions?query=workflow:nio4r)
 [![Code Climate](https://codeclimate.com/github/socketry/nio4r.svg)](https://codeclimate.com/github/socketry/nio4r)
-[![Coverage Status](https://coveralls.io/repos/socketry/nio4r/badge.svg?branch=master)](https://coveralls.io/r/socketry/nio4r)
 [![Yard Docs](https://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/gems/nio4r/2.2.0)
 
 **New I/O for Ruby (nio4r)**: cross-platform asynchronous I/O primitives for
@@ -98,36 +97,3 @@ rake clean
 rake compile
 rake release
 ```
-
-## License
-
-Released under the MIT license.
-
-Copyright, 2019, by Tony Arcieri.  
-Copyright, 2019, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-### libev
-
-Released under the BSD license. See [ext/libev/LICENSE] for details.
-
-Copyright, 2007-2019, by Marc Alexander Lehmann.
-
-[ext/libev/LICENSE]: https://github.com/socketry/nio4r/blob/master/ext/libev/LICENSE

data/ext/nio4r/extconf.rb

@@ -4,7 +4,10 @@ require "rubygems"
 
 # Write a dummy Makefile on Windows because we use the pure Ruby implementation there
 if Gem.win_platform?
-  require "devkit" if RUBY_PLATFORM.include?("mingw")
+  begin
+    require "devkit" if RUBY_PLATFORM.include?("mingw")
+  rescue LoadError => e
+  end
   File.write("Makefile", "all install::\n")
   File.write("nio4r_ext.so", "")
   exit

data/ext/nio4r/selector.c

@@ -43,13 +43,13 @@ static VALUE NIO_Selector_closed(VALUE self);
 static VALUE NIO_Selector_is_empty(VALUE self);
 
 /* Internal functions */
-static VALUE NIO_Selector_synchronize(VALUE self, VALUE (*func)(VALUE *args), VALUE *args);
+static VALUE NIO_Selector_synchronize(VALUE self, VALUE (*func)(VALUE arg), VALUE arg);
 static VALUE NIO_Selector_unlock(VALUE lock);
-static VALUE NIO_Selector_register_synchronized(VALUE *args);
-static VALUE NIO_Selector_deregister_synchronized(VALUE *args);
-static VALUE NIO_Selector_select_synchronized(VALUE *args);
-static VALUE NIO_Selector_close_synchronized(VALUE *args);
-static VALUE NIO_Selector_closed_synchronized(VALUE *args);
+static VALUE NIO_Selector_register_synchronized(VALUE arg);
+static VALUE NIO_Selector_deregister_synchronized(VALUE arg);
+static VALUE NIO_Selector_select_synchronized(VALUE arg);
+static VALUE NIO_Selector_close_synchronized(VALUE arg);
+static VALUE NIO_Selector_closed_synchronized(VALUE arg);
 
 static int NIO_Selector_run(struct NIO_Selector *selector, VALUE timeout);
 static void NIO_Selector_timeout_callback(struct ev_loop *ev_loop, struct ev_timer *timer, int revents);
@@ -62,7 +62,7 @@ static void NIO_Selector_wakeup_callback(struct ev_loop *ev_loop, struct ev_io *
 #define BUSYWAIT_INTERVAL 0.01
 
 /* Selectors wait for events */
-void Init_NIO_Selector()
+void Init_NIO_Selector(void)
 {
     mNIO = rb_define_module("NIO");
     cNIO_Selector = rb_define_class_under(mNIO, "Selector", rb_cObject);
@@ -285,7 +285,7 @@ static VALUE NIO_Selector_backend(VALUE self)
 }
 
 /* Synchronize around a reentrant selector lock */
-static VALUE NIO_Selector_synchronize(VALUE self, VALUE (*func)(VALUE *args), VALUE *args)
+static VALUE NIO_Selector_synchronize(VALUE self, VALUE (*func)(VALUE arg), VALUE arg)
 {
     VALUE current_thread, lock_holder, lock;
 
@@ -298,10 +298,10 @@ static VALUE NIO_Selector_synchronize(VALUE self, VALUE (*func)(VALUE *args), VA
         rb_ivar_set(self, rb_intern("lock_holder"), current_thread);
 
         /* We've acquired the lock, so ensure we unlock it */
-        return rb_ensure(func, (VALUE)args, NIO_Selector_unlock, self);
+        return rb_ensure(func, (VALUE)arg, NIO_Selector_unlock, self);
     } else {
         /* We already hold the selector lock, so no need to unlock it */
-        return func(args);
+        return func(arg);
     }
 }
 
@@ -321,17 +321,18 @@ static VALUE NIO_Selector_unlock(VALUE self)
 /* Register an IO object with the selector for the given interests */
 static VALUE NIO_Selector_register(VALUE self, VALUE io, VALUE interests)
 {
-    VALUE args[3] = { self, io, interests };
-    return NIO_Selector_synchronize(self, NIO_Selector_register_synchronized, args);
+    VALUE args[3] = {self, io, interests};
+    return NIO_Selector_synchronize(self, NIO_Selector_register_synchronized, (VALUE)args);
 }
 
 /* Internal implementation of register after acquiring mutex */
-static VALUE NIO_Selector_register_synchronized(VALUE *args)
+static VALUE NIO_Selector_register_synchronized(VALUE _args)
 {
     VALUE self, io, interests, selectables, monitor;
     VALUE monitor_args[3];
     struct NIO_Selector *selector;
 
+    VALUE *args = (VALUE *)_args;
     self = args[0];
     io = args[1];
     interests = args[2];
@@ -361,15 +362,16 @@ static VALUE NIO_Selector_register_synchronized(VALUE *args)
 /* Deregister an IO object from the selector */
 static VALUE NIO_Selector_deregister(VALUE self, VALUE io)
 {
-    VALUE args[2] = { self, io };
-    return NIO_Selector_synchronize(self, NIO_Selector_deregister_synchronized, args);
+    VALUE args[2] = {self, io};
+    return NIO_Selector_synchronize(self, NIO_Selector_deregister_synchronized, (VALUE)args);
 }
 
 /* Internal implementation of register after acquiring mutex */
-static VALUE NIO_Selector_deregister_synchronized(VALUE *args)
+static VALUE NIO_Selector_deregister_synchronized(VALUE _args)
 {
     VALUE self, io, selectables, monitor;
 
+    VALUE *args = (VALUE *)_args;
     self = args[0];
     io = args[1];
 
@@ -396,7 +398,6 @@ static VALUE NIO_Selector_is_registered(VALUE self, VALUE io)
 static VALUE NIO_Selector_select(int argc, VALUE *argv, VALUE self)
 {
     VALUE timeout;
-    VALUE args[2];
 
     rb_scan_args(argc, argv, "01", &timeout);
 
@@ -404,19 +405,19 @@ static VALUE NIO_Selector_select(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "time interval must be positive");
     }
 
-    args[0] = self;
-    args[1] = timeout;
-
-    return NIO_Selector_synchronize(self, NIO_Selector_select_synchronized, args);
+    VALUE args[2] = {self, timeout};
+    return NIO_Selector_synchronize(self, NIO_Selector_select_synchronized, (VALUE)args);
 }
 
 /* Internal implementation of select with the selector lock held */
-static VALUE NIO_Selector_select_synchronized(VALUE *args)
+static VALUE NIO_Selector_select_synchronized(VALUE _args)
 {
     int ready;
     VALUE ready_array;
     struct NIO_Selector *selector;
 
+    VALUE *args = (VALUE *)_args;
+
     Data_Get_Struct(args[0], struct NIO_Selector, selector);
 
     if (selector->closed) {
@@ -504,14 +505,13 @@ static VALUE NIO_Selector_wakeup(VALUE self)
 /* Close the selector and free system resources */
 static VALUE NIO_Selector_close(VALUE self)
 {
-    VALUE args[1] = { self };
-    return NIO_Selector_synchronize(self, NIO_Selector_close_synchronized, args);
+    return NIO_Selector_synchronize(self, NIO_Selector_close_synchronized, self);
 }
 
-static VALUE NIO_Selector_close_synchronized(VALUE *args)
+static VALUE NIO_Selector_close_synchronized(VALUE self)
 {
     struct NIO_Selector *selector;
-    VALUE self = args[0];
+
     Data_Get_Struct(self, struct NIO_Selector, selector);
 
     NIO_Selector_shutdown(selector);
@@ -522,14 +522,13 @@ static VALUE NIO_Selector_close_synchronized(VALUE *args)
 /* Is the selector closed? */
 static VALUE NIO_Selector_closed(VALUE self)
 {
-    VALUE args[1] = { self };
-    return NIO_Selector_synchronize(self, NIO_Selector_closed_synchronized, args);
+    return NIO_Selector_synchronize(self, NIO_Selector_closed_synchronized, self);
 }
 
-static VALUE NIO_Selector_closed_synchronized(VALUE *args)
+static VALUE NIO_Selector_closed_synchronized(VALUE self)
 {
     struct NIO_Selector *selector;
-    VALUE self = args[0];
+
     Data_Get_Struct(self, struct NIO_Selector, selector);
 
     return selector->closed ? Qtrue : Qfalse;

data/lib/nio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NIO
-  VERSION = "2.5.8"
+  VERSION = "2.5.9"
 end

data/license.md

@@ -0,0 +1,66 @@
+# MIT License
+
+Copyright, 2011-2020, by Tony Arcieri.
+Copyright, 2012, by Logan Bowers.
+Copyright, 2013, by FURUHASHI Sadayuki.
+Copyright, 2013, by Stephen von Takach.
+Copyright, 2013, by Tim Carey-Smith.
+Copyright, 2013, by brainopia.
+Copyright, 2013, by Luis Lavena.
+Copyright, 2014, by SHIBATA Hiroshi.
+Copyright, 2014, by Sergey Avseyev.
+Copyright, 2014, by JohnnyT.
+Copyright, 2015-2017, by Tiago Cardoso.
+Copyright, 2015, by Daniel Berger.
+Copyright, 2015, by Upekshe.
+Copyright, 2015-2016, by UpeksheJay.
+Copyright, 2015, by Vladimir Kochnev.
+Copyright, 2016-2018, by Jun Aruga.
+Copyright, 2016, by Omer Katz.
+Copyright, 2016-2021, by Olle Jonsson.
+Copyright, 2017, by usa.
+Copyright, 2017, by HoneyryderChuck.
+Copyright, 2017, by tompng.
+Copyright, 2018-2021, by Samuel Williams.
+Copyright, 2019, by Cédric Boutillier.
+Copyright, 2019-2020, by MSP-Greg.
+Copyright, 2019-2020, by Benoit Daloze.
+Copyright, 2019, by Jesús Burgos Maciá.
+Copyright, 2019, by Thomas Kuntz.
+Copyright, 2019, by Orien Madgwick.
+Copyright, 2019, by Thomas Dziedzic.
+Copyright, 2019, by Zhang Kang.
+Copyright, 2020, by eladeyal-intel.
+Copyright, 2020, by Pedro Paiva.
+Copyright, 2020, by Bo.
+Copyright, 2020, by Charles Oliver Nutter.
+Copyright, 2020-2021, by Joao Fernandes.
+Copyright, 2021, by Jun Jiang.
+Copyright, 2021, by Jeffrey Martin.
+Copyright, 2021, by Pavel Lobashov.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+## libev
+
+Released under the BSD license. See [ext/libev/LICENSE] for details.
+
+Copyright, 2007-2019, by Marc Alexander Lehmann.
+
+[ext/libev/LICENSE]: https://github.com/socketry/nio4r/blob/master/ext/libev/LICENSE

data/rakelib/extension.rake

@@ -4,8 +4,7 @@ if defined? JRUBY_VERSION
   require "rake/javaextensiontask"
   Rake::JavaExtensionTask.new("nio4r_ext") do |ext|
     ext.ext_dir = "ext/nio4r"
-    ext.source_version = "1.8"
-    ext.target_version = "1.8"
+    ext.release = '8'
   end
 else
   require "rake/extensiontask"

data/spec/nio/selectables/ssl_socket_spec.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "openssl"
 
 RSpec.describe OpenSSL::SSL::SSLSocket do
-
-  require "openssl"
-
   before(:all) do
     @tls = []
   end

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "coveralls"
-Coveralls.wear!
-
 require "nio"
 require "support/selectable_examples"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 2.5.8
+  version: 2.5.9
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2023-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - lib/nio/monitor.rb
 - lib/nio/selector.rb
 - lib/nio/version.rb
+- license.md
 - logo.png
 - nio4r.gemspec
 - rakelib/extension.rake
@@ -109,8 +110,8 @@ licenses:
 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.8
-  source_code_uri: https://github.com/socketry/nio4r/tree/v2.5.8
+  documentation_uri: https://www.rubydoc.info/gems/nio4r/2.5.9
+  source_code_uri: https://github.com/socketry/nio4r/tree/v2.5.9
   wiki_uri: https://github.com/socketry/nio4r/wiki
 post_install_message:
 rdoc_options: []
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: New IO for Ruby