build: reorganize main

cmd/cli/commands.go

···
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/spf13/cobra"
+	"github.com/stormlightlabs/noteleaf/cmd/handlers"
+	"github.com/stormlightlabs/noteleaf/internal/ui"
+)
+
+func rootCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "noteleaf",
+		Long:  ui.Colossal.ColoredInViewport(),
+		Short: "A TaskWarrior-inspired CLI with notes, media queues and reading lists",
+		Run: func(cmd *cobra.Command, args []string) {
+			if len(args) == 0 {
+				cmd.Help()
+			} else {
+				output := strings.Join(args, " ")
+				fmt.Println(output)
+			}
+		},
+	}
+}
+
+func todoCmd() *cobra.Command {
+	root := &cobra.Command{
+		Use:   "todo",
+		Short: "task management",
+	}
+
+	root.AddCommand(&cobra.Command{
+		Use:   "add [description]",
+		Short: "Add a new task",
+		Args:  cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			description := args[0]
+			fmt.Printf("Adding task: %s\n", description)
+			// TODO: Implement task creation
+			return nil
+		},
+	})
+
+	root.AddCommand(&cobra.Command{
+		Use:     "list",
+		Short:   "List tasks",
+		Aliases: []string{"ls"},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			fmt.Println("Listing tasks...")
+			// TODO: Implement task listing
+			return nil
+		},
+	})
+
+	root.AddCommand(&cobra.Command{
+		Use:   "done [task-id]",
+		Short: "Mark task as completed",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			taskID := args[0]
+			fmt.Printf("Marking task %s as done\n", taskID)
+			// TODO: Implement task completion
+			return nil
+		},
+	})
+
+	return root
+}
+
+func movieCmd() *cobra.Command {
+	root := &cobra.Command{
+		Use:   "movie",
+		Short: "Manage movie watch queue",
+	}
+
+	root.AddCommand(&cobra.Command{
+		Use:   "add [title]",
+		Short: "Add movie to watch queue",
+		Args:  cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			title := args[0]
+			fmt.Printf("Adding movie: %s\n", title)
+			// TODO: Implement movie addition
+			return nil
+		},
+	})
+
+	root.AddCommand(&cobra.Command{
+		Use:   "list",
+		Short: "List movies in queue",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			fmt.Println("Listing movies...")
+			// TODO: Implement movie listing
+			return nil
+		},
+	})
+
+	return root
+}
+
+func tvCmd() *cobra.Command {
+	root := &cobra.Command{
+		Use:   "tv",
+		Short: "Manage TV show watch queue",
+	}
+
+	root.AddCommand(&cobra.Command{
+		Use:   "add [title]",
+		Short: "Add TV show to watch queue",
+		Args:  cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			title := args[0]
+			fmt.Printf("Adding TV show: %s\n", title)
+			// TODO: Implement TV show addition
+			return nil
+		},
+	})
+
+	root.AddCommand(&cobra.Command{
+		Use:   "list",
+		Short: "List TV shows in queue",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			fmt.Println("Listing TV shows...")
+			// TODO: Implement TV show listing
+			return nil
+		},
+	})
+
+	return root
+}
+
+func bookCmd() *cobra.Command {
+	root := &cobra.Command{
+		Use:   "book",
+		Short: "Manage reading list",
+	}
+
+	root.AddCommand(&cobra.Command{
+		Use:   "add [title]",
+		Short: "Add book to reading list",
+		Args:  cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			title := args[0]
+			fmt.Printf("Adding book: %s\n", title)
+			// TODO: Implement book addition
+			return nil
+		},
+	})
+
+	root.AddCommand(&cobra.Command{
+		Use:   "list",
+		Short: "List books in reading list",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			fmt.Println("Listing books...")
+			// TODO: Implement book listing
+			return nil
+		},
+	})
+
+	return root
+}
+
+func noteCmd() *cobra.Command {
+	root := &cobra.Command{
+		Use:   "note",
+		Short: "Manage notes",
+	}
+
+	root.AddCommand(&cobra.Command{
+		Use:     "create [title] [content...]",
+		Short:   "Create a new note",
+		Aliases: []string{"new"},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return handlers.Create(cmd.Context(), args)
+		},
+	})
+
+	return root
+}
+
+func statusCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "status",
+		Short: "Show application status and configuration",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return handlers.Status(cmd.Context(), args)
+		},
+	}
+}
+
+func resetCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "reset",
+		Short: "Reset the application (removes all data)",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return handlers.Reset(cmd.Context(), args)
+		},
+	}
+}
+
+func setupCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "setup",
+		Short: "Initialize the application database and configuration",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return handlers.Setup(cmd.Context(), args)
+		},
+	}
+}
+
+func confCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "config [key] [value]",
+		Short: "Manage configuration",
+		Args:  cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			key, value := args[0], args[1]
+			fmt.Printf("Setting config %s = %s\n", key, value)
+			// TODO: Implement config management
+			return nil
+		},
+	}
+}

cmd/cli/main.go

···
 	"context"
 	"fmt"
 	"os"
-	"strings"
 
 	"github.com/charmbracelet/fang"
 	"github.com/spf13/cobra"
-	"github.com/stormlightlabs/noteleaf/cmd/handlers"
 	"github.com/stormlightlabs/noteleaf/internal/store"
 	"github.com/stormlightlabs/noteleaf/internal/ui"
 	"github.com/stormlightlabs/noteleaf/internal/utils"
···
 		return nil, fmt.Errorf("failed to initialize database: %w", err)
 	}
 
-	config, err := store.LoadConfig()
-	if err != nil {
+	if config, err := store.LoadConfig(); err != nil {
 		return nil, fmt.Errorf("failed to load configuration: %w", err)
+	} else {
+		return &App{db: db, config: config}, nil
 	}
-
-	return &App{
-		db:     db,
-		config: config,
-	}, nil
 }
 
 // Close cleans up application resources
···
 	}
 	defer app.Close()
 
-	rootCmd := &cobra.Command{
-		Use:   "noteleaf",
-		Short: "A TaskWarrior-inspired CLI with media queues and reading lists",
-		Run: func(cmd *cobra.Command, args []string) {
-			if len(args) == 0 {
-				fmt.Println(ui.Collosal.ColoredInViewport())
-				cmd.Help()
-				return
-			}
-
-			output := strings.Join(args, " ")
-			fmt.Println(output)
-		},
-	}
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "setup",
-		Short: "Initialize the application database and configuration",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return handlers.Setup(cmd.Context(), args)
-		},
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "reset",
-		Short: "Reset the application (removes all data)",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return handlers.Reset(cmd.Context(), args)
-		},
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "status",
-		Short: "Show application status and configuration",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return handlers.Status(cmd.Context(), args)
-		},
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "add [description]",
-		Short: "Add a new task",
-		Args:  cobra.MinimumNArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			description := args[0]
-			fmt.Printf("Adding task: %s\n", description)
-			// TODO: Implement task creation
-			return nil
-		},
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:     "list",
-		Short:   "List tasks",
-		Aliases: []string{"ls"},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			fmt.Println("Listing tasks...")
-			// TODO: Implement task listing
-			return nil
-		},
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "done [task-id]",
-		Short: "Mark task as completed",
-		Args:  cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			taskID := args[0]
-			fmt.Printf("Marking task %s as done\n", taskID)
-			// TODO: Implement task completion
-			return nil
-		},
-	})
-
-	movieCmd := &cobra.Command{
-		Use:   "movie",
-		Short: "Manage movie watch queue",
-	}
-
-	movieCmd.AddCommand(&cobra.Command{
-		Use:   "add [title]",
-		Short: "Add movie to watch queue",
-		Args:  cobra.MinimumNArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			title := args[0]
-			fmt.Printf("Adding movie: %s\n", title)
-			// TODO: Implement movie addition
-			return nil
-		},
-	})
-
-	movieCmd.AddCommand(&cobra.Command{
-		Use:   "list",
-		Short: "List movies in queue",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			fmt.Println("Listing movies...")
-			// TODO: Implement movie listing
-			return nil
-		},
-	})
-
-	rootCmd.AddCommand(movieCmd)
-
-	tvCmd := &cobra.Command{
-		Use:   "tv",
-		Short: "Manage TV show watch queue",
+	root := rootCmd()
+	commands := []func() *cobra.Command{
+		setupCmd, resetCmd, statusCmd, todoCmd,
+		movieCmd, noteCmd, tvCmd, bookCmd, confCmd,
 	}
 
-	tvCmd.AddCommand(&cobra.Command{
-		Use:   "add [title]",
-		Short: "Add TV show to watch queue",
-		Args:  cobra.MinimumNArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			title := args[0]
-			fmt.Printf("Adding TV show: %s\n", title)
-			// TODO: Implement TV show addition
-			return nil
-		},
-	})
-
-	tvCmd.AddCommand(&cobra.Command{
-		Use:   "list",
-		Short: "List TV shows in queue",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			fmt.Println("Listing TV shows...")
-			// TODO: Implement TV show listing
-			return nil
-		},
-	})
-
-	rootCmd.AddCommand(tvCmd)
-
-	bookCmd := &cobra.Command{
-		Use:   "book",
-		Short: "Manage reading list",
+	for _, cmdFunc := range commands {
+		cmd := cmdFunc()
+		root.AddCommand(cmd)
 	}
 
-	bookCmd.AddCommand(&cobra.Command{
-		Use:   "add [title]",
-		Short: "Add book to reading list",
-		Args:  cobra.MinimumNArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			title := args[0]
-			fmt.Printf("Adding book: %s\n", title)
-			// TODO: Implement book addition
-			return nil
-		},
-	})
-
-	bookCmd.AddCommand(&cobra.Command{
-		Use:   "list",
-		Short: "List books in reading list",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			fmt.Println("Listing books...")
-			// TODO: Implement book listing
-			return nil
-		},
-	})
-
-	rootCmd.AddCommand(bookCmd)
-
-	noteCmd := &cobra.Command{
-		Use:   "note",
-		Short: "Manage notes",
+	options := []fang.Option{
+		fang.WithVersion("0.1.0"),
+		fang.WithoutCompletions(),
+		fang.WithColorSchemeFunc(ui.NoteleafColorScheme),
 	}
 
-	noteCmd.AddCommand(&cobra.Command{
-		Use:     "create [title] [content...]",
-		Short:   "Create a new note",
-		Aliases: []string{"new"},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return handlers.Create(cmd.Context(), args)
-		},
-	})
-
-	rootCmd.AddCommand(noteCmd)
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "config [key] [value]",
-		Short: "Manage configuration",
-		Args:  cobra.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			key, value := args[0], args[1]
-			fmt.Printf("Setting config %s = %s\n", key, value)
-			// TODO: Implement config management
-			return nil
-		},
-	})
-
-	if err := fang.Execute(context.Background(), rootCmd, fang.WithVersion("0.1.0")); err != nil {
+	if err := fang.Execute(context.Background(), root, options...); err != nil {
 		os.Exit(1)
 	}
 }

codecov.yml

···
   - "**/*_test.go"
   - "**/testdata/**"
   - "**/vendor/**"
-  - "cmd/cli/main.go"  # Main entry point typically has minimal logic to test
+  - "cmd/cli/*.go"

internal/ui/logo.go

···
 type Logo int
 
 const (
-	Collosal Logo = iota
+	Colossal Logo = iota
 	Georgia
 	Alligator
 	ANSI
 	ANSIShadow
 )
 
-const collosal string = `
+const colossal string = `
 888b    888          888            888                    .d888
 8888b   888          888            888                   d88P"
 88888b  888          888            888                   888
···
 
 func (l Logo) String() string {
 	switch l {
-	case Collosal:
-		return collosal
+	case Colossal:
+		return colossal
 	case Georgia:
 		return georgia
 	case Alligator:
···
 	case ANSIShadow:
 		return ansiShadow
 	default:
-		return collosal
+		return colossal
 	}
 }
 
···
 	vp := viewport.New(maxWidth+4, len(lines))
 	vp.SetContent(coloredLogo)
 
-	style := lipgloss.NewStyle().
-		Border(lipgloss.RoundedBorder()).
-		BorderForeground(lipgloss.Color("#6b7280")).
-		Padding(1)
+	style := lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(lipgloss.Color("#6b7280")).PaddingLeft(1)
 
 	if len(renderer) > 0 && renderer[0] != nil {
 		style = style.Renderer(renderer[0])

internal/ui/ui_test.go

···
 			name     string
 			contains string
 		}{
-			{Collosal, "Collosal", "888b    888"},
+			{Colossal, "Collosal", "888b    888"},
 			{Georgia, "Georgia", "`7MN.   `7MF'"},
 			{Alligator, "Alligator", "::::    :::  ::::::::"},
 			{ANSI, "ANSI", "███    ██"},
···
 
 		t.Run("Colored in Viewport", func(t *testing.T) {
 			withColor(t, func(r *lipgloss.Renderer) {
-				logo := Collosal
+				logo := Colossal
 				viewport := logo.ColoredInViewport(r)
 				t.Logf("viewport output:\n%s", viewport)