Fix gtm verify

Author: mschenk42

command/verify.go

@@ -5,8 +5,11 @@
 package command
 
 import (
+	"bytes"
 	"flag"
 	"fmt"
+	"io"
+	"os"
 	"strings"
 
 	"github.com/hashicorp/go-version"
@@ -15,15 +18,9 @@ import (
 
 // VerifyCmd contains CLI commands for verify
 type VerifyCmd struct {
-	Ui      cli.Ui
-	Version string
-}
-
-// NewVerify returns new VerifyCmd struct with version set
-func NewVerify(v string) func() (cli.Command, error) {
-	return func() (cli.Command, error) {
-		return VerifyCmd{Version: v}, nil
-	}
+	Ui           cli.Ui
+	Version      string
+	ResultWriter *bytes.Buffer
 }
 
 // Help returns CLI help for Verify command
@@ -54,7 +51,16 @@ func (c VerifyCmd) Run(args []string) int {
 		c.Ui.Error(err.Error())
 		return 1
 	}
-	c.Ui.Output(fmt.Sprintf("%t", valid))
+
+	// c.Ui.Output adds a newline which is a bad for us here.
+	// Clients calling this method are comparing equal to "true" (without newline)
+	// ResultWriter allows for mocking during testing and defaults to Stdout
+	var writer io.Writer
+	writer = os.Stdout
+	if c.ResultWriter != nil {
+		writer = c.ResultWriter
+	}
+	fmt.Fprintf(writer, "%t", valid)
 	return 0
 }
 

command/verify_test.go

@@ -4,7 +4,12 @@
 
 package command
 
-import "testing"
+import (
+	"bytes"
+	"testing"
+
+	"github.com/mitchellh/cli"
+)
 
 func TestCheck(t *testing.T) {
 	cases := []struct {
@@ -33,4 +38,22 @@ func TestCheck(t *testing.T) {
 				tc.input, tc.cmd.Version, tc.valid, valid)
 		}
 	}
+
+}
+
+func TestVerify(t *testing.T) {
+	ui := new(cli.MockUi)
+	c := VerifyCmd{Ui: ui, Version: "1.0.0", ResultWriter: new(bytes.Buffer)}
+
+	args := []string{">= 1.0.0"}
+	rc := c.Run(args)
+
+	if rc != 0 {
+		t.Errorf("gtm verify(%+v), want 0 got %d, %s", args, rc, ui.ErrorWriter.String())
+	}
+
+	want := "true"
+	if want != c.ResultWriter.String() {
+		t.Errorf("gtm verify(%+v), want '%s' got '%s', %s", args, want, ui.OutputWriter.String(), ui.ErrorWriter.String())
+	}
 }

main.go

@@ -46,7 +46,8 @@ func main() {
 		},
 		"verify": func() (cli.Command, error) {
 			return &command.VerifyCmd{
-				Ui: ui,
+				Ui:      ui,
+				Version: Version,
 			}, nil
 		},
 		"uninit": func() (cli.Command, error) {