commands: reimplements printing deployment statuses, closes #462

api/deploy_test.go

@@ -62,7 +62,7 @@ func TestDeployService(t *testing.T) {
 	}, <-statuses)
 
 	require.Equal(t, DeployStatus{
-		Message: fmt.Sprintf("%s Completed.", aurora.Green("✔")),
+		Message: fmt.Sprintf("%s Service deployed.", aurora.Green("✔")),
 		Type:    DONE,
 	}, <-statuses)
 
@@ -159,7 +159,7 @@ func TestDeployServiceFromURL(t *testing.T) {
 	}, <-statuses)
 
 	require.Equal(t, DeployStatus{
-		Message: fmt.Sprintf("%s Completed.", aurora.Green("✔")),
+		Message: fmt.Sprintf("%s Service deployed.", aurora.Green("✔")),
 		Type:    DONE,
 	}, <-statuses)
 

commands/provider/service_deployer.go

@@ -2,11 +2,13 @@ package provider
 
 import (
 	"context"
+	"fmt"
 	"io"
 
 	"github.com/asaskevich/govalidator"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/mesg-foundation/core/protobuf/coreapi"
+	"github.com/mesg-foundation/core/utils/pretty"
 )
 
 // ServiceDeploy deploys service from given path.
@@ -87,17 +89,31 @@ func readDeployReply(stream coreapi.Core_DeployServiceClient, deployment chan de
 		}
 
 		var (
+			status          = message.GetStatus()
 			serviceID       = message.GetServiceID()
 			validationError = message.GetValidationError()
 		)
 
 		switch {
+		case status != nil:
+			switch status.Type {
+			case coreapi.DeployServiceReply_Status_RUNNING:
+				pretty.UseSpinner(status.Message)
+
+			case coreapi.DeployServiceReply_Status_DONE:
+				pretty.DestroySpinner()
+				fmt.Println(status.Message)
+			}
+
 		case serviceID != "":
+			pretty.DestroySpinner()
 			result.serviceID = serviceID
 			deployment <- result
 			return
 
 		case validationError != "":
+			pretty.DestroySpinner()
+			fmt.Println(pretty.Fail(validationError))
 			result.isValid = false
 			deployment <- result
 			return

commands/service_deploy.go

@@ -43,14 +43,12 @@ func (c *serviceDeployCmd) runE(cmd *cobra.Command, args []string) error {
 		valid bool
 		err   error
 	)
-	pretty.Progress("Deploying the service...", func() {
-		id, valid, err = c.e.ServiceDeploy(c.path)
-	})
+	id, valid, err = c.e.ServiceDeploy(c.path)
 	if err != nil {
 		return err
 	}
 	if !valid {
-		return errors.New("Service is invalid. To get more information, run: mesg-core service validate")
+		return errors.New("To get more information, run: mesg-core service validate")
 	}
 	fmt.Println("Service deployed with ID:", pretty.Success(id))
 	fmt.Printf("To start it, run the command: mesg-core service start %s\n", id)

commands/service_dev.go

@@ -53,16 +53,13 @@ func (c *serviceDevCmd) runE(cmd *cobra.Command, args []string) error {
 		valid bool
 		err   error
 	)
-	pretty.Progress("Deploying the service...", func() {
-		id, valid, err = c.e.ServiceDeploy(c.path)
-	})
+	id, valid, err = c.e.ServiceDeploy(c.path)
 	if err != nil {
 		return err
 	}
 	if !valid {
-		return errors.New("Service is invalid. To get more information, run: mesg-core service validate")
+		return errors.New("To get more information, run: mesg-core service validate")
 	}
-	fmt.Printf("%s Service deployed\n", pretty.SuccessSign)
 	defer pretty.Progress("Removing the service...", func() { c.e.ServiceDelete(id) })
 
 	pretty.Progress("Starting the service...", func() { err = c.e.ServiceStart(id) })

service/service.go

@@ -209,7 +209,7 @@ func (s *Service) deploy() error {
 	}
 
 	s.sendStatus(fmt.Sprintf("%s Image built with success.", aurora.Green("✔")), DDONE)
-	s.sendStatus(fmt.Sprintf("%s Completed.", aurora.Green("✔")), DDONE)
+	s.sendStatus(fmt.Sprintf("%s Service deployed.", aurora.Green("✔")), DDONE)
 
 	s.configuration.Key = "service"
 	s.configuration.Image = imageHash

utils/pretty/pretty.go

@@ -29,7 +29,7 @@ var (
 	FailSign    = pg.Fail("⨯")
 )
 
-// Predefiend colors
+// Predefined colors.
 var (
 	FgYellow  = color.New(color.FgYellow)
 	FgBlue    = color.New(color.FgBlue)
@@ -239,9 +239,19 @@ func (p *Pretty) Progress(message string, fn func()) {
 		return
 	}
 
+	p.UseSpinner(message)
+	fn()
+	p.DestroySpinner()
+}
+
+// UseSpinner uses spinner animation for message.
+func (p *Pretty) UseSpinner(message string) {
 	p.Spinner.Suffix = " " + strings.TrimRight(message, "\n")
 	p.Spinner.Start()
-	fn()
+}
+
+// DestroySpinner destroyes spinner animation.
+func (p *Pretty) DestroySpinner() {
 	p.Spinner.Stop()
 	p.Spinner.Suffix = ""
 }
@@ -356,6 +366,12 @@ func Colorize(c *color.Color, msg string) string { return pg.Colorize(c, msg) }
 // Progress prints spinner with the given message while calling fn function.
 func Progress(message string, fn func()) { pg.Progress(message, fn) }
 
+// UseSpinner uses spinner animation for message.
+func UseSpinner(message string) { pg.UseSpinner(message) }
+
+// DestroySpinner destroyes spinner animation.
+func DestroySpinner() { pg.DestroySpinner() }
+
 // ColorizeJSON colors keys and values of stringified JSON. On errors the original string is returned.
 // If color is nil then key/value won't be colorize.
 func ColorizeJSON(keyColor *color.Color, valueColor *color.Color, data []byte) []byte {