expect-pty 0.3.0 → 0.3.2

data/test/io_test.rb

@@ -133,6 +133,41 @@ class IOTest < ExpectTest
     assert_equal 1, session.expect("ABC", timeout: 1)
   end
 
+  def test_send_slow_zero_delay_only_polls_and_later_reply_remains_readable
+    client, peer = Socket.pair(:UNIX, :STREAM, 0)
+    @ios.push(client, peer)
+    session = Expect.open(client, log_stdout: false)
+    @sessions << session
+    waits = []
+    original = client.method(:wait_readable)
+    client.stub(:wait_readable, lambda { |timeout|
+      waits << timeout
+      original.call(0)
+    }) do
+      assert_equal 8, session.send_slow("a中😀", delay: 0)
+    end
+    assert_equal [0, 0, 0], waits
+    assert_equal("a中😀".b, bounded { peer.read(8) })
+    peer.write("late reply")
+    assert_equal 1, session.expect("late reply", timeout: 1)
+    assert_empty session.buffer
+  end
+
+  def test_send_slow_preserves_character_delay_and_write_timeout
+    session, = pipe_session
+    calls = []
+    failure = Expect::WriteTimeout.new(bytes_written: 0)
+    session.stub(:sleep, ->(duration) { calls << [:sleep, duration] }) do
+      session.stub(:write, lambda { |data|
+        calls << [:write, data]
+        raise failure
+      }) do
+        assert_same failure, assert_raises(Expect::WriteTimeout) { session.send_slow("中b", delay: 0.25) }
+      end
+    end
+    assert_equal [[:sleep, 0.25], [:write, "中"]], calls
+  end
+
   def test_large_bidirectional_write_does_not_deadlock
     session = child("STDIN.binmode; STDOUT.binmode; loop { print STDIN.readpartial(4096) }", raw_pty: true,
                                                                                              write_timeout: 3)

data/test/pattern_offset_test.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+class PatternOffsetTest < ExpectTest
+  def test_byte_offsets_captures_and_buffer_consumption
+    cases = [
+      ["abENDtail", /END/, 2, 3, []],
+      ["中文终点尾", /(终)(点)/, 6, 6, ["终".b, "点".b]],
+      ["😀中😀尾", /(😀)(x)?/, 0, 4, ["😀".b, nil]],
+      ["😀中END尾", /END/, 7, 3, []],
+      ["a\0b", /(\0)/n, 1, 1, ["\0".b]],
+      ["\xFF\x00\xFE".b, /(\xFE)/n, 2, 1, ["\xFE".b]],
+      ["中文尾", /(?=尾)/, 6, 0, []],
+      ["😀", /$/u, 4, 0, []]
+    ]
+    session, = pipe_session
+    cases.each do |text, regexp, offset, length, captures|
+      bytes = text.b
+      assert_equal [offset, length, captures], Expect::Pattern.new(value: regexp).locate(bytes)
+      session.buffer = bytes
+      result = session.expect_result(regexp, timeout: 0)
+      assert_equal bytes.byteslice(0, offset), result.before
+      assert_equal bytes.byteslice(offset, length), result.match
+      assert_equal bytes.byteslice((offset + length)..), result.after
+      assert_equal captures, result.captures
+      assert_equal result.after, session.buffer
+    end
+  end
+
+  def test_incomplete_utf8_defers_matching_and_eof_still_rejects_it
+    pattern = Expect::Pattern.new(value: /中(?=😀)/)
+    bytes = "前中😀".b
+    (1..3).each do |missing|
+      partial = bytes.byteslice(0, bytes.bytesize - missing)
+      assert_nil pattern.locate(partial)
+      assert_raises(EncodingError) { pattern.locate(partial, final: true) }
+    end
+    assert_equal [3, 3, []], pattern.locate(bytes)
+  end
+end

data/test/process_test.rb

@@ -36,9 +36,10 @@ class ProcessTest < ExpectTest
     assert session.slave.tty?
     session.slave.echo = false
     session.slave.winsize = [37, 111]
-    session.spawn(RbConfig.ruby, "--disable-gems", "-rio/console", "-e",
+    # 子进程需要 io-console gem，保留 RubyGems 以使用 Bundler 选定的版本。
+    session.spawn(RbConfig.ruby, "-rio/console", "-e",
                   'STDOUT.sync = true; puts STDIN.winsize.join(":"); puts STDIN.gets')
-    assert_equal 1, session.expect("37:111", timeout: 2)
+    assert_equal 1, session.expect("37:111", timeout: 2), session.before.inspect
     assert_equal [37, 111], session.winsize
     session.winsize = [24, 80]
     assert_equal [24, 80], session.winsize

data/test/relay_recovery_test.rb

@@ -234,6 +234,43 @@ class RelayRecoveryTest < ExpectTest
     end
   end
 
+  def test_split_literal_and_short_write_failures_preserve_delivery_and_callback_order
+    [1, 2, 3].product([1, 2, 3], [0, 2]).each do |split, step, failure_offset|
+      source, writer = pipe_session
+      fast = StringIO.new
+      received = "".b
+      failed = false
+      slow = Object.new
+      slow.define_singleton_method(:write) do |data|
+        if !failed && received.bytesize == failure_offset
+          failed = true
+          raise IOError, "injected partial delivery"
+        end
+        count = [step, data.bytesize].min
+        count = [count, failure_offset - received.bytesize].min unless failed
+        received << data.byteslice(0, count)
+        count
+      end
+      callbacks = []
+      source.listeners = [fast, slow]
+      source.on_sequence("STOP") do
+        callbacks << [fast.string.dup, received.dup]
+        false
+      end
+      source.buffer = "head#{"STOP".byteslice(0, split)}"
+      writer.write("#{"STOP".byteslice(split..)}tail")
+      assert_raises(IOError) { bounded { Expect.interconnect(source, timeout: 1) } }
+      assert_empty callbacks
+      assert source.pending_output?
+      assert_same(source, bounded { Expect.interconnect(source, timeout: 1) })
+      assert_equal [%w[head head]], callbacks
+      assert_equal "tail", source.buffer
+      assert_equal "head", fast.string
+      assert_equal "head", received
+      refute source.pending_output?
+    end
+  end
+
   def test_flush_failure_retries_flush_without_replaying_data
     source, = pipe_session
     output = StringIO.new

data/test/release_test.rb

@@ -63,14 +63,34 @@ class ReleaseTest < Minitest::Test
           release.stub(:system, push) do
             release.stub(:github, ->(*) { flunk "RubyGems-only release contacted GitHub" }) do
               release.stub(:publish_github, -> { flunk "RubyGems-only release published to GitHub" }) do
-                output, = capture_io { release.run }
-                assert_includes output, "SHA256 verified"
+                [nil, "true"].each do |github_actions|
+                  with_environment("GITHUB_ACTIONS" => github_actions,
+                                   "GEM_HOST_API_KEY" => (github_actions ? "test-only-api-key" : nil)) do
+                    published = false
+                    output, = capture_io { release.run }
+                    assert_includes output, "SHA256 verified"
+                    assert published
+                  end
+                end
               end
             end
           end
         end
       end
-      assert published
+    end
+  end
+
+  def test_ci_publish_requires_an_api_key_before_pushing
+    release = Release.new(rubygems_only: true)
+    release.stub(:registry_version, nil) do
+      release.stub(:system, ->(*) { flunk "pushed without a CI API key" }) do
+        [nil, ""].each do |api_key|
+          with_environment("GITHUB_ACTIONS" => "true", "GEM_HOST_API_KEY" => api_key) do
+            error = assert_raises(RuntimeError) { release.send(:publish_rubygems) }
+            assert_includes error.message, "RUBYGEMS_API_KEY"
+          end
+        end
+      end
     end
   end
 
@@ -194,6 +214,17 @@ class ReleaseTest < Minitest::Test
 
   private
 
+  # 发布测试显式控制凭据环境，避免本机登录状态或 CI 标记影响用例结果。
+  def with_environment(values)
+    previous = values.to_h { |name, _value| [name, ENV.fetch(name, nil)] }
+    begin
+      values.each { |name, value| ENV[name] = value }
+      yield
+    ensure
+      previous.each { |name, value| ENV[name] = value }
+    end
+  end
+
   def with_package
     Dir.mktmpdir("expect-release-test-") do |directory|
       Dir.chdir(directory) do

data/test/scan_reuse_test.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+class ScanReuseTest < ExpectTest
+  def test_each_scan_snapshots_a_session_once_across_non_adjacent_groups
+    first, = pipe_session
+    second, = pipe_session
+    first.buffer = "ready"
+    list = Expect::PatternList.new
+    list.on("missing", from: first).on("other", from: second).on("ready", from: first)
+    matcher = Expect::Matcher.new(list, 0)
+    snapshots = 0
+    original = first.method(:buffer)
+    first.stub(:buffer, lambda {
+      snapshots += 1
+      original.call
+    }) do
+      2.times do
+        result = matcher.__send__(:find_match)
+        assert_same first, result[0]
+        assert_equal 3, result[1].number
+        assert_equal [0, 5, []], result[2]
+      end
+    end
+    assert_equal 2, snapshots
+  end
+
+  def test_callback_replacement_and_nested_match_are_visible_on_the_next_scan
+    first, = pipe_session
+    second, = pipe_session
+    first.buffer = "start"
+    events = []
+    result = Expect.expect_result(timeout: 0) do
+      on("start", from: first) do |session|
+        events << session.match
+        session.buffer = "nested finish"
+        session.expect("nested ", timeout: 0)
+        events << session.match
+        session.continue
+      end
+      on("missing", from: second)
+      on("finish", from: first) { |session| events << session.match }
+    end
+    assert_equal 3, result.number
+    assert_equal ["start", "nested ", "finish"], events
+    assert_empty first.buffer
+  end
+
+  def test_shared_io_keeps_first_session_and_identity_despite_equal_hashes
+    first, writer = pipe_session
+    second = Expect.open(first.to_io)
+    @sessions << second
+    other, other_writer = pipe_session
+    # IO 的业务相等性不能替代 IO.select 返回对象的身份。
+    [first.to_io, other.to_io].each do |io|
+      io.define_singleton_method(:hash) { 0 }
+      io.define_singleton_method(:eql?) { |_other| true }
+    end
+    writer.write("first")
+    other_writer.write("other")
+    result = Expect.expect_result(timeout: 0) do
+      on("missing", from: [first, second, other])
+      on("other", from: other)
+    end
+    assert_same other, result.session
+    assert_equal "first", first.buffer
+    assert_empty second.buffer
+  end
+
+  def test_regexps_share_one_combined_text_and_literal_only_does_not_build_it
+    session, = pipe_session
+    session.listeners = [StringIO.new]
+    [0, 4].each do |count|
+      session.__send__(:sequences=, {})
+      count.times { |index| session.on_sequence(/missing#{index}/) }
+      session.on_sequence("STOP")
+      history = session.__send__(:relay_history)
+      concatenations = 0
+      original = history.method(:+)
+      history.define_singleton_method(:+) do |other|
+        concatenations += 1
+        original.call(other)
+      end
+      assert Expect.__send__(:relay_buffer, session, { session => "payload".b })
+      assert_equal count.zero? ? 0 : 1, concatenations
+    end
+  end
+
+  def test_escape_callback_can_change_rules_before_rescanning
+    session, = pipe_session
+    output = StringIO.new
+    session.listeners = [output]
+    events = []
+    session.on_sequence(/ONE/) do
+      events << :one
+      session.on_sequence(/TWO/) do
+        events << :two
+        false
+      end
+      true
+    end
+    buffers = { session => "aONEbTWOtail".b }
+    refute Expect.__send__(:relay_buffer, session, buffers)
+    assert_equal %i[one two], events
+    assert_equal "ab", output.string
+    assert_equal "tail", buffers.fetch(session)
+  end
+end

metadata

@@ -1,14 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: expect-pty
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - expect-pty contributors
 bindir: bin
 cert_chain: []
 date: 2026-09-26 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: forwardable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: io-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: io-wait
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: shellwords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: stringio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Automate interactive programs with exact and regexp matching, Ruby blocks,
   multi-session waits, logging and terminal interaction.
 executables: []
@@ -17,11 +105,18 @@ extra_rdoc_files: []
 files:
 - ".rubocop.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- benchmark/matching.rb
+- benchmark/relay.rb
+- benchmark/send_slow.rb
+- benchmark/support.rb
 - docs/COMPATIBILITY.md
+- docs/INTERNAL_CONTRACTS.md
+- docs/PERFORMANCE.md
 - docs/RELEASING.md
 - docs/VERIFICATION.md
 - examples/dialogue.rb
@@ -46,6 +141,7 @@ files:
 - lib/expect/version.rb
 - script/ci
 - script/release.rb
+- test/cleanup_test.rb
 - test/compare_upstream.rb
 - test/configuration_test.rb
 - test/edge_case_test.rb
@@ -62,10 +158,12 @@ files:
 - test/kibitz_test.rb
 - test/matching_test.rb
 - test/multi_session_test.rb
+- test/pattern_offset_test.rb
 - test/process_test.rb
 - test/relay_recovery_test.rb
 - test/release_test.rb
 - test/ruby_api_test.rb
+- test/scan_reuse_test.rb
 - test/script_logging_test.rb
 - test/support/interact_probe.rb
 - test/support/kibitz_probe.rb
@@ -94,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Ruby PTY automation with the Expect.pm interaction model
 test_files: []