refactor: use samber/lo wherever possible

Author: chenasraf

appconfig/appconfig.go

@@ -9,6 +9,7 @@ import (
 	"github.com/chenasraf/sofmani/platform"
 	"github.com/chenasraf/sofmani/utils"
 	"github.com/eschao/config"
+	"github.com/samber/lo"
 	"gopkg.in/yaml.v3"
 )
 
@@ -76,10 +77,7 @@ type AppConfigDefaults struct {
 
 // GetCategoryDisplay returns the effective category display mode, defaulting to "border".
 func (c *AppConfig) GetCategoryDisplay() CategoryDisplayMode {
-	if c.CategoryDisplay != nil {
-		return *c.CategoryDisplay
-	}
-	return CategoryDisplayBorder
+	return lo.FromPtrOr(c.CategoryDisplay, CategoryDisplayBorder)
 }
 
 // Environ returns the combined environment variables as a slice of strings.
@@ -172,21 +170,9 @@ func tryConfigDir(dir string) string {
 // GetConfigDesc returns a string slice describing the current configuration.
 func (c *AppConfig) GetConfigDesc() []string {
 	desc := []string{}
-	isDebug := false
-	if c.Debug != nil {
-		isDebug = *c.Debug
-	}
-	checkUpdates := false
-	if c.CheckUpdates != nil {
-		checkUpdates = *c.CheckUpdates
-	}
-	showSummary := true // default is enabled
-	if c.Summary != nil {
-		showSummary = *c.Summary
-	}
-	desc = append(desc, fmt.Sprintf("Debug: %t", isDebug))
-	desc = append(desc, fmt.Sprintf("CheckUpdates: %t", checkUpdates))
-	desc = append(desc, fmt.Sprintf("Summary: %t", showSummary))
+	desc = append(desc, fmt.Sprintf("Debug: %t", lo.FromPtrOr(c.Debug, false)))
+	desc = append(desc, fmt.Sprintf("CheckUpdates: %t", lo.FromPtrOr(c.CheckUpdates, false)))
+	desc = append(desc, fmt.Sprintf("Summary: %t", lo.FromPtrOr(c.Summary, true)))
 
 	if c.Env != nil {
 		desc = append(desc, "Environment Variables:")

appconfig/appconfig_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/chenasraf/sofmani/platform"
+	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -16,18 +17,18 @@ func TestPlatformMapResolve(t *testing.T) {
 		platform string
 		expected *string
 	}{
-		{"MacOS", "darwin", strPtr("macos")},
-		{"Linux", "linux", strPtr("linux")},
-		{"Windows", "windows", strPtr("windows")},
+		{"MacOS", "darwin", lo.ToPtr("macos")},
+		{"Linux", "linux", lo.ToPtr("linux")},
+		{"Windows", "windows", lo.ToPtr("windows")},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			platform.SetOS(tt.platform)
 			pm := platform.PlatformMap[string]{
-				MacOS:   strPtr("macos"),
-				Linux:   strPtr("linux"),
-				Windows: strPtr("windows"),
+				MacOS:   lo.ToPtr("macos"),
+				Linux:   lo.ToPtr("linux"),
+				Windows: lo.ToPtr("windows"),
 			}
 			assert.Equal(t, tt.expected, pm.Resolve())
 		})
@@ -135,7 +136,3 @@ func TestFindConfigFile(t *testing.T) {
 	assert.NoError(t, os.Chdir(dir))
 	assert.True(t, strings.HasSuffix(FindConfigFile(), file))
 }
-
-func strPtr(s string) *string {
-	return &s
-}

cmd/root.go

@@ -8,6 +8,7 @@ import (
 	"github.com/chenasraf/sofmani/appconfig"
 	"github.com/chenasraf/sofmani/logger"
 	"github.com/chenasraf/sofmani/machine"
+	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 )
 
@@ -153,26 +154,26 @@ func buildCliConfig(cmd *cobra.Command, args []string) *appconfig.AppCliConfig {
 
 	// Handle debug flag
 	if cmd.Flags().Changed("debug") {
-		config.Debug = boolPtr(true)
+		config.Debug = lo.ToPtr(true)
 	}
 	if cmd.Flags().Changed("no-debug") {
-		config.Debug = boolPtr(false)
+		config.Debug = lo.ToPtr(false)
 	}
 
 	// Handle update flag
 	if cmd.Flags().Changed("update") {
-		config.CheckUpdates = boolPtr(true)
+		config.CheckUpdates = lo.ToPtr(true)
 	}
 	if cmd.Flags().Changed("no-update") {
-		config.CheckUpdates = boolPtr(false)
+		config.CheckUpdates = lo.ToPtr(false)
 	}
 
 	// Handle summary flag
 	if cmd.Flags().Changed("summary") {
-		config.Summary = boolPtr(true)
+		config.Summary = lo.ToPtr(true)
 	}
 	if cmd.Flags().Changed("no-summary") {
-		config.Summary = boolPtr(false)
+		config.Summary = lo.ToPtr(false)
 	}
 
 	// Handle log file flag
@@ -201,10 +202,5 @@ func buildCliConfig(cmd *cobra.Command, args []string) *appconfig.AppCliConfig {
 	return config
 }
 
-// boolPtr returns a pointer to a boolean value.
-func boolPtr(b bool) *bool {
-	return &b
-}
-
 // RunMain is set by main.go to run the main application logic.
 var RunMain func(cliConfig *appconfig.AppCliConfig)

installer/apt_installer_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/chenasraf/sofmani/appconfig"
 	"github.com/chenasraf/sofmani/logger"
+	"github.com/samber/lo"
 )
 
 func newAptInstaller(data *appconfig.InstallerData) *AptInstaller {
@@ -21,7 +22,7 @@ func TestAptValidation(t *testing.T) {
 	logger.InitLogger(false)
 	aptInstaller := newAptInstaller(
 		&appconfig.InstallerData{
-			Name: strPtr("test-apt"),
+			Name: lo.ToPtr("test-apt"),
 			Type: appconfig.InstallerTypeApt,
 		},
 	)
@@ -33,7 +34,7 @@ func TestAptGetOpts(t *testing.T) {
 
 	// Test default opts (no options set)
 	defaultData := &appconfig.InstallerData{
-		Name: strPtr("vim"),
+		Name: lo.ToPtr("vim"),
 		Type: appconfig.InstallerTypeApt,
 	}
 	installer := newAptInstaller(defaultData)
@@ -50,7 +51,7 @@ func TestAptGetOpts(t *testing.T) {
 
 	// Test with flags option
 	flagsData := &appconfig.InstallerData{
-		Name: strPtr("vim"),
+		Name: lo.ToPtr("vim"),
 		Type: appconfig.InstallerTypeApt,
 		Opts: &map[string]any{
 			"flags": "-y --no-install-recommends",
@@ -64,7 +65,7 @@ func TestAptGetOpts(t *testing.T) {
 
 	// Test with install_flags option
 	installFlagsData := &appconfig.InstallerData{
-		Name: strPtr("vim"),
+		Name: lo.ToPtr("vim"),
 		Type: appconfig.InstallerTypeApt,
 		Opts: &map[string]any{
 			"install_flags": "--no-install-recommends",
@@ -78,7 +79,7 @@ func TestAptGetOpts(t *testing.T) {
 
 	// Test with update_flags option
 	updateFlagsData := &appconfig.InstallerData{
-		Name: strPtr("vim"),
+		Name: lo.ToPtr("vim"),
 		Type: appconfig.InstallerTypeApt,
 		Opts: &map[string]any{
 			"update_flags": "--only-upgrade",
@@ -92,7 +93,7 @@ func TestAptGetOpts(t *testing.T) {
 
 	// Test with all flags options combined
 	allFlagsData := &appconfig.InstallerData{
-		Name: strPtr("vim"),
+		Name: lo.ToPtr("vim"),
 		Type: appconfig.InstallerTypeApt,
 		Opts: &map[string]any{
 			"flags":         "--common",