update

Author: chaindead

Taskfile.yml

@@ -8,3 +8,8 @@ vars:
 tasks:
   default: go run ./...
   install: go install ./...
+  test:
+    cmds:
+      - go build -tags "fake" -o modup-test .
+      - defer: rm modup-test
+      - ./modup-test

internal/tui/cmd_prod.go

@@ -0,0 +1,30 @@
+//go:build !fake
+
+package tui
+
+import (
+	tea "github.com/charmbracelet/bubbletea"
+
+	"github.com/chaindead/modup/internal/deps"
+)
+
+func getPkgInfo(pkg string) tea.Cmd {
+	return func() tea.Msg {
+		mod, err := deps.GetModuleInfo(pkg)
+		return getPackageInfoMsg{mod, err}
+	}
+}
+
+func upgradeModule(mod deps.Module) tea.Cmd {
+	return func() tea.Msg {
+		err := deps.Upgrade(mod)
+		return upgradeModuleResultMsg{mod: mod, err: err}
+	}
+}
+
+func getPackageList() tea.Cmd {
+	return func() tea.Msg {
+		pkgs, err := deps.ListAllModulePaths()
+		return getPackageListMsg{pkgs, err}
+	}
+}

internal/tui/cmd_tst.go

@@ -1,11 +1,14 @@
+//go:build fake
+
 package tui
 
 import (
+	"fmt"
 	"math/rand"
 	"time"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/spf13/pflag"
+	tea "github.com/charmbracelet/bubbletea"
 
 	"github.com/chaindead/modup/internal/deps"
 )
@@ -17,8 +20,6 @@ func randomTestDelay() time.Duration {
 }
 
 var (
-	test = pflag.Bool("test", false, "fake run")
-
 	fakeDeps = map[string]deps.Module{
 		"github.com/gin-gonic/gin": {
 			Path:           "github.com/gin-gonic/gin",
@@ -462,3 +463,38 @@ func mustParseVersion(v string) *semver.Version {
 	}
 	return ver
 }
+
+func getPkgInfo(pkg string) tea.Cmd {
+	return func() tea.Msg {
+		time.Sleep(randomTestDelay())
+
+		if mod, exists := fakeDeps[pkg]; exists {
+			return getPackageInfoMsg{mod, nil}
+		}
+		return getPackageInfoMsg{deps.Module{Path: pkg}, nil}
+	}
+}
+
+func upgradeModule(mod deps.Module) tea.Cmd {
+	return func() tea.Msg {
+		time.Sleep(randomTestDelay())
+		// 10% simulated failure
+		r := rand.New(rand.NewSource(time.Now().UnixNano()))
+		if r.Float64() < 0.10 {
+			return upgradeModuleResultMsg{mod: mod, err: fmt.Errorf("simulated upgrade error")}
+		}
+		return upgradeModuleResultMsg{mod: mod, err: nil}
+	}
+}
+
+func getPackageList() tea.Cmd {
+	time.Sleep(randomTestDelay())
+
+	return func() tea.Msg {
+		packages := make([]string, 0, len(fakeDeps))
+		for pkg := range fakeDeps {
+			packages = append(packages, pkg)
+		}
+		return getPackageListMsg{packages, nil}
+	}
+}

internal/tui/cmds.go

@@ -1,8 +1,8 @@
+//go:build !test
+
 package tui
 
 import (
-	"fmt"
-	"math/rand"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
@@ -15,44 +15,14 @@ type getPackageListMsg struct {
 	err      error
 }
 
-func getPackageList() tea.Cmd {
-	if *test {
-		time.Sleep(randomTestDelay())
-
-		return func() tea.Msg {
-			packages := make([]string, 0, len(fakeDeps))
-			for pkg := range fakeDeps {
-				packages = append(packages, pkg)
-			}
-			return getPackageListMsg{packages, nil}
-		}
-	}
-
-	return func() tea.Msg {
-		pkgs, err := deps.ListAllModulePaths()
-		return getPackageListMsg{pkgs, err}
-	}
-}
-
 type getPackageInfoMsg struct {
 	mod deps.Module
 	err error
 }
 
-func getPkgInfo(pkg string) tea.Cmd {
-	return func() tea.Msg {
-		if *test {
-			time.Sleep(randomTestDelay())
-
-			if mod, exists := fakeDeps[pkg]; exists {
-				return getPackageInfoMsg{mod, nil}
-			}
-			return getPackageInfoMsg{deps.Module{Path: pkg}, nil}
-		}
-
-		mod, err := deps.GetModuleInfo(pkg)
-		return getPackageInfoMsg{mod, err}
-	}
+type upgradeModuleResultMsg struct {
+	mod deps.Module
+	err error
 }
 
 type changeModeListMsg bool
@@ -67,26 +37,8 @@ type beginUpgradeMsg struct {
 	modules []deps.Module
 }
 
-type upgradeModuleResultMsg struct {
-	mod deps.Module
-	err error
-}
-
-func upgradeModule(mod deps.Module) tea.Cmd {
-	return func() tea.Msg {
-		if *test {
-			time.Sleep(randomTestDelay())
-			// 10% simulated failure
-			r := rand.New(rand.NewSource(time.Now().UnixNano()))
-			if r.Float64() < 0.10 {
-				return upgradeModuleResultMsg{mod: mod, err: fmt.Errorf("simulated upgrade error")}
-			}
-			return upgradeModuleResultMsg{mod: mod, err: nil}
-		}
-
-		err := deps.Upgrade(mod)
-		return upgradeModuleResultMsg{mod: mod, err: err}
-	}
+func beginUpgradeCmd(selected []deps.Module) tea.Cmd {
+	return func() tea.Msg { return beginUpgradeMsg{modules: selected} }
 }
 
 type moduleStartedMsg struct{}

internal/tui/update_list.go

@@ -109,7 +109,7 @@ func newItemDelegate(keys *listKeyMap) list.DefaultDelegate {
 					item := m.Items()[idx]
 					newItem := listItemSetSelected(item, !listItemSelected(item))
 					setCmd := m.SetItem(idx, newItem)
-					statusCmd := m.NewStatusMessage(statusMessageStyle("Toggled " + newItem.(listModuleItem).Module.Path))
+					statusCmd := m.NewStatusMessage(statusMessageStyle("Selected " + newItem.(listModuleItem).Module.Path))
 					return tea.Batch(setCmd, statusCmd)
 				}
 
@@ -154,7 +154,11 @@ func newItemDelegate(keys *listKeyMap) list.DefaultDelegate {
 					}
 				}
 
-				return func() tea.Msg { return beginUpgradeMsg{modules: selected} }
+				if len(selected) == 0 {
+					return m.NewStatusMessage(statusMessageStyle("No packages selected to update"))
+				}
+
+				return beginUpgradeCmd(selected)
 			}
 		}
 

main.go

@@ -7,13 +7,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/spf13/pflag"
 
-	tui "github.com/chaindead/modup/internal/tui"
-)
-
-var (
-	version = "dev"
-	commit  = "none"
-	date    = "unknown"
+	"github.com/chaindead/modup/internal/tui"
 )
 
 func main() {