supplement 2.13 → 2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2e9e61df27643fc4cebe593ba085cbbfb26a3fbcc87094c5a80c9ea10b2cf2
-  data.tar.gz: b6d88bb52fe8e8655f2df9d0c567b164fe81f5f1c935f27cfbdfd553201c1116
+  metadata.gz: f7d2c8a62b912713a7bd3fde72cee97061910e0ee58e24486244bf08300b53aa
+  data.tar.gz: f08f0bd64339672d195765b8815f9d25e26274b0253897ceb54cc5f475dbd768
 SHA512:
-  metadata.gz: 87a0fd7dad676d4f8920506c796ca047fbcf4d3ce751377e12b5b5e4174e82e474ef405ded030289dc310a469f5b35eef517ccf00382a44f2626f32f18b63d7a
-  data.tar.gz: d023c6da1c77ab1b56acc978da9b107d7a9c76f6988a87ec9babfb2429dd56331ef69dc10ad72bdad86bb53387a5cccb311bb0405e13dc952bac3125482ed3f4
+  metadata.gz: 77e7a1dc857124d246dea1254da88d575cf2284513cc2cda5ee43ef600e9bb1a498b7e6669961142c3b70259e7090edb75800a5802add6275abf80b70e6bf86f
+  data.tar.gz: 4ee842477fe6b142c9956267d0347bf5b9fd19da879ba52bf69f079108e3492a4a1c3674568940c20975e201a536518364f56b5c0c7ac1084392dbefb4fa69f0

data/README

@@ -1,4 +1,4 @@
-= supplement 2.13  --  Useful Ruby enhancements
+= supplement 2.15  --  Useful Ruby enhancements
 
 
 Some simple Ruby extensions.
@@ -59,6 +59,7 @@ Now here it is where I can just point to.
   * Struct.[]
   * Integer.roman
   * Date.easter
+  * TCPServer.accept with a code block
   * File system stats
   * Process.renice
   * Interval timer

data/lib/Rakefile

@@ -17,6 +17,7 @@ DLs = {
   "supplement/filesys.so"  => %w(supplement/filesys.o),
   "supplement/itimer.so"   => %w(supplement/itimer.o),
   "supplement/terminal.so" => %w(supplement/terminal.o),
+  "supplement/socket.so"   => %w(supplement/socket.o),
 }
 
 DLs.each { |k,v|

data/lib/mkrf_conf

@@ -15,6 +15,7 @@ Autorake.configure {
       enable :dir_children
       if RUBY_VERSION < "1.9.2" then
         enable :array_select_bang
+        enable :file_size
         if RUBY_VERSION < "1.9" then
           enable :string_ord
           enable :string_clear

data/lib/supplement/filesys.c

@@ -354,7 +354,6 @@ rb_fsstat_inspect( VALUE self)
         rb_str_append( str, rb_inspect( (*member[i].func)( self)));
     }
     rb_str_buf_cat2( str, ">");
-    OBJ_INFECT( str, self);
 
     return str;
 }

data/lib/supplement/locked.c

@@ -59,8 +59,8 @@ rb_locked_init( int argc, VALUE *argv, VALUE self)
         static ID id_lock_failed = 0;
 
         switch (errno) {
-	case EINTR:
-	    break;
+        case EINTR:
+            break;
         case EAGAIN:
         case EACCES:
 #if defined( EWOULDBLOCK) && EWOULDBLOCK != EAGAIN

data/lib/supplement/socket.c

@@ -0,0 +1,53 @@
+/*
+ *  supplement/socket.c  --  Socket methods
+ */
+
+#if   HAVE_HEADER_RUBYIO_H
+    #include <rubyio.h>
+#elif HAVE_HEADER_RUBY_IO_H
+    #include <ruby/io.h>
+#endif
+
+
+static ID id_accept_orig;
+static ID id_close;
+
+static VALUE socket_close( VALUE);
+
+
+/*
+ *  call-seq:
+ *     socket.accept() { |socket| ... }  -> obj
+ *
+ *  Accept a connection and yield it to a block, if given.
+ */
+
+VALUE
+rb_socket_accept( VALUE socket)
+{
+    VALUE a = rb_funcall( socket, id_accept_orig, 0);
+    return rb_block_given_p() ?
+        rb_ensure( rb_yield, a, socket_close, a) : a;
+}
+
+VALUE
+socket_close( VALUE v)
+{
+    return rb_funcall( v, id_close, 0);
+}
+
+
+void Init_socket( void)
+{
+    VALUE rb_cTCPServer;
+
+    id_accept_orig = rb_intern( "accept_orig");
+    id_close = rb_intern( "close");
+
+    rb_require( "socket");
+    rb_cTCPServer = rb_const_get( rb_cObject, rb_intern( "TCPServer"));
+
+    rb_define_alias( rb_cTCPServer, "accept_orig", "accept");
+    rb_define_method( rb_cTCPServer, "accept", rb_socket_accept, 0);
+}
+

data/lib/supplement/socket.h

@@ -0,0 +1,21 @@
+/*
+ *  supplement/socket.h  --  Socket methods
+ */
+
+#ifndef __SUPPLEMENT_SOCKET_H__
+#define __SUPPLEMENT_SOCKET_H__
+
+#if   HAVE_HEADER_RUBY_H
+    #include <ruby.h>
+#elif HAVE_HEADER_RUBY_RUBY_H
+    #include <ruby/ruby.h>
+#endif
+
+
+extern VALUE rb_socket_accept( VALUE);
+
+
+extern void Init_socket( void);
+
+#endif
+

data/lib/supplement.c

@@ -328,7 +328,6 @@ rb_str_eat( int argc, VALUE *argv, VALUE str)
         val = rb_str_new5( str, RSTRING_PTR( str) + r, -n);
     }
     RSTRING_LEN( str) = r;
-    OBJ_INFECT( val, str);
 #else
     if (n > 0) {
         r = 0;
@@ -667,11 +666,10 @@ rb_str_axe( int argc, VALUE *argv, VALUE str)
         e = rb_str_strlen( ell);
 #endif
         if (newlen > e) {
-          ret = rb_str_substr( str, 0, newlen - e);
-          rb_str_append( ret, ell);
+            ret = rb_str_substr( str, 0, newlen - e);
+            rb_str_append( ret, ell);
         } else
             ret = rb_str_substr( str, 0, newlen);
-        OBJ_INFECT( ret, str);
     } else
         ret = str;
     return ret;
@@ -1189,6 +1187,9 @@ rb_hash_notempty_p( VALUE hash)
  *  Document-class: File
  */
 
+
+#ifdef FEATURE_FILE_SIZE
+
 /*
  *  call-seq:
  *     size   -> integer
@@ -1223,6 +1224,8 @@ rb_file_size( VALUE obj)
     return INT2FIX( st.st_size);
 }
 
+#endif
+
 
 /*
  *  call-seq:
@@ -1568,7 +1571,9 @@ void Init_supplement( void)
 
     rb_define_method( rb_cHash, "notempty?", rb_hash_notempty_p, 0);
 
+#ifdef FEATURE_FILE_SIZE
     rb_define_method( rb_cFile, "size", rb_file_size, 0);
+#endif
     rb_define_singleton_method( rb_cFile, "umask", rb_file_s_umask, -1);
 
     rb_define_singleton_method( rb_cDir, "current", rb_dir_s_current, 0);

data/lib/supplement.h

@@ -66,7 +66,9 @@ extern VALUE rb_num_cbrt( VALUE);
 
 extern VALUE rb_hash_notempty_p( VALUE);
 
+#ifdef FEATURE_FILE_SIZE
 extern VALUE rb_file_size( VALUE);
+#endif
 extern VALUE rb_file_s_umask( int, VALUE *, VALUE);
 extern VALUE rb_dir_s_current( VALUE);
 extern VALUE rb_dir_s_mkdir_bang( int, VALUE *, VALUE);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: supplement
 version: !ruby/object:Gem::Version
-  version: '2.13'
+  version: '2.15'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autorake
@@ -53,6 +53,8 @@ files:
 - lib/supplement/locked.c
 - lib/supplement/locked.h
 - lib/supplement/roman.rb
+- lib/supplement/socket.c
+- lib/supplement/socket.h
 - lib/supplement/terminal.c
 - lib/supplement/terminal.h
 homepage: http://www.bertram-scharpf.de/software/supplement