io-console 0.9.1-java → 0.9.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e86817ae95f9a6fc3fa3301ea895706a3071f8e500c3c2dec9ef669dae510609
-  data.tar.gz: 433bb663068ef08dbc2a076c0d037d94872f2906652bd198ee950fff5c3a1bc7
+  metadata.gz: 81030a79e741f9fbea14484f4849da9e6efc1daf0784d6d9b7fc067cc3a95357
+  data.tar.gz: f3c862f8495b89a129d0547177530875456cb44fcdf4f7b76d9ddb81c110b08b
 SHA512:
-  metadata.gz: ec7274caecc4e434b7a1e7afe30251d1b07f677c54d3865f3b341c008f96ca6a7d95faa7c87faacbbf65734ee7a0e23bbdfb469088349a03c1cacc5f82be3bee
-  data.tar.gz: a9b72f79b80a65809217ed7cdab1edeb01daa53ffe9647d42900960569f4db3e83bb869c80f8da8ee9b2c76d23a66b08cc5d879a373a9ac9d9f6bdd05c0c8a66
+  metadata.gz: 6441ea13e62add5a11937381834077352406e0fd96a4cd7ded00e6fbcdc08a4c0e1376aa9b42ec35a3aba9b68ca7a6e5b0b8eddd4086cec960cabc1d6a1565f4
+  data.tar.gz: 28f42664fef6544ae6cffcf2ebc09e921155c302c8cf8da85e3ff584697d5a98bf1893bccddf76cfe68fa391a3b7f86ebb97ffb2ab6eb6dd299ecdf19b055c3b

data/{lib/ffi/io/console/native_console.rb → jruby/lib/io/console/backend/ffi/termios.rb}

@@ -1,8 +1,72 @@
+require 'ffi'
+
+case RbConfig::CONFIG['host_os']
+when /darwin/i
+  tested_platforms = /i386|x86_64|aarch64/
+  unless tested_platforms.match?(FFI::Platform::ARCH)
+    raise LoadError, "native console on MacOS only supported on #{tested_platforms.source.gsub('|', ', ')}"
+  end
+when /linux/i
+  tested_platforms = /i386|x86_64|powerpc64|aarch64|s390x/
+  unless tested_platforms.match?(FFI::Platform::ARCH)
+    warn "native console only tested on #{tested_platforms.source.gsub('|', ', ')}"
+  end
+end
+
+module IO::Console::LibC
+  include IO::Console::Constants
+  extend FFI::Library
+  ffi_lib FFI::Library::LIBC
+
+  typedef TCFLAG_TYPE, :tcflag_t
+  typedef SPEED_TYPE, :speed_t
+
+  class Termios < FFI::Struct
+    constants = IO::Console::Constants
+    fields = [
+      :c_iflag, :tcflag_t,
+      :c_oflag, :tcflag_t,
+      :c_cflag, :tcflag_t,
+      :c_lflag, :tcflag_t,
+    ]
+    fields.concat([:c_line, :uchar]) if constants::TERMIOS_HAS_LINE
+    fields.concat([
+      :c_cc, [:uchar, constants::NCCS],
+      :c_ispeed, :speed_t,
+      :c_ospeed, :speed_t,
+    ])
+    layout(*fields)
+  end
+
+  class Winsize < FFI::Struct
+    layout \
+      :ws_row, :ushort,
+      :ws_col, :ushort,
+      :ws_xpixel, :ushort,
+      :ws_ypixel, :ushort
+  end
+
+  attach_function :tcsetattr, [:int, :int, :pointer], :int
+  attach_function :tcgetattr, [:int, :pointer], :int
+  attach_function :cfgetispeed, [:pointer], :speed_t
+  attach_function :cfgetospeed, [:pointer], :speed_t
+  attach_function :cfsetispeed, [:pointer, :speed_t], :int
+  attach_function :cfsetospeed, [:pointer, :speed_t], :int
+  attach_function :cfmakeraw, [:pointer], :void
+  attach_function :tcflush, [:int, :int], :int
+  attach_function :ioctl, [:int, :ulong, :varargs], :int
+end
+
 # Common logic that uses native calls for console
 module IO::Console
   def ttymode
     termios = LibC::Termios.new
-    if LibC.tcgetattr(self.fileno, termios) != 0
+    result = if LibC.const_defined?(:TIOCGETA)
+      LibC.ioctl(fileno, LibC::TIOCGETA, :pointer, termios.pointer)
+    else
+      LibC.tcgetattr(fileno, termios.pointer)
+    end
+    if result != 0
       raise SystemCallError.new(respond_to?(:path) ? path : "tcgetattr", FFI.errno)
     end
 
@@ -15,7 +79,12 @@ module IO::Console
   private :ttymode
 
   def ttymode_set(termios)
-    if LibC.tcsetattr(self.fileno, LibC::TCSANOW, termios) != 0
+    result = if LibC.const_defined?(:TIOCSETA)
+      LibC.ioctl(fileno, LibC::TIOCSETA, :pointer, termios.pointer)
+    else
+      LibC.tcsetattr(fileno, LibC::TCSANOW, termios.pointer)
+    end
+    if result != 0
       raise SystemCallError.new(respond_to?(:path) ? path : "tcsetattr(TCSANOW)", FFI.errno)
     end
   end
@@ -33,13 +102,19 @@ module IO::Console
   end
   private :ttymode_yield
 
-  TTY_RAW = Proc.new do |t, min: 1, time: nil, intr: nil|
-    LibC.cfmakeraw(t)
+  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
@@ -47,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)
@@ -88,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
 
@@ -99,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
@@ -117,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
@@ -176,4 +275,5 @@ end
 
 class IO
   include Console
+  prepend PlatformTty if instance_method(:tty?).arity == 0
 end

data/{lib/ffi/io/console/windows_console.rb → jruby/lib/io/console/backend/ffi/windows.rb}

@@ -1,13 +1,6 @@
 require 'ffi'
 
 module IO::Console::Windows
-  STD_INPUT_HANDLE = -10
-  STD_OUTPUT_HANDLE = -11
-  WAIT_OBJECT_0 = 0
-  WAIT_TIMEOUT = 258
-  ENABLE_WRAP_AT_EOL_OUTPUT = 2
-  ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4
-
   module Native
     extend FFI::Library
     ffi_convention :stdcall
@@ -125,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
@@ -158,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

@@ -0,0 +1,213 @@
+# attempt to call stty; if failure, raise error
+module IO::Console
+  STTY = %w[/usr/bin/stty /bin/stty].find {|path| File.executable?(path)}
+end
+
+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
+  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
+    @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)
+    @changes[:echo] = echo
+  end
+
+  def raw(min: nil, time: nil, intr: nil)
+    dup.raw!(min:, time:, intr:)
+  end
+
+  def raw!(min: nil, time: nil, intr: nil)
+    @args << 'raw'
+    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 :attrs, :saved, :args, :changes
+end
+
+# Non-Windows assumes stty command is available
+class IO
+  private def _io_console_stty(*args)
+    # pre-check to catch non-tty filenos we can't stty against anyway
+    raise Errno::ENOTTY, inspect if !tty?
+
+    IO.pipe do |re, we|
+      input = dup # workaround for JRuby
+      IO.popen([Console::STTY, *args, in: input, err: we], &:read)
+    ensure
+      input&.close
+      unless $?.success?
+        we.close
+        error = re.read
+        case error
+        when /Inappropriate ioctl for device/
+          raise Errno::ENOTTY, inspect
+        end
+        raise "stty command failed: #{error.chomp}"
+      end
+    end
+  end
+
+  def raw(*, min: 1, time: nil, intr: nil)
+    saved = console_mode
+    self.console_mode = saved.raw(min:, time:, intr:)
+    yield self
+  ensure
+    self.console_mode = saved if saved
+  end
+
+  def raw!(*, min: 1, time: nil, intr: nil)
+    self.console_mode = console_mode.raw(min:, time:, intr:)
+    self
+  end
+
+  def cooked(*)
+    saved = _io_console_stty('-g')
+    _io_console_stty('-raw')
+    yield self
+  ensure
+    _io_console_stty(saved) if saved
+  end
+
+  def cooked!(*)
+    _io_console_stty('-raw')
+  end
+
+  def echo=(echo)
+    _io_console_stty(echo ? 'echo' : '-echo')
+  end
+
+  def echo?
+    (_io_console_stty('-a') =~ / -echo /) ? false : true
+  end
+
+  def noecho
+    saved = _io_console_stty('-g')
+    _io_console_stty('-echo')
+    yield self
+  ensure
+    _io_console_stty(saved) if saved
+  end
+
+  def console_mode
+    Console::Mode.new(_io_console_stty('-g'), _io_console_stty('-a'))
+  end
+
+  def console_mode=(mode)
+    _io_console_stty(*mode.arguments)
+    mode
+  end
+
+  def winsize
+    # 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
+
+  def winsize=(size)
+    size = size.to_ary unless size.kind_of?(Array)
+    sizelen = size.size
+
+    if sizelen != 2 && sizelen != 4
+      raise ArgumentError, "wrong number of arguments (given #{sizelen}, expected 2 or 4)"
+    end
+
+    if sizelen == 4
+      warn "stty io/console does not support pixel winsize"
+    end
+
+    row, col, _, _ = size
+
+    _io_console_stty('rows', row.to_s, 'cols', col.to_s)
+  end
+
+  def iflush
+  end
+
+  def oflush
+  end
+
+  def ioflush
+  end
+
+  prepend PlatformTty
+end

data/{lib/ffi/io/console/stub_console.rb → 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/{lib/ffi → 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/{lib/ffi/io/console/bsd_console.rb → jruby/lib/io/console/constants/bsd.rb}

@@ -1,22 +1,14 @@
-require 'ffi'
-
-tested_platforms = %w[i386 x86_64]
-
-if RbConfig::CONFIG['host_os'].downcase =~ /darwin/ && FFI::Platform::ARCH !~ /#{tested_platforms.join('|')}/
-  raise LoadError.new("native console on MacOS only supported on #{tested_platforms.join(', ')}")
-end
-
-module IO::Console::LibC
-  extend FFI::Library
-  ffi_lib FFI::Library::LIBC
-
-  if RbConfig::CONFIG['host_os'].downcase =~ /darwin/
-    typedef :ulong, :tcflag_t
-    typedef :ulong, :speed_t
+module IO::Console::Constants
+  if /darwin/i.match?(RbConfig::CONFIG['host_os'])
+    TCFLAG_TYPE = :ulong
+    SPEED_TYPE = :ulong
+    TIOCGETA = 0x40487413
+    TIOCSETA = 0x80487414
   else
-    typedef :uint, :tcflag_t
-    typedef :uint, :speed_t
+    TCFLAG_TYPE = :uint
+    SPEED_TYPE = :uint
   end
+  TERMIOS_HAS_LINE = false
 
   # Special Control Characters
   VEOF     = 0 #  ICANON
@@ -124,51 +116,6 @@ module IO::Console::LibC
   IOCPARM_MASK = 0x1fff
   IOC_OUT = 0x40000000
   IOC_IN  = 0x80000000
-
-  def self._IOC(inout,group,num,len)
-    inout | ((len & IOCPARM_MASK) << 16) | ((group.ord << 8) | num)
-  end
-
-  def self._IOR(g,n,t)
-    self._IOC(IOC_OUT, g, n, find_type(t).size)
-  end
-
-  def self._IOW(g,n,t)
-    self._IOC(IOC_IN, g, n, find_type(t).size)
-  end
-
-
-  class Termios < FFI::Struct
-    layout \
-      :c_iflag, :tcflag_t,
-      :c_oflag, :tcflag_t,
-      :c_cflag, :tcflag_t,
-      :c_lflag, :tcflag_t,
-      :c_cc, [ :uchar, NCCS ],
-      :c_ispeed, :speed_t,
-      :c_ospeed, :speed_t
-  end
-
-  class Winsize < FFI::Struct
-    layout \
-      :ws_row, :ushort,
-      :ws_col, :ushort,
-      :ws_xpixel, :ushort,
-      :ws_ypixel, :ushort
-  end
-
-  TIOCGWINSZ = _IOR('t', 104, Winsize)  # get window size
-  TIOCSWINSZ = _IOW('t', 103, Winsize)  # set window size
-
-  attach_function :tcsetattr, [ :int, :int, Termios ], :int
-  attach_function :tcgetattr, [ :int, Termios ], :int
-  attach_function :cfgetispeed, [ Termios ], :speed_t
-  attach_function :cfgetospeed, [ Termios ], :speed_t
-  attach_function :cfsetispeed, [ Termios, :speed_t ], :int
-  attach_function :cfsetospeed, [ Termios, :speed_t ], :int
-  attach_function :cfmakeraw, [ Termios ], :int
-  attach_function :tcflush, [ :int, :int ], :int
-  attach_function :ioctl, [ :int, :ulong, :varargs ], :int
+  TIOCGWINSZ = 0x40087468
+  TIOCSWINSZ = 0x80087467
 end
-
-require_relative 'native_console'

data/{lib/ffi/io/console/linux_console.rb → jruby/lib/io/console/constants/linux.rb}

@@ -1,17 +1,7 @@
-require 'ffi'
-
-tested_platforms = %w[i386 x86_64 powerpc64 aarch64 s390x]
-
-unless FFI::Platform::ARCH =~ /#{tested_platforms.join('|')}/
-  warn "native console only tested on #{tested_platforms.join(', ')}"
-end
-
-module IO::Console::LibC
-  extend FFI::Library
-  ffi_lib FFI::Library::LIBC
-
-  typedef :uint, :tcflag_t
-  typedef :uint, :speed_t
+module IO::Console::Constants
+  TCFLAG_TYPE = :uint
+  SPEED_TYPE = :uint
+  TERMIOS_HAS_LINE = true
 
   VINTR = 0
   VQUIT = 1
@@ -168,39 +158,6 @@ module IO::Console::LibC
   TCSADRAIN = 1
   TCSAFLUSH = 2
   NCCS = 32
-  class Termios < FFI::Struct
-    layout \
-      :c_iflag, :tcflag_t,
-      :c_oflag, :tcflag_t,
-      :c_cflag, :tcflag_t,
-      :c_lflag, :tcflag_t,
-      :c_line, :uchar,
-      :c_cc, [ :uchar, NCCS ],
-      :c_ispeed, :speed_t,
-      :c_ospeed, :speed_t
-  end
-
-  class Winsize < FFI::Struct
-    layout \
-      :ws_row, :ushort,
-      :ws_col, :ushort,
-      :ws_xpixel, :ushort,
-      :ws_ypixel, :ushort
-  end
-
-
   TIOCGWINSZ = 0x5413
   TIOCSWINSZ = 0x5414
-
-  attach_function :tcsetattr, [ :int, :int, Termios ], :int
-  attach_function :tcgetattr, [ :int, Termios ], :int
-  attach_function :cfgetispeed, [ Termios ], :speed_t
-  attach_function :cfgetospeed, [ Termios ], :speed_t
-  attach_function :cfsetispeed, [ Termios, :speed_t ], :int
-  attach_function :cfsetospeed, [ Termios, :speed_t ], :int
-  attach_function :cfmakeraw, [ Termios ], :int
-  attach_function :tcflush, [ :int, :int ], :int
-  attach_function :ioctl, [ :int, :ulong, :varargs ], :int
 end
-
-require_relative 'native_console'

data/{lib/ffi/io/console/windows_constants.rb → jruby/lib/io/console/constants/windows.rb}

@@ -1,4 +1,11 @@
 module IO::Console::Windows
+  STD_INPUT_HANDLE = -10
+  STD_OUTPUT_HANDLE = -11
+  WAIT_OBJECT_0 = 0
+  WAIT_TIMEOUT = 258
+  ENABLE_WRAP_AT_EOL_OUTPUT = 2
+  ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4
+
   VK_TAB = 0x09
   VK_RETURN = 0x0d
   VK_SHIFT = 0x10

data/{lib/ffi → jruby/lib}/io/console/version.rb

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

data/{lib/ffi → jruby/lib}/io/console.rb

@@ -36,28 +36,30 @@ class IO
   deprecate_constant :ConsoleMode
 end
 
-libs = []
+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'].downcase
-when /darwin|openbsd|freebsd|netbsd/
-  libs << 'bsd' << 'stty'
-when /linux/
-  libs << 'linux' << 'stty'
+case RbConfig::CONFIG['host_os']
+when /darwin|openbsd|freebsd|netbsd/i
+  backends << %w[ffi/termios bsd] << %w[stty]
+when /linux/i
+  backends << %w[ffi/termios linux] << %w[stty]
 when /mswin|win32|ming/i
-  require_relative 'console/windows_constants'
-  require_relative 'console/windows_console'
-  return
+  backends << %w[ffi/windows windows]
 else
-  libs << 'stty'
+  backends << %w[stty]
 end
 
-return if libs.any? do |lib|
-  require_relative "console/#{lib}_console"
+return if backends.any? do |backend, constants|
+  require_relative "console/constants/#{constants}" if constants
+  require_relative "console/backend/#{backend}"
 rescue Exception => ex
-  warn "failed to load #{lib} console support: #{ex}" if $VERBOSE
+  warn "failed to load #{backend.split('/', 2).first} console support: #{ex}" if $VERBOSE
 else
   true
 end
 
 # If still not ready, just use stubbed version
-require_relative "console/stub_console"
+require_relative 'console/backend/stub'

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.1
+  version: 0.9.3
 platform: java
 authors:
 - Nobu Nakada
 bindir: bin
 cert_chain: []
-date: 2026-08-08 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
@@ -19,16 +19,16 @@ files:
 - BSDL
 - COPYING
 - README.md
-- lib/ffi/io/console.rb
-- lib/ffi/io/console/bsd_console.rb
-- lib/ffi/io/console/common.rb
-- lib/ffi/io/console/linux_console.rb
-- lib/ffi/io/console/native_console.rb
-- lib/ffi/io/console/stty_console.rb
-- lib/ffi/io/console/stub_console.rb
-- lib/ffi/io/console/version.rb
-- lib/ffi/io/console/windows_console.rb
-- lib/ffi/io/console/windows_constants.rb
+- jruby/lib/io/console.rb
+- jruby/lib/io/console/backend/ffi/termios.rb
+- jruby/lib/io/console/backend/ffi/windows.rb
+- jruby/lib/io/console/backend/stty.rb
+- jruby/lib/io/console/backend/stub.rb
+- jruby/lib/io/console/common.rb
+- jruby/lib/io/console/constants/bsd.rb
+- jruby/lib/io/console/constants/linux.rb
+- jruby/lib/io/console/constants/windows.rb
+- jruby/lib/io/console/version.rb
 - lib/io/console/size.rb
 homepage: https://github.com/ruby/io-console
 licenses:
@@ -39,7 +39,7 @@ metadata:
   changelog_uri: https://github.com/ruby/io-console/releases
 rdoc_options: []
 require_paths:
-- lib/ffi
+- jruby/lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:

data/lib/ffi/io/console/stty_console.rb

@@ -1,110 +0,0 @@
-# attempt to call stty; if failure, raise error
-module IO::Console
-  STTY = %w[/usr/bin/stty /bin/stty].find {|path| File.executable?(path)}
-end
-
-unless IO::Console::STTY &&
-       system(IO::Console::STTY, out: File::NULL, err: %i[child out])
-  raise "stty command returned nonzero exit status"
-end
-
-warn "io/console on JRuby shells out to stty for most operations" if $VERBOSE
-
-# Non-Windows assumes stty command is available
-class IO
-  private def _io_console_stty(*args)
-    # pre-check to catch non-tty filenos we can't stty against anyway
-    raise Errno::ENOTTY, inspect if !tty?
-
-    IO.pipe do |re, we|
-      input = dup # workaround for JRuby
-      IO.popen([Console::STTY, *args, in: input, err: we], &:read)
-    ensure
-      input&.close
-      unless $?.success?
-        we.close
-        error = re.read
-        case error
-        when /Inappropriate ioctl for device/
-          raise Errno::ENOTTY, inspect
-        end
-        raise "stty command failed: #{error.chomp}"
-      end
-    end
-  end
-
-  def raw(*, min: 1, time: nil, intr: nil)
-    saved = _io_console_stty('-g')
-    _io_console_stty('raw')
-    yield self
-  ensure
-    _io_console_stty(saved) if saved
-  end
-
-  def raw!(*)
-    _io_console_stty('raw')
-  end
-
-  def cooked(*)
-    saved = _io_console_stty('-g')
-    _io_console_stty('-raw')
-    yield self
-  ensure
-    _io_console_stty(saved) if saved
-  end
-
-  def cooked!(*)
-    _io_console_stty('-raw')
-  end
-
-  def echo=(echo)
-    _io_console_stty(echo ? 'echo' : '-echo')
-  end
-
-  def echo?
-    (_io_console_stty('-a') =~ / -echo /) ? false : true
-  end
-
-  def noecho
-    saved = _io_console_stty('-g')
-    _io_console_stty('-echo')
-    yield self
-  ensure
-    _io_console_stty(saved) if saved
-  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)
-    [match[:rows].to_i, match[:columns].to_i]
-  end
-
-  def winsize=(size)
-    size = size.to_ary unless size.kind_of?(Array)
-    sizelen = size.size
-
-    if sizelen != 2 && sizelen != 4
-      raise ArgumentError.new("wrong number of arguments (given #{sizelen}, expected 2 or 4)")
-    end
-
-    if sizelen == 4
-      warn "stty io/console does not support pixel winsize"
-    end
-
-    row, col, _, _ = size
-
-    _io_console_stty("rows #{row} cols #{col}")
-  end
-
-  def iflush
-  end
-
-  def oflush
-  end
-
-  def ioflush
-  end
-end