raygatherer 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef304a404bc427e2d066db7cf8767e73d06dc8c765b15f18b78afc68a78ee1e
-  data.tar.gz: e81748ac2ce4443e5a30ff55e63727db50148d7b1402ffebbee280c01f19a8a6
+  metadata.gz: 19099779bda496591260a273c3d6db20c9203f1c046393c2ce6b7c6b90b77db5
+  data.tar.gz: 7105312abb9d3d27aafbd452e386f87343b8ebce08308e30e4b7330128d260aa
 SHA512:
-  metadata.gz: cc2ce523698c34711223d9c88a14360f98850e91650da419acb9b532e6d1e5a8f1bc8db47d418e83acf648878803a4f2811ca65403dbfcbfae071017e0ad6c3b
-  data.tar.gz: bde55ec5165b8516d9e6295a2b6215db2c54f2399b9c299497591b9d0ebe212a1d2eac19c0d10ace5324816f1a37f477ca06587125110a858488c39a587f283d
+  metadata.gz: 68524f1ebfc17554e8fed101331eca036e25217f23c8ada0922e0da5c9f257257314126bebf671a37bb7a8a50ebffca355d2df24cd7dbf8d677951414d865288
+  data.tar.gz: d5453cb08bbe54cc9d07fbd1a32d05bce51f9e25ba866ced69bd657fcd3d067c3fe5210aec77f6e193c7a3421867fb0cc4cdfc26eefb61a9f1b8792f4e124c39

data/README.md

@@ -12,27 +12,43 @@ Currently implemented:
 
 - alerts from live analysis, with severity-based exit codes
 - recording list/start/stop/delete/download
-- system stats
+- analysis report for named or active recordings
 - analysis queue status and triggering analysis runs
+- system stats and raw log output
+- device clock show and sync
 - config show/set/test-notification
+- rayhunter update status, with a dedicated exit code for scripting
+- GPS position show/set (requires the device's gps_mode config to be set to Api)
+- wifi client status and network scan
 - JSON output mode for scriptable commands
 - optional basic auth and config file support
+- debug utilities (display-state)
 
 ## Installation
 
-### Ruby version
+### Via RubyGems
 
-`raygatherer` requires Ruby `>= 3.1.0`.
+```bash
+gem install raygatherer
+```
+
+Requires Ruby >= 3.2.
+
+## Compatibility
 
-### Install from this repo
+Tested against [rayhunter](https://github.com/EFForg/rayhunter/) v0.12.0 (last synced 2026-09-07). Older rayhunter versions may be missing some fields or endpoints raygatherer expects — commands that already have the connected daemon's version on hand (`stats`, `update status`) print a one-line warning to stderr when it's older than that, without blocking anything.
+
+### From source
 
 ```bash
+git clone https://github.com/mjstallard/raygatherer.git
+cd raygatherer
 bundle install
 make build
 make install
 ```
 
-Or install directly with RubyGems:
+Or build and install the gem directly:
 
 ```bash
 gem build raygatherer.gemspec
@@ -50,37 +66,49 @@ raygatherer --help
 Check live alerts:
 
 ```bash
-raygatherer --host http://rayhunter.local alerts
+raygatherer --host http://192.168.1.1 alerts
 ```
 
 Check live alerts as JSON:
 
 ```bash
-raygatherer --host http://rayhunter.local --json alerts
+raygatherer --host http://192.168.1.1 --json alerts
 ```
 
 List recordings:
 
 ```bash
-raygatherer --host http://rayhunter.local recording list
+raygatherer --host http://192.168.1.1 recording list
 ```
 
 Download a recording:
 
 ```bash
-raygatherer --host http://rayhunter.local recording download 1738950000
+raygatherer --host http://192.168.1.1 recording download 1738950000
+```
+
+Show analysis report for a recording:
+
+```bash
+raygatherer --host http://192.168.1.1 analysis report 1738950000
+```
+
+Show analysis report for the active recording:
+
+```bash
+raygatherer --host http://192.168.1.1 analysis report --live
 ```
 
 Show analysis queue status:
 
 ```bash
-raygatherer --host http://rayhunter.local analysis status
+raygatherer --host http://192.168.1.1 analysis status
 ```
 
 Show system stats:
 
 ```bash
-raygatherer --host http://rayhunter.local stats
+raygatherer --host http://192.168.1.1 stats
 ```
 
 ## Global Flags
@@ -113,7 +141,7 @@ CLI flags always override config values.
 Example:
 
 ```yaml
-host: http://rayhunter.local
+host: http://192.168.1.1
 basic_auth_user: admin
 basic_auth_password: replace-me
 json: false
@@ -126,16 +154,26 @@ Main commands:
 
 - `alerts`
 - `recording list`
-- `recording download <name> [--qmdl|--pcap|--zip] [--download-dir DIR|--save-as PATH]`
-- `recording delete <name>`
-- `recording stop`
 - `recording start`
+- `recording stop`
+- `recording download <name> [--qmdl|--pcap|--zip] [--download-dir DIR|--save-as PATH]`
+- `recording delete <name> | --all [--force]`
 - `analysis status`
-- `analysis run [NAME|--all]`
+- `analysis run <name> | --all`
+- `analysis report <name> | --live`
+- `time show`
+- `time sync`
 - `config show`
 - `config set` (reads JSON from stdin)
 - `config test-notification`
 - `stats`
+- `log`
+- `update status`
+- `gps show`
+- `gps set LAT LON` (requires gps_mode=Api on the device)
+- `wifi show`
+- `wifi scan`
+- `debug display-state <recording|paused|warning> [--severity low|medium|high]`
 
 For command-specific help:
 
@@ -164,11 +202,26 @@ raygatherer analysis run --help
 Example:
 
 ```bash
-raygatherer --host http://rayhunter.local alerts
+raygatherer --host http://192.168.1.1 alerts
 code=$?
 [ "$code" -ge 11 ] && echo "medium or high alert"
 ```
 
+## Update Status Exit Codes
+
+`update status` returns a dedicated code so a cron job can react without parsing output:
+
+- `0`: up to date (or `auto_check_updates` is disabled on the device)
+- `1`: error
+- `20`: update available
+
+Example:
+
+```bash
+raygatherer --host http://192.168.1.1 update status
+[ $? -eq 20 ] && echo "rayhunter update available"
+```
+
 ## JSON Output
 
 Commands that support `--json` return machine-readable output to `stdout`. This is intended for `jq` and/or scripts.
@@ -176,7 +229,7 @@ Commands that support `--json` return machine-readable output to `stdout`. This
 Example:
 
 ```bash
-raygatherer --host http://rayhunter.local --json config show | jq '.analyzers'
+raygatherer --host http://192.168.1.1 --json config show | jq '.analyzers'
 ```
 
 ## Development

data/lib/raygatherer/api_client.rb

@@ -73,10 +73,59 @@ module Raygatherer
       end
     end
 
+    def fetch_time
+      get("/api/time") do |body|
+        parse_json(body)
+      end
+    end
+
+    def fetch_gps
+      get_optional("/api/gps") { |body| parse_json(body) }
+    end
+
+    def set_gps(latitude, longitude)
+      post("/api/gps", expected_code: "200",
+        body: ::JSON.generate({latitude: latitude, longitude: longitude}),
+        content_type: "application/json")
+    end
+
+    def fetch_wifi_status
+      get("/api/wifi-status") do |body|
+        parse_json(body)
+      end
+    end
+
+    def scan_wifi
+      parse_json(post("/api/wifi-scan", expected_code: "200"))
+    end
+
+    def fetch_update_status
+      get("/api/update-status") do |body|
+        parse_json(body)
+      end
+    end
+
+    def set_time_offset(offset_seconds)
+      post("/api/time-offset", expected_code: "200",
+        body: ::JSON.generate({offset_seconds: offset_seconds}),
+        content_type: "application/json")
+    end
+
+    def fetch_log
+      get("/api/log") do |body|
+        log_verbose "Received log (#{body.bytesize} bytes)"
+        body
+      end
+    end
+
     def test_notification
       post("/api/test-notification", expected_code: "200")
     end
 
+    def set_display_state(body_json)
+      post("/api/debug/display-state", body: body_json, content_type: "application/json", expected_code: "200")
+    end
+
     def set_config(json_body)
       post("/api/config", body: json_body, content_type: "application/json")
     end
@@ -95,6 +144,10 @@ module Raygatherer
       post("/api/delete-recording/#{URI.encode_www_form_component(name)}")
     end
 
+    def delete_all_recordings
+      post("/api/delete-all-recordings")
+    end
+
     def start_analysis(name)
       encoded = URI.encode_www_form_component(name)
       body = post("/api/analysis/#{encoded}")
@@ -124,6 +177,26 @@ module Raygatherer
       raise
     end
 
+    def get_optional(path, not_found_code: "404")
+      response, body = request(:get, path, ok_code: "200", ok_status_text: "OK")
+
+      return nil if response.code == not_found_code
+
+      unless response.is_a?(Net::HTTPSuccess)
+        raise ApiError, server_error_message(response, body)
+      end
+
+      yield body
+    rescue ParseError => e
+      log_verbose "Parse failed: #{e.message}"
+      raise
+    end
+
+    # expected_code defaults to "202" (Accepted), matching the daemon's behavior for most POST
+    # actions (recordings, analysis, config). A handful of endpoints (gps, wifi-scan, time-offset,
+    # test-notification, display-state) respond "200" instead — pass expected_code: "200" for
+    # those. This isn't documented by rayhunter anywhere; it's observed per-endpoint behavior, so
+    # verify against the real device if you're adding a new one and unsure which applies.
     def post(path, expected_code: "202", body: nil, content_type: nil)
       ok_status_text = (expected_code == "202") ? "Accepted" : "OK"
       response, resp_body = request(:post, path, ok_code: expected_code,
@@ -137,16 +210,20 @@ module Raygatherer
     end
 
     def request(method, path, ok_code:, ok_status_text:, body: nil, content_type: nil)
-      url = "#{@host}#{path}"
-      uri = URI.parse(url)
+      with_connection_error_handling do
+        url = "#{@host}#{path}"
+        uri = URI.parse(url)
 
-      log_verbose "HTTP #{method.to_s.upcase} #{url}"
-      log_verbose "Basic Auth: user=#{@username}" if @username
+        log_verbose "HTTP #{method.to_s.upcase} #{url}"
+        log_verbose "Basic Auth: user=#{@username}" if @username
 
-      req = build_request(method, uri, body: body, content_type: content_type)
-      response, resp_body = execute_request(uri, req, ok_code: ok_code, ok_status_text: ok_status_text)
+        req = build_request(method, uri, body: body, content_type: content_type)
+        execute_request(uri, req, ok_code: ok_code, ok_status_text: ok_status_text)
+      end
+    end
 
-      [response, resp_body]
+    def with_connection_error_handling
+      yield
     rescue SocketError, Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout => e
       log_verbose "Connection error: #{e.class} - #{e.message}"
       raise ConnectionError, "Failed to connect to #{@host}: #{e.message}"
@@ -193,28 +270,26 @@ module Raygatherer
       start_time = Time.now
       log_verbose "Request started at: #{start_time.utc}"
 
-      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
-        request = Net::HTTP::Get.new(uri.request_uri)
-        request.basic_auth(@username, @password) if @username && @password
+      with_connection_error_handling do
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
+          req = build_request(:get, uri)
 
-        http.request(request) do |response|
-          elapsed = Time.now - start_time
-          status_text = (response.code == "200") ? "OK" : response.message.to_s
-          log_verbose "Response received: #{response.code} #{status_text} (#{format("%.3f", elapsed)}s)"
+          http.request(req) do |response|
+            elapsed = Time.now - start_time
+            status_text = (response.code == "200") ? "OK" : response.message.to_s
+            log_verbose "Response received: #{response.code} #{status_text} (#{format("%.3f", elapsed)}s)"
 
-          unless response.is_a?(Net::HTTPSuccess)
-            error_body = response.read_body
-            raise ApiError, server_error_message(response, error_body)
-          end
+            unless response.is_a?(Net::HTTPSuccess)
+              error_body = response.read_body
+              raise ApiError, server_error_message(response, error_body)
+            end
 
-          response.read_body do |chunk|
-            io.write(chunk)
+            response.read_body do |chunk|
+              io.write(chunk)
+            end
           end
         end
       end
-    rescue SocketError, Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout => e
-      log_verbose "Connection error: #{e.class} - #{e.message}"
-      raise ConnectionError, "Failed to connect to #{@host}: #{e.message}"
     end
 
     def server_error_message(response, body)
@@ -256,11 +331,10 @@ module Raygatherer
     end
 
     def normalize_host(host)
-      # Add http:// if no scheme is present
-      if !%r{^https?://}.match?(host)
-        "http://#{host}"
-      else
+      if %r{^https?://}.match?(host)
         host
+      else
+        "http://#{host}"
       end
     end
   end

data/lib/raygatherer/cli.rb

@@ -16,18 +16,28 @@ module Raygatherer
     end
 
     ROUTES = {
-      ["stats", nil] => {file: "commands/stats", klass: "Commands::Stats", json: true},
-      ["alerts", nil] => {file: "commands/alerts", klass: "Commands::Alerts", json: true},
-      ["recording", "list"] => {file: "commands/recording/list", klass: "Commands::Recording::List", json: true},
-      ["recording", "download"] => {file: "commands/recording/download", klass: "Commands::Recording::Download", json: false},
-      ["recording", "delete"] => {file: "commands/recording/delete", klass: "Commands::Recording::Delete", json: false},
-      ["recording", "stop"] => {file: "commands/recording/stop", klass: "Commands::Recording::Stop", json: false},
-      ["recording", "start"] => {file: "commands/recording/start", klass: "Commands::Recording::Start", json: false},
-      ["analysis", "status"] => {file: "commands/analysis/status", klass: "Commands::Analysis::Status", json: true},
-      ["analysis", "run"] => {file: "commands/analysis/run", klass: "Commands::Analysis::Run", json: true},
-      ["config", "show"] => {file: "commands/config/show", klass: "Commands::Config::Show", json: true},
-      ["config", "set"] => {file: "commands/config/set", klass: "Commands::Config::Set", json: false},
-      ["config", "test-notification"] => {file: "commands/config/test_notification", klass: "Commands::Config::TestNotification", json: false}
+      ["log", nil] => {klass: "Commands::Log", json: false},
+      ["stats", nil] => {klass: "Commands::Stats", json: true},
+      ["alerts", nil] => {klass: "Commands::Alerts", json: true},
+      ["recording", "list"] => {klass: "Commands::Recording::List", json: true},
+      ["recording", "download"] => {klass: "Commands::Recording::Download", json: false},
+      ["recording", "delete"] => {klass: "Commands::Recording::Delete", json: false},
+      ["recording", "stop"] => {klass: "Commands::Recording::Stop", json: false},
+      ["recording", "start"] => {klass: "Commands::Recording::Start", json: false},
+      ["analysis", "status"] => {klass: "Commands::Analysis::Status", json: true},
+      ["analysis", "run"] => {klass: "Commands::Analysis::Run", json: true},
+      ["analysis", "report"] => {klass: "Commands::Analysis::Report", json: true},
+      ["config", "show"] => {klass: "Commands::Config::Show", json: true},
+      ["config", "set"] => {klass: "Commands::Config::Set", json: false},
+      ["config", "test-notification"] => {klass: "Commands::Config::TestNotification", json: false},
+      ["debug", "display-state"] => {klass: "Commands::Debug::DisplayState", json: false},
+      ["time", "show"] => {klass: "Commands::Time::Show", json: true},
+      ["time", "sync"] => {klass: "Commands::Time::Sync", json: false},
+      ["update", "status"] => {klass: "Commands::Update::Status", json: true},
+      ["gps", "show"] => {klass: "Commands::Gps::Show", json: true},
+      ["gps", "set"] => {klass: "Commands::Gps::Set", json: false},
+      ["wifi", "show"] => {klass: "Commands::Wifi::Show", json: true},
+      ["wifi", "scan"] => {klass: "Commands::Wifi::Scan", json: true}
     }.freeze
 
     def self.run(argv, stdout: $stdout, stderr: $stderr, config: Config.new)
@@ -44,8 +54,8 @@ module Raygatherer
 
     def run
       # Extract global flags BEFORE processing
-      cli_verbose = @argv.delete("--verbose") ? true : nil
-      cli_json = @argv.delete("--json") ? true : nil
+      cli_verbose = extract_boolean_flag("--verbose")
+      cli_json = extract_boolean_flag("--json")
       cli_host = extract_value_flag("--host")
       cli_username = extract_value_flag("--basic-auth-user")
       cli_password = extract_value_flag("--basic-auth-password")
@@ -86,7 +96,6 @@ module Raygatherer
         return Commands::EXIT_CODE_ERROR
       end
 
-      require_relative route[:file]
       return Commands::EXIT_CODE_ERROR unless require_host!
 
       kwargs = {stdout: @stdout, stderr: @stderr, api_client: build_api_client}
@@ -145,11 +154,14 @@ module Raygatherer
       name.split("::").reduce(Raygatherer) { |mod, part| mod.const_get(part) }
     end
 
+    def extract_boolean_flag(flag)
+      @argv.delete(flag) ? true : nil
+    end
+
     def extract_value_flag(flag)
       index = @argv.index(flag)
       return nil unless index
-      @argv.delete_at(index) # remove the flag
-      @argv.delete_at(index) # remove the value (shifted into same index)
+      @argv.slice!(index, 2)&.last
     end
 
     def show_help(output = @stdout)
@@ -174,9 +186,19 @@ module Raygatherer
       output.puts "    analysis status                   Show analysis queue status"
       output.puts "    analysis run <name>               Queue a recording for analysis"
       output.puts "    analysis run --all                Queue all recordings for analysis"
+      output.puts "    analysis report <name>            Show the full analysis report for a recording"
       output.puts "    config show                       Show device configuration"
       output.puts "    config set                        Update device configuration (reads JSON from stdin)"
       output.puts "    config test-notification          Send a test notification"
+      output.puts "    debug display-state STATE         Set device display state (recording, paused, warning)"
+      output.puts "    time show                        Show device time (system, adjusted, offset)"
+      output.puts "    time sync                        Sync device clock to this machine's time"
+      output.puts "    update status                    Show rayhunter daemon update status"
+      output.puts "    gps show                         Show last known GPS position"
+      output.puts "    gps set LAT LON                  Submit a GPS position (requires gps_mode=Api on device)"
+      output.puts "    wifi show                        Show wifi client connection status"
+      output.puts "    wifi scan                        Scan for available wifi networks"
+      output.puts "    log                              Download the device log"
       output.puts "    stats                            Show device system stats"
       output.puts ""
       output.puts "Configuration:"

data/lib/raygatherer/commands/alerts.rb

@@ -3,7 +3,8 @@
 require "optparse"
 require "time"
 require_relative "base"
-require_relative "../formatters/json"
+require_relative "../formatters/alerts_json"
+require_relative "../formatters/alerts_human"
 
 module Raygatherer
   module Commands
@@ -20,8 +21,7 @@ module Raygatherer
       EXIT_CODE_HIGH_SEVERITY = 12
 
       def initialize(argv, stdout: $stdout, stderr: $stderr, api_client: nil, json: false)
-        super(argv, stdout: stdout, stderr: stderr, api_client: api_client)
-        @json = json
+        super
         @latest = false
         @after = nil
         @recording = nil
@@ -40,11 +40,9 @@ module Raygatherer
           alerts = filter_after(alerts) if @after
           alerts = filter_latest(alerts, data[:rows]) if @latest
 
-          # Select formatter based on --json flag
-          formatter = @json ? Formatters::JSON.new : Formatters::Human.new
+          formatter = @json ? Formatters::AlertsJSON.new : Formatters::AlertsHuman.new
           @stdout.puts formatter.format(alerts)
 
-          # Return severity-based exit code
           severity_exit_code(alerts)
         end
       end
@@ -69,10 +67,7 @@ module Raygatherer
             @after = parse_timestamp(ts)
           end
 
-          opts.on("-h", "--help", "Show this help message") do
-            show_help
-            raise CLI::EarlyExit, EXIT_CODE_SUCCESS
-          end
+          add_help_option(opts)
         end.parse!(@argv)
       end
 
@@ -105,13 +100,13 @@ module Raygatherer
       end
 
       def parse_timestamp(str)
-        Time.parse(str)
+        ::Time.parse(str)
       rescue ArgumentError
         raise ArgumentError, "invalid timestamp: #{str}"
       end
 
       def filter_after(alerts)
-        alerts.select { |a| a[:packet_timestamp] && Time.parse(a[:packet_timestamp]) > @after }
+        alerts.select { |a| a[:packet_timestamp] && ::Time.parse(a[:packet_timestamp]) > @after }
       end
 
       def filter_latest(alerts, rows)

data/lib/raygatherer/commands/analysis/report.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require "optparse"
+require_relative "../base"
+require_relative "../../formatters/analysis_report_json"
+require_relative "../../formatters/analysis_report_human"
+
+module Raygatherer
+  module Commands
+    module Analysis
+      class Report < Base
+        def initialize(argv, stdout: $stdout, stderr: $stderr, api_client: nil, json: false)
+          super
+          @live = false
+        end
+
+        def run
+          with_error_handling do
+            parse_options
+
+            name = @argv.shift
+
+            if @live && name
+              @stderr.puts "Error: cannot use --live with a recording name"
+              return EXIT_CODE_ERROR
+            end
+
+            if !@live && name.nil?
+              @stderr.puts "Error: recording name or --live is required"
+              return EXIT_CODE_ERROR
+            end
+
+            data = @live ? @api_client.fetch_live_analysis_report : @api_client.fetch_analysis_report(name)
+
+            formatter = @json ? Formatters::AnalysisReportJSON.new : Formatters::AnalysisReportHuman.new
+            @stdout.puts formatter.format(data)
+
+            EXIT_CODE_SUCCESS
+          end
+        end
+
+        private
+
+        def parse_options
+          OptionParser.new do |opts|
+            opts.banner = "Usage: raygatherer analysis report [options] NAME"
+            opts.separator ""
+            opts.separator "Options:"
+
+            opts.on("--live", "Show analysis report for the currently active recording") do
+              @live = true
+            end
+
+            add_help_option(opts)
+          end.parse!(@argv)
+        end
+
+        def show_help(output = @stdout)
+          output.puts "Usage: raygatherer [global options] analysis report [options] [NAME]"
+          output.puts ""
+          output.puts "Show the full analysis report for a named recording, or the active recording."
+          output.puts ""
+          output.puts "Options:"
+          output.puts "        --live                           Show analysis report for the currently active recording"
+          output.puts "    -h, --help                           Show this help message"
+          output.puts ""
+          print_global_options(output, json: true)
+          output.puts ""
+          output.puts "Examples:"
+          output.puts "  raygatherer --host http://192.168.1.100:8080 analysis report 1738950000"
+          output.puts "  raygatherer --host http://rayhunter --json analysis report 1738950000"
+          output.puts "  raygatherer --host http://rayhunter analysis report --live"
+        end
+      end
+    end
+  end
+end

data/lib/raygatherer/commands/analysis/run.rb

@@ -10,8 +10,7 @@ module Raygatherer
     module Analysis
       class Run < Base
         def initialize(argv, stdout: $stdout, stderr: $stderr, api_client: nil, json: false)
-          super(argv, stdout: stdout, stderr: stderr, api_client: api_client)
-          @json = json
+          super
           @all = false
         end
 
@@ -31,7 +30,7 @@ module Raygatherer
               return EXIT_CODE_ERROR
             end
 
-            status = @api_client.start_analysis(@all ? "" : name)
+            status = @all ? run_all : @api_client.start_analysis(name)
 
             formatter = @json ? Formatters::AnalysisStatusJSON.new : Formatters::AnalysisStatusHuman.new
             @stdout.puts formatter.format(status)
@@ -42,6 +41,13 @@ module Raygatherer
 
         private
 
+        def run_all
+          manifest = @api_client.fetch_manifest
+          names = manifest["entries"].map { |e| e["name"] }
+          names.each { |name| @api_client.start_analysis(name) }
+          @api_client.fetch_analysis_status
+        end
+
         def parse_options
           OptionParser.new do |opts|
             opts.banner = "Usage: raygatherer analysis run [options] [NAME]"
@@ -52,10 +58,7 @@ module Raygatherer
               @all = true
             end
 
-            opts.on("-h", "--help", "Show this help message") do
-              show_help
-              raise CLI::EarlyExit, EXIT_CODE_SUCCESS
-            end
+            add_help_option(opts)
           end.parse!(@argv)
         end