Use github.com/goyek/x (#74)

Author: pellared

Diff for: .github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/[email protected]
         with:
           go-version: '1.19'
-      - run: ./goyek.sh all diff
+      - run: ./goyek.sh -v all diff
       - name: Upload HTML coverage
         uses: actions/[email protected]
         with:

Diff for: build/diff.go

@@ -5,21 +5,18 @@ import (
 	"strings"
 
 	"github.com/goyek/goyek/v2"
+	"github.com/goyek/x/cmd"
 )
 
 var _ = goyek.Define(goyek.Task{
 	Name:  "diff",
 	Usage: "git diff",
 	Action: func(tf *goyek.TF) {
-		Exec(tf, dirRoot, "git diff --exit-code")
+		cmd.Exec(tf, "git diff --exit-code")
 
-		tf.Log("Cmd: git status --porcelain")
-		cmd := tf.Cmd("git", "status", "--porcelain")
 		sb := &strings.Builder{}
-		cmd.Stdout = io.MultiWriter(tf.Output(), sb)
-		if err := cmd.Run(); err != nil {
-			tf.Error(err)
-		}
+		out := io.MultiWriter(tf.Output(), sb)
+		cmd.Exec(tf, "git status --porcelain", cmd.Stdout(out))
 		if sb.Len() > 0 {
 			tf.Error("git status --porcelain returned output")
 		}

Diff for: build/exec.go

@@ -6,7 +6,7 @@ require (
 	github.com/client9/misspell v0.3.4
 	github.com/golangci/golangci-lint v1.50.1
 	github.com/goyek/goyek/v2 v2.0.0-rc.8
-	github.com/mattn/go-shellwords v1.0.12
+	github.com/goyek/x v0.1.0
 )
 
 require (
@@ -98,6 +98,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/mattn/go-shellwords v1.0.12 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/mbilski/exhaustivestruct v1.2.0 // indirect
 	github.com/mgechev/revive v1.2.4 // indirect

Diff for: build/go.mod

@@ -273,6 +273,8 @@ github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod
 github.com/gostaticanalysis/testutil v0.4.0 h1:nhdCmubdmDF6VEatUNjgUZBJKWRqugoISdUv3PPQgHY=
 github.com/goyek/goyek/v2 v2.0.0-rc.8 h1:C+NKVE1Gg61tJdGmU4yhyPvZNbyCd6Y6EcEZrwEYojU=
 github.com/goyek/goyek/v2 v2.0.0-rc.8/go.mod h1:qtHlK7t/dYs1Dw7mLXjEVmgE3nccNa7mQW/RmasOoYg=
+github.com/goyek/x v0.1.0 h1:/9HDwBqc7KG+4goVfbBZtZh0BYt+7ZEsJV42163TUsg=
+github.com/goyek/x v0.1.0/go.mod h1:5FhgNhbEC/3RAye/VLB4TO98Zr9rKA0ZWD0Z/kh+J8k=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=

Diff for: build/go.sum

@@ -1,15 +1,18 @@
 package main
 
-import "github.com/goyek/goyek/v2"
+import (
+	"github.com/goyek/goyek/v2"
+	"github.com/goyek/x/cmd"
+)
 
 var golint = goyek.Define(goyek.Task{
 	Name:  "golint",
 	Usage: "golangci-lint run --fix",
 	Action: func(tf *goyek.TF) {
-		if !Exec(tf, dirBuild, "go install github.com/golangci/golangci-lint/cmd/golangci-lint") {
+		if !cmd.Exec(tf, "go install github.com/golangci/golangci-lint/cmd/golangci-lint", cmd.Dir(dirBuild)) {
 			return
 		}
-		Exec(tf, dirRoot, "golangci-lint run --fix")
-		Exec(tf, dirBuild, "golangci-lint run --fix")
+		cmd.Exec(tf, "golangci-lint run --fix", cmd.Dir(dirRoot))
+		cmd.Exec(tf, "golangci-lint run --fix", cmd.Dir(dirBuild))
 	},
 })

Diff for: build/golint.go

@@ -2,10 +2,8 @@
 package main
 
 import (
-	"os"
-
 	"github.com/goyek/goyek/v2"
-	"github.com/goyek/goyek/v2/middleware"
+	"github.com/goyek/x/boot"
 )
 
 // Directories used in repository.
@@ -15,7 +13,6 @@ const (
 )
 
 func main() {
-	goyek.Use(middleware.ReportStatus)
 	goyek.SetDefault(all)
-	goyek.Main(os.Args[1:])
+	boot.Main()
 }

Diff for: build/main.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/goyek/goyek/v2"
+	"github.com/goyek/x/cmd"
 )
 
 var mdlint = goyek.Define(goyek.Task{
@@ -24,6 +25,6 @@ var mdlint = goyek.Define(goyek.Task{
 			tf.Skip("no .md files")
 		}
 		dockerImage := "ghcr.io/igorshubovych/markdownlint-cli:v0.32.2"
-		Exec(tf, dirRoot, "docker run --rm -v '"+curDir+":/workdir' "+dockerImage+" "+strings.Join(mdFiles, " "))
+		cmd.Exec(tf, "docker run --rm -v '"+curDir+":/workdir' "+dockerImage+" "+strings.Join(mdFiles, " "))
 	},
 })

Diff for: build/mdlint.go

@@ -1,12 +1,15 @@
 package main
 
-import "github.com/goyek/goyek/v2"
+import (
+	"github.com/goyek/goyek/v2"
+	"github.com/goyek/x/cmd"
+)
 
 var mod = goyek.Define(goyek.Task{
 	Name:  "mod",
 	Usage: "go mod tidy",
 	Action: func(tf *goyek.TF) {
-		Exec(tf, dirRoot, "go mod tidy")
-		Exec(tf, dirBuild, "go mod tidy")
+		cmd.Exec(tf, "go mod tidy", cmd.Dir(dirRoot))
+		cmd.Exec(tf, "go mod tidy", cmd.Dir(dirBuild))
 	},
 })

Diff for: build/mod.go

@@ -4,19 +4,20 @@ import (
 	"strings"
 
 	"github.com/goyek/goyek/v2"
+	"github.com/goyek/x/cmd"
 )
 
 var spell = goyek.Define(goyek.Task{
 	Name:  "spell",
 	Usage: "misspell",
 	Action: func(tf *goyek.TF) {
-		if !Exec(tf, dirBuild, "go install github.com/client9/misspell/cmd/misspell") {
+		if !cmd.Exec(tf, "go install github.com/client9/misspell/cmd/misspell", cmd.Dir(dirBuild)) {
 			return
 		}
 		mdFiles := find(tf, ".md")
 		if len(mdFiles) == 0 {
 			tf.Skip("no .md files")
 		}
-		Exec(tf, dirRoot, "misspell -error -locale=US -w "+strings.Join(mdFiles, " "))
+		cmd.Exec(tf, "misspell -error -locale=US -w "+strings.Join(mdFiles, " "))
 	},
 })

Diff for: build/spell.go

@@ -1,14 +1,17 @@
 package main
 
-import "github.com/goyek/goyek/v2"
+import (
+	"github.com/goyek/goyek/v2"
+	"github.com/goyek/x/cmd"
+)
 
 var test = goyek.Define(goyek.Task{
 	Name:  "test",
 	Usage: "go test",
 	Action: func(tf *goyek.TF) {
-		if !Exec(tf, dirRoot, "go test -race -covermode=atomic -coverprofile=coverage.out -coverpkg=./... ./...") {
+		if !cmd.Exec(tf, "go test -race -covermode=atomic -coverprofile=coverage.out -coverpkg=./... ./...") {
 			return
 		}
-		Exec(tf, dirRoot, "go tool cover -html=coverage.out -o coverage.html")
+		cmd.Exec(tf, "go tool cover -html=coverage.out -o coverage.html")
 	},
 })