feat: improved merge conflict solver

internal/cli/check.go

@@ -9,6 +9,7 @@ import (
 	"github.com/futurice/jalapeno/internal/cli/option"
 	"github.com/futurice/jalapeno/pkg/recipe"
 	"github.com/futurice/jalapeno/pkg/recipeutil"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/spf13/cobra"
 )
 
@@ -197,6 +198,6 @@ func runCheck(cmd *cobra.Command, opts checkOptions) error {
 		}
 	}
 
-	cmd.Printf("All recipes with newer versions upgraded %s\n", ColorGreen.Render("successfully!"))
+	cmd.Printf("All recipes with newer versions upgraded %s\n", colors.Green.Render("successfully!"))
 	return nil
 }

internal/cli/create_manifest.go

@@ -7,6 +7,7 @@ import (
 	"github.com/futurice/jalapeno/internal/cli/option"
 	"github.com/futurice/jalapeno/pkg/recipe"
 	"github.com/futurice/jalapeno/pkg/recipeutil"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/spf13/cobra"
 )
 
@@ -48,7 +49,7 @@ func runCreateManifest(cmd *cobra.Command, opts createManifestOptions) error {
 
 	cmd.Printf(
 		"Manifest created %s\n",
-		ColorGreen.Render("successfully!"),
+		colors.Green.Render("successfully!"),
 	)
 
 	return nil

internal/cli/create_recipe.go

@@ -7,6 +7,7 @@ import (
 	"github.com/futurice/jalapeno/internal/cli/option"
 	"github.com/futurice/jalapeno/pkg/recipe"
 	"github.com/futurice/jalapeno/pkg/recipeutil"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/spf13/cobra"
 )
 
@@ -73,7 +74,7 @@ func runCreateRecipe(cmd *cobra.Command, opts createRecipeOptions) error {
 	cmd.Printf(
 		"Recipe '%s' created %s\n",
 		opts.RecipeName,
-		ColorGreen.Render("successfully!"),
+		colors.Green.Render("successfully!"),
 	)
 
 	return nil

internal/cli/create_rtest.go

@@ -6,6 +6,7 @@ import (
 	"github.com/futurice/jalapeno/internal/cli/option"
 	"github.com/futurice/jalapeno/pkg/recipe"
 	"github.com/futurice/jalapeno/pkg/recipeutil"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/spf13/cobra"
 )
 
@@ -55,7 +56,7 @@ func runCreateTest(cmd *cobra.Command, opts createTestOptions) error {
 	cmd.Printf(
 		"Test '%s' created %s\n\n",
 		test.Name,
-		ColorGreen.Render("successfully!"),
+		colors.Green.Render("successfully!"),
 	)
 
 	fmt.Printf("Following files were created: \n%s", recipeutil.CreateFileTree(opts.Dir, map[string]recipeutil.FileStatus{

internal/cli/eject.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/futurice/jalapeno/internal/cli/option"
 	"github.com/futurice/jalapeno/pkg/recipe"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/spf13/cobra"
 )
 
@@ -56,6 +57,6 @@ func runEject(cmd *cobra.Command, opts ejectOptions) error {
 		return err
 	}
 
-	cmd.Printf("Ejected %s\n", ColorGreen.Render("successfully!"))
+	cmd.Printf("Ejected %s\n", colors.Green.Render("successfully!"))
 	return nil
 }

internal/cli/execute.go

@@ -13,6 +13,7 @@ import (
 	"github.com/futurice/jalapeno/pkg/engine"
 	"github.com/futurice/jalapeno/pkg/recipe"
 	"github.com/futurice/jalapeno/pkg/recipeutil"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/futurice/jalapeno/pkg/ui/survey"
 	"github.com/gofrs/uuid"
 	"github.com/spf13/cobra"
@@ -129,11 +130,11 @@ func runExecute(cmd *cobra.Command, opts executeOptions) error {
 }
 
 func executeRecipe(cmd *cobra.Command, opts executeOptions, re *recipe.Recipe) error {
-	cmd.Printf("%s: %s\n", ColorRed.Render("Recipe name"), re.Metadata.Name)
-	cmd.Printf("%s: %s\n", ColorRed.Render("Version"), re.Metadata.Version)
+	cmd.Printf("%s: %s\n", colors.Red.Render("Recipe name"), re.Metadata.Name)
+	cmd.Printf("%s: %s\n", colors.Red.Render("Version"), re.Metadata.Version)
 
 	if re.Metadata.Description != "" {
-		cmd.Printf("%s: %s\n", ColorRed.Render("Description"), re.Metadata.Description)
+		cmd.Printf("%s: %s\n", colors.Red.Render("Description"), re.Metadata.Description)
 	}
 
 	cmd.Println()
@@ -233,7 +234,7 @@ func executeRecipe(cmd *cobra.Command, opts executeOptions, re *recipe.Recipe) e
 		return err
 	}
 
-	cmd.Printf("Recipe executed %s\n", ColorGreen.Render("successfully!"))
+	cmd.Printf("Recipe executed %s\n", colors.Green.Render("successfully!"))
 
 	files := sauce.Files
 	if opts.Subpath != "" {

internal/cli/pull.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/futurice/jalapeno/internal/cli/option"
 	"github.com/futurice/jalapeno/pkg/recipe"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/spf13/cobra"
 )
 
@@ -69,6 +70,6 @@ func runPull(cmd *cobra.Command, opts pullOptions) error {
 		return err
 	}
 
-	cmd.Printf("Recipe pulled %s\n", ColorGreen.Render("successfully!"))
+	cmd.Printf("Recipe pulled %s\n", colors.Green.Render("successfully!"))
 	return nil
 }

internal/cli/push.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/futurice/jalapeno/internal/cli/option"
 	"github.com/futurice/jalapeno/pkg/recipe"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/spf13/cobra"
 )
 
@@ -65,6 +66,6 @@ func runPush(cmd *cobra.Command, opts pushOptions) error {
 		return fmt.Errorf("failed to push recipe: %w", err)
 	}
 
-	cmd.Printf("Recipe pushed %s\n", ColorGreen.Render("successfully!"))
+	cmd.Printf("Recipe pushed %s\n", colors.Green.Render("successfully!"))
 	return nil
 }

internal/cli/root.go

@@ -7,18 +7,15 @@ import (
 	"time"
 
 	"github.com/carlmjohnson/versioninfo"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	uiutil "github.com/futurice/jalapeno/pkg/ui/util"
 
-	"github.com/charmbracelet/lipgloss"
 	"github.com/spf13/cobra"
 )
 
 var (
 	// https://goreleaser.com/cookbooks/using-main.version/
 	version string
-
-	ColorRed   = lipgloss.NewStyle().Foreground(lipgloss.Color("#EF4136"))
-	ColorGreen = lipgloss.NewStyle().Foreground(lipgloss.Color("#26A568"))
 )
 
 type ExitCodeContextKey struct{}
@@ -89,6 +86,6 @@ func errorHandler(cmd *cobra.Command, err error) error {
 	}
 
 	// Color the error message
-	cmd.SetErrPrefix(ColorRed.Render("Error:"))
-	return errors.New(ColorRed.Render(err.Error()))
+	cmd.SetErrPrefix(colors.Red.Render("Error:"))
+	return errors.New(colors.Red.Render(err.Error()))
 }

internal/cli/test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/futurice/jalapeno/pkg/engine"
 	"github.com/futurice/jalapeno/pkg/recipe"
 	"github.com/futurice/jalapeno/pkg/recipeutil"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/spf13/cobra"
 )
 
@@ -169,6 +170,6 @@ func updateSnapshots(cmd *cobra.Command, opts testOptions, re *recipe.Recipe) er
 		return fmt.Errorf("failed to save recipe: %w", err)
 	}
 
-	cmd.Printf("Recipe test snapshots updated %s\n", ColorGreen.Render("successfully!"))
+	cmd.Printf("Recipe test snapshots updated %s\n", colors.Green.Render("successfully!"))
 	return nil
 }

internal/cli/upgrade.go

@@ -15,6 +15,7 @@ import (
 	"github.com/futurice/jalapeno/pkg/engine"
 	"github.com/futurice/jalapeno/pkg/recipe"
 	"github.com/futurice/jalapeno/pkg/recipeutil"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/futurice/jalapeno/pkg/ui/conflict"
 	"github.com/futurice/jalapeno/pkg/ui/survey"
 	"github.com/gofrs/uuid"
@@ -407,7 +408,7 @@ func runUpgrade(cmd *cobra.Command, opts upgradeOptions) error {
 	for _, status := range fileStatuses {
 		if status != recipeutil.FileUnchanged {
 			changesFound = true
-			cmd.Printf("Recipe upgraded %s\n", ColorGreen.Render("successfully!"))
+			cmd.Printf("Recipe upgraded %s\n", colors.Green.Render("successfully!"))
 			tree := recipeutil.CreateFileTree(opts.Dir, fileStatuses)
 			cmd.Printf("The following files have been processed by the recipe:\n\n%s", tree)
 			break

internal/cli/validate.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/futurice/jalapeno/internal/cli/option"
 	"github.com/futurice/jalapeno/pkg/recipe"
+	"github.com/futurice/jalapeno/pkg/ui/colors"
 	"github.com/spf13/cobra"
 )
 
@@ -59,7 +60,7 @@ func runValidate(cmd *cobra.Command, opts validateOptions) error {
 
 	cmd.Printf(
 		"%s The recipe is valid.\n",
-		ColorGreen.Render("Success!"),
+		colors.Green.Render("Success!"),
 	)
 
 	return nil