Commit098d35d

committed

feat: add '--no-color' flag

1 parent86175bf commit098d35dCopy full SHA for 098d35d

File tree

+33

-4

lines changed

+33

-4

lines changed

Lines changed: 19 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@ package cliui`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"flag"`
	`5`	`+"fmt"`
`5`	`6`	`"os"`
	`7`	`+"slices"`
`6`	`8`	`"sync"`
`7`	`9`	`"time"`
`8`	`10`
`@@ -12,6 +14,10 @@ import (`
`12`	`14`	`"github.com/coder/pretty"`
`13`	`15`	`)`
`14`	`16`
	`17`	`+constNoColorFlag="no-color"`
	`18`	`+`
	`19`	`+varNoColor=false`
	`20`	`+`
`15`	`21`	`varCanceled=xerrors.New("canceled")`
`16`	`22`
`17`	`23`	`// DefaultStyles compose visual elements of the UI.`
`@@ -37,21 +43,30 @@ var (`
`37`	`43`	`)`
`38`	`44`
`39`	`45`	`var (`
`40`		`-Green=Color("2")`
`41`		`-Red=Color("1")`
`42`		`-Yellow=Color("3")`
`43`		`-Blue=Color("6")`
	`46`	`+Green=Color("10")`
	`47`	`+Red=Color("9")`
	`48`	`+Yellow=Color("11")`
	`49`	`+Blue=Color("12")`
`44`	`50`	`)`
`45`	`51`
`46`	`52`	`// Color returns a color for the given string.`
`47`	`53`	`funcColor(sstring) termenv.Color {`
`48`	`54`	`colorOnce.Do(func() {`
`49`	`55`	`color=termenv.NewOutput(os.Stdout).ColorProfile()`
	`56`	`+`
`50`	`57`	`ifflag.Lookup("test.v")!=nil {`
`51`	`58`	`// Use a consistent colorless profile in tests so that results`
`52`	`59`	`// are deterministic.`
`53`	`60`	`color=termenv.Ascii`
`54`	`61`	`}`
	`62`	`+`
	`63`	`+// Currently it appears there is no way to use the flag from`
	`64`	`+// serpent as it isn't possible to create a root middleware that`
	`65`	+// runs for every command. For now we just check if `os.Args`
	`66`	`+// has the flag.`
	`67`	`+ifslices.Contains(os.Args,fmt.Sprintf("--%s",NoColorFlag)) {`
	`68`	`+color=termenv.Ascii`
	`69`	`+}`
`55`	`70`	`})`
`56`	`71`	`returncolor.Color(s)`
`57`	`72`	`}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -461,6 +461,12 @@ func (r RootCmd) Command(subcommands []serpent.Command) (*serpent.Command, err`
`461`	`461`	`Value:serpent.StringOf(&r.globalConfig),`
`462`	`462`	`Group:globalGroup,`
`463`	`463`	`},`
	`464`	`+{`
	`465`	`+Flag:cliui.NoColorFlag,`
	`466`	`+Description:"Disable use of color in CLI output.",`
	`467`	`+Value:serpent.BoolOf(&cliui.NoColor),`
	`468`	`+Group:globalGroup,`
	`469`	`+},`
`464`	`470`	`{`
`465`	`471`	`Flag:"version",`
`466`	`472`	`// This was requested by a customer to assist with their migration.`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,14 @@ func main() {`
`38`	`38`	`},`
`39`	`39`	`}`
`40`	`40`
	`41`	`+root.Options= []serpent.Option{`
	`42`	`+{`
	`43`	`+Default:"false",`
	`44`	`+Flag:cliui.NoColorFlag,`
	`45`	`+Value:serpent.BoolOf(&cliui.NoColor),`
	`46`	`+},`
	`47`	`+}`
	`48`	`+`
`41`	`49`	`root.Children=append(root.Children,&serpent.Command{`
`42`	`50`	`Use:"colors",`
`43`	`51`	`Handler:func(inv*serpent.Invocation)error {`

Comments

(0)