io-console 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68ea32590c1c5fdbd640fe0ec413c957a44b51e328044cc28ea07633e3011c8e
-  data.tar.gz: a11938128973b7f0df1426b8f26ed0468cce448797e070618fa63537e5dd16bf
+  metadata.gz: 982d948cdd16ab0999b230f5bcd0518e9e45306b4520ca2279d070cd19c545aa
+  data.tar.gz: 5b7e540146b2f6ff031a094d8c4b127eae8d16031d9fd14bee1f98b14bd4e531
 SHA512:
-  metadata.gz: d21896a494519ab82a9a965d4ec85bc756d6383126d31c1151d6f82efbef9169c76fc4922cebf00896d9a858a0cb1a47e75976c203125c35f49243c98ae680c4
-  data.tar.gz: 2685280165623b607c8e20b6e8a3c85ac1bc40738df7f2d701c7299a3b43afbdfde20b0598e6fe81d9ef8c7c5aee843b4cc31d250b6055ec97180ab42f115a72
+  metadata.gz: 3ad6916e763a997cb36429a8c5968ece5e24932698560a3e12b1502ddc98478361915ea3b8f673a558c7a1d06355a1ca5ecfd7b5c8b505be73ca1d63c658278a
+  data.tar.gz: 07ad02584ba78446e4f959e5fd76fe1b8e1ec48e465c77a4ae14b6538a43567adbc03b2c105115eec84789d56b83b6649fca6b17f9087023fcc11cfdb6f57742

data/ext/io/console/console.c

@@ -4,7 +4,7 @@
  */
 
 static const char *const
-IO_CONSOLE_VERSION = "0.9.2";
+IO_CONSOLE_VERSION = "0.9.4";
 
 #include "ruby.h"
 #include "ruby/io.h"
@@ -178,6 +178,22 @@ typedef struct {
 # define NIL_OR_UNDEF_P(obj) (NIL_P(obj) || UNDEF_P(obj))
 #endif
 
+static int
+to_vtime(VALUE vtime)
+{
+    VALUE v10 = INT2FIX(10);
+    vtime = rb_funcall3(vtime, '*', 1, &v10);
+    return NUM2INT(vtime);
+}
+
+static unsigned char
+clamp_uchar(int n)
+{
+    if ((unsigned int)n >= UCHAR_MAX) n = UCHAR_MAX;
+    else if (n < 0) n = 0;
+    return (unsigned char)n;
+}
+
 static rawmode_arg_t *
 rawmode_opt(int *argcp, VALUE *argv, int min_argc, int max_argc, rawmode_arg_t *opts)
 {
@@ -209,13 +225,11 @@ rawmode_opt(int *argcp, VALUE *argv, int min_argc, int max_argc, rawmode_arg_t *
 	opts->vtime = 0;
 	opts->intr = 0;
 	if (!NIL_OR_UNDEF_P(vmin)) {
-	    opts->vmin = NUM2INT(vmin);
+	    opts->vmin = clamp_uchar(NUM2INT(vmin));
 	    optp = opts;
 	}
 	if (!NIL_OR_UNDEF_P(vtime)) {
-	    VALUE v10 = INT2FIX(10);
-	    vtime = rb_funcall3(vtime, '*', 1, &v10);
-	    opts->vtime = NUM2INT(vtime);
+	    opts->vtime = clamp_uchar(to_vtime(vtime));
 	    optp = opts;
 	}
 	switch (intr) {
@@ -762,6 +776,13 @@ conmode_init_copy(VALUE obj, VALUE obj2)
     return obj;
 }
 
+static VALUE
+conmode_get_echo(VALUE obj)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+    return echo_p(t) ? Qtrue : Qfalse;
+}
+
 static VALUE
 conmode_set_echo(VALUE obj, VALUE f)
 {
@@ -794,6 +815,58 @@ conmode_raw_new(int argc, VALUE *argv, VALUE obj)
     return conmode_new(rb_obj_class(obj), &t);
 }
 
+static VALUE
+conmode_get_min(VALUE obj)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+#ifdef VMIN
+    return INT2FIX(t->c_cc[VMIN]);
+#else
+    (void)t;
+    return Qnil;
+#endif
+}
+
+static VALUE
+conmode_set_min(VALUE obj, VALUE min)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+    int vmin = NIL_P(min) ? 1 : clamp_uchar(NUM2INT(min));
+#ifdef VMIN
+    t->c_cc[VMIN] = vmin;
+#else
+    (void)t;
+    (void)vmin;
+#endif
+    return min;
+}
+
+static VALUE
+conmode_get_time(VALUE obj)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+#ifdef VTIME
+    return rb_rational_new(INT2FIX(t->c_cc[VTIME]), INT2FIX(10));
+#else
+    (void)t;
+    return Qnil;
+#endif
+}
+
+static VALUE
+conmode_set_time(VALUE obj, VALUE time)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+    int vtime = NIL_P(time) ? 0 : clamp_uchar(to_vtime(time));
+#ifdef VTIME
+    t->c_cc[VTIME] = vtime;
+#else
+    (void)t;
+    (void)vtime;
+#endif
+    return time;
+}
+
 #ifdef _WIN32
 /*
  * call-seq:
@@ -2135,10 +2208,17 @@ puts_call(VALUE io)
     return rb_io_write(io, rb_default_rs);
 }
 
+static VALUE
+funcall_with_rs(VALUE obj, ID mid)
+{
+    const VALUE rs = rb_default_rs; /* rvalue in TruffleRuby */
+    return rb_funcallv(obj, mid, 1, &rs);
+}
+
 static VALUE
 gets_call(VALUE io)
 {
-    return rb_funcallv(io, id_gets, 0, 0);
+    return funcall_with_rs(io, id_gets);
 }
 
 static VALUE
@@ -2161,8 +2241,7 @@ static VALUE
 str_chomp(VALUE str)
 {
     if (!NIL_P(str)) {
-	const VALUE rs = rb_default_rs; /* rvalue in TruffleRuby */
-	rb_funcallv(str, id_chomp_bang, 1, &rs);
+	funcall_with_rs(str, id_chomp_bang);
     }
     return str;
 }
@@ -2223,7 +2302,7 @@ io_getpass(int argc, VALUE *argv, VALUE io)
  * call-seq:
  *   io.ttyname       -> string or nil
  *
- * Returns name of associated terminal (tty) if +io+ is not a tty.
+ * Returns name of associated terminal (tty) if +io+ is a tty.
  * Returns +nil+ otherwise.
  */
 static VALUE
@@ -2235,20 +2314,23 @@ console_ttyname(VALUE io)
     return rb_usascii_str_new_lit("con");
 # elif defined HAVE_TTYNAME_R
     {
+# ifdef TTYNAME_R_RETURNS_CHAR_P
+#   define ttyname_r(fd, name, size) (ttyname_r(fd, name, size) == NULL ? errno : 0)
+# endif
 	char termname[1024], *tn = termname;
 	size_t size = sizeof(termname);
 	int e;
-	if (ttyname_r(fd, tn, size) == 0)
+	if ((e = ttyname_r(fd, tn, size)) == 0)
 	    return rb_interned_str_cstr(tn);
-	if ((e = errno) == ERANGE) {
+	if (e == ERANGE) {
 	    VALUE s = rb_str_new(0, size);
 	    while (1) {
 		tn = RSTRING_PTR(s);
 		size = rb_str_capacity(s);
-		if (ttyname_r(fd, tn, size) == 0) {
+		if ((e = ttyname_r(fd, tn, size)) == 0) {
 		    return rb_str_to_interned_str(rb_str_resize(s, strlen(tn)));
 		}
-		if ((e = errno) != ERANGE) break;
+		if (e != ERANGE) break;
 		if ((size *= 2) >= INT_MAX/2) break;
 		rb_str_resize(s, size);
 	    }
@@ -2502,9 +2584,15 @@ InitVM_console(void)
         rb_define_alloc_func(cConmode, conmode_alloc);
         rb_undef_method(cConmode, "initialize");
         rb_define_method(cConmode, "initialize_copy", conmode_init_copy, 1);
+	rb_define_method(cConmode, "echo?", conmode_get_echo, 0);
+	rb_define_method(cConmode, "echo", conmode_get_echo, 0);
         rb_define_method(cConmode, "echo=", conmode_set_echo, 1);
         rb_define_method(cConmode, "raw!", conmode_set_raw, -1);
         rb_define_method(cConmode, "raw", conmode_raw_new, -1);
+	rb_define_method(cConmode, "min", conmode_get_min, 0);
+	rb_define_method(cConmode, "min=", conmode_set_min, 1);
+	rb_define_method(cConmode, "time", conmode_get_time, 0);
+	rb_define_method(cConmode, "time=", conmode_set_time, 1);
 #ifdef _WIN32
         rb_define_method(cConmode, "virtual_terminal_processing?", conmode_virtual_terminal_processing_p, 0);
         rb_define_method(cConmode, "virtual_terminal_processing=", conmode_set_virtual_terminal_processing, 1);

data/ext/io/console/extconf.rb

@@ -50,10 +50,35 @@ when true
   end
   have_func("rb_category_warn")
   have_const("RB_WARN_CATEGORY_DEPRECATED")
-  win32 or have_func("ttyname_r") or have_func("ttyname")
+  unless win32
+    if have_func("ttyname_r")
+      ret = checking_for("type of ttyname_r()", "%s") {try_link(<<~C) ? "int" : "char *"}
+          #{cpp_include %<unistd.h>}
+          int t(void) {char name[1024]; return ttyname_r(0, name, sizeof(name)) % 1024;}
+          #{MAIN_DOES_NOTHING('t')}
+        C
+      $defs << "-DTTYNAME_R_RETURNS_#{ret.tr_cpp}"
+    else
+      have_func("ttyname")
+    end
+  end
   have_func("rb_prepend_module") # not exported by TruffleRuby
+  vk_tool = find_executable("gperf")
   create_makefile("io/console") {|conf|
-    conf << "\n""VK_HEADER = #{vk_header}\n"
+    conf << "###\n" "all: # the default target\n"
+    if vk_header
+      conf << <<~MK
+        VK_HEADER = #{vk_header}
+        console.#$OBJEXT: $(VK_HEADER)
+      MK
+    end
+    if vk_tool and vk_mk = (File.read("#$srcdir/win32_vk.mk") rescue nil)
+      unless conf.any? {|c| /^ *top_srcdir *=/.match?(c)}
+        conf << "top_srcdir = $(srcdir)/../../..\n"
+      end
+      conf.concat(depend_rules(vk_mk))
+    end
+    conf
   }
 when nil
   File.write("Makefile", dummy_makefile($srcdir).join(""))

data/lib/io/console/size.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: false
 # fallback to console window size
 def IO.default_console_size
+  lines = ENV["LINES"].to_i
+  columns = ENV["COLUMNS"].to_i
   [
-    ENV["LINES"].to_i.nonzero? || 25,
-    ENV["COLUMNS"].to_i.nonzero? || 80,
+    lines.positive? ? lines : 25,
+    columns.positive? ? columns : 80,
   ]
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: io-console
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Nobu Nakada
 bindir: bin
 cert_chain: []
-date: 2026-08-10 00:00:00.000000000 Z
+date: 2026-09-17 00:00:00.000000000 Z
 dependencies: []
 description: add console capabilities to IO instances.
 email: nobu@ruby-lang.org