Merge branch 'master' into jruby-new-pty

Author: nobu

.github/workflows/push_gem.yml

@@ -23,11 +23,11 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0

.github/workflows/sync-ruby.yml

@@ -0,0 +1,33 @@
+name: Sync ruby
+on:
+  push:
+    branches: [master]
+jobs:
+  sync:
+    name: Sync ruby
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'ruby' }}
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Create GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: 2060836
+          private-key: ${{ secrets.RUBY_SYNC_DEFAULT_GEMS_PRIVATE_KEY }}
+          owner: ruby
+          repositories: ruby
+
+      - name: Sync to ruby/ruby
+        uses: convictional/trigger-workflow-and-wait@v1.6.5
+        with:
+          owner: ruby
+          repo: ruby
+          workflow_file_name: sync_default_gems.yml
+          github_token: ${{ steps.app-token.outputs.token }}
+          ref: master
+          client_payload: |
+            {"gem":"${{ github.event.repository.name }}","before":"${{ github.event.before }}","after":"${{ github.event.after }}"}
+          propagate_failure: true
+          wait_interval: 10

.github/workflows/test.yml

@@ -34,7 +34,7 @@ jobs:
         git config --global core.autocrlf false
         git config --global core.eol lf
         git config --global advice.detachedHead 0
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:

Gemfile

@@ -6,6 +6,7 @@ gemspec
 group :development do
   gem "bundler"
   gem "rake"
+  gem "rdoc"
   gem "test-unit"
   gem "test-unit-ruby-core"
   gem 'rake-compiler'

ext/io/console/console.c

@@ -4,7 +4,7 @@
  */
 
 static const char *const
-IO_CONSOLE_VERSION = "0.8.0";
+IO_CONSOLE_VERSION = "0.8.1";
 
 #include "ruby.h"
 #include "ruby/io.h"

ext/io/console/extconf.rb

@@ -10,11 +10,11 @@
   abort
 
 have_func("rb_interned_str_cstr")
-have_func("rb_io_path")
-have_func("rb_io_descriptor")
-have_func("rb_io_get_write_io")
-have_func("rb_io_closed_p")
-have_func("rb_io_open_descriptor")
+have_func("rb_io_path", "ruby/io.h")
+have_func("rb_io_descriptor", "ruby/io.h")
+have_func("rb_io_get_write_io", "ruby/io.h")
+have_func("rb_io_closed_p", "ruby/io.h")
+have_func("rb_io_open_descriptor", "ruby/io.h")
 have_func("rb_ractor_local_storage_value_newkey")
 
 is_wasi = /wasi/ =~ MakeMakefile::RbConfig::CONFIG["platform"]

lib/ffi/io/console.rb

@@ -24,45 +24,51 @@
 require_relative 'console/version'
 require_relative 'console/common'
 
-# If Windows, always use the stub version
-if RbConfig::CONFIG['host_os'] =~ /(mswin)|(win32)|(ming)/
-  require_relative 'console/stub_console'
-else
-
+case RbConfig::CONFIG['host_os']
+when /darwin|openbsd|freebsd|netbsd|linux/i
   # If Linux or BSD, try to load the native version
-  if RbConfig::CONFIG['host_os'].downcase =~ /darwin|openbsd|freebsd|netbsd|linux/
-    begin
 
-      # Attempt to load the native Linux and BSD console logic
-      require_relative 'console/native_console'
-      ready = true
+  begin
+
+    # Attempt to load the native Linux and BSD console logic
+    require_relative 'console/native_console'
+
+  rescue Exception => ex
 
-    rescue Exception => ex
+    warn "failed to load native console support: #{ex}" if $VERBOSE
 
-      warn "failed to load native console support: #{ex}" if $VERBOSE
-      ready = false
+  else
+
+    # Native ready.
+    ready = true
 
-    end
   end
 
-  # Native failed, try to use stty
-  if !ready
-    begin
+when /mswin|win32|ming/i
+  # If Windows, stty is not possible, always use the stub version
+
+  ready = false
 
-      require_relative 'console/stty_console'
-      ready = true
+end
 
-    rescue Exception => ex2
+if ready.nil?
+  # Native is not ready, try to use stty
 
-      warn "failed to load stty console support: #{ex2}" if $VERBOSE
-      ready = false
+  begin
+
+    require_relative 'console/stty_console'
+    ready = true
+
+  rescue Exception => ex2
+
+    warn "failed to load stty console support: #{ex2}" if $VERBOSE
+    ready = false
 
-    end
   end
+end
 
+unless ready
   # If still not ready, just use stubbed version
-  if !ready
-    require_relative 'console/stub_console'
-  end
 
+  require_relative 'console/stub_console'
 end

test/io/console/test_io_console.rb

@@ -7,6 +7,11 @@
 end
 
 class TestIO_Console < Test::Unit::TestCase
+  HOST_OS = RbConfig::CONFIG['host_os']
+  private def host_os?(os)
+    HOST_OS =~ os
+  end
+
   begin
     PATHS = $LOADED_FEATURES.grep(%r"/io/console(?:\.#{RbConfig::CONFIG['DLEXT']}|\.rb|/\w+\.rb)\z") {$`}
   rescue Encoding::CompatibilityError
@@ -26,7 +31,7 @@ class TestIO_Console < Test::Unit::TestCase
   # But it does not occur in `make test-all > /dev/null`, so
   # there should be an additional factor, I guess.
   def set_winsize_setup
-    @old_ttou = trap(:TTOU, 'IGNORE') if RUBY_PLATFORM =~ /freebsd/i
+    @old_ttou = trap(:TTOU, 'IGNORE') if host_os?(/freebsd/)
   end
 
   def set_winsize_teardown
@@ -368,10 +373,10 @@ def assert_ctrl(expect, cc, r, w)
     w.flush
     result = EnvUtil.timeout(3) {r.gets}
     if result
-      case cc
-      when 0..31
+      case cc.chr
+      when "\C-A".."\C-_"
         cc = "^" + (cc.ord | 0x40).chr
-      when 127
+      when "\C-?"
         cc = "^?"
       end
       result.sub!(cc, "")
@@ -387,7 +392,7 @@ def test_intr
     # TestIO_Console#test_intr [/usr/home/chkbuild/chkbuild/tmp/build/20220304T163001Z/ruby/test/io/console/test_io_console.rb:387]:
     # <"25"> expected but was
     # <"-e:12:in `p': \e[1mexecution expired (\e[1;4mTimeout::Error\e[m\e[1m)\e[m">.
-    omit if /freebsd/ =~ RUBY_PLATFORM
+    omit if host_os?(/freebsd/)
 
     run_pty("#{<<~"begin;"}\n#{<<~'end;'}") do |r, w, _|
       begin;
@@ -413,7 +418,7 @@ def test_intr
       if cc = ctrl["intr"]
         assert_ctrl("#{cc.ord}", cc, r, w)
         assert_ctrl("#{cc.ord}", cc, r, w)
-        assert_ctrl("Interrupt", cc, r, w) unless /linux/ =~ "#{RUBY_PLATFORM} #{RbConfig::CONFIG['host_os']}"
+        assert_ctrl("Interrupt", cc, r, w) unless host_os?(/linux/)
       end
       if cc = ctrl["dsusp"]
         assert_ctrl("#{cc.ord}", cc, r, w)