feat(cli): assign short option -o to report file

Author: dbohdan

README.md

@@ -45,9 +45,9 @@ go install dbohdan.com/recur/v3@latest
 <!-- BEGIN USAGE -->
 ```none
 Usage: recur [-h] [-V] [-a <attempts>] [-b <backoff>] [-c <condition>] [-d
-<delay>] [-E] [-F] [-f] [-I] [-j <jitter>] [-m <max-delay>] [-O] [-R <format>]
-[--report-file <path>] [-r <reset-time>] [-s <seed>] [-t <timeout>] [-v] [--]
-<command> [<arg> ...]
+<delay>] [-E] [-F] [-f] [-I] [-j <jitter>] [-m <max-delay>] [-O] [-o <path>] [-R
+<format>] [-r <reset-time>] [-s <seed>] [-t <timeout>] [-v] [--] <command>
+[<arg> ...]
 
 Retry a command with exponential backoff and jitter.
 
@@ -100,12 +100,12 @@ Fibonacci backoff (duration)
   -O, --hold-stdout
           Buffer standard output for each attempt and only print it on success
 
+  -o, --report-file "-"
+          Report output file path ("-" for stderr)
+
   -R, --report "none"
           Report format ("none", "json", or "text")
 
-      --report-file "-"
-          Report output file path ("-" for stderr)
-
   -r, --reset -1s
           Minimum attempt time that resets exponential and Fibonacci backoff
 (duration; negative for no reset)

main.go

@@ -480,7 +480,7 @@ func wrapForTerm(s string) string {
 
 func usage(w io.Writer) {
 	s := fmt.Sprintf(
-		`Usage: %s [-h] [-V] [-a <attempts>] [-b <backoff>] [-c <condition>] [-d <delay>] [-E] [-F] [-f] [-I] [-j <jitter>] [-m <max-delay>] [-O] [-R <format>] [--report-file <path>] [-r <reset-time>] [-s <seed>] [-t <timeout>] [-v] [--] <command> [<arg> ...]`,
+		`Usage: %s [-h] [-V] [-a <attempts>] [-b <backoff>] [-c <condition>] [-d <delay>] [-E] [-F] [-f] [-I] [-j <jitter>] [-m <max-delay>] [-O] [-o <path>] [-R <format>] [-r <reset-time>] [-s <seed>] [-t <timeout>] [-v] [--] <command> [<arg> ...]`,
 		filepath.Base(os.Args[0]),
 	)
 
@@ -541,12 +541,12 @@ Options:
   -O, --hold-stdout
           Buffer standard output for each attempt and only print it on success
 
+  -o, --report-file %q
+          Report output file path ("-" for stderr)
+
   -R, --report %q
           Report format ("none", "json", or "text")
 
-      --report-file %q
-          Report output file path ("-" for stderr)
-
   -r, --reset %v
           Minimum attempt time that resets exponential and Fibonacci backoff (duration; negative for no reset)
 
@@ -565,8 +565,8 @@ Options:
 		formatDuration(delayDefault),
 		jitterDefault,
 		formatDuration(maxDelayDefault),
-		reportDefault,
 		reportFileDefault,
+		reportDefault,
 		formatDuration(resetDefault),
 		randomSeedDefault,
 		formatDuration(timeoutDefault),
@@ -703,6 +703,9 @@ func parseArgs() retryConfig {
 		case "-O", "--hold-stdout":
 			config.HoldStdout = true
 
+		case "-o", "--report-file":
+			config.ReportFile = nextArg(arg)
+
 		case "-E", "--hold-stderr":
 			config.HoldStderr = true
 
@@ -746,9 +749,6 @@ func parseArgs() retryConfig {
 
 			config.Report = reportFormat
 
-		case "--report-file":
-			config.ReportFile = nextArg(arg)
-
 		// "-v" is handled in the default case.
 		case "--verbose":
 			config.Verbose++

main_test.go

@@ -717,7 +717,7 @@ func TestReportJSON(t *testing.T) {
 }
 
 func TestReportText(t *testing.T) {
-	_, stderr, _ := runCommand("-R", "text", "-a", "3", "-c", "False", commandExit99)
+	_, stderr, _ := runCommand("-R", "text", "-o", "-", "-a", "3", "-c", "False", commandExit99)
 
 	for _, text := range []string{"attempts: 3", "Exit codes: 99, 99, 99"} {
 		if !strings.Contains(stderr, text) {