One color package to rule them all.

internal/util/util.go

@@ -9,17 +9,17 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/ooni/probe-cli/internal/colors"
+	"github.com/fatih/color"
 )
 
 // Log outputs a log message.
 func Log(msg string, v ...interface{}) {
-	fmt.Printf("     %s\n", colors.Purple(fmt.Sprintf(msg, v...)))
+	fmt.Printf("     %s\n", color.CyanString(msg, v...))
 }
 
 // Fatal error
 func Fatal(err error) {
-	fmt.Fprintf(os.Stderr, "\n     %s %s\n\n", colors.Red("Error:"), err)
+	fmt.Fprintf(os.Stderr, "\n     %s %s\n\n", color.RedString("Error:"), err)
 	os.Exit(1)
 }
 

internal/util/util_test.go

@@ -4,14 +4,13 @@ import (
 	"testing"
 
 	"github.com/fatih/color"
-	ocolor "github.com/ooni/probe-cli/internal/colors"
 )
 
 func TestEscapeAwareRuneCountInString(t *testing.T) {
 	var bold = color.New(color.Bold)
 	var myColor = color.New(color.FgBlue)
 
-	s := myColor.Sprintf("•ABC%s%s", bold.Sprintf("DEF"), ocolor.Red("GHI"))
+	s := myColor.Sprintf("•ABC%s%s", bold.Sprintf("DEF"), "\x1B[00;38;5;244m\x1B[m\x1B[00;38;5;33mGHI\x1B[0m")
 	count := EscapeAwareRuneCountInString(s)
 	if count != 10 {
 		t.Errorf("Count was incorrect, got: %d, want: %d.", count, 10)