add post init flow tasks

Oleg Sucharevich · Oleg Sucharevich · commit fa0f8c11d590 · 2019-11-26T00:19:31.000+02:00
diff --git a/build/cli-generator.yaml b/build/cli-generator.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: cli-generator
   description: Generate CLI entrypoints from spec file
-  version: 0.17.0
+  version: 0.18.0
   maintainers:
     - Oleg Sucharevich
 loose: true
@@ -32,6 +32,8 @@ commands:
       type: bool
     - name: run-init-flow
       type: bool
+    - name: run-post-init-flow
+      type: bool
 - name: calculate-sha
   flags:
     - name: language
diff --git a/cmd/generate.go b/cmd/generate.go
diff --git a/cmd/root.go b/cmd/root.go
diff --git a/configs/templates/go.cmd.tmpl b/configs/templates/go.cmd.tmpl
@@ -7,6 +7,7 @@ import (
 	{{ if .cmd.root }}
 	"github.com/spf13/viper"
 	"fmt"
+	"os"
 	{{ end }}
 
 	{{- if not .cmd.loose }}
@@ -79,6 +80,7 @@ func Execute() {
 	err := {{$name}}Cmd.Execute()
 	if err != nil {
 		fmt.Println(err.Error())
+		os.Exit(1)
 	}
 }
 {{ end }}
diff --git a/configs/templates/templates.go b/configs/templates/templates.go
diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.12
 
 require (
 	github.com/Masterminds/goutils v1.1.0 // indirect
+	github.com/Pallinder/go-randomdata v1.2.0 // indirect
 	github.com/Shopify/ejson v1.2.1 // indirect
 	github.com/aws/aws-sdk-go v1.25.0 // indirect
 	github.com/boltdb/bolt v1.3.1 // indirect
diff --git a/go.sum b/go.sum
@@ -4,6 +4,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/Pallinder/go-randomdata v1.2.0 h1:DZ41wBchNRb/0GfsePLiSwb0PHZmT67XY00lCDlaYPg=
+github.com/Pallinder/go-randomdata v1.2.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y=
 github.com/Shopify/ejson v1.2.1 h1:Dx0Ipn0mUgrZlzIa5oIUrH0rdSmBOyod/UJmQQK1KHo=
 github.com/Shopify/ejson v1.2.1/go.mod h1:J8cw5GOA0l/aMOPp+uDfwNYVbeqIaBhzRkv1+76UCvk=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
diff --git a/greet/go.mod b/greet/go.mod
@@ -0,0 +1,3 @@
+module github.com/greet/greet
+
+go 1.13
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
@@ -0,0 +1,50 @@
+package engine
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+)
+
+type (
+	// Runner can run commands on the host
+	Runner interface {
+		Run(tasks Task) error
+	}
+
+	// Options is the options that can be passed to New function
+	Options struct {
+	}
+
+	// RunOptions is the options to run a ii
+	RunOptions struct {
+		Path                 string
+		Arguments            []string
+		EnvironmentVariables map[string]string
+	}
+
+	engine struct{}
+)
+
+// New - creates new engine
+func New(opt *Options) Runner {
+	return &engine{}
+}
+
+func (e *engine) Run(task Task) error {
+	cmd := exec.Command(task.Path, task.Args...)
+
+	envs := []string{}
+	for k, v := range task.Envs {
+		envs = append(envs, fmt.Sprintf("%s=%s", k, v))
+	}
+	envs = append(envs, os.Environ()...)
+	cmd.Env = envs
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Start(); err != nil {
+		fmt.Printf("Failed to run task %s\n", task.Name)
+		return err
+	}
+	return nil
+}
diff --git a/pkg/engine/task.go b/pkg/engine/task.go
@@ -0,0 +1,10 @@
+package engine
+
+type (
+	Task struct {
+		Path string
+		Envs map[string]string
+		Args []string
+		Name string
+	}
+)
diff --git a/pkg/generate/generate.go b/pkg/generate/generate.go
@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 
 	"github.com/olegsu/cli-generator/configs/templates"
+	"github.com/olegsu/cli-generator/pkg/engine"
 	"github.com/olegsu/cli-generator/pkg/generate/language"
 	"github.com/olegsu/cli-generator/pkg/logger"
 	"github.com/olegsu/cli-generator/pkg/spec"
@@ -14,9 +15,13 @@ type (
 	resultRenderProcessor interface {
 		Process([]*language.RenderResult) error
 	}
+
+	taskRunner interface {
+		Run(engine.Task) error
+	}
 )
 
-func handle(cnf *viper.Viper, log logger.Logger, processor resultRenderProcessor) error {
+func handle(cnf *viper.Viper, log logger.Logger, processor resultRenderProcessor, taskRunner engine.Runner) error {
 	projectDir := cnf.GetString("projectDir")
 	lang := cnf.GetString("language")
 
@@ -38,24 +43,39 @@ func handle(cnf *viper.Viper, log logger.Logger, processor resultRenderProcessor
 
 	log.Debug("Running template engine", "lang", lang)
 	var renderError error
-	engine := language.New(&language.Options{
+	e := language.New(&language.Options{
 		Type:             lang,
 		Spec:             s,
 		Logger:           log.New("type", lang),
 		ProjectDirectory: projectDir,
 		RunInitFlow:      cnf.GetBool("runInitFlow"),
 		GenerateHandlers: cnf.GetBool("createHandlers"),
+		GoPackage:        cnf.GetString("goPackage"),
 	})
-	key, store := engine.BuildData(cnf)
+	key, store := e.BuildData(cnf)
 
 	var res []*language.RenderResult
-	if res, renderError = engine.Render(map[string]interface{}{
+	if res, renderError = e.Render(map[string]interface{}{
 		"spec": specJSON,
 		key:    store,
 	}); renderError != nil {
 		log.Error(renderError.Error())
 	}
 
-	return processor.Process(res)
+	err = processor.Process(res)
+	if err != nil {
+		return err
+	}
+	if cnf.GetBool("runPostInitFlow") {
+		for _, t := range e.PostInitFlow() {
+			log.Debug("Running task", "task", t)
+			err := taskRunner.Run(t)
+			if err != nil {
+				log.Error("Failed to run task", "task", t.Name, "error", err.Error())
+				return err
+			}
+		}
+	}
+	return nil
 
 }
diff --git a/pkg/generate/handler.go b/pkg/generate/handler.go
@@ -1,6 +1,7 @@
 package generate
 
 import (
+	"github.com/olegsu/cli-generator/pkg/engine"
 	"github.com/olegsu/cli-generator/pkg/logger"
 	"github.com/spf13/viper"
 )
@@ -12,6 +13,7 @@ type (
 	// Options additional options to Handle func
 	Options struct {
 		ResultRenderProcessor resultRenderProcessor
+		TaskRunner            taskRunner
 		Logger                logger.Logger
 	}
 )
@@ -22,6 +24,7 @@ func (g *Handler) Handle(cnf *viper.Viper, opt ...Options) error {
 		Verbose: cnf.GetBool("verbose"),
 	})
 	var rrp resultRenderProcessor = &processor{log}
+	var taskRunner taskRunner = engine.New(nil)
 	if len(opt) == 1 {
 		if opt[0].ResultRenderProcessor != nil {
 			rrp = opt[0].ResultRenderProcessor
@@ -30,5 +33,5 @@ func (g *Handler) Handle(cnf *viper.Viper, opt ...Options) error {
 			log = opt[0].Logger
 		}
 	}
-	return handle(cnf, log, rrp)
+	return handle(cnf, log, rrp, taskRunner)
 }
diff --git a/pkg/generate/language/golang.go b/pkg/generate/language/golang.go
@@ -8,6 +8,7 @@ import (
 	"github.com/iancoleman/strcase"
 	"github.com/imdario/mergo"
 	"github.com/olegsu/cli-generator/configs/templates"
+	"github.com/olegsu/cli-generator/pkg/engine"
 	"github.com/olegsu/cli-generator/pkg/logger"
 	"github.com/olegsu/cli-generator/pkg/spec"
 	"github.com/spf13/viper"
@@ -20,6 +21,8 @@ type (
 		generateHandlers bool
 		runInitFlow      bool
 		spec             *spec.CLISpec
+		taskRunner       TaskRunner
+		goPackage        string
 	}
 )
 
@@ -92,6 +95,21 @@ func (g *golang) BuildData(cnf *viper.Viper) (string, map[string]interface{}) {
 	return "go", res
 }
 
+func (g *golang) PostInitFlow() []engine.Task {
+	return []engine.Task{
+		engine.Task{
+			Path: "go",
+			Args: []string{"mod", "init", g.goPackage},
+			Name: "golang init mod",
+		},
+		engine.Task{
+			Path: "go",
+			Args: []string{"mod", "tidy"},
+			Name: "golang install deps",
+		},
+	}
+}
+
 func (g *golang) renderFile(name string, tmpl string, data interface{}) *RenderResult {
 	res := &RenderResult{
 		File: name,
diff --git a/pkg/generate/language/language.go b/pkg/generate/language/language.go
@@ -3,15 +3,17 @@ package language
 import (
 	"bytes"
 
+	"github.com/olegsu/cli-generator/pkg/engine"
 	"github.com/olegsu/cli-generator/pkg/logger"
 	"github.com/olegsu/cli-generator/pkg/spec"
 	"github.com/spf13/viper"
 )
 
 type (
-	Engine interface {
+	TemplateEngine interface {
 		Render(data interface{}) ([]*RenderResult, error)
 		BuildData(cnf *viper.Viper) (string, map[string]interface{})
+		PostInitFlow() []engine.Task
 	}
 
 	Options struct {
@@ -21,22 +23,29 @@ type (
 		GenerateHandlers bool
 		RunInitFlow      bool
 		Spec             *spec.CLISpec
+		GoPackage        string
 	}
 
 	RenderResult struct {
 		Content *bytes.Buffer
 		File    string
 	}
+
+	TaskRunner interface {
+		Run(*engine.RunOptions) ([]byte, error)
+	}
 )
 
-func New(opt *Options) Engine {
+// New returns new template engine based on the target language
+func New(opt *Options) TemplateEngine {
 	if opt.Type == "go" {
 		return &golang{
 			logger:           opt.Logger,
 			projectDirectory: opt.ProjectDirectory,
 			spec:             opt.Spec,
 			generateHandlers: opt.GenerateHandlers,
 			runInitFlow:      opt.RunInitFlow,
+			goPackage:        opt.GoPackage,
 		}
 	}
 	return nil
diff --git a/scripts/cli-example-sub-command.sh b/scripts/cli-example-sub-command.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-make build-local
+make build
 
 echo "Generating new CLI: cli-example-sub-command"
 cli-generator-dev generate --project-dir cli-example-sub-command --language go --spec ./examples/cli-example-sub-command.yaml --go-package github.com/cli-example-sub-command/cli-example-sub-command --create-handlers --run-init-flow --verbose
diff --git a/scripts/example.sh b/scripts/example.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 set -e
 
-make build-local
+make build
+
+echo "Generating greed directory"
+mkdir greet
 
 echo "Generating new CLI: greet"
-cli-generator-dev generate --project-dir greet --language go --spec ./examples/greet.yaml --go-package github.com/greet/greet --create-handlers --run-init-flow --verbose
+cli-generator-dev generate --project-dir greet --language go --spec ./examples/greet.yaml --go-package github.com/greet/greet --create-handlers --run-init-flow --verbose --run-post-init-flow
 
 cd greet
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`{{ if .cmd.root }}`
`8`	`8`	`"github.com/spf13/viper"`
`9`	`9`	`"fmt"`
	`10`	`+ "os"`
`10`	`11`	`{{ end }}`
`11`	`12`
`12`	`13`	`{{- if not .cmd.loose }}`
`@@ -79,6 +80,7 @@ func Execute() {`
`79`	`80`	`err := {{$name}}Cmd.Execute()`
`80`	`81`	`if err != nil {`
`81`	`82`	`fmt.Println(err.Error())`
	`83`	`+ os.Exit(1)`
`82`	`84`	`}`
`83`	`85`	`}`
`84`	`86`	`{{ end }}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module github.com/greet/greet`
	`2`	`+`
	`3`	`+go 1.13`