net-connector 0.20.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f04a6944e8273ad350cc4ec2af6f7c1673d40d0bd75a52ee4068c0c5086047c
-  data.tar.gz: c7cb714084fdc5edaca889c3261af88398167db99d181bbfb6dc0db596c45325
+  metadata.gz: d4fb0da3edb43705fb7cf6cf98d08748f1b5efe5e9c9ad1385ee773d42cafb6e
+  data.tar.gz: b7cf3167af1527683bee2e2ca9bd69a8750608168b069868f6e28dc56f2d54b1
 SHA512:
-  metadata.gz: f044f6b70db2ca9129878e7e7cc5d8e1ad4ec8e0984c7977ac266f3d86731712be06ac6c97ce86ff5e203c72bc11ea7b19460993fceb145f02350de568961520
-  data.tar.gz: 03e67f261dcbe821f673bee9ac5df06bd82371e23f7effdac6fc2f39ac29e487f2c946591d749d8cff2060f7517240255cebcb851c2e5f74b32cbc48ff1bdd63
+  metadata.gz: 238e37ad287e6c4dc61cf2924b5b1bf91a3899cb7c304258795f225182a9c814b033b07bca48a5c8986fd59673e2dade8af17787aa3ac74b7e96fdeacd5a77f5
+  data.tar.gz: c5da59c15251d4e0f5b7dce7cca4e4a4135962bd6708fa871cd86dd371679922a388af48ef8fb20843cb0372d24eba917c291ae16181096c445263fb1f6bdeaf

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## 0.22.0 - 2026-10-30
+
+- Require Ruby 4.0.6 and expect-pty 0.10.x. Adapt its explicit Result status and match_number in PTY transport and SSH authentication while retaining connector event semantics and zero-based indexes.
+- Accept explicit expect-pty source and package candidates for integration and isolated installation checks; verify the installed candidate bytes.
+
+## 0.21.0 - 2026-10-30
+
+- Rename neighbor fields to `remote_name`, `remote_interface` and `remote_chassis_id`, retaining `local_interface`. Collection progress reads schema 4 `target`; require ctx_cli 0.5. No legacy accessor aliases.
+
 ## 0.20.0 - 2026-10-29
 
 - Require the latest stable TextFSM 0.5.1, align the minimum dependency matrix, and verify JSON 3 with its original published package instead of a source metadata patch.

data/README.md

@@ -4,7 +4,7 @@
 
 Ruby sessions for network device CLIs over SSH or Telnet. Collect configurations, save private backups, run interactive scripts, parse output with TextFSM, and back up fleets from Netdisco inventories.
 
-Requires Ruby 3.4+, expect-pty 0.9.6+, ctx_cli 0.4.x, TextFSM 0.5.1+ and a POSIX system. SSH uses local OpenSSH; Telnet requires a local `telnet` executable and explicit configuration.
+Requires Ruby 4.0.6+, expect-pty 0.10.x, ctx_cli 0.5.x, TextFSM 0.5.1+ and a POSIX system. SSH uses local OpenSSH; Telnet requires a local `telnet` executable and explicit configuration.
 
 ## Install
 
@@ -85,3 +85,7 @@ credentials = Net::Connector::Credentials.new(env: ENV).resolve(platform: :cisco
 Catalog owns inventory reading, normalization, duplicate marking and cache status (`#status`). It does not resolve device credentials, log into devices or create operation reports. Pass one policy snapshot throughout a run. Fleet delegates to Catalog and retains operation orchestration.
 
 Credentials reads the injected environment on every `resolve`; it returns an independent frozen hash, or nil when no username is available. Platform-specific `NC_<PLATFORM>_USERNAME`, `_PASSWORD`, and `_ENABLE_PASSWORD` override `NC_DEVICE_USERNAME`, `NC_DEVICE_PASSWORD`, and `NC_ENABLE_PASSWORD` respectively. Blank values fall back. Secrets are never cached or included in object inspection.
+
+## Domain contract migration (2026-10-30)
+
+Rename neighbor fields to `remote_name`, `remote_interface` and `remote_chassis_id`, retaining `local_interface`. Collection progress reads schema 4 `target`; require ctx_cli 0.5. No legacy accessor aliases. See the [schema 4 migration and module contracts](https://github.com/gatework/ctx_runner/blob/main/docs/contracts-2026-10-30.md). Regenerate old collection reports and change plans; changing only their version number is not supported.

data/README.zh-CN.md

@@ -4,7 +4,7 @@
 
 通过 SSH 或 Telnet 操作网络设备的 Ruby 库。支持配置采集、私有备份、交互脚本、TextFSM 解析，以及基于 Netdisco 清单的批量备份。
 
-需要 Ruby 3.4+、expect-pty 0.9.6+、ctx_cli 0.4.x、TextFSM 0.5.1+ 和 POSIX 系统。SSH 使用本机 OpenSSH；Telnet 需要本机安装 `telnet` 并显式配置。
+需要 Ruby 4.0.6+、expect-pty 0.10.x、ctx_cli 0.5.x、TextFSM 0.5.1+ 和 POSIX 系统。SSH 使用本机 OpenSSH；Telnet 需要本机安装 `telnet` 并显式配置。
 
 ## 安装
 

data/docs/VERIFICATION.md

@@ -1,5 +1,20 @@
 # 验证、依赖与敏感数据
 
+## 2026-10-30：expect-pty 0.10 候选联调
+
+使用 RVM Ruby 4.0.6 / Bundler 4.0.16 / Linux x86_64，显式指定 `EXPECT_PTY_PATH=../expect-ruby` 和
+`EXPECT_PTY_GEM=/absolute/path/expect-pty-0.10.0.gem` 运行完整 `bash script/ci`。
+1,285 runs、12,997 assertions，零失败、错误或跳过；源码/历史/包扫描、307 文件 lint、工作流检查、
+关键组覆盖率下限、基准 smoke、普通/Bundler 隔离安装通过，安装后逐文件核对候选包内容。
+历史覆盖率基线的 Ruby 描述与本机不同，比较状态为 not_comparable，未改写历史基线。
+
+PTY 适配显式映射 matched、timeout、eof、error 和 match_number；设备事件继续使用零基 index，
+超时与 EOF 不会因为 Result#error 为 nil 被误判为成功。真实本地 PTY 测试覆盖流式读取、输出上限、关闭与认证。
+最低业务依赖组合（expect-pty 0.10.0、ctx_cli 0.5.0、TextFSM 0.5.1、JSON 2）亦通过完整测试与普通/Bundler 隔离安装；
+先安装候选包，再在未设置 EXPECT_PTY_PATH 的环境中解析 minimum.gemfile。
+日志为 `tmp/lean-ci.log`；最低依赖记录保存在工作区 `.expect-review-20261030/minimum.log`。
+远端 Actions、macOS 和真实设备未在本轮执行。
+
 在项目根目录执行：
 
 ```sh
@@ -128,7 +143,7 @@ NC-00 未保存逐文件数据，因此本轮不伪造逐文件历史下限；
 
 ## 平台与工具
 
-CI 矩阵为 Ubuntu 24.04 / macOS 15 × Ruby 3.4、4.0。
+CI 矩阵为 Ubuntu 24.04 / macOS 15 × Ruby 4.0.6、4.0。
 GitHub Actions 固定提交 SHA；Gitleaks 与 actionlint 固定版本和各平台归档
 SHA-256，首次使用时从官方 GitHub Release 下载，缓存到 `tmp/tools/`。
 已有工具归档和可执行文件也会再次校验。初次安装依赖和下载工具需要联网；
@@ -155,7 +170,7 @@ SHA-256，首次使用时从官方 GitHub Release 下载，缓存到 `tmp/tools/
 
 运行依赖写在 `net-connector.gemspec`，包括直接使用的、可能从 Ruby 默认
 安装中拆出的标准库 gem。开发工具只写在 Gemfile，不进入运行依赖。
-PTY 与共享脱敏直接依赖 expect-pty 0.9.6+ 的公开 `Session`、`buffer_bytesize` 和 `Expect::Redactor` 接口。
+PTY 与共享脱敏直接依赖 expect-pty 0.10.x 的公开 `Session`、`buffer_bytesize` 和 `Expect::Redactor` 接口。
 开发用 `parallel` 保持 1.x。升级 expect-pty 时先验证源码集成，再用本次构建的 gem 验证隔离安装；
 新依赖版本发布前不得将本地构建验证记成已发布版本验收，也不能退回旧接口掩盖依赖缺失。
 
@@ -163,9 +178,9 @@ PTY 与共享脱敏直接依赖 expect-pty 0.9.6+ 的公开 `Session`、`buffer_
 分别解析兼容依赖。应用使用者应在自己的应用中提交 lockfile。测试和打包
 脚本通过隔离安装检查运行依赖，避免依赖开发环境里偶然存在的 gem。
 
-`gemfiles/minimum.gemfile` 固定受支持的依赖下界 expect-pty 0.9.6、ctx_cli 0.4.0、textfsm 0.5.1；
+`gemfiles/minimum.gemfile` 固定受支持的依赖下界 expect-pty 0.10.0、ctx_cli 0.5.0、textfsm 0.5.1；
 标准库和开发工具仍按主 Gemfile 的兼容范围解析。普通矩阵检查允许版本的正常解析，
-另在 Ubuntu / Ruby 3.4、4.0 检查这组版本的全量测试与隔离安装。本地复现：
+另在 Ubuntu / Ruby 4.0.6、4.0 检查这组版本的全量测试与隔离安装。本地复现：
 
 ```sh
 BUNDLE_GEMFILE=gemfiles/minimum.gemfile bundle install
@@ -211,7 +226,7 @@ Gitleaks 默认规则之外，还检查网络设备密码/SNMP community 配置
 运行依赖要求 TextFSM 0.5.1 或更新版本；0.5.1 的公开 JSON 声明为 `>= 2.0`，
 允许普通消费者选择 JSON 2 或 JSON 3。最低依赖任务固定 TextFSM 0.5.1 与 JSON 2。
 
-CI 的 `json3-compatibility` 在 Ruby 3.4 / 4.0 使用已发布 TextFSM 0.5.1 与 JSON 3，
+CI 的 `json3-compatibility` 在 Ruby 4.0.6 / 4.0 使用已发布 TextFSM 0.5.1 与 JSON 3，
 执行完整测试和真实打包隔离安装。脚本核对原始 gem 的 JSON 依赖声明，再将发布包缓存
 交给隔离消费者；不再检出旧源码、修改 metadata 或重建同版本 TextFSM。
 
@@ -244,7 +259,7 @@ TFTP 远端未核验回执以及自定义日志目录；离线复核同时支持
 实施记录使用当前工作区文件和方法可见性快照，区别已有改动与本轮增量，不以 Git HEAD 冒充修改前基线。
 源码根目录 `RENAMES.md` 记录批准的改名与兼容边界。完整验收仍运行 `bundle exec rake ci`；
 临时 PostgreSQL 使用 `bundle exec rake test:postgres`，可通过 `NC_TEST_PG_BINDIR` 指定服务端工具目录。
-最低 Ruby 3.4 必须在对应解释器中运行 lint/test；RuboCop 的 TargetRubyVersion 和 Ruby 4.0 测试不能替代此项。
+最低 Ruby 4.0.6 必须在对应解释器中运行 lint/test；RuboCop 的 TargetRubyVersion 和 Ruby 4.0 测试不能替代此项。
 
 ## 报告统计基准
 

data/lib/net/connector/collect/progress.rb

@@ -27,7 +27,7 @@ module Net
                     when "partial" then "Partially complete (#{code})"
                     else "Incomplete (#{code})"
                     end
-          super(host: result.fetch("device").fetch("host"), success: status == "complete",
+          super(host: result.fetch("target").fetch("host"), success: status == "complete",
                 duration_ms: result.fetch("duration_ms"), message: message, error_code: code&.to_sym)
         end
 

data/lib/net/connector/device/interfaces/audit.rb

@@ -64,7 +64,7 @@ module Net
         def inspect_interface(interface, peers)
           peer = peers.first
           current = @descriptions[interface]
-          row = { interface: peer.local_interface, neighbor: peer.neighbor_name, port: peer.neighbor_interface,
+          row = { interface: peer.local_interface, neighbor: peer.remote_name, port: peer.remote_interface,
                   current: current, expected: nil, status: :unverified }
           @comparisons << row
           if peers.size != 1
@@ -78,7 +78,7 @@ module Net
           local = @strategy.configuration_interface(peer.local_interface)
           Description.validate_interface!(local)
           row.merge!(expected: proposed, status: compare_status(current, proposed, peer))
-          @evidence[interface] = [peer.neighbor_name, peer.neighbor_interface, current]
+          @evidence[interface] = [peer.remote_name, peer.remote_interface, current]
           return if row[:status] == :matches
 
           @changes << Change.new(interface: local, old_description: current, new_description: proposed, neighbor: peer)

data/lib/net/connector/device/interfaces/description.rb

@@ -10,11 +10,11 @@ module Net
         # 将邻居名称和接口拼成默认描述；统一邻居接口简称，原始发现记录保持不变。
         def self.format(neighbor, abbreviate: true, lowercase: false)
           port = if abbreviate
-                   Name.short(neighbor.neighbor_interface, lowercase: lowercase)
+                   Name.short(neighbor.remote_interface, lowercase: lowercase)
                  else
-                   lowercase ? neighbor.neighbor_interface.downcase : neighbor.neighbor_interface
+                   lowercase ? neighbor.remote_interface.downcase : neighbor.remote_interface
                  end
-          validate!("To_#{neighbor.neighbor_name.tr(" ", "_")}_#{port.tr(" ", "_")}")
+          validate!("To_#{neighbor.remote_name.tr(" ", "_")}_#{port.tr(" ", "_")}")
         end
 
         # 保留语义相同的旧描述；只归一末尾已知接口别名和大小写，不模糊匹配名称或端口编号。

data/lib/net/connector/device/interfaces/neighbor.rb

@@ -4,11 +4,11 @@ module Net
   module Connector
     class Interfaces
       # 邻居身份拥有独立字符串，格式化回调不能改写发现证据。
-      Neighbor = Data.define(:local_interface, :neighbor_name, :neighbor_interface, :chassis_id, :protocol) do
+      Neighbor = Data.define(:local_interface, :remote_name, :remote_interface, :remote_chassis_id, :protocol) do
         # 复制并冻结本地端口、邻居名称、远端端口及发现协议。
-        def initialize(local_interface:, neighbor_name:, neighbor_interface:, chassis_id:, protocol:)
-          fields = { local_interface: local_interface, neighbor_name: neighbor_name,
-                     neighbor_interface: neighbor_interface, chassis_id: chassis_id }
+        def initialize(local_interface:, remote_name:, remote_interface:, remote_chassis_id:, protocol:)
+          fields = { local_interface: local_interface, remote_name: remote_name,
+                     remote_interface: remote_interface, remote_chassis_id: remote_chassis_id }
           raise ArgumentError, "neighbor fields must be Strings" unless fields.values.all?(String)
           raise ArgumentError, "neighbor protocol must be a Symbol" unless protocol.is_a?(Symbol)
 
@@ -18,8 +18,8 @@ module Net
         # 原始发现数据保留占位符；规划与下发重验共用身份校验，不能把未知名称写入描述。
         # MAC 是合法的 LLDP Port ID，不凭地址形状猜测设备角色，也不拿 chassis ID 补造名称。
         def identity_issue
-          return :unknown_neighbor_name if unknown_identity?(neighbor_name)
-          return :unknown_neighbor_interface if unknown_identity?(neighbor_interface)
+          return :unknown_neighbor_name if unknown_identity?(remote_name)
+          return :unknown_neighbor_interface if unknown_identity?(remote_interface)
 
           nil
         end

data/lib/net/connector/device/interfaces.rb

@@ -88,9 +88,9 @@ module Net
 
         rows.map do |row|
           Neighbor.new(local_interface: row.fetch("LOCAL_INTERFACE").strip.freeze,
-                       neighbor_name: row.fetch("NEIGHBOR_NAME", "").strip.freeze,
-                       neighbor_interface: row.fetch("NEIGHBOR_INTERFACE").strip.freeze,
-                       chassis_id: row.fetch("CHASSIS_ID", "").strip.freeze,
+                       remote_name: row.fetch("NEIGHBOR_NAME", "").strip.freeze,
+                       remote_interface: row.fetch("NEIGHBOR_INTERFACE").strip.freeze,
+                       remote_chassis_id: row.fetch("CHASSIS_ID", "").strip.freeze,
                        protocol: @strategy.protocol).freeze
         end
       end
@@ -272,7 +272,7 @@ module Net
         plan.changes.each do |change|
           Description.validate!(change.new_description)
           unless evidence.fetch(@strategy.interface_key(change.interface)) ==
-                 [change.neighbor.neighbor_name, change.neighbor.neighbor_interface, change.old_description]
+                 [change.neighbor.remote_name, change.neighbor.remote_interface, change.old_description]
             raise ArgumentError, "plan changes do not match its discovery evidence"
           end
         end
@@ -319,7 +319,7 @@ module Net
 
         interfaces.transform_values do |peers|
           peer = peers.fetch(0)
-          [peer.neighbor_name, peer.neighbor_interface, current.fetch(@strategy.interface_key(peer.local_interface))].freeze
+          [peer.remote_name, peer.remote_interface, current.fetch(@strategy.interface_key(peer.local_interface))].freeze
         end.freeze
       end
 

data/lib/net/connector/engine/transports.rb

@@ -61,8 +61,15 @@ module Net
         # 从信道读取下一事件，并把字符串字段转换为字节字符串。
         def read(patterns, timeout:)
           result = @channel.expect(*patterns, STREAM, timeout: timeout)
-          Event.new(index: result.number && (result.number - 1), before: result.before.to_s,
-                    match: result.match.to_s, error: result.error)
+          # 传输事件维持连接器的零基索引与事件协议；PTY 的等待状态和异常在适配边界明确转换。
+          error = case result.status
+                  when :matched then nil
+                  when :eof, :timeout then result.status
+                  when :error then result.error
+                  else raise ArgumentError, "unknown PTY result status"
+                  end
+          Event.new(index: result.match_number && (result.match_number - 1), before: result.before.to_s,
+                    match: result.match.to_s, error:)
         end
 
         # 临时设置写入超时，完成写入后恢复原设置。

data/lib/net/connector/netdisco/ssh/authentication.rb

@@ -17,11 +17,11 @@ module Net
             Expect.spawn(*arguments, raw: true, buffer_limit: 65_536, write_timeout: 5) do |session|
               deadline = Expect.monotonic + 15
               challenge = session.expect(PASSWORD, REJECTED, timeout: [deadline - Expect.monotonic, 0].max)
-              next false unless challenge.number == 1
+              next false unless challenge.match_number == 1
 
               session.write(password + "\n")
               completion = session.expect(PASSWORD, REJECTED, timeout: [deadline - Expect.monotonic, 0].max)
-              completion.error == :eof
+              completion.eof?
             end
           end
         end

data/lib/net/connector/netdisco/topology/options.rb

@@ -51,10 +51,10 @@ module Net
 
           # 使用当前模板和端口展示策略生成缺失或确需修正的目标描述。
           def description_for(neighbor)
-            port = neighbor.neighbor_interface
+            port = neighbor.remote_interface
             port = Net::Connector::Interfaces::Name.short(port) if abbreviate_ports
             port = port.downcase if lowercase_ports
-            format(neighbor: neighbor.neighbor_name, port: port)
+            format(neighbor: neighbor.remote_name, port: port)
           end
 
           # 仅显式声明的旧名称前缀可保留；不把未知名称、包含匹配或不同编号当作同一邻居。
@@ -63,7 +63,7 @@ module Net
             return true if comparison.equivalent?(current, expected)
 
             neighbor_name_prefixes.any? do |prefix|
-              variant = neighbor.with(neighbor_name: prefix + neighbor.neighbor_name)
+              variant = neighbor.with(remote_name: prefix + neighbor.remote_name)
               comparison.equivalent?(current, description_for(variant))
             end
           end

data/lib/net/connector/version.rb

@@ -3,6 +3,6 @@
 module Net
   module Connector
     # gemspec、CLI 与发布工具共用此版本，运行时读取不触发设备依赖加载。
-    VERSION = "0.20.0"
+    VERSION = "0.22.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: net-connector
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.22.0
 platform: ruby
 authors:
 - net-connector contributors
 bindir: bin
 cert_chain: []
-date: 2026-10-29 00:00:00.000000000 Z
+date: 2026-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ctx_cli
@@ -15,40 +15,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: expect-pty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: textfsm
   requirement: !ruby/object:Gem::Requirement
@@ -586,7 +586,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.4'
+      version: 4.0.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="