Move main cmd to ./cmd

So that it can be run as a library.

.goreleaser.yml

@@ -16,6 +16,7 @@ builds:
       - amd64
       - arm64
     env: [CGO_ENABLED=0]
+    ldflags: ["-s -w -X gotest.tools/gotestsum/cmd.version={{.Version}}"]
 
 checksum:
   name_template: '{{ .ProjectName }}-{{ .Version }}-checksums.txt'

flags.go → cmd/flags.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/csv"

flags_test.go → cmd/flags_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"testing"

handler.go → cmd/handler.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

handler_test.go → cmd/handler_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"
@@ -35,7 +35,7 @@ func TestPostRunHook(t *testing.T) {
 
 func newExecFromTestData(t *testing.T) *testjson.Execution {
 	t.Helper()
-	f, err := os.Open("testjson/testdata/go-test-json.out")
+	f, err := os.Open("../testjson/testdata/go-test-json.out")
 	assert.NilError(t, err)
 	defer f.Close() // nolint: errcheck
 
@@ -58,7 +58,7 @@ func TestEventHandler_Event_WithMissingActionFail(t *testing.T) {
 	errBuf := new(bytes.Buffer)
 	format := testjson.NewEventFormatter(errBuf, "testname")
 
-	source := golden.Get(t, "../testjson/testdata/go-test-json-missing-test-fail.out")
+	source := golden.Get(t, "../../testjson/testdata/go-test-json-missing-test-fail.out")
 	cfg := testjson.ScanConfig{
 		Stdout:  bytes.NewReader(source),
 		Handler: &eventHandler{jsonFile: buf, formatter: format},

cmd/main.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"context"
@@ -12,41 +12,13 @@ import (
 	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
-	"gotest.tools/gotestsum/cmd"
-	"gotest.tools/gotestsum/cmd/tool"
 	"gotest.tools/gotestsum/log"
 	"gotest.tools/gotestsum/testjson"
 )
 
-var version = "master"
-
-func main() {
-	err := route(os.Args)
-	switch err.(type) {
-	case nil:
-		return
-	case *exec.ExitError:
-		// go test should already report the error to stderr, exit with
-		// the same status code
-		os.Exit(exitCodeWithDefault(err))
-	default:
-		log.Error(err.Error())
-		os.Exit(3)
-	}
-}
-
-func route(args []string) error {
-	name := args[0]
-	next, rest := cmd.Next(args[1:])
-	switch next {
-	case "tool":
-		return tool.Run(name+" "+next, rest)
-	default:
-		return runMain(name, args[1:])
-	}
-}
+var version = "dev"
 
-func runMain(name string, args []string) error {
+func Run(name string, args []string) error {
 	flags, opts := setupFlags(name)
 	switch err := flags.Parse(args); {
 	case err == pflag.ErrHelp:
@@ -378,9 +350,9 @@ func startGoTest(ctx context.Context, args []string) (proc, error) {
 	return p, nil
 }
 
-// GetExitCode returns the ExitStatus of a process from the error returned by
+// ExitCodeWithDefault returns the ExitStatus of a process from the error returned by
 // exec.Run(). If the exit status is not available an error is returned.
-func exitCodeWithDefault(err error) int {
+func ExitCodeWithDefault(err error) int {
 	if err == nil {
 		return 0
 	}

main_e2e_test.go → cmd/main_e2e_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"
@@ -88,7 +88,7 @@ func TestE2E_RerunFails(t *testing.T) {
 			args: []string{
 				"-f=testname",
 				"--rerun-fails=2",
-				"--packages=./testjson/internal/broken",
+				"--packages=../testjson/internal/broken",
 				"--", "-count=1", "-tags=stubpkg",
 			},
 			expectedErr: "rerun aborted because previous run had errors",
@@ -182,7 +182,7 @@ func compileBinary(t *testing.T) string {
 		assert.NilError(t, err)
 
 		path := filepath.Join(tmpDir, "gotestsum")
-		result := icmd.RunCommand("go", "build", "-o", path, ".")
+		result := icmd.RunCommand("go", "build", "-o", path, "..")
 		result.Assert(t, icmd.Success)
 		return path
 	})

main_test.go → cmd/main_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"

rerunfails.go → cmd/rerunfails.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"context"
@@ -89,7 +89,7 @@ func hasErrors(err error, exec *testjson.Execution) error {
 	case len(exec.Errors()) > 0:
 		return fmt.Errorf("rerun aborted because previous run had errors")
 	// Exit code 0 and 1 are expected.
-	case exitCodeWithDefault(err) > 1:
+	case ExitCodeWithDefault(err) > 1:
 		return fmt.Errorf("unexpected go test exit code: %v", err)
 	default:
 		return nil

rerunfails_test.go → cmd/rerunfails_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"

main.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"os"
+	"os/exec"
+
+	"gotest.tools/gotestsum/cmd"
+	"gotest.tools/gotestsum/cmd/tool"
+	"gotest.tools/gotestsum/log"
+)
+
+func main() {
+	err := route(os.Args)
+	switch err.(type) {
+	case nil:
+		return
+	case *exec.ExitError:
+		// go test should already report the error to stderr, exit with
+		// the same status code
+		os.Exit(cmd.ExitCodeWithDefault(err))
+	default:
+		log.Error(err.Error())
+		os.Exit(3)
+	}
+}
+
+func route(args []string) error {
+	name := args[0]
+	next, rest := cmd.Next(args[1:])
+	switch next {
+	case "tool":
+		return tool.Run(name+" "+next, rest)
+	default:
+		return cmd.Run(name, args[1:])
+	}
+}