update logs

Author: iignatevich

compose/builder.go

@@ -11,8 +11,9 @@ import (
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"github.com/launchrctl/launchr"
 	"github.com/stevenle/topsort"
+
+	"github.com/launchrctl/launchr/pkg/action"
 )
 
 const (
@@ -122,15 +123,15 @@ func identifyStrategy(name string) (mergeStrategyType, mergeStrategyTarget) {
 
 // Builder struct, provides methods to merge packages into build
 type Builder struct {
+	withLogger action.WithLogger
+	withTerm   action.WithTerm
+
 	platformDir      string
 	targetDir        string
 	sourceDir        string
 	skipNotVersioned bool
 	logConflicts     bool
 	packages         []*Package
-
-	log  *launchr.Slog
-	term *launchr.Terminal
 }
 
 type fsEntry struct {
@@ -143,14 +144,14 @@ type fsEntry struct {
 
 func createBuilder(c *Composer, targetDir, sourceDir string, packages []*Package) *Builder {
 	return &Builder{
+		c.withLogger,
+		c.withTerm,
 		c.pwd,
 		targetDir,
 		sourceDir,
 		c.options.SkipNotVersioned,
 		c.options.ConflictsVerbosity,
 		packages,
-		c.log,
-		c.term,
 	}
 }
 
@@ -181,7 +182,7 @@ func getVersionedMap(gitDir string) (map[string]bool, error) {
 }
 
 func (b *Builder) build(ctx context.Context) error {
-	b.term.Println("Creating composition...")
+	b.withTerm.Term().Println("Creating composition...")
 	err := EnsureDirExists(b.targetDir)
 	if err != nil {
 		return err
@@ -257,7 +258,7 @@ func (b *Builder) build(ctx context.Context) error {
 	targetsMap := getTargetsMap(b.packages)
 
 	if b.logConflicts {
-		b.term.Info().Printf("Conflicting files:\n")
+		b.withTerm.Term().Info().Printf("Conflicting files:\n")
 	}
 
 	for i := 0; i < len(items); i++ {
@@ -349,7 +350,7 @@ func (b *Builder) logConflictResolve(resolveto mergeConflictResolve, path, pkgNa
 		return
 	}
 
-	b.term.Info().Printfln("[%s] - %s > Selected from %s", pkgName, path, entry.From)
+	b.withTerm.Term().Info().Printfln("[%s] - %s > Selected from %s", pkgName, path, entry.From)
 }
 
 func getTargetsMap(packages []*Package) map[string]string {

compose/compose.go

@@ -10,7 +10,9 @@ import (
 	"syscall"
 
 	"github.com/launchrctl/keyring"
+
 	"github.com/launchrctl/launchr"
+	"github.com/launchrctl/launchr/pkg/action"
 )
 
 const (
@@ -25,47 +27,13 @@ var (
 	errComposeBadStructure = errors.New("incorrect mapping for plasma-compose.yaml, ensure structure is correct")
 )
 
-// Composer stores compose definition
-type Composer struct {
-	pwd     string
-	options *ComposerOptions
-	compose *YamlCompose
-	k       keyring.Keyring
-	log     *launchr.Slog
-	term    *launchr.Terminal
-}
-
-// ComposerOptions - list of possible composer options
-type ComposerOptions struct {
-	Clean              bool
-	WorkingDir         string
-	SkipNotVersioned   bool
-	ConflictsVerbosity bool
-	Interactive        bool
-}
-
-// CreateComposer instance
-func CreateComposer(pwd string, opts ComposerOptions, k keyring.Keyring, log *launchr.Slog, term *launchr.Terminal) (*Composer, error) {
-	config, err := Lookup(os.DirFS(pwd))
-	if err != nil {
-		return nil, err
-	}
-
-	for _, dep := range config.Dependencies {
-		if dep.Source.Tag != "" {
-			term.Warning().Printfln("found deprecated field `tag` in `%s` dependency. Use `ref` field for tags or branches.", dep.Name)
-		}
-	}
-
-	return &Composer{pwd, &opts, config, k, log, term}, nil
-}
-
 type keyringWrapper struct {
+	action.WithLogger
+	action.WithTerm
+
 	keyringService keyring.Keyring
 	interactive    bool
 	shouldUpdate   bool
-	log            *launchr.Slog
-	term           *launchr.Terminal
 }
 
 func (kw *keyringWrapper) getForURL(url string) (keyring.CredentialsItem, error) {
@@ -74,7 +42,7 @@ func (kw *keyringWrapper) getForURL(url string) (keyring.CredentialsItem, error)
 		if errors.Is(errGet, keyring.ErrEmptyPass) {
 			return ci, errGet
 		} else if !errors.Is(errGet, keyring.ErrNotFound) {
-			kw.log.Debug(errGet.Error())
+			kw.WithLogger.Log().Debug(errGet.Error())
 			return ci, errors.New("the keyring is malformed or wrong passphrase provided")
 		}
 
@@ -102,7 +70,7 @@ func (kw *keyringWrapper) getForURL(url string) (keyring.CredentialsItem, error)
 
 func (kw *keyringWrapper) fillCredentials(ci keyring.CredentialsItem) (keyring.CredentialsItem, error) {
 	if ci.URL != "" {
-		kw.term.Printfln("Please add login and password for URL - %s", ci.URL)
+		kw.WithTerm.Term().Printfln("Please add login and password for URL - %s", ci.URL)
 	}
 	err := keyring.RequestCredentialsFromTty(&ci)
 	if err != nil {
@@ -112,6 +80,46 @@ func (kw *keyringWrapper) fillCredentials(ci keyring.CredentialsItem) (keyring.C
 	return ci, nil
 }
 
+// Composer stores compose definition
+type Composer struct {
+	withLogger action.WithLogger
+	withTerm   action.WithTerm
+
+	pwd     string
+	options *ComposerOptions
+	compose *YamlCompose
+	k       keyring.Keyring
+}
+
+// ComposerOptions - list of possible composer options
+type ComposerOptions struct {
+	Clean              bool
+	WorkingDir         string
+	SkipNotVersioned   bool
+	ConflictsVerbosity bool
+	Interactive        bool
+}
+
+// CreateComposer instance
+func CreateComposer(pwd string, opts ComposerOptions, k keyring.Keyring) (*Composer, error) {
+	config, err := Lookup(os.DirFS(pwd))
+	if err != nil {
+		return nil, err
+	}
+
+	return &Composer{pwd: pwd, options: &opts, compose: config, k: k}, nil
+}
+
+// SetLogger sets logger for composer.
+func (c *Composer) SetLogger(logger *launchr.Logger) {
+	c.withLogger.SetLogger(logger)
+}
+
+// SetTerm sets terminal for composer.
+func (c *Composer) SetTerm(term *launchr.Terminal) {
+	c.withTerm.SetTerm(term)
+}
+
 // RunInstall on Composer
 func (c *Composer) RunInstall() error {
 	ctx, cancel := context.WithCancel(context.Background())
@@ -121,7 +129,7 @@ func (c *Composer) RunInstall() error {
 
 	go func() {
 		<-signalChan
-		c.term.Printfln("\nTermination signal received. Cleaning up...")
+		c.withTerm.Term().Printfln("\nTermination signal received. Cleaning up...")
 		// cleanup dir
 		_, _, _ = c.prepareInstall(false)
 
@@ -141,9 +149,9 @@ func (c *Composer) RunInstall() error {
 			keyringService: c.getKeyring(),
 			shouldUpdate:   false,
 			interactive:    c.options.Interactive,
-			log:            c.log,
-			term:           c.term,
 		}
+		kw.WithLogger = c.withLogger
+		kw.WithTerm = c.withTerm
 		dm := CreateDownloadManager(kw)
 		packages, err := dm.Download(ctx, c.getCompose(), packagesDir)
 		if err != nil {
@@ -161,17 +169,23 @@ func (c *Composer) RunInstall() error {
 }
 
 func (c *Composer) prepareInstall(clean bool) (string, string, error) {
+	for _, dep := range c.compose.Dependencies {
+		if dep.Source.Tag != "" {
+			c.withTerm.Term().Warning().Printfln("found deprecated field `tag` in `%s` dependency. Use `ref` field for tags or branches.", dep.Name)
+		}
+	}
+
 	buildPath := c.getPath(BuildDir)
 	packagesPath := c.getPath(c.options.WorkingDir)
 
-	c.term.Printfln("Cleaning build dir: %s", BuildDir)
+	c.withTerm.Term().Printfln("Cleaning build dir: %s", BuildDir)
 	err := os.RemoveAll(buildPath)
 	if err != nil {
 		return "", "", err
 	}
 
 	if clean {
-		c.term.Printfln("Cleaning packages dir: %s", packagesPath)
+		c.withTerm.Term().Printfln("Cleaning packages dir: %s", packagesPath)
 		err = os.RemoveAll(packagesPath)
 		if err != nil {
 			return "", "", err

compose/downloadManager.go

@@ -140,7 +140,7 @@ func (m DownloadManager) downloadPackage(ctx context.Context, pkg *Package, targ
 	if err != nil {
 		errRemove := os.RemoveAll(downloadPath)
 		if errRemove != nil {
-			m.kw.log.Debug("error cleaning package folder", "path", downloadPath, "err", err)
+			m.kw.WithLogger.Log().Debug("error cleaning package folder", "path", downloadPath, "err", err)
 		}
 	}
 

compose/forms.go

@@ -9,7 +9,8 @@ import (
 
 	"dario.cat/mergo"
 	"github.com/charmbracelet/huh"
-	"github.com/launchrctl/launchr"
+
+	"github.com/launchrctl/launchr/pkg/action"
 )
 
 // RawStrategies represents collection of submitted flags for strategies.
@@ -18,8 +19,14 @@ type RawStrategies struct {
 	Paths []string
 }
 
+// FormsAction provides form operations with compose file.
+type FormsAction struct {
+	action.WithLogger
+	action.WithTerm
+}
+
 // AddPackage adds a new package to plasma-compose.
-func AddPackage(doCreate bool, newDependency *Dependency, rawStrategies *RawStrategies, dir string, _ *launchr.Slog, term *launchr.Terminal) error {
+func (f *FormsAction) AddPackage(doCreate bool, newDependency *Dependency, rawStrategies *RawStrategies, dir string) error {
 	config, err := Lookup(os.DirFS(dir))
 	if err != nil {
 		if !errors.Is(err, errComposeNotExists) {
@@ -55,7 +62,7 @@ func AddPackage(doCreate bool, newDependency *Dependency, rawStrategies *RawStra
 			return err
 		}
 
-		err = processStrategiesForm(newDependency)
+		err = f.processStrategiesForm(newDependency)
 		if err != nil {
 			return err
 		}
@@ -73,15 +80,15 @@ func AddPackage(doCreate bool, newDependency *Dependency, rawStrategies *RawStra
 
 	sanitizeDependency(newDependency)
 	config.Dependencies = append(config.Dependencies, *newDependency)
-	term.Println("Saving plasma-compose...")
+	f.WithTerm.Term().Println("Saving plasma-compose...")
 	sortPackages(config)
 	err = writeComposeYaml(config)
 
 	return err
 }
 
 // UpdatePackage updates a single package in plasma-compose.
-func UpdatePackage(dependency *Dependency, rawStrategies *RawStrategies, dir string, _ *launchr.Slog, term *launchr.Terminal) error {
+func (f *FormsAction) UpdatePackage(dependency *Dependency, rawStrategies *RawStrategies, dir string) error {
 	config, err := Lookup(os.DirFS(dir))
 	if err != nil {
 		return err
@@ -114,15 +121,15 @@ func UpdatePackage(dependency *Dependency, rawStrategies *RawStrategies, dir str
 	}
 
 	sanitizeDependency(toUpdate)
-	term.Println("Saving plasma-compose...")
+	f.WithTerm.Term().Println("Saving plasma-compose...")
 	sortPackages(config)
 	err = writeComposeYaml(config)
 
 	return err
 }
 
 // UpdatePackages updates packages in plasma-compose in interactive way.
-func UpdatePackages(dir string, _ *launchr.Slog, term *launchr.Terminal) error {
+func (f *FormsAction) UpdatePackages(dir string) error {
 	config, err := Lookup(os.DirFS(dir))
 	if err != nil {
 		return err
@@ -162,7 +169,7 @@ func UpdatePackages(dir string, _ *launchr.Slog, term *launchr.Terminal) error {
 			return err
 		}
 
-		err = processStrategiesForm(selectedDep)
+		err = f.processStrategiesForm(selectedDep)
 		if err != nil {
 			return err
 		}
@@ -178,7 +185,7 @@ func UpdatePackages(dir string, _ *launchr.Slog, term *launchr.Terminal) error {
 		}
 	}
 
-	term.Println("Saving plasma-compose...")
+	f.WithTerm.Term().Println("Saving plasma-compose...")
 	var newDeps []Dependency
 	for _, dep := range packagesMap {
 		newDeps = append(newDeps, *dep)
@@ -192,7 +199,7 @@ func UpdatePackages(dir string, _ *launchr.Slog, term *launchr.Terminal) error {
 }
 
 // DeletePackages removes packages plasma-compose.
-func DeletePackages(packages []string, dir string, _ *launchr.Slog, term *launchr.Terminal) error {
+func (f *FormsAction) DeletePackages(packages []string, dir string) error {
 	config, err := Lookup(os.DirFS(dir))
 	if err != nil {
 		return err
@@ -238,18 +245,18 @@ OUTER:
 	}
 
 	if saveRequired {
-		term.Println("Updating plasma-compose...")
+		f.WithTerm.Term().Println("Updating plasma-compose...")
 		config.Dependencies = dependencies
 		sortPackages(config)
 		err = writeComposeYaml(config)
 	} else {
-		term.Println("Nothing to update, quiting")
+		f.WithTerm.Term().Println("Nothing to update, quiting")
 	}
 
 	return err
 }
 
-func processStrategiesForm(dependency *Dependency) error {
+func (f *FormsAction) processStrategiesForm(dependency *Dependency) error {
 	var addStrategies bool
 	err := huh.NewConfirm().
 		Title("Would you like to add strategies?").