nio4r 2.3.1 → 2.4.0

data/spec/support/selectable_examples.rb

@@ -1,11 +1,21 @@
 # frozen_string_literal: true
 
+RSpec.shared_context NIO::Selector do
+  let(:selector) {@selector = NIO::Selector.new}
+
+  after(:each) do
+    if defined?(@selector)
+      @selector.close
+    end
+  end
+end
+
 RSpec.shared_context "an NIO selectable" do
-  let(:selector) { NIO::Selector.new }
+  include_context NIO::Selector
 
-  it "selects readable objects", retry: 5 do # retry: Flaky on OS X
+  it "selects readable objects" do
     monitor = selector.register(readable_subject, :r)
-    ready = selector.select(0)
+    ready = selector.select(1)
     expect(ready).to be_an Enumerable
     expect(ready).to include monitor
   end
@@ -17,25 +27,29 @@ RSpec.shared_context "an NIO selectable" do
 
   it "selects writable objects" do
     monitor = selector.register(writable_subject, :w)
-    ready = selector.select(0)
+    ready = selector.select(1)
     expect(ready).to be_an Enumerable
     expect(ready).to include monitor
   end
 
   it "does not select unwritable objects" do
     selector.register(unwritable_subject, :w)
-    expect(selector.select(0)).to be_nil
+    ready = selector.select(0)
+    expect(ready).to be_nil
   end
 end
 
-RSpec.shared_context "an NIO selectable stream" do
-  let(:selector) { NIO::Selector.new }
+RSpec.shared_context "an NIO selectable stream" do |is_tls13|
+  include_context NIO::Selector
+
   let(:stream)   { pair.first }
   let(:peer)     { pair.last }
 
   it "selects readable when the other end closes" do
     monitor = selector.register(stream, :r)
-    expect(selector.select(0)).to be_nil
+    unless is_tls13
+      expect(selector.select(1)).to be_nil
+    end
 
     peer.close
     # Wait and give the TCP session time to close
@@ -44,22 +58,28 @@ RSpec.shared_context "an NIO selectable stream" do
 end
 
 RSpec.shared_context "an NIO bidirectional stream" do
-  let(:selector) { NIO::Selector.new }
-  let(:stream)   { pair.first }
-  let(:peer)     { pair.last }
+  include_context NIO::Selector
+
+  let(:stream) {pair.first}
+  let(:peer) {pair.last}
 
-  it "selects readable and writable", retry: 5 do # retry: Flaky on OS X
+  it "selects readable and writable" do
     selector.register(readable_subject, :rw)
-    selector.select(0) do |m|
-      expect(m.readiness).to eq(:rw)
+
+    selector.select(1) do |monitor|
+      expect(monitor.readiness).to eq(:rw)
     end
+
+    readable_subject.close
   end
+
   it "keeps readiness after the selectable has been closed" do
     selector.register(readable_subject, :rw)
-    selector.select(0) do |m|
-      expect(m.readiness).to eq(:rw)
+
+    selector.select(1) do |monitor|
+      expect(monitor.readiness).to eq(:rw)
       readable_subject.close
-      expect(m.readiness).to eq(:rw)
+      expect(monitor.readiness).to eq(:rw)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2019-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,7 +62,6 @@ files:
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README
-- ext/libev/README.embed
 - ext/libev/ev.c
 - ext/libev/ev.h
 - ext/libev/ev_epoll.c
@@ -73,7 +72,6 @@ files:
 - ext/libev/ev_vars.h
 - 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
@@ -92,6 +90,9 @@ files:
 - lib/nio/version.rb
 - logo.png
 - nio4r.gemspec
+- rakelib/extension.rake
+- rakelib/rspec.rake
+- rakelib/rubocop.rake
 - spec/nio/acceptables_spec.rb
 - spec/nio/bytebuffer_spec.rb
 - spec/nio/monitor_spec.rb
@@ -102,9 +103,6 @@ files:
 - spec/nio/selector_spec.rb
 - spec/spec_helper.rb
 - spec/support/selectable_examples.rb
-- tasks/extension.rake
-- tasks/rspec.rake
-- tasks/rubocop.rake
 homepage: https://github.com/socketry/nio4r
 licenses:
 - MIT
@@ -117,15 +115,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: New IO for Ruby

data/ext/libev/README.embed

@@ -1,3 +0,0 @@
-This file is now included in the main libev documentation, see
-
-   http://cvs.schmorp.de/libev/ev.html

data/ext/libev/test_libev_win32.c

@@ -1,123 +0,0 @@
-  // a single header file is required
-  #include <ev.h>
-   #include <stdio.h>
-   #include <io.h>
-
-   // every watcher type has its own typedef'd struct
-   // with the name ev_TYPE
-   ev_io stdin_watcher;
-   ev_timer timeout_watcher;
-
-   // all watcher callbacks have a similar signature
-   // this callback is called when data is readable on stdin
-   static void
-   stdin_cb (EV_P_ ev_io *w, int revents)
-   {
-     puts ("stdin ready or done or something");
-     // for one-shot events, one must manually stop the watcher
-     // with its corresponding stop function.
-     //ev_io_stop (EV_A_ w);
-
-     // this causes all nested ev_loop's to stop iterating
-     //ev_unloop (EV_A_ EVUNLOOP_ALL);
-   }
-
-   // another callback, this time for a time-out
-   static void
-   timeout_cb (EV_P_ ev_timer *w, int revents)
-   {
-     puts ("timeout");
-     // this causes the innermost ev_loop to stop iterating
-     ev_unloop (EV_A_ EVUNLOOP_ONE);
-   }
-
-
-
-   #include <winsock.h>
-
-#include <stdlib.h>
-#include <iostream>
-   int get_server_fd()
-   {
-
-  //----------------------
-  // Initialize Winsock.
-  WSADATA wsaData;
-  int iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
-  if (iResult != NO_ERROR) {
-    printf("Error at WSAStartup()\n");
-    return 1;
-  }
-
-  //----------------------
-  // Create a SOCKET for listening for
-  // incoming connection requests.
-  SOCKET ListenSocket;
-  ListenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  if (ListenSocket == INVALID_SOCKET) {
-    printf("Error at socket(): %ld\n", WSAGetLastError());
-    WSACleanup();
-    return 1;
-  }
-  printf("socket returned %d\n", ListenSocket);
-
-  //----------------------
-  // The sockaddr_in structure specifies the address family,
-  // IP address, and port for the socket that is being bound.
-  sockaddr_in service;
-  service.sin_family = AF_INET;
-  service.sin_addr.s_addr = inet_addr("127.0.0.1");
-  service.sin_port = htons(4444);
-
-  if (bind( ListenSocket,
-    (SOCKADDR*) &service,
-    sizeof(service)) == SOCKET_ERROR) {
-    printf("bind() failed.\n");
-    closesocket(ListenSocket);
-    WSACleanup();
-    return 1;
-  }
-
-  //----------------------
-  // Listen for incoming connection requests.
-  // on the created socket
-  if (listen( ListenSocket, 1 ) == SOCKET_ERROR) {
-    printf("Error listening on socket.\n");
-    closesocket(ListenSocket);
-    WSACleanup();
-    return 1;
-  }
-
-
-  printf("sock and osf handle are %d %d, error is \n", ListenSocket, _get_osfhandle (ListenSocket)); // -1 is invalid file handle: http://msdn.microsoft.com/en-us/library/ks2530z6.aspx
-  printf("err was %d\n",  WSAGetLastError());
-  //----------------------
-  return ListenSocket;
-   }
-
-
-   int
-   main (void)
-   {
-     struct ev_loop *loopy = ev_default_loop(0);
-     int fd = get_server_fd();
-     int fd_real =  _open_osfhandle(fd, NULL);
-     int conv = _get_osfhandle(fd_real);
-     printf("got server fd %d, loop %d, fd_real %d, that converted %d\n", fd, loopy, fd_real, conv);
-    // accept(fd, NULL, NULL);
-     // initialise an io watcher, then start it
-     // this one will watch for stdin to become readable
-     ev_io_init (&stdin_watcher, stdin_cb, /*STDIN_FILENO*/ conv, EV_READ);
-     ev_io_start (loopy, &stdin_watcher);
-
-     // initialise a timer watcher, then start it
-     // simple non-repeating 5.5 second timeout
-     //ev_timer_init (&timeout_watcher, timeout_cb, 15.5, 0.);
-     //ev_timer_start (loopy, &timeout_watcher);
-    printf("starting loop\n");
-     // now wait for events to arrive
-     ev_loop (loopy, 0);
-
-     // unloop was called, so exit
-     return 0;
-   }