From c8ad3094d5fff12299a21139a4a18a4e52560e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ko=C5=BAmiski?= Date: Mon, 10 Aug 2020 07:19:17 +0200 Subject: [PATCH 1/2] NO-TICKET Add verbose log to commit testing --- Makefile | 2 +- rules/rules.go | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 987f922..479a9db 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -build: gitector +build: go build install: build diff --git a/rules/rules.go b/rules/rules.go index 8d6bc1f..8ce59fa 100644 --- a/rules/rules.go +++ b/rules/rules.go @@ -2,6 +2,7 @@ package rules import ( "gitlab.com/tbacompany/gitector/reader" + "log" "strings" ) @@ -12,11 +13,12 @@ type GitError struct { Commit reader.GitCommit } -func Rules(description []reader.GitCommit, directory string) []GitError { +func Rules(commits []reader.GitCommit, directory string) []GitError { config := ReadConfig(directory) var errors []GitError - for _, elem := range description { - foundErrors := singleCommit(elem, config) + for _, commit := range commits { + foundErrors := singleCommit(commit, config) + log.Printf("Found %d issues for commit %s ", len(foundErrors), commit.Title) errors = append(errors, foundErrors...) } return errors From 3e12931af4d6b03da2b48a9f84a7085b128b047e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ko=C5=BAmiski?= Date: Mon, 10 Aug 2020 21:53:19 +0200 Subject: [PATCH 2/2] NO-TICKET Add Logger as start param --- app.go | 12 ++++++++++++ go.mod | 1 + go.sum | 2 ++ rules/rules.go | 6 ++++-- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app.go b/app.go index 57c74a8..282f456 100644 --- a/app.go +++ b/app.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "github.com/op/go-logging" "github.com/urfave/cli" "gitlab.com/tbacompany/gitector/printer" @@ -39,9 +40,20 @@ func CreateNewApp() *cli.App { Name: "direct-input, di", Usage: "Use direct input ", }, + cli.BoolFlag{ + Name: "verbose", + Usage: "Print additional debug info", + }, } app.Action = func(c *cli.Context) error { + // Set logging level + if c.Bool("verbose") { + logging.SetLevel(logging.INFO, "") + } else { + logging.SetLevel(logging.DEBUG, "") + } + // gitScope is defined same way as git diff does it branch..branch or commit..commit gitScope := "master.." if c.NArg() > 0 { diff --git a/go.mod b/go.mod index e293271..4c24608 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/bclicn/color v0.0.0-20180711051946-108f2023dc84 github.com/gobuffalo/packr v1.30.1 github.com/knadh/koanf v0.5.0 + github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/stretchr/testify v1.4.0 github.com/urfave/cli v1.22.1 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 diff --git a/go.sum b/go.sum index 9cf4bfe..46e79d8 100644 --- a/go.sum +++ b/go.sum @@ -66,6 +66,8 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg= diff --git a/rules/rules.go b/rules/rules.go index 8ce59fa..818999a 100644 --- a/rules/rules.go +++ b/rules/rules.go @@ -1,8 +1,8 @@ package rules import ( + "github.com/op/go-logging" "gitlab.com/tbacompany/gitector/reader" - "log" "strings" ) @@ -13,12 +13,14 @@ type GitError struct { Commit reader.GitCommit } +var log = logging.MustGetLogger("") + func Rules(commits []reader.GitCommit, directory string) []GitError { config := ReadConfig(directory) var errors []GitError for _, commit := range commits { foundErrors := singleCommit(commit, config) - log.Printf("Found %d issues for commit %s ", len(foundErrors), commit.Title) + log.Debugf("Found %d issues for commit %s ", len(foundErrors), commit.Title) errors = append(errors, foundErrors...) } return errors