feat: consolidate build command with logging (#77)

Author: mvllow

builder/builder_test.go

@@ -71,9 +71,9 @@ var testConfig = config.BuildConfig{
 var testBuildTemplateConfig = config.BuildTemplateConfig{
 	Input:   "",
 	Output:  "",
+	Variant: "moon",
 	Prefix:  "$",
 	Format:  "hex",
-	Variant: "moon",
 	Plain:   false,
 	Commas:  true,
 	Spaces:  true,
@@ -135,7 +135,6 @@ var testVariants = []struct {
 }
 
 func TestColorFormatting(t *testing.T) {
-
 	tests := []struct {
 		name   string
 		format color.ColorFormat

cmd/build.go

@@ -3,27 +3,36 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"slices"
+	"strings"
 
 	"github.com/rose-pine/rose-pine-bloom/builder"
+	"github.com/rose-pine/rose-pine-bloom/color"
 	"github.com/rose-pine/rose-pine-bloom/config"
 	"github.com/spf13/cobra"
 )
 
+var (
+	outputDir string
+	prefix    string
+	format    string
+	plain     bool
+	noCommas  bool
+	noSpaces  bool
+)
+
 var buildCmd = &cobra.Command{
-	Use:   "build [flags] <template>",
-	Short: "Builds the theme files from templates",
-	Long: `Builds the theme files from templates.
-
-	This command processes the theme templates and generates the final theme files that can be used in applications.
-	The template argument specifies the template file or directory to process.
-	If the template argument is a directory, it will process all templates in that directory.`,
-	Args: cobra.ExactArgs(1),
+	Use:   "build <template>",
+	Short: "Generate theme files from template",
+	Args:  cobra.ExactArgs(1),
 	PreRunE: func(cmd *cobra.Command, args []string) error {
 		return validateFormat(format)
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		template := args[0]
 
+		fmt.Printf("Building themes from %s...\n", template)
+
 		err := builder.Build(&config.BuildConfig{
 			Template: template,
 			Output:   outputDir,
@@ -34,21 +43,37 @@ var buildCmd = &cobra.Command{
 			Spaces:   !noSpaces,
 		})
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error building theme: %v\n", err)
+			fmt.Fprintf(os.Stderr, "Error building themes: %v\n", err)
 			os.Exit(1)
 		}
+
+		fmt.Printf("Themes generated in %s\n", outputDir)
 	},
 }
 
 func init() {
-
-	buildCmd.Flags().StringVarP(&outputDir, "output", "o", "dist", "Directory for generated files")
-	buildCmd.Flags().StringVarP(&prefix, "prefix", "p", "$", "Color variable prefix")
+	buildCmd.Flags().StringVarP(&outputDir, "output", "o", "dist", "Output directory")
+	buildCmd.Flags().StringVarP(&prefix, "prefix", "p", "$", "Variable prefix")
 	buildCmd.Flags().StringVarP(&format, "format", "f", "hex", formatFlagUsage())
-	buildCmd.Flags().BoolVar(&plain, "plain", false, "Remove decorators from color values")
-	buildCmd.Flags().BoolVar(&noCommas, "no-commas", false, "Remove commas from color values")
-	buildCmd.Flags().BoolVar(&noSpaces, "no-spaces", false, "Remove spaces from color values")
+	buildCmd.Flags().BoolVar(&plain, "plain", false, "Remove decorators")
+	buildCmd.Flags().BoolVar(&noCommas, "no-commas", false, "Remove commas")
+	buildCmd.Flags().BoolVar(&noSpaces, "no-spaces", false, "Remove spaces")
 
 	rootCmd.AddCommand(buildCmd)
+}
+
+func formatFlagUsage() string {
+	table, err := color.FormatsTable()
+	if err != nil {
+		fmt.Printf("Error generating format table: %v", err)
+		os.Exit(1)
+	}
+	return fmt.Sprintf("Color format:\n%s", table)
+}
 
+func validateFormat(format string) error {
+	if slices.Contains(color.AllFormats, format) {
+		return nil
+	}
+	return fmt.Errorf("invalid format '%s'. Valid formats: %s", format, strings.Join(color.AllFormats, ", "))
 }

cmd/buildFlags.go

@@ -2,35 +2,66 @@ package cmd
 
 import (
 	"fmt"
+	"os"
 
+	"github.com/rose-pine/rose-pine-bloom/builder"
+	"github.com/rose-pine/rose-pine-bloom/config"
 	"github.com/rose-pine/rose-pine-bloom/docs"
 	"github.com/spf13/cobra"
 )
 
+var (
+	variant string
+	output  string
+)
+
 var initCmd = &cobra.Command{
-	Use:   "init",
-	Short: "Project initialization",
-	Long:  `Creates files to start a new Rosé Pine theme project.`,
+	Use:   "init [theme-file]",
+	Short: "Initialise new theme",
+	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println("Creating theme files...")
+
 		if err := docs.EnsureReadme(); err != nil {
-			fmt.Println("unable to update README:", err)
+			fmt.Fprintf(os.Stderr, "Error creating README: %v\n", err)
+		} else {
+			fmt.Println("Created README.md")
 		}
+
 		if err := docs.EnsureLicense(); err != nil {
-			fmt.Println("unable to update LICENSE:", err)
+			fmt.Fprintf(os.Stderr, "Error creating LICENSE: %v\n", err)
+		} else {
+			fmt.Println("Created LICENSE")
+		}
+
+		if len(args) > 0 {
+			themeFile := args[0]
+			fmt.Printf("Creating template from %s...\n", themeFile)
+
+			err := builder.BuildTemplate(&config.BuildTemplateConfig{
+				Input:   themeFile,
+				Output:  output,
+				Variant: variant,
+				Prefix:  "$",
+				Format:  "hex",
+				Plain:   false,
+				Commas:  true,
+				Spaces:  true,
+			})
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "Error creating template: %v\n", err)
+				os.Exit(1)
+			}
+
+			fmt.Printf("Template created in %s\n", output)
 		}
+
+		fmt.Println("Theme initialised")
 	},
 }
 
 func init() {
+	initCmd.Flags().StringVarP(&variant, "variant", "v", "main", "Theme variant (main, moon, dawn)")
+	initCmd.Flags().StringVarP(&output, "output", "o", ".", "Template output directory")
 	rootCmd.AddCommand(initCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// initCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// initCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }

cmd/buildTemplate.go

@@ -6,22 +6,13 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var (
-	// version will be set at build time using -ldflags
-	version = "dev"
-)
+var version = "dev"
 
 var rootCmd = &cobra.Command{
 	Use:   "bloom",
-	Short: "The Rosé Pine theme generator",
-	Long:  `The Rosé Pine theme generator.`,
-	// Uncomment the following line if your bare application
-	// has an action associated with it:
-	// Run: func(cmd *cobra.Command, args []string) { },
+	Short: "Generate Rosé Pine theme files from templates",
 }
 
-// Execute adds all child commands to the root command and sets flags appropriately.
-// This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
 	rootCmd.Version = version
 
@@ -32,12 +23,4 @@ func Execute() {
 }
 
 func init() {
-	// Here you will define your flags and configuration settings.
-	// Cobra supports persistent flags, which, if defined here,
-	// will be global for your application.
-
-	// rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.rose-pine-bloom.yaml)")
-
-	// Cobra also supports local flags, which will only run
-	// when this action is called directly.
 }