Skip to content

Implemented use of 3 variables instead of a single #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonasbn wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Implemented use of 3 variables instead of a single #18

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7c35cb2
Implemented use of 3 variables instead of a single
jonasbn Mar 9, 2020
c4b7aec
Changed into using constants for repeated string values
jonasbn May 12, 2020
33c93e9
Revert "Implemented use of 3 variables instead of a single"
jonasbn May 13, 2020
7ca2673
Fixed a recently introduced bug
jonasbn May 13, 2020
a407bac
WIP: Made first iteration on changes based on feedback from @subtleps…
jonasbn May 16, 2020
eca7f85
Updated from master, conflicts resolved
jonasbn Jun 8, 2020
5d71bfc
Single color definitions now holds precedence over the palette defini…
jonasbn Jun 8, 2020
8573394
First shot at documentation, In general the documentation needs an ov…
jonasbn Jun 8, 2020
6f170e0
Updated README.md
jonasbn Jun 9, 2020
ee765ea
Removed excess line
jonasbn Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 35 additions & 9 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,21 @@ import (
"github.com/fatih/color"
)

const (
paletteEnv = "GOTEST_PALETTE"
failEnv = "GOTEST_FAIL_COLOR"
passEnv = "GOTEST_PASS_COLOR"
skipEnv = "GOTEST_SKIP_COLOR"
)

var (
success = color.New(color.FgGreen)
skipped = color.New(color.FgYellow)
fail = color.New(color.FgHiRed)
)

func main() {
setPalette()
parseEnvAndSetPalette()
enableOnCI()
os.Exit(gotest(os.Args[1:]))
}
Expand Down Expand Up @@ -124,13 +131,32 @@ func enableOnCI() {
}
}

func setPalette() {
func parseEnvAndSetPalette() {
v := os.Getenv(paletteEnv)
if v == "" {
parseEnvColor()
} else {

vals := strings.Split(v, ",")
if len(vals) != 3 {
return
}

if c, ok := colors[vals[0]]; ok {
fail = color.New(c)
}
if c, ok := colors[vals[1]]; ok {
success = color.New(c)
}
if c, ok := colors[vals[2]]; ok {
skipped = color.New(c)
}
}
}

const TestSkipColorEnvVar string = "GOTEST_SKIP_COLOR"
const TestFailColorEnvVar string = "GOTEST_FAIL_COLOR"
const TestPassColorEnvVar string = "GOTEST_PASS_COLOR"
func parseEnvColor() {

envArray := [3]string{TestSkipColorEnvVar, TestFailColorEnvVar, TestPassColorEnvVar}
envArray := [3]string{skipEnv, failEnv, passEnv}

for _, e := range envArray {
v := os.Getenv(e)
Expand All @@ -139,11 +165,11 @@ func setPalette() {
}
if c, ok := colors[v]; ok {
switch e {
case TestFailColorEnvVar:
case failEnv:
fail = color.New(c)
case TestPassColorEnvVar:
case passEnv:
success = color.New(c)
case TestSkipColorEnvVar:
case skipEnv:
skipped = color.New(c)
}
}
Expand Down