cli: Inject the OS StepWriter to the installer

livingsilver94 · Nov 25, 2023 · 5311a92 · 5311a92
1 parent e28365b
commit 5311a92
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/cli/install.go b/cli/install.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/livingsilver94/backee/installer"
+	"github.com/livingsilver94/backee/installer/stepwriter"
 	"github.com/livingsilver94/backee/repo"
 	"github.com/livingsilver94/backee/repo/solver"
 	"github.com/livingsilver94/backee/service"
@@ -22,6 +23,7 @@ type keepassXC struct {
 
 type install struct {
 	Directory  string    `short:"C" type:"existingdir" help:"Change the base directory."`
+	DryRun     bool      `short:"d" help:"Test the installation without writing any file."`
 	KeepassXC  keepassXC `embed:"" prefix:"keepassxc."`
 	PkgManager []string  `name:"pkgmanager" help:"Override the package manager command for services."`
 	Variant    string    `help:"Specify the system variant."`
@@ -99,6 +101,10 @@ func (in *install) installer(rep repo.FS, fileList **os.File) installer.Installe
 		}
 	}
 
+	writ := installer.StepWriter(stepwriter.OS{})
+	if in.DryRun {
+		writ = stepwriter.DryRun{}
+	}
 	opts := []installer.Option{
 		installer.WithCommonVars(envVars()),
 		installer.WithList(list),
@@ -110,7 +116,7 @@ func (in *install) installer(rep repo.FS, fileList **os.File) installer.Installe
 			installer.WithVarSolvers(map[service.VarKind]repo.VarSolver{"keepassxc": kee}),
 		)
 	}
-	return installer.New(rep, opts...)
+	return installer.New(rep, writ, opts...)
 }
 
 // envVars returns a map of environment variables.

diff --git a/cli/privilege.go b/cli/privilege.go
@@ -6,7 +6,7 @@ package cli
 import (
 	"os"
 
-	_ "github.com/livingsilver94/backee/installer"
+	_ "github.com/livingsilver94/backee/installer/stepwriter"
 	priv "github.com/livingsilver94/backee/privilege"
 )
 

diff --git a/installer/installer.go b/installer/installer.go
@@ -13,17 +13,18 @@ import (
 
 type Installer struct {
 	repository repo.Repo
-	variables  repo.Variables
-	list       List
 	writer     StepWriter
+
+	variables repo.Variables
+	list      List
 }
 
-func New(repository repo.Repo, options ...Option) Installer {
+func New(repository repo.Repo, sw StepWriter, options ...Option) Installer {
 	i := Installer{
 		repository: repository,
+		writer:     sw,
 		variables:  repo.NewVariables(),
 		list:       NewList(),
-		writer:     nil, // TODO: pass a real writer.
 	}
 	i.variables.RegisterSolver(service.Datadir, solver.NewDatadir(repository))
 	for _, option := range options {