From 9067d95bd758b05f1829be142e4b5c4170ab0b93 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Wed, 28 Feb 2018 14:11:07 +0900 Subject: [PATCH 1/2] support Windows colors --- cmd/git-chglog/initializer.go | 3 ++- cmd/git-chglog/main.go | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/git-chglog/initializer.go b/cmd/git-chglog/initializer.go index 920df14b..27cfdd97 100644 --- a/cmd/git-chglog/initializer.go +++ b/cmd/git-chglog/initializer.go @@ -5,6 +5,7 @@ import ( "path/filepath" "github.com/fatih/color" + "github.com/mattn/go-colorable" gitcmd "github.com/tsuyoshiwada/go-gitcmd" ) @@ -30,7 +31,7 @@ func NewInitializer( return &Initializer{ ctx: ctx, fs: fs, - logger: NewLogger(ctx.Stdout, ctx.Stderr, false, false), + logger: NewLogger(colorable.NewColorableStdout(), colorable.NewColorableStderr(), false, false), questioner: questioner, configBuilder: configBuilder, templateBuilder: templateBuilder, diff --git a/cmd/git-chglog/main.go b/cmd/git-chglog/main.go index c4781ed0..fb8e0c21 100644 --- a/cmd/git-chglog/main.go +++ b/cmd/git-chglog/main.go @@ -5,6 +5,7 @@ import ( "os" "github.com/fatih/color" + "github.com/mattn/go-colorable" gitcmd "github.com/tsuyoshiwada/go-gitcmd" "github.com/urfave/cli" ) @@ -120,8 +121,8 @@ func main() { initializer := NewInitializer( &InitContext{ WorkingDir: wd, - Stdout: os.Stdout, - Stderr: os.Stderr, + Stdout: colorable.NewColorableStdout(), + Stderr: colorable.NewColorableStderr(), }, fs, NewQuestioner( @@ -141,8 +142,8 @@ func main() { chglogCLI := NewCLI( &CLIContext{ WorkingDir: wd, - Stdout: os.Stdout, - Stderr: os.Stderr, + Stdout: colorable.NewColorableStdout(), + Stderr: colorable.NewColorableStderr(), ConfigPath: c.String("config"), OutputPath: c.String("output"), Silent: c.Bool("silent"), From 88ea38ea8fb4663fb4319d7d663bf599278eaf21 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Wed, 28 Feb 2018 17:47:33 +0900 Subject: [PATCH 2/2] revert change for Initializer since InitContext should have Stdout/Stderr which is set as colorable --- cmd/git-chglog/initializer.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/git-chglog/initializer.go b/cmd/git-chglog/initializer.go index 27cfdd97..920df14b 100644 --- a/cmd/git-chglog/initializer.go +++ b/cmd/git-chglog/initializer.go @@ -5,7 +5,6 @@ import ( "path/filepath" "github.com/fatih/color" - "github.com/mattn/go-colorable" gitcmd "github.com/tsuyoshiwada/go-gitcmd" ) @@ -31,7 +30,7 @@ func NewInitializer( return &Initializer{ ctx: ctx, fs: fs, - logger: NewLogger(colorable.NewColorableStdout(), colorable.NewColorableStderr(), false, false), + logger: NewLogger(ctx.Stdout, ctx.Stderr, false, false), questioner: questioner, configBuilder: configBuilder, templateBuilder: templateBuilder,