Merge pull request #3898 from Joshua-Anderson/deisctl-cleanup

ref(deisctl): clean up some parsing and error behavior

Author: Matthew Fisher

deisctl/deisctl.go

@@ -60,15 +60,16 @@ Options:
 	argv, helpFlag := parseArgs(argv)
 	// give docopt an optional final false arg so it doesn't call os.Exit()
 	args, err := docopt.Parse(usage, argv, false, version.Version, true, false)
-	if err != nil || len(args) == 0 {
-		if helpFlag {
-			fmt.Print(usage)
-			return 0
-		} else if argv[0] == "--version" {
-			return 0
-		}
+
+	if err != nil && err.Error() != "" {
+		fmt.Println(err)
 		return 1
 	}
+
+	if len(args) == 0 {
+		return 0
+	}
+
 	command := args["<command>"]
 	setTunnel := true
 	// "--help" and "refresh-units" doesn't need SSH tunneling

deisctl/deisctl_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"fmt"
 	"io"
 	"os"
 	"strings"
@@ -47,8 +48,9 @@ func TestHelp(t *testing.T) {
 // TestUsage ensures that deisctl prints a short usage string when no arguments were provided.
 func TestUsage(t *testing.T) {
 	out := commandOutput(nil)
-	if out != "Usage: deisctl [options] <command> [<args>...]\n" {
-		t.Error(out)
+	expected := "Usage: deisctl [options] <command> [<args>...]\n"
+	if out != expected {
+		t.Error(fmt.Errorf("Expected '%s', Got '%s'", expected, out))
 	}
 }