io-console 0.9.2-java → 0.9.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd5a5305181bf526a7053c3303f099b0fa0e47d8791fa35c310e5af5ed5d5b9
-  data.tar.gz: 9db378bc55068b6c1ca6e79b57be5955013d577307d8a5faf50f4869ac3e5108
+  metadata.gz: 81030a79e741f9fbea14484f4849da9e6efc1daf0784d6d9b7fc067cc3a95357
+  data.tar.gz: f3c862f8495b89a129d0547177530875456cb44fcdf4f7b76d9ddb81c110b08b
 SHA512:
-  metadata.gz: 24b6dac4157c567a4caa5d6228375f38aa091de553ab8971dfe31c8a0c5af25c57c6b3c0235b6ba41ffc95711d8dfe85224c6486da85a50ceabddc57048a46fc
-  data.tar.gz: 577c04bb5a8ff5808418a74bd7835c7a795c8998b0fecbe71954ffe166f47fdc9f66c3fbe018b37232b91cb567d207a65679d1a084e2131528a429fb2fae749c
+  metadata.gz: 6441ea13e62add5a11937381834077352406e0fd96a4cd7ded00e6fbcdc08a4c0e1376aa9b42ec35a3aba9b68ca7a6e5b0b8eddd4086cec960cabc1d6a1565f4
+  data.tar.gz: 28f42664fef6544ae6cffcf2ebc09e921155c302c8cf8da85e3ff584697d5a98bf1893bccddf76cfe68fa391a3b7f86ebb97ffb2ab6eb6dd299ecdf19b055c3b

data/jruby/lib/io/console/backend/ffi/termios.rb

@@ -102,13 +102,19 @@ module IO::Console
   end
   private :ttymode_yield
 
-  TTY_RAW = Proc.new do |t, min: 1, time: nil, intr: nil|
+  TTY_SET_MIN = Proc.new do |t, min|
+    t[:c_cc][LibC::VMIN] = min ? min.to_i.clamp(0, 255) : 1
+  end
+
+  TTY_SET_TIME = Proc.new do |t, time|
+    t[:c_cc][LibC::VTIME] = time ? (time * 10).to_i.clamp(0, 255) : 0
+  end
+
+  TTY_RAW = Proc.new do |t, min: nil, time: nil, intr: nil|
     LibC.cfmakeraw(t.pointer)
     t[:c_lflag] &= ~(LibC::ECHOE|LibC::ECHOK)
-    if min >= 0
-      t[:c_cc][LibC::VMIN] = min
-    end
-    t[:c_cc][LibC::VTIME] = (time&.to_i || 0) * 10
+    TTY_SET_MIN[t, min]
+    TTY_SET_TIME[t, time]
     if intr
       t[:c_iflag] |= LibC::BRKINT
       t[:c_lflag] |= LibC::ISIG
@@ -116,18 +122,19 @@ module IO::Console
     end
   end
 
-  def raw(*, min: 1, time: nil, intr: nil, &block)
+  def raw(*, min: nil, time: nil, intr: nil, &block)
     ttymode_yield(block, min:, time:, intr:, &TTY_RAW)
   end
 
-  def raw!(*)
-    ttymode(&TTY_RAW)
+  def raw!(*, min: 1, time: nil, intr: nil)
+    ttymode { |t| TTY_RAW.call(t, min:, time:, intr:) }
+    self
   end
 
   TTY_COOKED = Proc.new do |t|
     t[:c_iflag] |= (LibC::BRKINT|LibC::ISTRIP|LibC::ICRNL|LibC::IXON)
     t[:c_oflag] |= LibC::OPOST
-    t[:c_lflag] |= (LibC::ECHO|LibC::ECHOE|LibC::ECHOK|LibC::ECHONL|LibC::ICANON|LibC::ISIG|LibC::IEXTEN)
+    t[:c_lflag] |= (TTY_ECHO|LibC::ICANON|LibC::ISIG|LibC::IEXTEN)
   end
 
   def cooked(*, &block)
@@ -157,6 +164,8 @@ module IO::Console
     ttymode_yield(block) { |t| t[:c_lflag] &= ~(TTY_ECHO) }
   end
 
+  private_constant :TTY_SET_TIME, :TTY_SET_MIN, :TTY_RAW, :TTY_COOKED, :TTY_ECHO
+
   class Mode
     attr_reader :termios
 
@@ -168,6 +177,11 @@ module IO::Console
       @termios = m.termios.dup
     end
 
+    def echo?
+      !(@termios[:c_lflag] & TTY_ECHO).zero?
+    end
+    alias echo echo?
+
     def echo=(echo)
       if echo
         @termios[:c_lflag] |= TTY_ECHO
@@ -186,6 +200,22 @@ module IO::Console
       TTY_RAW[new_mode.termios, min:, time:, intr:]
       new_mode
     end
+
+    def min
+      @termios[:c_cc][LibC::VMIN]
+    end
+
+    def min=(min)
+      TTY_SET_MIN[@termios, min]
+    end
+
+    def time
+      @termios[:c_cc][LibC::VTIME].quo(10)
+    end
+
+    def time=(time)
+      TTY_SET_TIME[@termios, time]
+    end
   end
 
   def console_mode
@@ -245,4 +275,5 @@ end
 
 class IO
   include Console
+  prepend PlatformTty if instance_method(:tty?).arity == 0
 end

data/jruby/lib/io/console/backend/ffi/windows.rb

@@ -118,11 +118,30 @@ end
 
 IO.prepend(IO::Console::Windows::TTY)
 
-class IO::ConsoleMode
+class IO::Console::Mode
   def initialize(mode)
     @mode = mode
   end
 
+  def echo?
+  end
+  alias echo echo?
+
+  def echo=(echo)
+  end
+
+  def min
+  end
+
+  def min=(min)
+  end
+
+  def time
+  end
+
+  def time=(time)
+  end
+
   def virtual_terminal_processing?
     @mode & IO::Console::Windows::ENABLE_VIRTUAL_TERMINAL_PROCESSING != 0
   end
@@ -151,7 +170,7 @@ end
 
 class IO
   def console_mode
-    IO::ConsoleMode.new(IO::Console::Windows.console_mode(self))
+    IO::Console::Mode.new(IO::Console::Windows.console_mode(self))
   end
 
   def console_mode=(mode)

data/jruby/lib/io/console/backend/stty.rb

@@ -8,37 +8,97 @@ raise LoadError, "stty command not found" unless IO::Console::STTY
 warn "io/console on JRuby shells out to stty for most operations" if $VERBOSE
 
 class IO::Console::Mode
-  def initialize(saved)
-    @saved = saved
+  STTY_PATTERNS = /
+    (?<a>[a-z]\w*)\s(?:=\s(?:(?<n>\d+)|(?<c>\^.|.)|<undef>)|(?<n>\d+)(?:\s+\w+)?); |
+    (?<n>\d+)\s+(?<a>[a-z]\w*); |
+    (?<f>-)?(?<a>[a-z]\w*)(?=\s|$)
+  /x
+  private_constant :STTY_PATTERNS
+
+  def initialize(saved, attrs)
+    @saved = saved.chomp
+    @attrs = {}
+    attrs.scan(STTY_PATTERNS) do
+      m = $~
+      case attr = m[:a]
+      when "echo"
+        @attrs[attr.to_sym] = !m[:f]
+      when "min", "time"
+        @attrs[attr.to_sym] = m[:n]&.to_i
+      when *%w[brkint icanon isig opost]
+        @attrs[attr.to_sym] = !m[:f]
+      end
+    end
     @args = []
+    @changes = {}
   end
 
   def initialize_copy(mode)
     super
-    @saved = mode.__send__(:saved).dup
-    @args = mode.__send__(:args).dup
+    @attrs = @attrs.dup
+    @saved = @saved.dup
+    @args = @args.dup
+    @changes = @changes.dup
+  end
+
+  def arguments
+    [
+      @saved,
+      *@args,
+      *@changes.flat_map {|a, v|
+        case v
+        when true
+          a.to_s
+        when false
+          "-#{a}"
+        when nil
+        else
+          [a.to_s, v.to_s]
+        end
+      },
+    ]
   end
 
+  def echo?
+    @changes.fetch(:echo) {@attrs[:echo]}
+  end
+  alias echo echo?
+
   def echo=(echo)
-    @args << (echo ? 'echo' : '-echo')
-    echo
+    @changes[:echo] = echo
   end
 
-  def raw(min: 1, time: nil, intr: nil)
+  def raw(min: nil, time: nil, intr: nil)
     dup.raw!(min:, time:, intr:)
   end
 
-  def raw!(min: 1, time: nil, intr: nil)
+  def raw!(min: nil, time: nil, intr: nil)
     @args << 'raw'
-    @args.push('min', min.to_s) if min >= 0
-    @args.push('time', ((time || 0) * 10).to_i.to_s)
-    @args.concat(%w[brkint isig opost]) if intr
+    self.min = min
+    self.time = time
+    %i[brkint isig opost].each {|a| @changes[a] = true} if intr
     self
   end
 
+  def min
+    @changes.fetch(:min) {@attrs[:min]}
+  end
+
+  def min=(min)
+    @changes[:min] = (min || 1).to_i.clamp(0, 255)
+  end
+
+  def time
+    @changes.fetch(:time) {@attrs[:time]}&.quo(10)
+  end
+
+  def time=(time)
+    @changes[:time] = ((time || 0) * 10).to_i.clamp(0, 255)
+  end
+
   private
 
-  attr_reader :saved, :args
+  attr_reader :attrs, :saved, :args, :changes
 end
 
 # Non-Windows assumes stty command is available
@@ -72,8 +132,9 @@ class IO
     self.console_mode = saved if saved
   end
 
-  def raw!(*)
-    _io_console_stty('raw')
+  def raw!(*, min: 1, time: nil, intr: nil)
+    self.console_mode = console_mode.raw(min:, time:, intr:)
+    self
   end
 
   def cooked(*)
@@ -105,20 +166,20 @@ class IO
   end
 
   def console_mode
-    Console::Mode.new(_io_console_stty('-g').chomp)
+    Console::Mode.new(_io_console_stty('-g'), _io_console_stty('-a'))
   end
 
   def console_mode=(mode)
-    _io_console_stty(mode.__send__(:saved), *mode.__send__(:args))
+    _io_console_stty(*mode.arguments)
     mode
   end
 
-  # Not all systems return same format of stty -a output
-  IEEE_STD_1003_2 = '(?<rows>\d+) rows; (?<columns>\d+) columns'
-  UBUNTU = 'rows (?<rows>\d+); columns (?<columns>\d+)'
-
   def winsize
-    match = _io_console_stty('-a').match(/#{IEEE_STD_1003_2}|#{UBUNTU}/o)
+    # Pattern for rows/columns; all systems may not return in these formats.
+    match = /
+      (?<rows>\d+)\s+rows;\s*(?<columns>\d+)\s+columns |
+      rows\s+(?<rows>\d+);\s*columns\s+(?<columns>\d+)
+    /x.match(_io_console_stty('-a'))
     [match[:rows].to_i, match[:columns].to_i]
   end
 
@@ -127,7 +188,7 @@ class IO
     sizelen = size.size
 
     if sizelen != 2 && sizelen != 4
-      raise ArgumentError.new("wrong number of arguments (given #{sizelen}, expected 2 or 4)")
+      raise ArgumentError, "wrong number of arguments (given #{sizelen}, expected 2 or 4)"
     end
 
     if sizelen == 4
@@ -147,4 +208,6 @@ class IO
 
   def ioflush
   end
+
+  prepend PlatformTty
 end

data/jruby/lib/io/console/backend/stub.rb

@@ -27,6 +27,18 @@ class IO
     yield self
   end
 
+  def min
+  end
+
+  def min=(n)
+  end
+
+  def time
+  end
+
+  def time=(t)
+  end
+
   def winsize
     [25, 80]
   end

data/jruby/lib/io/console/common.rb

@@ -6,7 +6,7 @@ end
 
 class IO
   # TODO: Windows version uses "conin$" and "conout$" instead of /dev/tty
-  def self.console(sym = nil, *args)
+  def self.console(sym = nil, *args, **opts)
     raise TypeError, "expected Symbol, got #{sym.class}" unless sym.nil? || sym.kind_of?(Symbol)
 
     # klass = self == IO ? File : self
@@ -43,7 +43,8 @@ class IO
       @console = con
     end
 
-    return con.send(sym, *args) if sym
+    return nil unless con
+    return con.send(sym, *args, **opts) if sym
     return con
   end
 
@@ -57,14 +58,11 @@ class IO
     wio = self == $stdin ? $stderr : self
     wio.write(prompt) if prompt
     begin
-      str = nil
-      noecho do
-        str = gets
-      end
+      str = noecho {gets("\n")}
     ensure
-      puts($/)
+      puts
     end
-    str.chomp
+    str&.chomp("\n")
   end
 
   def input_pending?
@@ -108,6 +106,7 @@ class IO
         end
       end
 
+      return nil unless b && result.length == 2
       result.map(&:pred)
     end
   end
@@ -162,9 +161,26 @@ class IO
 
     def getpass(prompt = nil)
       write(prompt) if prompt
-      str = gets.chomp
-      puts($/)
+      str = gets("\n")&.chomp("\n")
+      puts
       str
     end
   end
+
+  module PlatformTty           # :nodoc:
+    def tty?(*modes)
+      modes.each do |mode|
+        case mode
+        when nil
+        when :any
+        when Symbol
+          raise ArgumentError, "unknown tty type: #{mode.inspect}"
+        else
+          raise TypeError, "wrong argument type #{mode.class} (expected Symbol)"
+        end
+      end
+      super()
+    end
+  end
+  private_constant :PlatformTty
 end

data/jruby/lib/io/console/version.rb

@@ -1,5 +1,5 @@
 class IO
   module Console
-    VERSION = "0.9.2"
+    VERSION = "0.9.3"
   end
 end

data/jruby/lib/io/console.rb

@@ -37,6 +37,9 @@ class IO
 end
 
 backends = []
+ENV["IO_CONSOLE_BACKEND"]&.then do |be|
+  backends.concat(be.split(",").map {|b| b.split(":")})
+end&.first ||
 # If Linux or BSD, try to load the native version
 case RbConfig::CONFIG['host_os']
 when /darwin|openbsd|freebsd|netbsd/i
@@ -44,9 +47,7 @@ when /darwin|openbsd|freebsd|netbsd/i
 when /linux/i
   backends << %w[ffi/termios linux] << %w[stty]
 when /mswin|win32|ming/i
-  require_relative 'console/constants/windows'
-  require_relative 'console/backend/ffi/windows'
-  return
+  backends << %w[ffi/windows windows]
 else
   backends << %w[stty]
 end

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.3
 platform: java
 authors:
 - Nobu Nakada
 bindir: bin
 cert_chain: []
-date: 2026-08-10 00:00:00.000000000 Z
+date: 2026-09-14 00:00:00.000000000 Z
 dependencies: []
 description: add console capabilities to IO instances.
 email: nobu@ruby-lang.org