From 29ad6ee6ad7e02dbec3334e8843bb6711c011b55 Mon Sep 17 00:00:00 2001 From: "[[ BOT ]] Lynn Cyrin" Date: Fri, 23 Aug 2019 20:09:08 -0700 Subject: [PATCH] DRY --- build.go | 64 ++++++++++++-------------------------------------------- 1 file changed, 13 insertions(+), 51 deletions(-) diff --git a/build.go b/build.go index 125d25f..4572d28 100644 --- a/build.go +++ b/build.go @@ -52,8 +52,8 @@ func main() { } } -func VetActionFunc(_ *cli.Context) error { - cmd := exec.Command("go", "vet") +func runCmd(args ...string) error { + cmd := exec.Command(args[0], args[1:]...) cmd.Stdin = os.Stdin cmd.Stdout = os.Stdout @@ -62,6 +62,10 @@ func VetActionFunc(_ *cli.Context) error { return cmd.Run() } +func VetActionFunc(_ *cli.Context) error { + return runCmd("go", "vet") +} + func TestActionFunc(c *cli.Context) error { for _, pkg := range packages { var packageName string @@ -74,13 +78,7 @@ func TestActionFunc(c *cli.Context) error { coverProfile := fmt.Sprintf("--coverprofile=%s.coverprofile", pkg) - cmd := exec.Command("go", "test", "-v", coverProfile, packageName) - - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - - err := cmd.Run() + err := runCmd("go", "test", "-v", coverProfile, packageName) if err != nil { return err } @@ -152,34 +150,16 @@ func GfmrunActionFunc(_ *cli.Context) error { return err } - cmd := exec.Command("gfmrun", "-c", fmt.Sprint(counter), "-s", "README.md") - - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - - return cmd.Run() + return runCmd("gfmrun", "-c", fmt.Sprint(counter), "-s", "README.md") } func TocActionFunc(_ *cli.Context) error { - cmd := exec.Command("node_modules/.bin/markdown-toc", "-i", "README.md") - - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - - err := cmd.Run() + err := runCmd("node_modules/.bin/markdown-toc", "-i", "README.md") if err != nil { return err } - cmd = exec.Command("git", "diff", "--exit-code") - - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - - err = cmd.Run() + err = runCmd("git", "diff", "--exit-code") if err != nil { return err } @@ -188,35 +168,17 @@ func TocActionFunc(_ *cli.Context) error { } func GenActionFunc(_ *cli.Context) error { - cmd := exec.Command("go", "generate", "flag-gen/main.go") - - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - - err := cmd.Run() + err := runCmd("go", "generate", "flag-gen/main.go") if err != nil { return err } - cmd = exec.Command("go", "generate", "cli.go") - - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - - err = cmd.Run() + err = runCmd("go", "generate", "cli.go") if err != nil { return err } - cmd = exec.Command("git", "diff", "--exit-code") - - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - - err = cmd.Run() + err = runCmd("git", "diff", "--exit-code") if err != nil { return err }