refactor: Improve build and deploy process with enhanced console feed…

…back

cmd/build.go

@@ -61,21 +61,24 @@ func buildAndPushServices(ctx context.Context, services []config.Service, builde
 }
 
 func buildAndPushService(ctx context.Context, service config.Service, builder *build.Build, skipPush bool) error {
-	spinner := console.NewSpinner(fmt.Sprintf("building service %s", service.Name))
+	spinner := console.NewSpinner(fmt.Sprintf("Building service %s", service.Name))
 
 	if err := builder.Build(ctx, service.Image, service.Path); err != nil {
-		spinner.Fail("build failed")
+		spinner.Fail("Build failed")
 		return fmt.Errorf("failed to build image: %w", err)
 	}
 
+	spinner.Success(fmt.Sprintf("Service %s built successfully", service.Name))
+	spinner = console.NewSpinner(fmt.Sprintf("Pushing service %s", service.Name))
+
 	if !skipPush {
-		spinner.UpdateText(fmt.Sprintf("pushing service %s", service.Name))
+		spinner.UpdateText(fmt.Sprintf("Pushing service %s", service.Name))
 		if err := builder.Push(ctx, service.Image); err != nil {
-			spinner.Fail("push failed")
+			spinner.Fail("Push failed")
 			return fmt.Errorf("failed to push image: %w", err)
 		}
+		spinner.Success(fmt.Sprintf("Service %s pushed successfully", service.Name))
 	}
 
-	spinner.Success(fmt.Sprintf("service %s built successfully", service.Name))
 	return nil
 }

cmd/deploy.go

@@ -88,51 +88,56 @@ func deployToServer(project string, cfg *config.Config, server config.Server) er
 
 	events := deploy.Deploy(ctx, project, cfg)
 
-	var spinner *pterm.SpinnerPrinter
+	multi := pterm.DefaultMultiPrinter
+
+	spinners := make(map[string]*pterm.SpinnerPrinter)
+
+	_, _ = multi.Start()
+	defer func() { _, _ = multi.Stop() }()
 
 	for event := range events {
 		switch event.Type {
 		case deployment.EventTypeStart:
-			if spinner != nil {
-				spinner.Success()
-			}
-			spinner = console.NewSpinner(event.Message)
+			spinner := console.NewSpinnerWithWriter(event.Message, multi.NewWriter())
+			spinners[event.Name] = spinner
 		case deployment.EventTypeProgress:
-			if spinner != nil {
+			if spinner, ok := spinners[event.Name]; ok {
 				spinner.UpdateText(event.Message)
 			} else {
 				console.Info(event.Message)
 			}
 		case deployment.EventTypeFinish:
-			if spinner != nil {
+			if spinner, ok := spinners[event.Name]; ok {
 				spinner.Success(event.Message)
-				spinner = nil
+				delete(spinners, event.Name)
 			} else {
 				console.Success(event.Message)
 			}
 		case deployment.EventTypeError:
-			if spinner != nil {
+			if spinner, ok := spinners[event.Name]; ok {
 				spinner.Fail(fmt.Sprintf("Deployment error: %s", event.Message))
+				delete(spinners, event.Name)
 			} else {
 				console.Error(fmt.Sprintf("Deployment error: %s", event.Message))
 			}
 			return fmt.Errorf("deployment error: %s", event.Message)
 		case deployment.EventTypeComplete:
-			if spinner != nil {
+			if spinner, ok := spinners[event.Name]; ok {
 				spinner.Success(event.Message)
+				delete(spinners, event.Name)
 			} else {
 				console.Success(event.Message)
 			}
 		default:
-			if spinner != nil {
+			if spinner, ok := spinners[event.Name]; ok {
 				spinner.UpdateText(event.Message)
 			} else {
 				console.Info(event.Message)
 			}
 		}
 	}
 
-	if spinner != nil {
+	for _, spinner := range spinners {
 		_ = spinner.Stop()
 	}
 

pkg/console/console.go

@@ -3,6 +3,7 @@ package console
 import (
 	"bufio"
 	"fmt"
+	"io"
 	"os"
 	"strings"
 	"time"
@@ -86,6 +87,10 @@ func ReadPassword() (string, error) {
 }
 
 func NewSpinner(initialText string) *pterm.SpinnerPrinter {
+	return NewSpinnerWithWriter(initialText, os.Stdout)
+}
+
+func NewSpinnerWithWriter(initialText string, writer io.Writer) *pterm.SpinnerPrinter {
 	spinner := pterm.SpinnerPrinter{
 		Sequence:            []string{" ⠋ ", " ⠙ ", " ⠹ ", " ⠸ ", " ⠼ ", " ⠴ ", " ⠦ ", " ⠧ ", " ⠇ ", " ⠏ "},
 		Style:               &pterm.ThemeDefault.SpinnerStyle,
@@ -98,6 +103,7 @@ func NewSpinner(initialText string) *pterm.SpinnerPrinter {
 		SuccessPrinter:      successPrinter,
 		FailPrinter:         errorPrinter,
 		WarningPrinter:      warningPrinter,
+		Writer:              writer,
 	}
 
 	spinnerPrinter, _ := spinner.Start(initialText)