supplement 2.31 → 2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ecb9754ff9168f112f5cc9535bdd6fa1dd1877cb7eb4738757a32854a56c325
-  data.tar.gz: 983d0b6c6c91258fd74eb0e6fe31f16124654e730d750a09105fe66873086915
+  metadata.gz: 9a7108dafb3707ef51a08d12ac718a6c00358bae7b3f98e32448886f8d9dd29b
+  data.tar.gz: d389cf607de0a21d6b4cd3a02550a25200f68205cbaad22ed442025123420bed
 SHA512:
-  metadata.gz: 31724b42dca923848441e648d91757c58bb212a63d91a3613fbedb760b6894f64d432bfb30de89f95fbba93002b9e316283efab175ef747e162ca174ac25e3c4
-  data.tar.gz: 5f9e2ff5d368ea29e22bc2218c22b2261b582a8d81724ae5fb48f841fd1c6d77d3367950a68372a74fd8287a8b51b08ba0c7e7635d5bed296619362103f2f5bb
+  metadata.gz: e4006b5753eff8a4cce364b2e26a0717493948177e2476818113b7a62070fdf69ff71bc72105a14cf7d02a639471a282e99181e7f702f618678db63483dc7e1e
+  data.tar.gz: ae9e62b121909a5cdfb63abea92a3abd2ca71bf887a6364806dd2af55c7e44796bfcaa09cafb326f14f27ffa84332817630c8fb4aced20995220d4b43af0f5b5

data/LICENSE

@@ -1,6 +1,6 @@
 # BSD-2-clause license, extended by language use conditions
 
-Copyright (C) 2009-2025, Bertram Scharpf <software@bertram-scharpf.de>.
+Copyright (C) 2009-2026, Bertram Scharpf <software@bertram-scharpf.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -1,4 +1,4 @@
-# supplement 2.31  --  Useful Ruby enhancements
+# supplement 2.32  --  Useful Ruby enhancements
 
 Some simple Ruby extensions.
 
@@ -48,7 +48,7 @@ one of them to be included into the Ruby standard.
 
 ## Copyright
 
-  * (C) 2009-2025 Bertram Scharpf <software@bertram-scharpf.de>
+  * (C) 2009-2026 Bertram Scharpf <software@bertram-scharpf.de>
   * License: [BSD-2-Clause+](./LICENSE)
   * Repository: [ruby-supplement](https://github.com/BertramScharpf/ruby-supplement)
 

data/lib/mkrf_conf

@@ -10,8 +10,8 @@ Autorake.configure {
 
   extending_ruby
 
-  if RUBY_VERSION < "3.3" then
-    enable :old_io_functions
+  if RUBY_VERSION < "3.3" then  # Always false after March 2026
+    enable :some_calls
   end
 
   have_header "ruby/ruby.h"

data/lib/supplement/locked.c

@@ -28,29 +28,14 @@
 VALUE
 rb_locked_init( int argc, VALUE *argv, VALUE self)
 {
-#ifdef FEATURE_OLD_IO_FUNCTIONS
-    rb_io_t *fptr;
-#endif
     struct timeval time;
     int op;
 
-#ifdef FEATURE_OLD_IO_FUNCTIONS
-    GetOpenFile( self, fptr);
-#endif
-
     rb_call_super_kw(argc, argv, RB_PASS_CALLED_KEYWORDS);
 
-#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) {
@@ -72,11 +57,7 @@ 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,14 +13,6 @@ static VALUE io_unget( VALUE);
 static VALUE io_reset( VALUE);
 
 
-#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:
  *     io.unget(str, ...)   -> nil
@@ -33,28 +25,20 @@ 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_str( RB_FAIL_PATH( io, fptr));
+        rb_sys_fail_str( rb_io_path( io));
     newtio = oldtio;
     newtio.c_iflag &= ~ICRNL;
     if (tcsetattr( fd, TCSANOW, &newtio) < 0)
-        rb_sys_fail_str( RB_FAIL_PATH( io, fptr));
+        rb_sys_fail_str( rb_io_path( io));
 
-    v[0] = &fd, v[1] = (void *) RB_IO_VAR( io, fptr), v[2] = &oldtio,
+    v[0] = &fd, v[1] = (void *) io, v[2] = &oldtio,
         v[3] = &argc, v[4] = (void *) argv;
     return rb_ensure( io_unget, (VALUE) v, io_reset, (VALUE) v);
 }
@@ -76,7 +60,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_str( RB_FAIL_PATH( (VALUE) vp[1], (rb_io_t *) vp[1]));
+                rb_sys_fail_str( rb_io_path( (VALUE) vp[1]));
     }
     return Qnil;
 }
@@ -87,7 +71,7 @@ io_reset( VALUE v)
     void **vp = (void **) v;
 
     if (tcsetattr( *(int *) vp[0], TCSANOW, (struct termios *) vp[2]) < 0)
-        rb_sys_fail_str( RB_FAIL_PATH( (VALUE) vp[1], (rb_io_t *) vp[1]));
+        rb_sys_fail_str( rb_io_path( (VALUE) vp[1]));
 
     return Qnil;
 }
@@ -105,22 +89,14 @@ 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_str( RB_FAIL_PATH( self, fptr));
+        rb_sys_fail_str( rb_io_path( self));
     r = rb_ary_new2( 4);
     rb_ary_store( r, 0, INT2NUM( w.ws_col));
     rb_ary_store( r, 1, INT2NUM( w.ws_row));

data/lib/supplement.c

@@ -12,7 +12,6 @@
 
 
 static long  supplement_args_len_default( int, VALUE *);
-static void  supplement_make_ellipse( void);
 static void  supplement_ary_assure_notempty( VALUE);
 static VALUE supplement_index_blk( VALUE);
 static VALUE supplement_index_ref( VALUE, VALUE);
@@ -21,8 +20,7 @@ static VALUE supplement_rindex_ref( VALUE, VALUE);
 static VALUE supplement_do_unumask( VALUE);
 
 
-static VALUE supplement_ellipse = Qnil;
-static long  supplement_len_ell = 0;
+static const char *supplement_ellipse = "...";
 
 static ID id_delete_at = 0;
 static ID id_cmp = 0;
@@ -112,28 +110,6 @@ rb_krn_tap_bang( VALUE obj)
 }
 
 
-/*
- *  call-seq:
- *     with { |x| ... }    -> obj
- *
- *  Warning. This method will be removed. Use +Kernel#then+ instead.
- *
- *  Yields +x+ to the block.
- *  The difference to +tap+ is that the block's result will be returned.
- *
- *  Use this to narrow your namespace.
- *
- */
-
-VALUE
-rb_krn_with( VALUE obj)
-{
-    rb_category_warning(RB_WARN_CATEGORY_DEPRECATED,
-        "Kernel#with will be removed from the supplement gem. Use Kernel#then instead.");
-    return rb_yield( obj);
-}
-
-
 /*
  *  Document-class: Module
  */
@@ -413,15 +389,6 @@ supplement_args_len_default( int argc, VALUE *argv)
     return r;
 }
 
-void
-supplement_make_ellipse( void)
-{
-    if (!NIL_P( supplement_ellipse))
-        return;
-    supplement_ellipse = rb_str_new2( "...");
-    supplement_len_ell = rb_str_strlen( supplement_ellipse);
-}
-
 /*
  *  call-seq:
  *     axe( n = 80)   -> str
@@ -445,12 +412,16 @@ rb_str_axe( int argc, VALUE *argv, VALUE str)
 
     oldlen = rb_str_strlen( str);
     if (newlen < oldlen) {
-        supplement_make_ellipse();
-        if (newlen >= supplement_len_ell) {
-            ret = rb_str_substr( str, 0, newlen - supplement_len_ell);
-            rb_str_append( ret, supplement_ellipse);
+        VALUE ell;
+        long le;
+
+        ell = rb_str_new2( supplement_ellipse);
+        le = rb_str_strlen( ell);
+        if (newlen >= le) {
+            ret = rb_str_substr( str, 0, newlen - le);
+            rb_str_append( ret, ell);
         } else
-            ret = rb_str_substr( supplement_ellipse, 0, newlen);
+            ret = rb_str_substr( ell, 0, newlen);
     } else
         ret = str;
     return ret;
@@ -484,12 +455,15 @@ rb_str_axe_bang( int argc, VALUE *argv, VALUE str)
 
     oldlen = rb_str_strlen( str);
     if (newlen < oldlen) {
+        VALUE ell;
+        long le;
         long re;
 
         rb_str_update( str, newlen, oldlen - newlen, rb_str_new( NULL, 0));
-        supplement_make_ellipse();
-        re = newlen < supplement_len_ell ? newlen : supplement_len_ell;
-        rb_str_update( str, newlen - re, re, rb_str_substr( supplement_ellipse, 0, re));
+        ell = rb_str_new2( supplement_ellipse);
+        le = rb_str_strlen( ell);
+        re = newlen < le ? newlen : le;
+        rb_str_update( str, newlen - re, re, rb_str_substr( ell, 0, re));
         return str;
     } else
         return Qnil;
@@ -1227,7 +1201,6 @@ void Init_supplement( void)
     rb_define_method( rb_cObject, "new_string", rb_obj_new_string, 0);
     rb_define_method( rb_cObject, "nil_if", rb_obj_nil_if, 1);
     rb_define_method( rb_mKernel, "tap!", rb_krn_tap_bang, 0);
-    rb_define_method( rb_mKernel, "with", rb_krn_with, 0);
 
     rb_define_method( rb_cModule, "plain_name", rb_module_plain_name, 0);
 

data/lib/supplement.h

@@ -12,7 +12,6 @@
 extern VALUE rb_obj_new_string( VALUE);
 extern VALUE rb_obj_nil_if( VALUE, VALUE);
 extern VALUE rb_krn_tap_bang( VALUE);
-extern VALUE rb_krn_with( VALUE);
 
 extern VALUE rb_module_plain_name( VALUE);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supplement
 version: !ruby/object:Gem::Version
-  version: '2.31'
+  version: '2.32'
 platform: ruby
 authors:
 - Bertram Scharpf
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="