change: reworked main menu to make it autodocumenting

Author: michele-sciabarra

main.go

@@ -243,7 +243,7 @@ func executeTools(args []string, opsHome string) int {
 
 	case "retry":
 		args[0] = "-retry"
-		if err := tools.ExpBackoffRetry(args[1:]); err != nil {
+		if err := tools.ExpBackoffRetry(args); err != nil {
 			log.Fatalf("error: %s", err.Error())
 		}
 		return 0

tests/login.bats

@@ -24,7 +24,7 @@ setup() {
 @test "ops -login help" {
     run ops -login
     assert_line "Usage:"
-	assert_line "ops login <apihost> [<user>]"
+	assert_line "ops -login <apihost> [<user>]"
     assert_line "error: missing apihost"
 
     run ops -login -h

tests/plugin.bats

@@ -24,14 +24,14 @@ setup() {
 }
 
 @test "ops prints 'Plugins:'" {
-    run ops
+    run ops -t
     assert_line 'Plugins:'
     assert_line "  plugin (local)"
 }
 
 @test "ops skips invalid plugin folders (without opsfile.yml)" {
     run mkdir olaris-test2
-    run ops
+    run ops -t
     refute_line "  test2 (local)"
     run rm -rf olaris-test2
 }
@@ -61,7 +61,7 @@ setup() {
 @test "other plugin without olaris is shown" {
     cd testdata
     run ops -update
-    run ops
+    run ops -t
     assert_line 'Plugins:'
     assert_line "  other (local)"
 }
@@ -104,7 +104,7 @@ setup() {
     run ops -plugin https://github.com/sciabarracom/olaris-test.git
     assert_success
 
-    run ops
+    run ops -t
     assert_line 'Plugins:'
     assert_line "  plugin (local)"
     assert_line "  test (ops)"

tests/prereq.bats

@@ -20,20 +20,20 @@ setup() {
     load 'test_helper/bats-assert/load'
     export NO_COLOR=1
     export OPS_BRANCH="0.1.0-testing"
-    rm -Rvf ~/.ops/
+    ops -reset force
     cd prereq
 }
 
 @test "ops prereq" {
-    run ops
+    run ops -t
     assert_line --partial "ensuring prerequisite 7zz" 
     #assert_line --partial "ensuring prerequisite coreutils" 
     #assert_line --partial "ensuring prerequisite bun" 
     #assert_line --partial "ensuring prerequisite kubectl" 
     #assert_line --partial "ensuring prerequisite kind" 
     #assert_line --partial "ensuring prerequisite k3sup" 
     assert_line --partial "info" 
-    run ops
+    run ops -t
     refute_line  "ensuring prerequisite 7zz" 
     #refute_line  "ensuring prerequisite coreutils" 
     #refute_line  "ensuring prerequisite bun" 
@@ -45,27 +45,27 @@ setup() {
 
 
 @test "windows" {
-    run env __OS=windows ops
+    run env __OS=windows ops -t
     assert_line --partial "ensuring prerequisite 7zz"
     assert test -e ~/.ops/windows-*/bin/7zz.exe
 }
 
 @test "linux" {
-    run env __OS=linux __ARCH=amd64 ops
+    run env __OS=linux __ARCH=amd64 ops -t
     assert_line --partial "ensuring prerequisite 7zz"
     assert test -e ~/.ops/linux-amd64/bin/7zz
 
-    run env __OS=linux __ARCH=arm64 ops
+    run env __OS=linux __ARCH=arm64 ops -t
     assert_line --partial "ensuring prerequisite 7zz"
     assert test -e ~/.ops/linux-arm64/bin/7zz
 }
 
 @test "darwin" {
-    run env __OS=darwin __ARCH=amd64 ops
+    run env __OS=darwin __ARCH=amd64 ops -t
     assert_line --partial "ensuring prerequisite 7zz"
     assert test -e ~/.ops/darwin-amd64/bin/7zz
 
-    run env __OS=darwin __ARCH=arm64 ops
+    run env __OS=darwin __ARCH=arm64 ops -t
     assert_line --partial "ensuring prerequisite 7zz"
     assert test -e ~/.ops/darwin-arm64/bin/7zz
 }

tests/retry.bats

@@ -41,7 +41,7 @@ setup() {
     assert_failure
 
     run ops -retry -t 0 -v ops failing
-    assert_line "Retry Parameters: max time=60 seconds, retries=0 times"
+    assert_line "Retry Parameters: max time=60 seconds, retries=0 times."
     assert_line "error: failure after 0 retries or 60 seconds."
     assert_failure
 

tools/retry.go

@@ -63,9 +63,18 @@ func ExpBackoffRetry(args []string) error {
 	}
 
 	if verboseFlag {
-		fmt.Printf("Retry Parameters: max time=%d seconds, retries=%d times\n", maxFlag, triesFlag)
+		fmt.Printf("Retry Parameters: max time=%d seconds, retries=%d times.\nCommand: %v\n", maxFlag, triesFlag, rest)
 	}
+
+	counter := 0
+	startTime := time.Now()
+
 	runCmd := func(args []string) error {
+		if verboseFlag {
+			counter += 1
+			elapsedTime := time.Since(startTime)
+			fmt.Printf("retry attempt %-3d elapsed %-3d seconds\n", counter, int(elapsedTime.Seconds()))
+		}
 		cmd := exec.Command(rest[0], rest[1:]...)
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr