Fix colorestream on white screens

Author: wpjunior

tsuru/cmd/render.go

@@ -11,8 +11,9 @@ import (
 )
 
 const (
-	pattern  = "\033[%d;%d;%dm%s\033[0m"
-	bgFactor = 10
+	pattern       = "\033[%d;%d;%dm%s\033[0m"
+	effectPattern = "\033[%dm%s\033[0m"
+	bgFactor      = 10
 )
 
 var fontColors = map[string]int{
@@ -43,5 +44,8 @@ func Colorfy(msg string, fontcolor string, background string, effect string) str
 	if DisableColors {
 		return msg
 	}
+	if fontcolor == "" && background == "" && effect != "" {
+		return fmt.Sprintf(effectPattern, fontEffects[effect], msg)
+	}
 	return fmt.Sprintf(pattern, fontEffects[effect], fontColors[fontcolor], fontColors[background]+bgFactor, msg)
 }

tsuru/cmd/v2/config.go

@@ -12,6 +12,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/tsuru/go-tsuruclient/pkg/config"
 	"github.com/tsuru/tablecli"
+	"golang.org/x/term"
 )
 
 var defaultViper = preSetupViper(nil)
@@ -29,8 +30,17 @@ func Pager() (pager string, found bool) {
 }
 
 func ColorStream() bool {
-	// TODO: detect by current terminal capabilities
-	return !ColorDisabled() && defaultViper.GetBool("color-stream")
+	if ColorDisabled() {
+		return false
+	}
+
+	def := term.IsTerminal(int(os.Stdout.Fd()))
+
+	key := "color-stream"
+	if defaultViper.IsSet(key) {
+		return defaultViper.GetBool(key)
+	}
+	return def
 }
 
 // preSetupViper prepares viper for being used by NewProductionTsuruContext()

tsuru/formatter/coloredstream.go

@@ -87,7 +87,7 @@ func (w *coloredEncoderWriter) writeSectionLine(line string) {
 	content := line[len(streamfmt.SectionPrefix) : len(line)-len(streamfmt.SectionSuffix)]
 
 	fmt.Fprint(w.Encoder, cmd.Colorfy(sectionIndicator, "blue", "", ""))
-	fmt.Fprintf(w.Encoder, " %s \n", cmd.Colorfy(content, "white", "", "bold"))
+	fmt.Fprintf(w.Encoder, " %s \n", cmd.Colorfy(content, "", "", "bold"))
 }
 
 // writeActionLine writes an action line with green arrow, preserving indentation.
@@ -98,15 +98,15 @@ func (w *coloredEncoderWriter) writeActionLine(line string) {
 
 	fmt.Fprint(w.Encoder, strings.Repeat(" ", leadingSpaces))
 	fmt.Fprint(w.Encoder, cmd.Colorfy(actionArrow, "green", "", "bold"))
-	fmt.Fprintf(w.Encoder, " %s\n", cmd.Colorfy(content, "white", "", ""))
+	fmt.Fprintf(w.Encoder, " %s\n", cmd.Colorfy(content, "", "", "reset"))
 }
 
 // writeErrorLine writes an error line with red cross indicator.
 func (w *coloredEncoderWriter) writeErrorLine(line string) {
 	content := line[len(streamfmt.ErrorPrefix) : len(line)-len(streamfmt.ErrorSuffix)]
 
 	fmt.Fprint(w.Encoder, cmd.Colorfy(errorCross+errorCross, "red", "", "bold"))
-	fmt.Fprintf(w.Encoder, " %s\n", cmd.Colorfy(content, "red", "", ""))
+	fmt.Fprintf(w.Encoder, " %s\n", cmd.Colorfy(content, "red", "", "reset"))
 }
 
 func NewColoredStreamWriter(encoder io.Writer) io.Writer {