io-console 0.9.0-java → 0.9.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc37059dc6ded078404cd8181d764b22545a4aeaafe29605b9ecaed1bfefe34
-  data.tar.gz: 8d5573e31e5ac3a363b7c999943a2058f4bbeb088ec6cfe389d91a55d3c5db1b
+  metadata.gz: 1fd5a5305181bf526a7053c3303f099b0fa0e47d8791fa35c310e5af5ed5d5b9
+  data.tar.gz: 9db378bc55068b6c1ca6e79b57be5955013d577307d8a5faf50f4869ac3e5108
 SHA512:
-  metadata.gz: bf2f1d86a07950b42159fba56963c6ab0c6ec113747f58d408d3ed1d60ade3d00d2b9eb9296b3455a407102d9d762bb95f959810f4c21327135be9e0208c58be
-  data.tar.gz: 0efd7b1cfa2da8d37b76ea2cab159130dd7940ba7ba1a30a9a6465ae4511cd4bc7c4dc87359c5579c003c88c021c3e7b63c5028ed4d19cc0965ce177dd2e3569
+  metadata.gz: 24b6dac4157c567a4caa5d6228375f38aa091de553ab8971dfe31c8a0c5af25c57c6b3c0235b6ba41ffc95711d8dfe85224c6486da85a50ceabddc57048a46fc
+  data.tar.gz: 577c04bb5a8ff5808418a74bd7835c7a795c8998b0fecbe71954ffe166f47fdc9f66c3fbe018b37232b91cb567d207a65679d1a084e2131528a429fb2fae749c

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
@@ -34,7 +103,7 @@ module IO::Console
   private :ttymode_yield
 
   TTY_RAW = Proc.new do |t, min: 1, time: nil, intr: nil|
-    LibC.cfmakeraw(t)
+    LibC.cfmakeraw(t.pointer)
     t[:c_lflag] &= ~(LibC::ECHOE|LibC::ECHOK)
     if min >= 0
       t[:c_cc][LibC::VMIN] = min

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

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

@@ -3,13 +3,44 @@ 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
+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
+    @args = []
+  end
+
+  def initialize_copy(mode)
+    super
+    @saved = mode.__send__(:saved).dup
+    @args = mode.__send__(:args).dup
+  end
+
+  def echo=(echo)
+    @args << (echo ? 'echo' : '-echo')
+    echo
+  end
+
+  def raw(min: 1, time: nil, intr: nil)
+    dup.raw!(min:, time:, intr:)
+  end
+
+  def raw!(min: 1, 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
+  end
+
+  private
+
+  attr_reader :saved, :args
+end
+
 # Non-Windows assumes stty command is available
 class IO
   private def _io_console_stty(*args)
@@ -17,8 +48,10 @@ class IO
     raise Errno::ENOTTY, inspect if !tty?
 
     IO.pipe do |re, we|
-      IO.popen([Console::STTY, *args, in: fileno, err: we], &:read)
+      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
@@ -32,11 +65,11 @@ class IO
   end
 
   def raw(*, min: 1, time: nil, intr: nil)
-    saved = _io_console_stty('-g')
-    _io_console_stty('raw')
+    saved = console_mode
+    self.console_mode = saved.raw(min:, time:, intr:)
     yield self
   ensure
-    _io_console_stty(saved) if saved
+    self.console_mode = saved if saved
   end
 
   def raw!(*)
@@ -71,6 +104,15 @@ class IO
     _io_console_stty(saved) if saved
   end
 
+  def console_mode
+    Console::Mode.new(_io_console_stty('-g').chomp)
+  end
+
+  def console_mode=(mode)
+    _io_console_stty(mode.__send__(:saved), *mode.__send__(:args))
+    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+)'
@@ -94,7 +136,7 @@ class IO
 
     row, col, _, _ = size
 
-    _io_console_stty("rows #{row} cols #{col}")
+    _io_console_stty('rows', row.to_s, 'cols', col.to_s)
   end
 
   def iflush

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.0"
+    VERSION = "0.9.2"
   end
 end

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

@@ -36,28 +36,29 @@ class IO
   deprecate_constant :ConsoleMode
 end
 
-libs = []
+backends = []
 # 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'
+  require_relative 'console/constants/windows'
+  require_relative 'console/backend/ffi/windows'
   return
 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'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: io-console
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: java
 authors:
 - Nobu Nakada
 bindir: bin
 cert_chain: []
-date: 2026-08-08 00:00:00.000000000 Z
+date: 2026-08-10 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: