supplement 2.31.1 → 2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dff470072491d922eb1edfa3e305fad6323caa366f83379f10065de3c8ce5a84
-  data.tar.gz: a69fc76a288c99a345e583029fac4678ec591aaa6edd50cf896e77a498147cef
+  metadata.gz: 9a1c02a87bc3156c7468abf0618da0dc18769fc09335605638e62515ebfc4b3c
+  data.tar.gz: e73d0a28b4f10dafdaea31aa8aa55f85e29db0ecb5d392512ad0429a280a1e1d
 SHA512:
-  metadata.gz: cabaaa436d3f1e3a7bfae57e47c2df42980e8011a1f2a745be79489bbbdc164e8ef7a89c420369a0128e743618303649b396f045351009c5e3b85cca1e60e740
-  data.tar.gz: e5de3d55afe67a240d8efbf35198bed3ca114ef143c1e5a91d221b63ee3c5eea367b76548a250010bcc8eca420cc287f0305f612fb075c746ad267fd3a5ca168
+  metadata.gz: ca470be4d0d6f934d0adc74d249b52a1c682a38928848d03ea78ba3ef564cae49f2de61540b6e886fc8e08340085dacfd55d1516a9eab6bbc2c6dc3bfa227c79
+  data.tar.gz: 2c00ea6c30f2a6aa3b7f456d05c8f58895b12821590f928263e32e411d151ffe7e702b9b090cb954d677a628a5fc161217675b2a3496ae472230286300a3ca6a

data/README.md

@@ -1,4 +1,4 @@
-# supplement 2.31.1  --  Useful Ruby enhancements
+# supplement 2.33  --  Useful Ruby enhancements
 
 Some simple Ruby extensions.
 

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 :old_feature
   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

@@ -110,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
  */
@@ -432,7 +410,6 @@ rb_str_axe( int argc, VALUE *argv, VALUE str)
     if (newlen < 0)
         return Qnil;
 
-
     oldlen = rb_str_strlen( str);
     if (newlen < oldlen) {
         VALUE ell;
@@ -575,6 +552,43 @@ rb_str_ends_with_p( int argc, VALUE *argv, VALUE str)
 }
 
 
+/*
+ *  call-seq:
+ *     notempy?( oth)   -> nil or sym
+ *
+ *  Checks whether the head is <code>oth</code>. Returns length of
+ *  <code>oth</code> when matching.
+ *
+ *     :"sys-apps".starts_with?( "sys-")    #=> 4
+ *
+ *  Caution! The Ruby 1.9.3 method #start_with? (note the missing s)
+ *  just returns +true+ or +false+. Mnemonics: "s" = prepare for
+ *  <code>#slice</code>.
+ */
+
+
+/*
+ *  call-seq:
+ *     notempty?   -> nil or self
+ *
+ *  Returns <code>self</code> if and only if <code>str</code> is not
+ *  empty, <code>nil</code> otherwise.
+ *
+ *     :hello.notempty?     #=> :hello
+ *     :"".notempty?        #=> nil
+ *
+ *  This seems to be quite useless. Its only purpose is to avoid either type
+ *  detection or error catching if other objects are asked whether they're not
+ *  empty.
+ */
+
+VALUE
+rb_sym_notempty_p( VALUE sym)
+{
+    return NUM2LONG( rb_funcall( sym, rb_intern( "length"), 0)) ? sym : Qnil;
+}
+
+
 /*
  *  call-seq:
  *     starts_with?( oth)   -> nil or int
@@ -1224,7 +1238,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);
 
@@ -1243,6 +1256,7 @@ void Init_supplement( void)
     rb_define_method( rb_cString, "axe!", rb_str_axe_bang, -1);
     rb_define_method( rb_cString, "starts_with?", rb_str_starts_with_p, -1);
     rb_define_method( rb_cString, "ends_with?", rb_str_ends_with_p, -1);
+    rb_define_method( rb_cSymbol, "notempty?", rb_sym_notempty_p, 0);
     rb_define_method( rb_cSymbol, "starts_with?", rb_sym_starts_with_p, -1);
     rb_define_method( rb_cSymbol, "ends_with?", rb_sym_ends_with_p, -1);
 

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);
 
@@ -30,6 +29,7 @@ extern VALUE rb_str_axe( int, VALUE *, VALUE);
 extern VALUE rb_str_axe_bang( int, VALUE *, VALUE);
 extern VALUE rb_str_starts_with_p( int argc, VALUE *argv, VALUE);
 extern VALUE rb_str_ends_with_p( int argc, VALUE *argv, VALUE);
+extern VALUE rb_sym_notempty_p( VALUE);
 extern VALUE rb_sym_starts_with_p( int argc, VALUE *argv, VALUE);
 extern VALUE rb_sym_ends_with_p( int argc, VALUE *argv, VALUE);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supplement
 version: !ruby/object:Gem::Version
-  version: 2.31.1
+  version: '2.33'
 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:
   - - ">="