io-wait 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630936f8af6e2cf9265ebff0794cab1daf10048933460b71306486aecb92a85a
-  data.tar.gz: 153bc0301fdb8fce6f4983d45879364509bb6534a81775d98e5f61b5ffe1923e
+  metadata.gz: '09f49ee95b2ba86480e8e9433aeb0f05890e1573b04a9967f76a705da944c11b'
+  data.tar.gz: 48db6154ed263ecdb3a3ace629d629c18c18637e8577cec6d784310b38e33050
 SHA512:
-  metadata.gz: 07e0a9997d9e8dd84368feb0fdcd681282d7c583aea8d03d90abf031d6474224aa7a6f61050de11a03750cc0e20ba5759ac4eca28aae07891a778ef82cef24c6
-  data.tar.gz: 7294e823b4536cded39faead19916b437e4a8a4d398e35917c81e84d4618d5f99bd414aa9f6989cfad4bfb8bf0721fb7934b083a72576a7e95a60d7fcf35e853
+  metadata.gz: 72db9c0fea93027e7c8489ad5ecc7533c99f494743939ca2a1aaac3cac3847847538e07346ae53ca9026fb20aaa801ca0d35a5e8c491047f96b1e6cea0996e92
+  data.tar.gz: b70fc31c4c86f82e026be29904dbb819cb45deb2b6cff8d4cde4266f039c3b3b2c64e3b6c99be9df3034f1a9b8766d87078c1e2dba379aa542e914766712f564

data/.document

@@ -0,0 +1,6 @@
+COPYING
+ChangeLog
+README.md
+_doc/
+ext/
+logs/ChangeLog-*

data/.rdoc_options

@@ -0,0 +1,2 @@
+---
+main_page: README.md

data/Gemfile

@@ -7,5 +7,6 @@ group :development do
   gem "rake"
   gem "rake-compiler"
   gem "test-unit"
+  gem "test-unit-ruby-core"
   gem 'ruby-maven', :platforms => :jruby
 end

data/_doc/io.rb

@@ -0,0 +1,3 @@
+# See {IO}[https://docs.ruby-lang.org/en/master/IO.html]
+class IO
+end

data/ext/io/wait/depend

@@ -2,7 +2,7 @@
 wait.o: $(RUBY_EXTCONF_H)
 wait.o: $(arch_hdrdir)/ruby/config.h
 wait.o: $(hdrdir)/ruby.h
-# wait.o: $(hdrdir)/ruby/assert.h # not in 2.6
+wait.o: $(hdrdir)/ruby/assert.h
 wait.o: $(hdrdir)/ruby/backward.h
 wait.o: $(hdrdir)/ruby/defines.h
 wait.o: $(hdrdir)/ruby/encoding.h

data/ext/io/wait/extconf.rb

@@ -1,24 +1,21 @@
 # frozen_string_literal: false
 require 'mkmf'
 
-if RUBY_VERSION < "2.6"
-  File.write("Makefile", dummy_makefile($srcdir).join(""))
+target = "io/wait"
+have_func("rb_io_wait", "ruby/io.h")
+have_func("rb_io_descriptor", "ruby/io.h")
+unless macro_defined?("DOSISH", "#include <ruby.h>")
+  have_header(ioctl_h = "sys/ioctl.h") or ioctl_h = nil
+  fionread = %w[sys/ioctl.h sys/filio.h sys/socket.h].find do |h|
+    have_macro("FIONREAD", [h, ioctl_h].compact)
+  end
+  if fionread
+    $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
+    create_makefile(target)
+  end
 else
-  target = "io/wait"
-  have_func("rb_io_wait")
-  unless macro_defined?("DOSISH", "#include <ruby.h>")
-    have_header(ioctl_h = "sys/ioctl.h") or ioctl_h = nil
-    fionread = %w[sys/ioctl.h sys/filio.h sys/socket.h].find do |h|
-      have_macro("FIONREAD", [h, ioctl_h].compact)
-    end
-    if fionread
-      $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
-      create_makefile(target)
-    end
-  else
-    if have_func("rb_w32_ioctlsocket", "ruby.h")
-      have_func("rb_w32_is_socket", "ruby.h")
-      create_makefile(target)
-    end
+  if have_func("rb_w32_ioctlsocket", "ruby.h")
+    have_func("rb_w32_is_socket", "ruby.h")
+    create_makefile(target)
   end
 end

data/ext/io/wait/wait.c

@@ -87,8 +87,15 @@ io_nread(VALUE io)
     rb_io_check_readable(fptr);
     len = rb_io_read_pending(fptr);
     if (len > 0) return INT2FIX(len);
-    if (!FIONREAD_POSSIBLE_P(fptr->fd)) return INT2FIX(0);
-    if (ioctl(fptr->fd, FIONREAD, &n)) return INT2FIX(0);
+
+#ifdef HAVE_RB_IO_DESCRIPTOR
+    int fd = rb_io_descriptor(io);
+#else
+    int fd = fptr->fd;
+#endif
+
+    if (!FIONREAD_POSSIBLE_P(fd)) return INT2FIX(0);
+    if (ioctl(fd, FIONREAD, &n)) return INT2FIX(0);
     if (n > 0) return ioctl_arg2num(n);
     return INT2FIX(0);
 }
@@ -305,7 +312,7 @@ io_event_from_value(VALUE value)
 /*
  * call-seq:
  *   io.wait(events, timeout) -> event mask, false or nil
- *   io.wait(timeout = nil, mode = :read) -> self, true, or false
+ *   io.wait(*event_symbols[, timeout]) -> self, true, or false
  *
  * Waits until the IO becomes ready for the specified events and returns the
  * subset of events that become ready, or a falsy value when times out.
@@ -313,10 +320,14 @@ io_event_from_value(VALUE value)
  * The events can be a bit mask of +IO::READABLE+, +IO::WRITABLE+ or
  * +IO::PRIORITY+.
  *
- * Returns a truthy value immediately when buffered data is available.
+ * Returns an event mask (truthy value) immediately when buffered data is
+ * available.
  *
- * Optional parameter +mode+ is one of +:read+, +:write+, or
- * +:read_write+.
+ * The second form: if one or more event symbols (+:read+, +:write+, or
+ * +:read_write+) are passed, the event mask is the bit OR of the bitmask
+ * corresponding to those symbols.  In this form, +timeout+ is optional, the
+ * order of the arguments is arbitrary, and returns +io+ if any of the
+ * events is ready.
  *
  * You must require 'io/wait' to use this method.
  */
@@ -353,10 +364,6 @@ io_wait(int argc, VALUE *argv, VALUE io)
     rb_io_event_t events = 0;
     int i, return_io = 0;
 
-    /* The documented signature for this method is actually incorrect.
-     * A single timeout is allowed in any position, and multiple symbols can be given.
-     * Whether this is intentional or not, I don't know, and as such I consider this to
-     * be a legacy/slow path. */
     if (argc != 2 || (RB_SYMBOL_P(argv[0]) || RB_SYMBOL_P(argv[1]))) {
         /* We'd prefer to return the actual mask, but this form would return the io itself: */
         return_io = 1;

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io-wait
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Nobu Nakada
 - Charles Oliver Nutter
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-16 00:00:00.000000000 Z
+date: 2025-07-15 00:00:00.000000000 Z
 dependencies: []
 description: Waits until IO is readable or writable without blocking.
 email:
@@ -20,9 +19,12 @@ extensions:
 - ext/io/wait/extconf.rb
 extra_rdoc_files: []
 files:
+- ".document"
+- ".rdoc_options"
 - COPYING
 - Gemfile
 - README.md
+- _doc/io.rb
 - ext/io/wait/depend
 - ext/io/wait/extconf.rb
 - ext/io/wait/wait.c
@@ -33,7 +35,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/io-wait
   source_code_uri: https://github.com/ruby/io-wait
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -41,15 +42,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Waits until IO is readable or writable without blocking.
 test_files: []