Rework structure, improve builder version.

Author: lexbritvin

app.go

@@ -2,25 +2,23 @@
 package launchr
 
 import (
-	"bytes"
 	"fmt"
-	"io/fs"
 	"os"
 	"path/filepath"
-	"text/template"
 
 	"github.com/spf13/cobra"
 
-	"github.com/launchrctl/launchr/core/cli"
-	"github.com/launchrctl/launchr/core/log"
+	"github.com/launchrctl/launchr/pkg/cli"
+	"github.com/launchrctl/launchr/pkg/log"
 )
 
 // App holds app related global variables.
 type App struct {
 	cmd     *cobra.Command
 	cli     cli.Cli
-	wdFS    fs.FS
-	version fmt.Stringer
+	workDir string
+	cfgDir  string
+	version *AppVersion
 	plugins map[PluginInfo]Plugin
 }
 
@@ -29,14 +27,9 @@ func NewApp() *App {
 	return &App{}
 }
 
-// GetFS returns application wdFS.
-func (app *App) GetFS() fs.FS {
-	return app.wdFS
-}
-
-// SetFS sets application wdFS.
-func (app *App) SetFS(f fs.FS) {
-	app.wdFS = f
+// GetWD provides app's working dir.
+func (app *App) GetWD() string {
+	return app.workDir
 }
 
 // GetCli returns application cli.
@@ -49,27 +42,24 @@ func (app *App) SetCli(c cli.Cli) {
 	app.cli = c
 }
 
-// SetVersion sets application cli.
-func (app *App) SetVersion(v fmt.Stringer) {
-	app.version = v
-}
-
-// Version returns application version string.
-func (app *App) Version() string {
-	return app.version.String()
-}
-
 // Plugins returns installed app plugins.
 func (app *App) Plugins() map[PluginInfo]Plugin {
 	return app.plugins
 }
 
 // Init initializes application and plugins.
 func (app *App) Init() error {
+	var err error
+	app.version = GetVersion()
 	// Global configuration.
+	app.cfgDir = fmt.Sprintf(".%s", app.version.Name)
+	app.workDir, err = filepath.Abs("./")
+	if err != nil {
+		return err
+	}
 	appCli, err := cli.NewAppCli(
 		cli.WithStandardStreams(),
-		cli.WithGlobalConfigFromDir(os.DirFS(".launchr")), // @todo how should it work with embed?
+		cli.WithGlobalConfigFromDir(os.DirFS(app.cfgDir)),
 	)
 	if err != nil {
 		return err
@@ -87,78 +77,6 @@ func (app *App) Init() error {
 	return nil
 }
 
-func (app *App) gen(buildPath string, wordDir string) error {
-	var err error
-	buildPath, err = filepath.Abs(buildPath)
-	if err != nil {
-		return err
-	}
-	wordDir, err = filepath.Abs(wordDir)
-	if err != nil {
-		return err
-	}
-	// Clean build path before generating.
-	err = filepath.WalkDir(buildPath, func(path string, dir fs.DirEntry, err error) error {
-		if path == buildPath {
-			return nil
-		}
-		if dir.IsDir() {
-			errRem := os.RemoveAll(path)
-			if errRem != nil {
-				return errRem
-			}
-			return filepath.SkipDir
-		}
-		if dir.Name() != "pkg.go" {
-			errRem := os.Remove(path)
-			if errRem != nil {
-				return errRem
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	// Call generate functions on plugins.
-	plugins := app.Plugins()
-	initSet := make(map[string]struct{}, len(plugins))
-	for _, p := range app.Plugins() {
-		p, ok := p.(GeneratePlugin)
-		if ok {
-			genData, err := p.Generate(buildPath, wordDir)
-			if err != nil {
-				return err
-			}
-			for _, class := range genData.Plugins {
-				initSet[class] = struct{}{}
-			}
-		}
-	}
-	if len(initSet) > 0 {
-		var tplName = "init.gen"
-		tpl, err := template.New(tplName).Parse(initGenTemplate)
-		if err != nil {
-			return err
-		}
-		// Generate main.go.
-		var buf bytes.Buffer
-		err = tpl.Execute(&buf, &initTplVars{
-			Plugins: initSet,
-		})
-		if err != nil {
-			return err
-		}
-		target := filepath.Join(buildPath, tplName+".go")
-		err = os.WriteFile(target, buf.Bytes(), 0600)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (app *App) exec() error {
 	// Set root cobra command.
 	var rootCmd = &cobra.Command{
@@ -174,9 +92,7 @@ func (app *App) exec() error {
 			return cmd.Help()
 		},
 	}
-	if app.version != nil {
-		rootCmd.SetVersionTemplate(app.Version())
-	}
+	rootCmd.SetVersionTemplate(app.version.String())
 	verbosityFlags(rootCmd)
 	for _, p := range app.Plugins() {
 		p, ok := p.(CobraPlugin)
@@ -195,23 +111,8 @@ func (app *App) exec() error {
 	return app.cmd.Execute()
 }
 
-// Generate runs generation of included plugins.
-func (app *App) Generate() int {
-	buildPath := "./gen"
-	wd := "./"
-	if len(os.Args) > 1 {
-		wd = os.Args[1]
-	}
-	if err := app.gen(buildPath, wd); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		return 125
-	}
-	return 0
-}
-
 // Execute is a cobra entrypoint to the launchr app.
 func (app *App) Execute() int {
-	app.version = GetVersion()
 	if err := app.exec(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		return 1
@@ -249,32 +150,3 @@ func Run() int {
 	}
 	return app.Execute()
 }
-
-// Gen generates application specific build files and returns os exit code.
-func Gen() int {
-	app := NewApp()
-	if err := app.Init(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		return 125
-	}
-	return app.Generate()
-}
-
-type initTplVars struct {
-	Plugins map[string]struct{}
-}
-
-const initGenTemplate = `
-{{- print "// GENERATED. DO NOT EDIT." }}
-package gen
-
-import (
-	"github.com/launchrctl/launchr"
-)
-
-func init() {
-	{{- range $class, $ := .Plugins }}
-	launchr.RegisterPlugin(&{{$class}}{})
-	{{- end }}
-}
-`

cmd/launchr/gen.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/launchrctl/launchr"
-	_ "github.com/launchrctl/launchr/core/plugins"
+	_ "github.com/launchrctl/launchr/pkg/plugins"
 )
 
 func main() {

cmd/launchr/launchr.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/launchrctl/launchr"
 	_ "github.com/launchrctl/launchr/cmd/launchr/gen"
-	_ "github.com/launchrctl/launchr/core/plugins"
+	_ "github.com/launchrctl/launchr/pkg/plugins"
 )
 
 func main() {

core/plugins/builder/tmpl/genpkg.tmpl

@@ -28,13 +28,13 @@ There are the following build options:
 Plugins is a way to extend launchr functionality.  
 The main difference from actions is that plugins must be written in `go` and run natively on a host machine.
 
-The plugin must implement `core.Plugin` interface. Here is an example:
+The plugin must implement `launchr.Plugin` interface. Here is an example:
 ```go
 package example
 
 import (
     ...
-    launchr "github.com/launchrctl/launchr/core"
+    "github.com/launchrctl/launchr"
     ...
 )
 
@@ -47,14 +47,14 @@ type Plugin struct {
 	app *launchr.App
 }
 
-// PluginInfo implements core.Plugin interface.
+// PluginInfo implements launchr.Plugin interface.
 func (p *Plugin) PluginInfo() launchr.PluginInfo {
 	return launchr.PluginInfo{
 		ID: ID,
 	}
 }
 
-// InitApp implements core.Plugin interface to provide discovered actions.
+// InitApp implements launchr.Plugin interface to provide discovered actions.
 func (p *Plugin) InitApp(app *launchr.App) error {
 	p.app = app
 	return nil