nio4r 2.5.2-java → 2.5.7-java

data/lib/nio.rb

@@ -12,9 +12,28 @@ module NIO
   def self.engine
     ENGINE
   end
+
+  def self.pure?(env = ENV)
+    # The user has explicitly opted in to non-native implementation:
+    if env["NIO4R_PURE"] == "true"
+      return true
+    end
+
+    # Native Ruby on Windows is not supported:
+    if (Gem.win_platform? && !defined?(JRUBY_VERSION))
+      return true
+    end
+
+    # M1 native extension is crashing on M1 (arm64):
+    # if RUBY_PLATFORM =~ /darwin/ && RUBY_PLATFORM =~ /arm64/
+    #   return true
+    # end
+
+    return false
+  end
 end
 
-if ENV["NIO4R_PURE"] == "true" || (Gem.win_platform? && !defined?(JRUBY_VERSION))
+if NIO.pure?
   require "nio/monitor"
   require "nio/selector"
   require "nio/bytebuffer"

data/lib/nio/bytebuffer.rb

@@ -24,6 +24,7 @@ module NIO
     # @return [NIO::ByteBuffer]
     def initialize(capacity)
       raise TypeError, "no implicit conversion of #{capacity.class} to Integer" unless capacity.is_a?(Integer)
+
       @capacity = capacity
       clear
     end
@@ -119,9 +120,11 @@ module NIO
     # @return [self]
     def put(str)
       raise TypeError, "expected String, got #{str.class}" unless str.respond_to?(:to_str)
+
       str = str.to_str
 
       raise OverflowError, "buffer is full" if str.length > @limit - @position
+
       @buffer[@position...str.length] = str
       @position += str.length
       self
@@ -188,6 +191,7 @@ module NIO
     # @raise [NIO::ByteBuffer::MarkUnsetError] mark has not been set (call `#mark` first)
     def reset
       raise MarkUnsetError, "mark has not been set" unless @mark
+
       @position = @mark
       self
     end

data/lib/nio/monitor.rb

@@ -8,7 +8,7 @@ module NIO
 
     # :nodoc:
     def initialize(io, interests, selector)
-      unless io.is_a? OpenSSL::SSL::SSLSocket
+      unless defined?(::OpenSSL) && io.is_a?(::OpenSSL::SSL::SSLSocket)
         unless io.is_a?(IO)
           if IO.respond_to? :try_convert
             io = IO.try_convert(io)

data/lib/nio/selector.rb

@@ -14,7 +14,7 @@ module NIO
 
     # Create a new NIO::Selector
     def initialize(backend = :ruby)
-      raise ArgumentError, "unsupported backend: #{backend}" unless backend == :ruby
+      raise ArgumentError, "unsupported backend: #{backend}" unless [:ruby, nil].include?(backend)
 
       @selectables = {}
       @lock = Mutex.new
@@ -26,14 +26,16 @@ module NIO
 
     # Return a symbol representing the backend I/O multiplexing mechanism used.
     # Supported backends are:
-    # * :ruby    - pure Ruby (i.e IO.select)
-    # * :java    - Java NIO on JRuby
-    # * :epoll   - libev w\ Linux epoll
-    # * :poll    - libev w\ POSIX poll
-    # * :kqueue  - libev w\ BSD kqueue
-    # * :select  - libev w\ SysV select
-    # * :port    - libev w\ I/O completion ports
-    # * :unknown - libev w\ unknown backend
+    # * :ruby     - pure Ruby (i.e IO.select)
+    # * :java     - Java NIO on JRuby
+    # * :epoll    - libev w\ Linux epoll
+    # * :poll     - libev w\ POSIX poll
+    # * :kqueue   - libev w\ BSD kqueue
+    # * :select   - libev w\ SysV select
+    # * :port     - libev w\ I/O completion ports
+    # * :linuxaio - libev w\ Linux AIO io_submit (experimental)
+    # * :io_uring - libev w\ Linux io_uring (experimental)
+    # * :unknown  - libev w\ unknown backend
     def backend
       :ruby
     end
@@ -44,7 +46,7 @@ module NIO
     # * :w - is the IO writeable?
     # * :rw - is the IO either readable or writeable?
     def register(io, interest)
-      unless io.is_a? OpenSSL::SSL::SSLSocket
+      unless defined?(::OpenSSL) && io.is_a?(::OpenSSL::SSL::SSLSocket)
         io = IO.try_convert(io)
       end
 

data/lib/nio/version.rb

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

data/nio4r.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path("../lib/nio/version", __FILE__)
+require File.expand_path("lib/nio/version", __dir__)
 
 Gem::Specification.new do |spec|
   spec.authors       = ["Tony Arcieri"]
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
     "wiki_uri"          => "https://github.com/socketry/nio4r/wiki"
   }
 
-  spec.required_ruby_version = ">= 2.3"
+  spec.required_ruby_version = ">= 2.4"
 
   if defined? JRUBY_VERSION
     spec.files << "lib/nio4r_ext.jar"

data/spec/nio/bytebuffer_spec.rb

@@ -352,4 +352,3 @@ RSpec.describe NIO::ByteBuffer do
     end
   end
 end
-# rubocop:enable Metrics/BlockLength

data/spec/nio/selectables/ssl_socket_spec.rb

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

data/spec/nio/selectables/udp_socket_spec.rb

@@ -33,8 +33,8 @@ RSpec.describe UDPSocket, if: !defined?(JRUBY_VERSION) do
       peer.send("X" * 1024, 0)
       cntr += 1
       t = select [], [peer], [], 0
-    rescue Errno::ECONNREFUSED => ex
-      skip "Couldn'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

data/spec/nio/selector_spec.rb

@@ -24,6 +24,10 @@ RSpec.describe NIO::Selector do
       example.reporter.message "Supported backends: #{described_class.backends}"
     end
 
+    it "automatically selects a backend if none or nil is specified" do
+      expect(described_class.new.backend).to eq described_class.new(nil).backend
+    end
+
     it "raises ArgumentError if given an invalid backend" do
       expect { described_class.new(:derp) }.to raise_error ArgumentError
     end
@@ -234,4 +238,3 @@ RSpec.describe NIO::Selector do
     expect(subject).to be_closed
   end
 end
-# rubocop:enable Metrics/BlockLength

data/spec/spec_helper.rb

@@ -12,6 +12,8 @@ RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"
 
+  config.filter_run_when_matching :focus
+
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.7
 platform: java
 authors:
 - Tony Arcieri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -46,16 +46,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/workflow.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
-- Guardfile
 - README.md
 - Rakefile
-- appveyor.yml
 - examples/echo_server.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
@@ -63,6 +61,7 @@ files:
 - ext/libev/ev.c
 - ext/libev/ev.h
 - ext/libev/ev_epoll.c
+- ext/libev/ev_iouring.c
 - ext/libev/ev_kqueue.c
 - ext/libev/ev_linuxaio.c
 - ext/libev/ev_poll.c
@@ -71,6 +70,7 @@ files:
 - ext/libev/ev_vars.h
 - ext/libev/ev_win32.c
 - ext/libev/ev_wrap.h
+- ext/nio4r/.clang-format
 - ext/nio4r/bytebuffer.c
 - ext/nio4r/extconf.rb
 - ext/nio4r/libev.h
@@ -109,8 +109,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.2
-  source_code_uri: https://github.com/socketry/nio4r/tree/v2.5.2
+  documentation_uri: https://www.rubydoc.info/gems/nio4r/2.5.7
+  source_code_uri: https://github.com/socketry/nio4r/tree/v2.5.7
   wiki_uri: https://github.com/socketry/nio4r/wiki
 post_install_message:
 rdoc_options: []
@@ -120,15 +120,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: New IO for Ruby

data/.travis.yml

@@ -1,44 +0,0 @@
-language: ruby
-cache: bundler
-dist: xenial
-env: OS="xenial 16.04"
-bundler_args: --without development
-
-after_script:
-  - ruby -ropenssl -e "puts ENV['OS'], RUBY_DESCRIPTION, OpenSSL::OPENSSL_LIBRARY_VERSION"
-
-matrix:
-  fast_finish: true
-  include:
-    - rvm: 2.3
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-      env: NIO4R_PURE=true
-    - rvm: 2.6
-    - rvm: 2.3
-      dist: trusty
-      env: OS="trusty 14.04"
-    - rvm: 2.6.3
-      dist: bionic
-      env: OS="bionic 18.04"
-    - rvm: 2.6
-      os: osx
-      env: OS="osx"
-    - rvm: 2.4.6
-      os: osx
-      osx_image: xcode10.2
-      env: OS="osx xcode 10.2"
-    - rvm: truffleruby
-    - rvm: truffleruby
-      env: NIO4R_PURE=true
-    - rvm: jruby
-      env: JRUBY_OPTS="--debug -X+O --dev -J-Djruby.launch.inproc=true -J-Xmx1024M"
-    - rvm: jruby-head
-      env: JRUBY_OPTS="--debug -X+O --dev -J-Djruby.launch.inproc=true -J-Xmx1024M"
-    - rvm: ruby-head
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: truffleruby
-    - rvm: jruby-head
-    - rvm: jruby

data/Guardfile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-directories %w[lib spec]
-clearing :on
-
-guard :rspec, cmd: "bundle exec rspec" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})    { |m| "spec/#{m[1]}_spec.rb" }
-  watch("spec/spec_helper.rb") { "spec" }
-end

data/appveyor.yml

@@ -1,40 +0,0 @@
-build: off
-deploy: off
-
-environment:
-  PATH: C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  APPVEYOR_SAVE_CACHE_ON_ERROR: True
-  matrix:
-  - RUBY_VERSION: _trunk
-  - RUBY_VERSION: 26-x64
-  - RUBY_VERSION: 25-x64
-  - RUBY_VERSION: 24-x64
-  - RUBY_VERSION: 23-x64
-  - RUBY_VERSION: 23
-
-init:
-  - ps: |
-      if ($env:RUBY_VERSION -eq '_trunk') {
-        $trunk_uri = 'https://ci.appveyor.com/api/projects/MSP-Greg/ruby-loco/artifacts/ruby_trunk.7z'
-        (New-Object Net.WebClient).DownloadFile($trunk_uri, 'C:\ruby_trunk.7z')
-        7z.exe x C:\ruby_trunk.7z -oC:\Ruby_trunk
-      }
-
-install:
-  - SET RAKEOPT=-rdevkit
-  - gem update --system --conservative --no-document
-  - ruby -v
-  - gem -v
-  - bundle -v
-  - bundle install --path vendor\bundle --without development
-
-test_script:
-  - bundle exec rake spec
-
-matrix:
-  allow_failures:
-    - RUBY_VERSION: _trunk
-
-cache:
-  # If one of the files after the right arrow changes, cache will be invalidated
-  - vendor\bundle -> appveyor.yml, Gemfile, nio4r.gemspec