style(Generator): rename Gen to Run

Author: pot-code

cmd/gen_api.go

@@ -58,7 +58,7 @@ var genAPICmd = &cli.Command{
 				Model:       config.Model,
 				Root:        config.Root,
 			})
-			if err := gen.Gen(); err != nil {
+			if err := gen.Run(); err != nil {
 				gen.Cleanup()
 				return err
 			}

cmd/gen_backend.go

@@ -60,7 +60,7 @@ var generateBECmd = &cli.Command{
 				Author:      config.Author,
 				Version:     config.Version,
 			})
-			if err := gen.Gen(); err != nil {
+			if err := gen.Run(); err != nil {
 				gen.Cleanup()
 				return err
 			}

core/executor.go

@@ -0,0 +1,32 @@
+package core
+
+import (
+	"os"
+	"os/exec"
+	"strings"
+
+	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
+)
+
+type CmdExecutor struct {
+	name string
+	args []string
+}
+
+var _ Executor = CmdExecutor{}
+
+func NewCmdExecutor(bin string, args ...string) *CmdExecutor {
+	return &CmdExecutor{bin, args}
+}
+
+func (ce CmdExecutor) Run() error {
+	log.WithFields(log.Fields{
+		"bin":  ce.name,
+		"args": ce.args,
+	}).Debug("execute command")
+	cmd := exec.Command(ce.name, ce.args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stdout
+	return errors.Wrapf(cmd.Run(), "failed to execute command '%s %s'", ce.name, strings.Join(ce.args, " "))
+}

core/executor_test.go

@@ -0,0 +1,33 @@
+package core
+
+import "testing"
+
+func TestCmdExecutor_Run(t *testing.T) {
+	type fields struct {
+		name string
+		args []string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		wantErr bool
+	}{
+		{"", fields{
+			"ls", []string{"-ahl"},
+		}, false},
+		{"", fields{
+			"lab", []string{"-ahl"},
+		}, true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ce := CmdExecutor{
+				name: tt.fields.name,
+				args: tt.fields.args,
+			}
+			if err := ce.Run(); (err != nil) != tt.wantErr {
+				t.Errorf("CmdExecutor.Run() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

core/file_generator.go

@@ -25,7 +25,7 @@ func NewFileGenerator(path string, data DataProvider) Generator {
 	return &FileGenerator{file, data, false}
 }
 
-func (gt *FileGenerator) Gen() error {
+func (gt *FileGenerator) Run() error {
 	file := gt.file
 	provider := gt.data
 

core/file_generator_test.go

@@ -27,7 +27,7 @@ func TestFileGenerator_Gen(t *testing.T) {
 				data:    tt.fields.data,
 				cleaned: tt.fields.cleaned,
 			}
-			if err := gt.Gen(); (err != nil) != tt.wantErr {
+			if err := gt.Run(); (err != nil) != tt.wantErr {
 				t.Errorf("FileGenerator.Gen() error = %v, wantErr %v", err, tt.wantErr)
 			}
 			gt.Cleanup()

core/interface.go

@@ -1,6 +1,10 @@
 package core
 
 type Generator interface {
-	Gen() error
+	Executor
 	Cleanup() error
 }
+
+type Executor interface {
+	Run() error
+}

core/parallel_generator.go

@@ -20,7 +20,7 @@ func NewParallelGenerator(subtasks ...Generator) *ParallelGenerator {
 	return &ParallelGenerator{subtasks, false}
 }
 
-func (pg ParallelGenerator) Gen() error {
+func (pg ParallelGenerator) Run() error {
 	subtasks := pg.subtasks
 	errChan := make(chan error)
 	doneChan := make(chan struct{})
@@ -30,8 +30,8 @@ func (pg ParallelGenerator) Gen() error {
 	for i := range subtasks {
 		wg.Add(1)
 		go func(task Generator) {
-			if err := task.Gen(); err != nil {
-				errChan <- task.Gen()
+			if err := task.Run(); err != nil {
+				errChan <- task.Run()
 			} else {
 				wg.Done()
 			}

core/parallel_generator_test.go

@@ -37,7 +37,7 @@ func TestParallelGenerator_Gen(t *testing.T) {
 				subtasks: tt.fields.subtasks,
 				cleaned:  tt.fields.cleaned,
 			}
-			if err := pg.Gen(); (err != nil) != tt.wantErr {
+			if err := pg.Run(); (err != nil) != tt.wantErr {
 				t.Errorf("ParallelGenerator.Gen() error = %v, wantErr %v", err, tt.wantErr)
 			}
 			pg.Cleanup()

generate/gen_api_go.go

@@ -82,14 +82,14 @@ func NewGolangApiGenerator(config *GolangApiConfig) *golangApiGenerator {
 	return &golangApiGenerator{config: config, recipe: recipe}
 }
 
-func (gag golangApiGenerator) Gen() error {
+func (gag golangApiGenerator) Run() error {
 	log.Debugf("generation tree:\n%s", gag.recipe.GetGenerationTree())
 	dir := path.Join(gag.config.Root, gag.config.PackageName)
 	_, err := os.Stat(dir)
 	if os.IsNotExist(err) {
 		gen := gag.recipe.MakeGenerator()
 		gag.gen = gen
-		return errors.Wrap(gen.Gen(), "failed to generate go api")
+		return errors.Wrap(gen.Run(), "failed to generate go api")
 	}
 	if err == nil {
 		log.Infof("[skipped]'%s' already exists", dir)