ctx_cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2e8622dd69aeb8ad48fb4e9b5d0212345698f81b78f042d4dfa761bdf0c3890
-  data.tar.gz: b579bf0a5ad0a3d795249f4e8d0048366120f5a8f857f95a29901c78266b28f2
+  metadata.gz: 6757c9c4e28fdbf88436ead17a364fc8dcb7fc2d4fda107654fd278c0d5229c3
+  data.tar.gz: a727b09657a6b79ab821c2a2f8f899c1d09b248faf659ff288306514c07d0a68
 SHA512:
-  metadata.gz: 2e18324d1c852f300873ea0bf02fadd159fd70bf4637f716590e1e0435d92d5dc1a1580e5eed4f552cc607cf2aeef5549df544a8f07f1340faff5cc87724ecc3
-  data.tar.gz: b61f9d0812d4bde92d8b5bf86d804bc9d9f2b8991b7f3b7c308909c74696c4ecfec333dd1ef9b14ae9da57c043cf91a35b9ee74d62eaeea6bd17398e015222c6
+  metadata.gz: d0d80afb9a473f4bceff0dc6f0cfbb7b78d2987b8aed673c4b230e1c05086bdbc9f2fa950ee1f54dc95cbfe487f803178ecace433d40ac758257e7b0633c726e
+  data.tar.gz: ee8af08341391087d93c40df85d61b486346fcfef8c92ee8b675704749e4ad3e4dcededc8126edadb7d52fc1d82190725fa1e1774c6604cd36124c6c9f938c6e

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.2.1 (2026-10-23)
+
+- Use English command help, prompts and collection/review diagnostics.
+- Allow compatible dotenv versions without an upper version bound.
+
 ## 0.2.0 (2026-10-23)
 
 - Rename Initialization to Initializer and Application to Router; remove the old constants and require paths in the 0.2.0 candidate.

data/README.md

@@ -73,7 +73,7 @@ Options 协作者沿用现有入口协议：`informational?`、`validate_interac
 bundle install
 bundle exec rake
 bundle exec rake build
-ruby script/verify_package.rb pkg/ctx_cli-0.2.0.gem
+ruby script/verify_package.rb pkg/ctx_cli-0.2.1.gem
 ```
 
 默认任务包括 RSpec、RuboCop 和离线示例。安装验证在独立 GEM_HOME/GEM_PATH 下运行普通与最小 Bundler 应用，检查实际加载来源。CI 参照 ctx_parser 的固定 action 提交和候选制品校验；发布需另行明确授权。

data/lib/ctx_cli/collection.rb

@@ -33,13 +33,13 @@ module CtxCli
       return 0 if @options.missing?(input: @input, error: @error)
       @options.load
       @progress = @progress_factory.call(@options)
-      @progress.notice("配置：#{@options.config}")
+      @progress.notice("Configuration: #{@options.config}")
       return output(@options.public_values.merge("sources" => @options.sources)) if @options.flags[:show_config]
       @devices, @inventory_total = @adapter.inventory(@options, progress: @progress)
       devices = @devices
       return output(devices) if @options.flags[:inventory_only]
       if devices.empty?
-        @progress.notice("没有匹配设备，未建立连接")
+        @progress.notice("No devices matched; no connections opened")
         @output.json({ status: :no_devices, total: 0 }, pretty: false) if @options.flags[:json]
         return 1
       end
@@ -47,7 +47,7 @@ module CtxCli
       @store = @adapter.report(@options)
       @batch = @batch_class.new(report: @store, progress: @progress, requested: devices)
       outcome = @batch.run(present: ->(summary) { @output.json(summary) if @options.flags[:json] }) do
-        @progress.plan(devices: devices, total: @inventory_total, parallel: @options.values.fetch("parallel"), label: "#{@label} 只读采集")
+        @progress.plan(devices: devices, total: @inventory_total, parallel: @options.values.fetch("parallel"), label: "#{@label} read-only collection")
         @progress.with_updates do
           @adapter.execute(devices, @options) do |device|
             @batch.collect(device) { @adapter.collect(device, @options, context: context, progress: @progress) }
@@ -57,19 +57,19 @@ module CtxCli
       end
       completion(outcome)
     rescue Interrupt
-      diagnostic "采集已取消，已保存的设备报告保留；未保存结果见报告状态"
+      diagnostic "Collection cancelled; saved device reports retained; check report status for unsaved results"
       130
     rescue SystemCallError, IOError => error
-      diagnostic "#{@label} 参数或报告错误：#{report_diagnostic(error)}"
+      diagnostic "#{@label} argument or report error: #{report_diagnostic(error)}"
       2
     rescue Error, Configuration::Error => error
-      diagnostic "#{@label} 参数、依赖或报告错误：#{error.message}；使用 --help 查看参数"
+      diagnostic "#{@label} argument, dependency or report error: #{error.message}; use --help for options"
       2
     rescue OptionParser::ParseError, ArgumentError, LoadError => error
-      diagnostic "#{@label} 参数、依赖或报告错误：#{error.class.name}；使用 --help 查看参数"
+      diagnostic "#{@label} argument, dependency or report error: #{error.class.name}; use --help for options"
       2
     rescue StandardError => error
-      diagnostic "#{@label} 清单或执行失败：#{@failure_code.call(error)}（#{error.class.name}）"
+      diagnostic "#{@label} inventory or execution failed: #{@failure_code.call(error)} (#{error.class.name})"
       2
     end
 
@@ -82,18 +82,18 @@ module CtxCli
     # Runner 决定批次结论；CLI 仅呈现安全诊断并映射退出码。
     def completion(outcome)
       if outcome.finalization_error
-        diagnostic "#{@label} 摘要报告错误：#{outcome.finalization_error}"
+        diagnostic "#{@label} summary report error: #{outcome.finalization_error}"
       end
       if outcome.recovery_failed
-        diagnostic "摘要恢复未确认；请依据退出码及报告目录检查，不能将旧摘要视为本次成功。"
+        diagnostic "Summary recovery is unconfirmed; check the exit code and report directory. An earlier summary does not confirm this run succeeded."
       end
       if outcome.status == :interrupted
-        diagnostic "采集已取消，已保存的设备报告保留；未保存结果见报告状态"
+        diagnostic "Collection cancelled; saved device reports retained; check report status for unsaved results"
       elsif (failure = outcome.failure)
         if failure[:kind] == :report
-          diagnostic "#{@label} 参数或报告错误：#{failure[:detail]}"
+          diagnostic "#{@label} argument or report error: #{failure[:detail]}"
         else
-          diagnostic "#{@label} 清单或执行失败：#{failure[:error_type]}；已采集结果见批次报告"
+          diagnostic "#{@label} inventory or execution failed: #{failure[:error_type]}; see the batch report for collected results"
         end
       end
       { complete: 0, incomplete: 1, failed: 2, interrupted: 130 }.fetch(outcome.status)
@@ -115,7 +115,7 @@ module CtxCli
         @output.json(value)
       else
         value.each { |device| @out.puts "#{device.fetch('host')}\t#{device.fetch('name')}\t#{device['model']}" }
-        @out.puts "设备：#{value.size} 台；未建立设备连接"
+        @out.puts "Devices: #{value.size}; no device connections opened"
       end
       value.is_a?(Array) && value.empty? ? 1 : 0
     end

data/lib/ctx_cli/command.rb

@@ -18,7 +18,7 @@ module CtxCli
       @parser.banner = @banner
       @configure&.call(@parser, @values)
       rest = @parser.parse(argv.dup)
-      raise ArgumentError, "不接受位置参数" unless rest.empty?
+      raise ArgumentError, "Positional arguments are not accepted" unless rest.empty?
       @values
     end
 

data/lib/ctx_cli/options.rb

@@ -4,34 +4,34 @@ module CtxCli
   # 普通参数分组只登记语法；不加载配置、不执行操作、不拥有领域校验。
   module Options
     def self.initialization(parser, values)
-      parser.on("--init", "创建缺失配置和环境模板后退出；已有文件不覆盖") { values[:init] = true }
-      parser.on("--interactive", "缺少配置时询问是否创建；要求真实终端") { values[:interactive] = true }
-      parser.on("--non-interactive", "禁用问答；创建文件须同时指定 --init") { values[:interactive] = false }
+      parser.on("--init", "Create missing configuration and environment templates, then exit; preserve existing files") { values[:init] = true }
+      parser.on("--interactive", "Prompt to create missing configuration; requires an interactive terminal") { values[:interactive] = true }
+      parser.on("--non-interactive", "Disable prompts; specify --init to create files") { values[:interactive] = false }
     end
 
     def self.output(parser, values, quiet: :quiet)
-      parser.on("--json", "stdout 输出 JSON；默认显示可读摘要") { values[:json] = true }
-      parser.on("--quiet", "--no-progress", "关闭 stderr 进度，可配合 --json") { values[quiet] = true }
-      parser.on("--verbose", "显示逐台结果及安全命令事件") { values[:verbose] = true }
+      parser.on("--json", "Write JSON to stdout; defaults to a readable summary") { values[:json] = true }
+      parser.on("--quiet", "--no-progress", "Disable progress on stderr; can be combined with --json") { values[quiet] = true }
+      parser.on("--verbose", "Show per-device results and safe command events") { values[:verbose] = true }
     end
 
     def self.information(parser, values)
-      parser.on("-h", "--help", "查看选项帮助") { values[:help] = true }
-      parser.on("--help-all", "查看全部选项、路径与环境约定") { values[:help_all] = true }
-      parser.on("--examples", "查看常用命令范例，不执行任务") { values[:examples] = true }
+      parser.on("-h", "--help", "Show option help") { values[:help] = true }
+      parser.on("--help-all", "Show all options, paths and environment conventions") { values[:help_all] = true }
+      parser.on("--examples", "Show common command examples without executing tasks") { values[:examples] = true }
     end
 
     # 值转换留在宿主边界，允许不同入口沿用原有存储格式。
-    def self.configuration(parser, parallel_help: "设备并发数", &store)
-      parser.on("--config FILE", "显式 YAML 最后叠加于自动发现的配置") { |value| store.call(:config, value) }
-      parser.on("--env-file FILE", "显式环境文件最后叠加；进程环境优先") { |value| store.call(:env_file, value) }
+    def self.configuration(parser, parallel_help: "Device concurrency", &store)
+      parser.on("--config FILE", "Overlay explicit YAML after automatically discovered configuration") { |value| store.call(:config, value) }
+      parser.on("--env-file FILE", "Load explicit environment files last; process environment takes precedence") { |value| store.call(:env_file, value) }
       parser.on("-p", "--parallel N", Integer, parallel_help) { |value| store.call(:parallel, value) }
-      parser.on("--directory DIR", "按设备保存报告的目录") { |value| store.call(:directory, value) }
+      parser.on("--directory DIR", "Directory for per-device reports") { |value| store.call(:directory, value) }
     end
 
     def self.list(value)
       values = value.split(",", -1).map(&:strip)
-      raise ArgumentError, "列表不能有空项" if values.any?(&:empty?)
+      raise ArgumentError, "Lists must not contain empty entries" if values.any?(&:empty?)
       values
     end
   end

data/lib/ctx_cli/output.rb

@@ -14,7 +14,7 @@ module CtxCli
 
     # 最后的错误流失败不能覆盖原本的失败或取消状态。
     def diagnostic(message, exception: nil)
-      @error.puts(exception ? "#{message}（#{exception.class.name}）" : message)
+      @error.puts(exception ? "#{message} (#{exception.class.name})" : message)
     rescue StandardError
       nil
     end

data/lib/ctx_cli/review.rb

@@ -23,10 +23,10 @@ module CtxCli
     def run(argv)
       options = @command.parse(argv)
       return 0 if @command.informational?
-      raise ArgumentError, "需要批次目录" unless options[:batch]
+      raise ArgumentError, "A batch directory is required" unless options[:batch]
       batch = File.expand_path(options[:batch])
       paths = source_paths(File.join(batch, @directory))
-      raise ArgumentError, "无设备报告" if paths.empty?
+      raise ArgumentError, "No device reports found" if paths.empty?
       remaining = @max_total_bytes
       sources = paths.map do |path|
         raise ArgumentError, "review byte budget exceeded" unless remaining.positive?
@@ -38,10 +38,10 @@ module CtxCli
       @output.text(@adapter.publish(sources, options, batch: batch, context: context))
       0
     rescue Interrupt
-      @output.diagnostic("建议生成已取消；已有报告保留，未执行设备变更。")
+      @output.diagnostic("Review cancelled; existing reports retained; no device changes executed.")
       130
     rescue StandardError => error
-      @output.diagnostic("建议生成失败（#{error.class.name}）；请检查输入结构、目录权限和 --help；未执行设备变更。")
+      @output.diagnostic("Review failed (#{error.class.name}); check the input structure, directory permissions and --help; no device changes executed.")
       2
     end
 

data/lib/ctx_cli/router.rb

@@ -21,7 +21,7 @@ module CtxCli
         return 0
       end
       return @commands.fetch(command).call(arguments) if @commands.key?(command)
-      @error.puts "未知命令或多余参数；使用 #{@name} --help 查看用法"
+      @error.puts "Unknown command or extra arguments; use #{@name} --help for usage"
       2
     end
   end

data/lib/ctx_cli/terminal.rb

@@ -10,7 +10,7 @@ module CtxCli
     def self.tty?(*streams) = streams.all? { |stream| stream.respond_to?(:tty?) && stream.tty? }
     def tty?(*others) = self.class.tty?(@input, @out, *others)
 
-    def require_tty!(*others, message: "必须使用真实交互终端")
+    def require_tty!(*others, message: "An interactive terminal is required")
       raise ArgumentError, message unless tty?(*others)
     end
 
@@ -26,13 +26,13 @@ module CtxCli
     end
 
     def password(label:)
-      raise ArgumentError, "密码提示需要交互终端；自动化任务可使用环境变量或 --stdin-credentials" unless self.class.tty?(@input)
+      raise ArgumentError, "Password prompts require an interactive terminal; use environment variables or --stdin-credentials for automation" unless self.class.tty?(@input)
       require "io/console"
-      @out.print "#{label}："
+      @out.print "#{label}: "
       @out.flush
       value = @input.noecho { |terminal| terminal.gets("\n") }&.chomp("\n")
       @out.puts
-      raise ArgumentError, "密码不能为空" if value.nil? || value.empty?
+      raise ArgumentError, "Password must not be empty" if value.nil? || value.empty?
       value
     end
   end

data/lib/ctx_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CtxCli
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ctx_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gatework contributors
@@ -15,20 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fileutils
   requirement: !ruby/object:Gem::Requirement