net-connector 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33503c92ccbe8f7000652c0b47b967a8f2f40e6c9edd7081ba305c3246efe820
-  data.tar.gz: f2d4c434caab1b888d1b4cd9bf25a0def4e7e26eb63b2e6e5e93d8b56cc34c0d
+  metadata.gz: aadffbf2db023105e9b507fb732a89bd710207adf28456b2edb5184eb245fedf
+  data.tar.gz: 72cc71886fd9c6dce77171af3c8300f5f84af7c7e8192acd335e132c942b2b3c
 SHA512:
-  metadata.gz: e8c126666632d1f4a708cbcc42c1df5ad434d37978a55fe2db363e3628f2c7e2779192d05ad7d8989933d389d92a6de520669a93a47c46209816a85d423abcca
-  data.tar.gz: ad704438b1ed05942371fe3f57a7ebf66f563261406682013b18f57c8cfbc8b01a190a41a685a2991f4d53ff3e2912d2cf8c8e272b593bc83e1a439c821ef349
+  metadata.gz: 4d59d23ae05999d469f96837baf6b5f2eca3518104b8769947c36c860788627f3f9cb35c4e05151e364e51f159f0b171905f64fbfd30b963d096bf176cbf35d5
+  data.tar.gz: 0b0137d959ecc3be69fd72fbed2bcc562e95c615ab13a786c4485dcf107ff9de30376e2c731051edbac6f297b496be1cdc97c2ec321066c955c9a3a88ef369f6

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # 更新记录
 
+## Unreleased
+
+## 0.17.2 - 2026-10-23
+
+- Migrate shared CLI entrypoints to ctx_cli 0.2.0 names without legacy aliases.
+- Synchronize new directory ancestry across batch reports and local/SSH archives; synchronize uploaded-file cleanup.
+- Keep host-key comparison and vendor parsing independent of host field separators.
+- Reuse ctx_cli configuration, initialization, terminal and option boundaries without changing backup/TFTP/topology policies.
+
 ## 0.17.1 - 2026-10-22
 
 - Delegate shared configuration, private initialization, option groups and terminal interaction to ctx_cli 0.1.0.

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

@@ -159,7 +159,7 @@ module Net
         output, status = Open3.capture2e("ssh-keygen", "-f", path, "-F", @host)
         raise IOError, "reading device host key failed" unless [0, 1].include?(status.exitstatus)
 
-        output.lines("\n").reject { |line| line.start_with?("#") }.map { |line| line.split[1, 2] }.uniq
+        output.lines("\n").reject { |line| line.start_with?("#") }.map { |line| line.split(" ")[1, 2] }.uniq
       end
 
       # 从指定快照中移除当前主机条目，不直接修改共享信任文件。

data/lib/net/connector/netdisco/config/initializer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "yaml"
-require "ctx_cli/initialization"
+require "ctx_cli/initializer"
 require "ctx_cli/terminal"
 require_relative "../settings"
 require_relative "../../config"
@@ -15,7 +15,7 @@ module Net
           # 绑定配置问答的输入输出，保留调用方对 IO 的所有权。
           def initialize(input: $stdin, output: $stderr)
             @input, @output = input, output
-            @writer = CtxCli::Initialization.new(prefix: ".net-connector-config-")
+            @writer = CtxCli::Initializer.new(prefix: ".net-connector-config-")
           end
 
           # 完成默认值校验与可选问答后独占发布新配置，不覆盖已存在文件。

data/lib/net/connector/netdisco/report/store.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../storage/directory"
+
 require "json"
 require_relative "../report"
 require "fileutils"
@@ -17,7 +19,7 @@ module Net
             # 以临时文件和重命名原子写入私有 JSON 报告。
             def write(report, directory:)
               destination = File.expand_path(directory)
-              FileUtils.mkdir_p(destination, mode: 0o700)
+              Storage::Directory.prepare(destination)
               filename = "netdisco-#{report.mode}-#{report.started_at.strftime("%Y%m%dT%H%M%SZ")}-#{SecureRandom.hex(4)}.json"
               path = File.join(destination, filename)
               Storage::AtomicFile.write(path, JSON.pretty_generate(report.summary)).path

data/lib/net/connector/netdisco/ssh/archive/client.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../../storage/directory"
+
 require "digest"
 require "json"
 require "open3"
@@ -68,7 +70,7 @@ module Net
               end
               @password = password&.dup&.freeze
               @report_directory = File.expand_path(directory)
-              FileUtils.mkdir_p(@report_directory, mode: 0o700)
+              Storage::Directory.prepare(@report_directory)
               @batch = "#{Time.now.getlocal("+08:00").strftime("%Y-%m-%d_%H-%M-%S")}-ssh-#{SecureRandom.hex(8)}"
               @launcher = launcher || method(:open_ssh)
               @custom_launcher = !launcher.nil?
@@ -179,7 +181,7 @@ module Net
                                           archive_path: remote_path(proof.fetch("archive_path")))
               outcome = outcome.with(backup: receipt)
               path = File.join(@report_directory, "tftp", archive_name)
-              FileUtils.mkdir_p(File.dirname(path), mode: 0o700)
+              Storage::Directory.prepare(File.dirname(path))
               Storage::AtomicFile.write(path, bytes)
               outcome = outcome.with(backup: receipt.with(local_path: path))
               raise Tftp::Archive::Failure unless Storage::FileReader.fingerprint(path).sha256 == digest

data/lib/net/connector/netdisco/tftp/archive.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../storage/directory"
+
 require "fileutils"
 require "tempfile"
 require "digest"
@@ -50,7 +52,7 @@ module Net
           def initialize(directory:, root: nil)
             @report_directory = File.expand_path(directory)
             @server_root = root && File.realpath(root)
-            FileUtils.mkdir_p(@report_directory, mode: 0o700)
+            Storage::Directory.prepare(@report_directory)
             @server_archive_directory = create_server_archive_directory if @server_root
             @remote_suffix = reserve_remote_suffix unless @server_root
             @verifier = Tftp::Verifier.new(root: @server_root)
@@ -113,7 +115,7 @@ module Net
             return unless bytes
 
             previous_directory = File.join(@server_archive_directory, "previous")
-            FileUtils.mkdir_p(previous_directory, mode: 0o700)
+            Storage::Directory.prepare(previous_directory)
             archive_path = File.join(previous_directory, archive_filename(device, File.extname(remote_filename)))
             Storage::AtomicFile.write(archive_path, bytes)
             previous
@@ -126,7 +128,7 @@ module Net
             parent = File.join(@server_root, "archive")
             raise ArgumentError, "TFTP archive directory must not be a symlink" if File.symlink?(parent)
 
-            FileUtils.mkdir_p(parent, mode: 0o700)
+            Storage::Directory.prepare(parent)
             raise ArgumentError, "TFTP archive directory escaped its root" unless File.realpath(parent) == parent
 
             base = batch_name
@@ -136,6 +138,7 @@ module Net
               path = File.join(parent, candidate)
               begin
                 Dir.mkdir(path, 0o700)
+                Storage::Directory.sync(parent)
                 return path
               rescue Errno::EEXIST
                 number += 1
@@ -171,7 +174,7 @@ module Net
             receipt = outcome.backup
             saved_paths = { local_path: nil, archive_path: nil }
             batch_directory = File.join(@report_directory, "tftp")
-            FileUtils.mkdir_p(batch_directory, mode: 0o700)
+            Storage::Directory.prepare(batch_directory)
             extension = File.extname(receipt.path)
             filename = archive_filename(outcome.device, extension)
             batch_archive_path = File.join(batch_directory, filename)
@@ -192,6 +195,7 @@ module Net
               raise Failure.new(host: outcome.device.host) unless Storage::FileReader.same_entry?(uploaded_path, uploaded_fingerprint)
 
               File.unlink(uploaded_path)
+              Storage::Directory.sync(File.dirname(uploaded_path))
             end
             outcome.with(backup: receipt.with(**saved_paths))
           rescue StandardError => error

data/lib/net/connector/storage/batch_directory.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "fileutils"
+require_relative "directory"
 
 module Net
   module Connector
@@ -9,7 +9,7 @@ module Net
       class BatchDirectory
         # 固定 UTC+8，不依赖运行主机时区；mkdir 原子防止并发任务覆盖。
         def self.create(root, time: Time.now)
-          FileUtils.mkdir_p(root, mode: 0o700)
+          Directory.prepare(root)
           stamp = time.getlocal("+08:00").strftime("%Y-%m-%d_%H-%M-%S")
           suffix = 0
           loop do
@@ -17,6 +17,7 @@ module Net
             path = File.join(root, name)
             begin
               Dir.mkdir(path, 0o700)
+              Directory.sync(root)
               return path
             rescue Errno::EEXIST
               suffix += 1

data/lib/net/connector/storage/directory.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "fileutils"
+
+module Net
+  module Connector
+    module Storage
+      # 新建目录与已有目录的文件发布共用持久化边界。
+      module Directory
+        def self.prepare(path)
+          path = File.expand_path(path)
+          missing, parent = [], path
+          until File.directory?(parent)
+            missing << parent
+            parent = File.dirname(parent)
+          end
+          FileUtils.mkdir_p(path, mode: 0o700)
+          missing.reverse_each { |created| sync(File.dirname(created)) }
+          path
+        end
+
+        def self.sync(path)
+          File.open(File.realpath(path), File::RDONLY | File::NOFOLLOW) { |directory| directory.fsync }
+        end
+      end
+    end
+  end
+end

data/lib/net/connector/storage.rb

@@ -4,6 +4,7 @@ module Net
   module Connector
     # 文件存储不依赖设备连接；备份、离线导出和批量报告共享这些原语。
     module Storage
+      autoload :Directory, File.expand_path("storage/directory", __dir__)
       autoload :BatchDirectory, File.expand_path("storage/batch_directory", __dir__)
       autoload :BackupLock, File.expand_path("storage/backup_lock", __dir__)
       autoload :AtomicFile, File.expand_path("storage/atomic_file", __dir__)

data/lib/net/connector/vendor/h3c/topology.rb

@@ -43,7 +43,7 @@ module Net
             local_column = output.match?(/^[ \t]*System Name[ \t]+Local Interface\b/i) ? 1 : 0
             lines = neighbor_lines(output)
             return unless lines.all? do |line|
-              interface = line.split.fetch(local_column, nil)
+              interface = line.split(" ").fetch(local_column, nil)
               interface&.match?(/\A(?:[A-Za-z][A-Za-z-]*\d+(?:\/\d+)+|(?:Bridge-Aggregation|BAGG|Route-Aggregation|RAGG)\d+)(?:[:.]\d+)*\z/i)
             end
 

data/lib/net/connector/vendor/hillstone/tftp.rb

@@ -32,7 +32,7 @@ module Net
 
           # 从山石成功回显提取实际目标文件名。
           def remote_path(_target, result)
-            filename = completion_line(result)&.split&.last
+            filename = completion_line(result)&.split(" ")&.last
             TftpTarget.validate_path!(filename)
           end
 

data/lib/net/connector/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-connector
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - net-connector contributors
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: expect-pty
   requirement: !ruby/object:Gem::Requirement
@@ -491,6 +491,7 @@ files:
 - lib/net/connector/storage/atomic_file.rb
 - lib/net/connector/storage/backup_lock.rb
 - lib/net/connector/storage/batch_directory.rb
+- lib/net/connector/storage/directory.rb
 - lib/net/connector/storage/file_reader.rb
 - lib/net/connector/storage/saved_config.rb
 - lib/net/connector/textfsm.rb