Merge pull request #151 from dnephin/move-run

Move the main Run functions into the cmd package
gotestyourself · Oct 10, 2020 · e3cd29c · e3cd29c
2 parents 55c3dab + 60f382a
commit e3cd29c
Show file tree

Hide file tree

Showing 32 changed files with 819 additions and 810 deletions.
diff --git a/.goreleaser.yml b/.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'
diff --git a/flags.go → cmd/flags.go b/flags.go → cmd/flags.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/csv"

diff --git a/flags_test.go → cmd/flags_test.go b/flags_test.go → cmd/flags_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"testing"

diff --git a/handler.go → cmd/handler.go b/handler.go → cmd/handler.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

diff --git a/handler_test.go → cmd/handler_test.go b/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},

diff --git a/internal/signalhandlerdriver/main.go → cmd/internal/signalhandlerdriver/main.go b/internal/signalhandlerdriver/main.go → cmd/internal/signalhandlerdriver/main.go