expect-pty 0.3.2 → 0.4.0

data/test/release_test.rb

@@ -36,11 +36,11 @@ class ReleaseTest < Minitest::Test
 
   def test_rubygems_only_publishes_the_verified_copy_without_github
     with_package do |_release, artifact|
+      commit_package_source
       release = Release.new(artifact: artifact, rubygems_only: true)
       bytes = File.binread(artifact)
       checksum = Digest::SHA256.hexdigest(bytes)
       published = false
-      capture = ->(*arguments) { arguments.include?("rev-parse") ? "verified" : "" }
       get = lambda do |path|
         if path.start_with?("/downloads/")
           Struct.new(:code, :body).new("200", bytes)
@@ -58,19 +58,17 @@ class ReleaseTest < Minitest::Test
         refute_equal File.expand_path(artifact), candidate
         published = true
       end
-      release.stub(:capture, capture) do
-        release.stub(:get, get) do
-          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
-                [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
+      release.stub(:get, get) do
+        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
+              [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
@@ -107,9 +105,11 @@ class ReleaseTest < Minitest::Test
 
   def test_rubygems_only_rechecks_source_after_verification
     with_package do |_release, artifact|
+      commit_package_source
       release = Release.new(artifact: artifact, rubygems_only: true)
       statuses = ["", " M payload.rb"]
-      capture = ->(*arguments) { arguments.include?("rev-parse") ? "verified" : statuses.shift }
+      original = release.method(:capture)
+      capture = ->(*arguments) { arguments.include?("rev-parse") ? original.call(*arguments) : statuses.shift }
       release.stub(:capture, capture) do
         release.stub(:get, ->(*) { flunk "changed source contacted RubyGems" }) do
           capture_io do
@@ -127,6 +127,53 @@ class ReleaseTest < Minitest::Test
     end
   end
 
+  def test_rejects_ignored_source_collected_by_the_package_glob
+    with_package do |_release, artifact|
+      commit_package_source
+      FileUtils.mkdir_p("lib")
+      File.write("lib/local_only.rb", "puts :local_only\n")
+      File.write(".git/info/exclude", "lib/local_only.rb\n", mode: "a")
+      rebuild_package
+      assert_empty git("status", "--porcelain")
+
+      error = publishing_source_error(artifact)
+      assert_match "not in release commit: lib/local_only.rb", error.message
+      # 提交前的 dry-run 仍可检验候选包，但不能以此证明发布来源。
+      capture_io { Release.new(artifact: artifact, dry_run: true).run }
+    end
+  end
+
+  def test_rejects_source_changes_hidden_from_git_status
+    with_package do |_release, artifact|
+      commit_package_source
+      git("update-index", "--assume-unchanged", "payload.rb")
+      File.binwrite("payload.rb", "puts :changed\n\n")
+      rebuild_package
+      assert_empty git("status", "--porcelain")
+      assert_match "differs from release commit: payload.rb", publishing_source_error(artifact).message
+    end
+  end
+
+  def test_rejects_executable_mode_changes_hidden_from_git_status
+    with_package do |_release, artifact|
+      commit_package_source
+      git("config", "core.filemode", "false")
+      File.chmod(0o755, "payload.rb")
+      rebuild_package
+      assert_empty git("status", "--porcelain")
+      assert_match "permissions differ from release commit: payload.rb", publishing_source_error(artifact).message
+    end
+  end
+
+  def test_rejects_altered_homepage_metadata
+    with_package do |release, _artifact|
+      spec = Gem::Specification.load(File.expand_path("expect-pty.gemspec")).dup
+      spec.homepage = "https://example.invalid/altered"
+      capture_io { Gem::Package.build(spec) }
+      assert_match "metadata", assert_raises(RuntimeError) { release.send(:verify_package) }.message
+    end
+  end
+
   def test_rejects_different_installation_metadata_even_with_identical_source_files
     with_package do |release, _artifact|
       expected = Gem::Specification.load(File.expand_path("expect-pty.gemspec")).dup
@@ -214,6 +261,37 @@ class ReleaseTest < Minitest::Test
 
   private
 
+  def git(*)
+    output, error, status = Open3.capture3("git", *)
+    assert status.success?, error
+    output
+  end
+
+  def commit_package_source
+    git("init", "--quiet")
+    git("config", "core.hooksPath", File::NULL)
+    File.write(".git/info/exclude", "*.gem\ntmp/\n")
+    git("add", "--", "payload.rb", "CHANGELOG.md", "expect-pty.gemspec")
+    git("-c", "user.name=Release Test", "-c", "user.email=release-test@example.invalid",
+        "-c", "commit.gpgsign=false", "commit", "--quiet", "-m", "Release fixture")
+  end
+
+  def rebuild_package
+    # Gem::Specification.load 会缓存已加载的 gemspec；重新执行才能看到新的 glob 文件。
+    Gem::Specification.reset
+    spec = Gem::Specification.load(File.expand_path("expect-pty.gemspec"))
+    capture_io { Gem::Package.build(spec) }
+  end
+
+  def publishing_source_error(artifact)
+    release = Release.new(artifact: artifact, rubygems_only: true)
+    release.stub(:get, ->(*) { flunk "uncommitted package content reached RubyGems" }) do
+      error = nil
+      capture_io { error = assert_raises(RuntimeError) { release.run } }
+      error
+    end
+  end
+
   # 发布测试显式控制凭据环境，避免本机登录状态或 CI 标记影响用例结果。
   def with_environment(values)
     previous = values.to_h { |name, _value| [name, ENV.fetch(name, nil)] }
@@ -238,7 +316,7 @@ class ReleaseTest < Minitest::Test
             spec.authors = ["Test"]
             spec.license = "MIT"
             spec.homepage = "https://github.com/gatework/expect-ruby"
-            spec.files = ["payload.rb", "CHANGELOG.md", "expect-pty.gemspec"]
+            spec.files = ["payload.rb", "CHANGELOG.md", "expect-pty.gemspec"] + Dir["lib/**/*.rb"]
           end
         RUBY
         artifact = nil

data/test/timeout_test.rb

@@ -48,6 +48,125 @@ class TimeoutTest < ExpectTest
     assert_equal :timeout, session.error
   end
 
+  def test_eof_continuation_without_reset_observes_the_deadline_before_matching_again
+    first, = pipe_session
+    second, = pipe_session
+    first.close
+    now = 0.0
+    result = Expect.stub(:monotonic, -> { now }) do
+      Expect.expect_result(timeout: 1) do
+        eof(from: first) do
+          now = 2.0
+          second.buffer = "ready"
+          Expect.continue(reset_timeout: false)
+        end
+        on("ready", from: second)
+      end
+    end
+
+    assert result.timeout?
+    assert_same second, result.session
+    assert_equal "ready", second.buffer
+    assert first.last_result.eof?
+  end
+
+  def test_eof_continuation_can_reset_an_expired_deadline
+    first, = pipe_session
+    second, = pipe_session
+    first.close
+    now = 0.0
+    result = Expect.stub(:monotonic, -> { now }) do
+      Expect.expect_result(timeout: 1) do
+        eof(from: first) do
+          now = 2.0
+          second.buffer = "ready"
+          Expect.continue
+        end
+        on("ready", from: second)
+      end
+    end
+
+    assert_equal "ready", result.match
+    assert_same second, result.session
+  end
+
+  def test_last_eof_returns_even_when_continuation_deadline_has_expired
+    session, = pipe_session
+    session.close
+    now = 0.0
+    result = Expect.stub(:monotonic, -> { now }) do
+      session.expect_result(timeout: 1) do
+        eof do
+          now = 2.0
+          Expect.continue(reset_timeout: false)
+        end
+      end
+    end
+
+    assert result.eof?
+    assert_same session, result.session
+  end
+
+  def test_expired_eof_continuation_delivers_all_known_eof_events
+    sessions = Array.new(3) { pipe_session.first }
+    sessions.each(&:close)
+    seen = []
+    result = Expect.expect_result(from: sessions, timeout: 0) do
+      eof do |session|
+        seen << session
+        Expect.continue(reset_timeout: false)
+      end
+    end
+
+    assert result.eof?
+    assert_equal sessions, seen
+    assert(sessions.all? { |session| session.last_result.eof? })
+  end
+
+  def test_expired_eof_continuation_handles_known_eof_before_timing_out_live_sources
+    first, = pipe_session
+    second, = pipe_session
+    live, = pipe_session
+    [first, second].each(&:close)
+    seen = []
+    timed_out = nil
+    result = Expect.expect_result(timeout: 0) do
+      eof(from: [first, second]) do |session|
+        seen << session
+        live.buffer = "ready"
+        Expect.continue(reset_timeout: false)
+      end
+      on("ready", from: live)
+      timeout { |sessions| timed_out = sessions }
+    end
+
+    assert result.timeout?
+    assert_equal [first, second], seen
+    assert_equal [live], timed_out
+    assert_equal "ready", live.buffer
+  end
+
+  def test_reset_after_expired_eof_continuation_resumes_text_matching
+    %i[eof timeout].each do |reset_event|
+      first, = pipe_session
+      second, = pipe_session
+      live, = pipe_session
+      [first, second].each(&:close)
+      result = Expect.expect_result(timeout: 0) do
+        eof(from: first) do
+          live.buffer = "ready"
+          Expect.continue(reset_timeout: false)
+        end
+        eof(from: second) { Expect.continue(reset_timeout: reset_event == :eof) }
+        on("ready", from: live)
+        timeout { Expect.continue }
+      end
+
+      assert_equal "ready", result.match
+      assert_same live, result.session
+    end
+  end
+
   def test_restart_timeout_on_receive
     session, writer = pipe_session
     session.reset_timeout_on_read = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: expect-pty
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - expect-pty contributors
 bindir: bin
 cert_chain: []
-date: 2026-09-26 00:00:00.000000000 Z
+date: 2026-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forwardable
@@ -112,6 +112,7 @@ files:
 - Rakefile
 - benchmark/matching.rb
 - benchmark/relay.rb
+- benchmark/scaling.rb
 - benchmark/send_slow.rb
 - benchmark/support.rb
 - docs/COMPATIBILITY.md
@@ -130,20 +131,26 @@ files:
 - lib/expect.rb
 - lib/expect/configuration.rb
 - lib/expect/interaction.rb
+- lib/expect/logging.rb
 - lib/expect/matcher.rb
 - lib/expect/pattern.rb
 - lib/expect/pattern_list.rb
 - lib/expect/pty.rb
+- lib/expect/redactor.rb
 - lib/expect/relay.rb
 - lib/expect/relay_writer.rb
 - lib/expect/result.rb
 - lib/expect/session_resources.rb
+- lib/expect/terminal.rb
 - lib/expect/version.rb
 - script/ci
 - script/release.rb
+- test/buffer_accounting_test.rb
 - test/cleanup_test.rb
 - test/compare_upstream.rb
 - test/configuration_test.rb
+- test/deadline_test.rb
+- test/diagnostics_test.rb
 - test/edge_case_test.rb
 - test/fixtures/ssh_scripts/01_identity.sh
 - test/fixtures/ssh_scripts/02_output.sh
@@ -156,6 +163,8 @@ files:
 - test/interconnect_test.rb
 - test/io_test.rb
 - test/kibitz_test.rb
+- test/lifecycle_contract_test.rb
+- test/literal_scan_test.rb
 - test/matching_test.rb
 - test/multi_session_test.rb
 - test/pattern_offset_test.rb