supplement 2.20 → 2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8787714cfe43e572f3ea76d897be6f62902bef77397723210e77cc05e9da3ffe
-  data.tar.gz: ba6d8f69cbdc98f9573bc67af364272cc69400935d94e21a058e2836b0c989f5
+  metadata.gz: 7195670e7cd62225ea949b29536edf23349f53688ad4bb85f2aae7e90497cef9
+  data.tar.gz: 61b52622f92b881337daf310681533758245f61b9939997caf018088e0f00547
 SHA512:
-  metadata.gz: 6e0f5c4e4ff4c1e515be996e30ff7f8437c13079718b832233bd591a9418e55c4f939522dec7023b8d1eb18b6b8c446f82316a3c82bf26530e3f5db2e74a9352
-  data.tar.gz: 6811a569b15b096aeada5c792cb0474944735be1967c02a6d0f8489e56b30f191507af03e5cede067b1b27c87f9aa243030691209ef7f5370981310c0ba40e7c
+  metadata.gz: 3fecc23c00a4981a04cd4193297ff84f768b2b37d98e471a36a86e7af062197ddbe4977f9d44c0f2f979b22dddfc4c28d889189e7c029cc0a7a4f6eb6b5b474b
+  data.tar.gz: 1e8e2585b26e5fa445d370b169a7ba73d08b42bec9399bf6b4ade2b90fc4fc0885d766a24c26705899bc176cf15d71d6b27645f3723ee1eff743bb2ce9a68016

data/README

@@ -1,4 +1,4 @@
-= supplement 2.20  --  Useful Ruby enhancements
+= supplement 2.21  --  Useful Ruby enhancements
 
 
 Some simple Ruby extensions.

data/lib/mkrf_conf

@@ -10,12 +10,15 @@ Autorake.configure {
 
   extending_ruby
 
-  if RUBY_VERSION < "2.7" then
-    if RUBY_VERSION < "2.6" then
-      enable :dir_children
+  if RUBY_VERSION < "3.3" then
+    if RUBY_VERSION < "2.7" then
+      if RUBY_VERSION < "2.6" then
+        enable :dir_children
+      end
+    else
+      enable :super_kwargs
     end
-  else
-    enable :super_kwargs
+    enable :old_io_functions
   end
 
   have_header "ruby/ruby.h"

data/lib/supplement/locked.c

@@ -28,20 +28,35 @@
 VALUE
 rb_locked_init( int argc, VALUE *argv, VALUE self)
 {
+#ifdef FEATURE_OLD_IO_FUNCTIONS
+    rb_io_t *fptr;
+#endif
 #ifdef HAVE_FUNC_RB_THREAD_WAIT_FOR
     struct timeval time;
 #endif
     int op;
 
+#ifdef FEATURE_OLD_IO_FUNCTIONS
+    GetOpenFile( self, fptr);
+#endif
+
 #ifdef FEATURE_SUPER_KWARGS
     rb_call_super_kw(argc, argv, RB_PASS_CALLED_KEYWORDS);
 #else
     rb_call_super( argc, argv);
 #endif
 
+#ifdef FEATURE_OLD_IO_FUNCTIONS
+    op = fptr->mode & FMODE_WRITABLE ? LOCK_EX : LOCK_SH;
+#else
     op = rb_io_mode( self) & FMODE_WRITABLE ? LOCK_EX : LOCK_SH;
+#endif
     op |= LOCK_NB;
+#ifdef FEATURE_OLD_IO_FUNCTIONS
+    while (flock( fptr->fd, op) < 0) {
+#else
     while (flock( rb_io_descriptor( self), op) < 0) {
+#endif
         static ID id_lock_failed = 0;
 
         switch (errno) {
@@ -67,7 +82,11 @@ rb_locked_init( int argc, VALUE *argv, VALUE self)
             }
             break;
         default:
+#ifdef FEATURE_OLD_IO_FUNCTIONS
+            rb_sys_fail_str( fptr->pathv);
+#else
             rb_sys_fail_str( rb_io_path( self));
+#endif
             break;
         }
     }

data/lib/supplement/terminal.c

@@ -13,7 +13,13 @@ static VALUE io_unget( VALUE);
 static VALUE io_reset( VALUE);
 
 
-#define RB_SYS_FAIL( io)     rb_sys_fail_str( rb_io_path( io));
+#ifdef FEATURE_OLD_IO_FUNCTIONS
+  #define RB_FAIL_PATH( io, fptr)   ((fptr)->pathv)
+  #define RB_IO_VAR(    io, fptr)   fptr
+#else
+  #define RB_FAIL_PATH( io, fptr)   rb_io_path( io)
+  #define RB_IO_VAR(    io, fptr)   io
+#endif
 
 /*
  *  call-seq:
@@ -27,20 +33,28 @@ static VALUE io_reset( VALUE);
 VALUE
 rb_io_unget( int argc, VALUE *argv, VALUE io)
 {
+#ifdef FEATURE_OLD_IO_FUNCTIONS
+    rb_io_t *fptr;
+#endif
     int fd;
     struct termios oldtio, newtio;
     void *v[5];
 
+#ifdef FEATURE_OLD_IO_FUNCTIONS
+    GetOpenFile( io, fptr);
+    fd = fptr->fd;
+#else
     fd = rb_io_descriptor( io);
+#endif
 
     if (tcgetattr( fd, &oldtio) < 0)
-        RB_SYS_FAIL( io);
+        rb_sys_fail_str( RB_FAIL_PATH( io, fptr));
     newtio = oldtio;
     newtio.c_iflag &= ~ICRNL;
     if (tcsetattr( fd, TCSANOW, &newtio) < 0)
-        RB_SYS_FAIL( io);
+        rb_sys_fail_str( RB_FAIL_PATH( io, fptr));
 
-    v[0] = &fd, v[1] = (void *) io, v[2] = &oldtio,
+    v[0] = &fd, v[1] = (void *) RB_IO_VAR( io, fptr), v[2] = &oldtio,
         v[3] = &argc, v[4] = (void *) argv;
     return rb_ensure( io_unget, (VALUE) v, io_reset, (VALUE) v);
 }
@@ -62,7 +76,7 @@ io_unget( VALUE v)
         p = RSTRING_PTR(str);
         for (i = RSTRING_LEN(str); i; --i, ++p)
             if (ioctl( *(int *) vp[0], TIOCSTI, p) < 0)
-                RB_SYS_FAIL( (VALUE) vp[1]);
+                rb_sys_fail_str( RB_FAIL_PATH( (VALUE) vp[1], (rb_io_t *) vp[1]));
     }
     return Qnil;
 }
@@ -73,7 +87,7 @@ io_reset( VALUE v)
     void **vp = (void **) v;
 
     if (tcsetattr( *(int *) vp[0], TCSANOW, (struct termios *) vp[2]) < 0)
-        RB_SYS_FAIL( (VALUE) vp[1]);
+        rb_sys_fail_str( RB_FAIL_PATH( (VALUE) vp[1], (rb_io_t *) vp[1]));
 
     return Qnil;
 }
@@ -91,14 +105,22 @@ io_reset( VALUE v)
 VALUE
 rb_io_wingeom( VALUE self)
 {
+#ifdef FEATURE_OLD_IO_FUNCTIONS
+    rb_io_t *fptr;
+#endif
     int fd;
     struct winsize w;
     VALUE r;
 
+#ifdef FEATURE_OLD_IO_FUNCTIONS
+    GetOpenFile( self, fptr);
+    fd = fptr->fd;
+#else
     fd = rb_io_descriptor( self);
+#endif
 
     if (ioctl( fd, TIOCGWINSZ, &w) < 0)
-        RB_SYS_FAIL( self);
+        rb_sys_fail_str( RB_FAIL_PATH( self, fptr));
     r = rb_ary_new2( 4);
     rb_ary_store( r, 0, INT2NUM( w.ws_col));
     rb_ary_store( r, 1, INT2NUM( w.ws_row));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: supplement
 version: !ruby/object:Gem::Version
-  version: '2.20'
+  version: '2.21'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby and the autorake gem
-rubygems_version: 3.5.14
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Simple Ruby extensions