Merge pull request #1467 from ulyssessouza/progress-tail-msgs

Add plain tail messages on progress writer

api/progress/noop.go

@@ -30,5 +30,8 @@ func (p *noopWriter) Start(ctx context.Context) error {
 func (p *noopWriter) Event(e Event) {
 }
 
+func (p *noopWriter) TailMsgf(_ string, _ ...interface{}) {
+}
+
 func (p *noopWriter) Stop() {
 }

api/progress/plain.go

@@ -40,6 +40,10 @@ func (p *plainWriter) Event(e Event) {
 	fmt.Fprintln(p.out, e.ID, e.Text, e.StatusText)
 }
 
+func (p *plainWriter) TailMsgf(m string, args ...interface{}) {
+	fmt.Fprintln(p.out, append([]interface{}{m}, args...)...)
+}
+
 func (p *plainWriter) Stop() {
 	p.done <- true
 }

api/progress/tty.go

@@ -32,13 +32,14 @@ import (
 )
 
 type ttyWriter struct {
-	out      io.Writer
+	out        io.Writer
-	events   map[string]Event
+	events     map[string]Event
-	eventIDs []string
+	eventIDs   []string
-	repeated bool
+	repeated   bool
-	numLines int
+	numLines   int
-	done     chan bool
+	done       chan bool
-	mtx      *sync.RWMutex
+	mtx        *sync.RWMutex
+	tailEvents []string
 }
 
 func (w *ttyWriter) Start(ctx context.Context) error {
@@ -48,9 +49,11 @@ func (w *ttyWriter) Start(ctx context.Context) error {
 		select {
 		case <-ctx.Done():
 			w.print()
+			w.printTailEvents()
 			return ctx.Err()
 		case <-w.done:
 			w.print()
+			w.printTailEvents()
 			return nil
 		case <-ticker.C:
 			w.print()
@@ -91,6 +94,20 @@ func (w *ttyWriter) Event(e Event) {
 	}
 }
 
+func (w *ttyWriter) TailMsgf(msg string, args ...interface{}) {
+	w.mtx.Lock()
+	defer w.mtx.Unlock()
+	w.tailEvents = append(w.tailEvents, fmt.Sprintf(msg, args...))
+}
+
+func (w *ttyWriter) printTailEvents() {
+	w.mtx.Lock()
+	defer w.mtx.Unlock()
+	for _, msg := range w.tailEvents {
+		fmt.Fprintln(w.out, msg)
+	}
+}
+
 func (w *ttyWriter) print() {
 	w.mtx.Lock()
 	defer w.mtx.Unlock()

api/progress/writer.go

@@ -31,6 +31,7 @@ type Writer interface {
 	Start(context.Context) error
 	Stop()
 	Event(Event)
+	TailMsgf(string, ...interface{})
 }
 
 type writerKey struct{}

local/compose/pull.go

@@ -21,7 +21,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"strings"
 
@@ -72,13 +71,7 @@ func (s *composeService) Pull(ctx context.Context, project *types.Project, opts
 				if !opts.IgnoreFailures {
 					return err
 				}
-				// If IgnoreFailures we still want to show the error message
+				w.TailMsgf("Pulling %s: %s", service.Name, err.Error())
-				w.Event(progress.Event{
-					ID:         fmt.Sprintf("Pulling %s:", service.Name),
-					Text:       fmt.Sprintf("%v", err),
-					Status:     progress.Error,
-					StatusText: fmt.Sprintf("%s", err),
-				})
 			}
 			return nil
 		})

local/compose/push.go

@@ -70,12 +70,7 @@ func (s *composeService) Push(ctx context.Context, project *types.Project, optio
 				if !options.IgnoreFailures {
 					return err
 				}
-				w.Event(progress.Event{
+				w.TailMsgf("Pushing %s: %s", service.Name, err.Error())
-					ID:         fmt.Sprintf("Pushing %s:", service.Name),
-					Text:       fmt.Sprintf("%v", err),
-					Status:     progress.Error,
-					StatusText: fmt.Sprintf("%s", err),
-				})
 			}
 			return nil
 		})