fix: Introduce NewListCommand, NewRSyncSimulateCommand

Author: jdehaan

backup/cmd/list.go

@@ -14,8 +14,7 @@ func buildListCommand() *cobra.Command {
 			configPath, _ := cmd.Flags().GetString("config")
 			rsyncPath, _ := cmd.Flags().GetString("rsync-path")
 			cfg := internal.LoadResolvedConfig(configPath)
-			command := internal.NewRSyncCommand(rsyncPath)
-			command.ListOnly = true
+			command := internal.NewListCommand(rsyncPath)
 
 			cfg.Apply(command)
 		},

backup/cmd/simulate.go

@@ -15,8 +15,7 @@ func buildSimulateCommand() *cobra.Command {
 			rsyncPath, _ := cmd.Flags().GetString("rsync-path")
 
 			cfg := internal.LoadResolvedConfig(configPath)
-			command := internal.NewRSyncCommand(rsyncPath)
-			command.Simulate = true
+			command := internal.NewRSyncSimulateCommand(rsyncPath)
 
 			cfg.Apply(command)
 		},

backup/internal/job.go

@@ -1,29 +1,9 @@
 package internal
 
-import (
-	"fmt"
-	"strings"
-)
-
 func (job Job) Apply(rsync RSyncCommand, logPath string) string {
 	if !job.Enabled {
 		return "SKIPPED"
 	}
 
-	args := rsync.ArgumentsForJob(job, logPath)
-	fmt.Printf("Job: %s\n", job.Name)
-	fmt.Printf("Command: rsync %s %s\n", rsync.BinPath, strings.Join(args, " "))
-
-	if rsync.ListOnly {
-		return "SUCCESS"
-	}
-
-	out, err := rsync.Run(args...)
-	fmt.Printf("Output:\n%s\n", string(out))
-
-	if err != nil {
-		return "FAILURE"
-	}
-
-	return "SUCCESS"
+	return rsync.Run(job, logPath)
 }

backup/internal/rsync.go

@@ -24,14 +24,30 @@ func NewRSyncCommand(binPath string) RSyncCommand {
 	}
 }
 
+func NewRSyncSimulateCommand(binPath string) RSyncCommand {
+	return RSyncCommand{
+		BinPath:  binPath,
+		Simulate: true,
+		Executor: &RealSync{},
+	}
+}
+
+func NewListCommand(binPath string) RSyncCommand {
+	return RSyncCommand{
+		BinPath:  binPath,
+		ListOnly: true,
+		Executor: &RealSync{},
+	}
+}
+
 func (command RSyncCommand) GetVersionInfo() (string, error) {
 	rsyncPath := command.BinPath
 
 	if !filepath.IsAbs(rsyncPath) {
 		return "", fmt.Errorf("%w: \"%s\"", ErrInvalidRsyncPath, rsyncPath)
 	}
 
-	output, err := command.Run("--version")
+	output, err := command.Executor.Execute("--version")
 	if err != nil {
 		return "", fmt.Errorf("error fetching rsync version: %w", err)
 	}
@@ -44,7 +60,7 @@ func (command RSyncCommand) GetVersionInfo() (string, error) {
 	return string(output), nil
 }
 
-func (command RSyncCommand) ArgumentsForJob(job Job, logPath string) []string {
+func ArgumentsForJob(job Job, logPath string, simulate bool) []string {
 	args := []string{"-aiv", "--stats"}
 	if job.Delete {
 		args = append(args, "--delete")
@@ -59,13 +75,28 @@ func (command RSyncCommand) ArgumentsForJob(job Job, logPath string) []string {
 	}
 
 	args = append(args, job.Source, job.Target)
-	if command.Simulate {
+	if simulate {
 		args = append([]string{"--dry-run"}, args...)
 	}
 
 	return args
 }
 
-func (command RSyncCommand) Run(args ...string) ([]byte, error) {
-	return command.Executor.Execute(command.BinPath, args...)
+func (rsync RSyncCommand) Run(job Job, logPath string) string {
+	args := ArgumentsForJob(job, logPath, rsync.Simulate)
+	fmt.Printf("Job: %s\n", job.Name)
+	fmt.Printf("Command: rsync %s %s\n", rsync.BinPath, strings.Join(args, " "))
+
+	if rsync.ListOnly {
+		return "SUCCESS"
+	}
+
+	out, err := rsync.Executor.Execute(rsync.BinPath, args...)
+	fmt.Printf("Output:\n%s\n", string(out))
+
+	if err != nil {
+		return "FAILURE"
+	}
+
+	return "SUCCESS"
 }

backup/internal/test/rsync_test.go

@@ -20,10 +20,7 @@ func TestArgumentsForJob(t *testing.T) {
 		WithTarget("/target/user/music/home"),
 		WithExclusions([]string{"*.tmp", "node_modules/"}),
 	)
-	command := internal.RSyncCommand{
-		Simulate: true,
-	}
-	args := command.ArgumentsForJob(job, "")
+	args := internal.ArgumentsForJob(job, "", true)
 
 	expectedArgs := []string{
 		"--dry-run", "-aiv", "--stats", "--delete",