remove logging

Author: isacikgoz

README.md

@@ -34,7 +34,6 @@ For more information see the [wiki pages](https://github.com/isacikgoz/gitbatch/
 ## Credits
 - [go-git](https://github.com/src-d/go-git) for git interface (partially)
 - [gocui](https://github.com/jroimartin/gocui) for user interface
-- [logrus](https://github.com/sirupsen/logrus) for logging
 - [viper](https://github.com/spf13/viper) for configuration management
 - [color](https://github.com/fatih/color) for colored text
 - [kingpin](https://github.com/alecthomas/kingpin) for command-line flag&options

go.mod

@@ -11,7 +11,6 @@ require (
 github.com/mattn/go-isatty v0.0.7 // indirect
 github.com/mattn/go-runewidth v0.0.4 // indirect
 github.com/nsf/termbox-go v0.0.0-20190325093121-288510b9734e // indirect
-github.com/sirupsen/logrus v1.4.0
 github.com/spf13/viper v1.3.2
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6
 gopkg.in/alecthomas/kingpin.v2 v2.2.6

go.sum

@@ -27,7 +27,6 @@ github.com/jroimartin/gocui v0.4.0 h1:52jnalstgmc25FmtGcWqa0tcbMEWS6RpFLsOIO+I+E
 github.com/jroimartin/gocui v0.4.0/go.mod h1:7i7bbj99OgFHzo7kB2zPb8pXLqMBSQegY7azfqXMkyY=
 github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp/Cjunrr1WlsXSZpqXn+uREuHvUVcK82CV8=
 github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -54,8 +53,6 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sirupsen/logrus v1.4.0 h1:yKenngtzGh+cUSSh6GWbxW2abRqhYUSR/t/6+2QqNvE=
-github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
@@ -68,7 +65,6 @@ github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
 github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro=
@@ -82,7 +78,6 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

internal/app/builder.go

@@ -1,11 +1,10 @@
 package app
 
 import (
-"errors"
+"fmt"
 "os"
 
 "github.com/isacikgoz/gitbatch/internal/gui"
-log "github.com/sirupsen/logrus"
 )
 
 // The App struct is responsible to hold app-wide related entities. Currently
@@ -38,12 +37,6 @@ func Setup(argConfig *Config) (*App, error) {
 return nil, err
 }
 appConfig := overrideConfig(presetConfig, argConfig)
-
-setLogLevel(appConfig.LogLevel)
-
-// hopefull everything went smooth as butter
-log.Trace("App configuration completed")
-
 dirs := generateDirectories(appConfig.Directories, appConfig.Depth)
 
 if appConfig.QuickMode {
@@ -63,27 +56,6 @@ func Setup(argConfig *Config) (*App, error) {
 return app, nil
 }
 
-// set the level of logging it is fatal by default
-func setLogLevel(logLevel string) {
-switch logLevel {
-case "trace":
-log.SetLevel(log.TraceLevel)
-case "debug":
-log.SetLevel(log.DebugLevel)
-case "info":
-log.SetLevel(log.InfoLevel)
-case "warn":
-log.SetLevel(log.WarnLevel)
-case "error":
-log.SetLevel(log.ErrorLevel)
-default:
-log.SetLevel(log.FatalLevel)
-}
-log.WithFields(log.Fields{
-"level": logLevel,
-}).Trace("logging level has been set")
-}
-
 func overrideConfig(appConfig, setupConfig *Config) *Config {
 if len(setupConfig.Directories) > 0 {
 appConfig.Directories = setupConfig.Directories
@@ -107,7 +79,7 @@ func execQuickMode(dirs []string, cfg *Config) error {
 x := cfg.Mode == "fetch"
 y := cfg.Mode == "pull"
 if x == y {
-return errors.New("unrecognized quick mode: " + cfg.Mode)
+return fmt.Errorf("unrecognized quick mode: " + cfg.Mode)
 }
 quick(dirs, cfg.Mode)
 return nil

internal/app/builder_test.go

@@ -7,7 +7,6 @@ import (
 "time"
 
 "github.com/isacikgoz/gitbatch/internal/git"
-log "github.com/sirupsen/logrus"
 ggit "gopkg.in/src-d/go-git.v4"
 )
 
@@ -55,21 +54,6 @@ func TestSetup(t *testing.T) {
 }
 }
 
-func TestSetLogLevel(t *testing.T) {
-var tests = []struct {
-input string
-}{
-{"debug"},
-{"info"},
-}
-for _, test := range tests {
-setLogLevel(test.input)
-if test.input != log.GetLevel().String() {
-t.Errorf("Test Failed: %s inputted, actual: %s", test.input, log.GetLevel().String())
-}
-}
-}
-
 func TestOverrideConfig(t *testing.T) {
 var tests = []struct {
 inp1 *Config

internal/app/config.go

@@ -5,7 +5,6 @@ import (
 "path/filepath"
 "runtime"
 
-log "github.com/sirupsen/logrus"
 "github.com/spf13/viper"
 )
 
@@ -26,7 +25,6 @@ var (
 modeKeyDefault = "fetch"
 pathsKey = "paths"
 pathsKeyDefault = []string{"."}
-logLevelKey = "loglevel"
 logLevelKeyDefault = "error"
 qucikKey = "quick"
 qucikKeyDefault = false
@@ -54,7 +52,6 @@ func LoadConfiguration() (*Config, error) {
 }
 config := &Config{
 Directories: directories,
-LogLevel: viper.GetString(logLevelKey),
 Depth: viper.GetInt(recursionKey),
 QuickMode: viper.GetBool(qucikKey),
 Mode: viper.GetString(modeKey),
@@ -64,7 +61,6 @@ func LoadConfiguration() (*Config, error) {
 
 // set default configuration parameters
 func setDefaults() error {
-viper.SetDefault(logLevelKey, logLevelKeyDefault)
 viper.SetDefault(qucikKey, qucikKeyDefault)
 viper.SetDefault(recursionKey, recursionKeyDefault)
 viper.SetDefault(modeKey, modeKeyDefault)
@@ -116,8 +112,6 @@ func osConfigDirectory(osname string) (osConfigDirectory string) {
 osConfigDirectory = os.Getenv("HOME") + "/Library/Application Support"
 case "linux":
 osConfigDirectory = os.Getenv("HOME") + "/.config"
-default:
-log.Warn("Operating system couldn't be recognized")
 }
 return osConfigDirectory
 }

internal/app/files.go

@@ -4,8 +4,6 @@ import (
 "io/ioutil"
 "os"
 "path/filepath"
-
-log "github.com/sirupsen/logrus"
 )
 
 // generateDirectories returns poosible git repositories to pipe into git pkg's
@@ -31,9 +29,6 @@ func walkRecursive(search, appendant []string) ([]string, []string) {
 // find possible repositories and remaining ones, b slice is possible ones
 a, b, err := seperateDirectories(search[i])
 if err != nil {
-log.WithFields(log.Fields{
-"directory": search[i],
-}).WithError(err).Trace("Can't read directory")
 continue
 }
 // since we started to search let's get rid of it and remove from search
@@ -55,20 +50,13 @@ func seperateDirectories(directory string) ([]string, []string, error) {
 files, err := ioutil.ReadDir(directory)
 // can we read the directory?
 if err != nil {
-log.WithFields(log.Fields{
-"directory": directory,
-}).Trace("Can't read directory")
 return nil, nil, nil
 }
 for _, f := range files {
 repo := directory + string(os.PathSeparator) + f.Name()
 file, err := os.Open(repo)
 // if we cannot open it, simply continue to iteration and don't consider
 if err != nil {
-log.WithFields(log.Fields{
-"file": file,
-"directory": repo,
-}).WithError(err).Trace("Failed to open file in the directory")
 file.Close()
 continue
 }

internal/command/add.go

@@ -1,10 +1,9 @@
 package command
 
 import (
-"errors"
+"fmt"
 
 "github.com/isacikgoz/gitbatch/internal/git"
-log "github.com/sirupsen/logrus"
 )
 
 // AddOptions defines the rules for "git add" command
@@ -33,7 +32,7 @@ func Add(r *git.Repository, f *git.File, o *AddOptions) error {
 err := addWithGoGit(r, f)
 return err
 }
-return errors.New("Unhandled add operation")
+return fmt.Errorf("unhandled add operation")
 }
 
 // AddAll function is the wrapper of "git add ." command
@@ -44,10 +43,9 @@ func AddAll(r *git.Repository, o *AddOptions) error {
 args = append(args, "--dry-run")
 }
 args = append(args, ".")
-out, err := Run(r.AbsPath, "git", args)
+_, err := Run(r.AbsPath, "git", args)
 if err != nil {
-log.Warn("Error while add command")
-return errors.New(out + "\n" + err.Error())
+return fmt.Errorf("could not run add function: %v", err)
 }
 return nil
 }
@@ -65,10 +63,9 @@ func addWithGit(r *git.Repository, f *git.File, o *AddOptions) error {
 if o.DryRun {
 args = append(args, "--dry-run")
 }
-out, err := Run(r.AbsPath, "git", args)
+_, err := Run(r.AbsPath, "git", args)
 if err != nil {
-log.Warn("Error while add command")
-return errors.New(out + "\n" + err.Error())
+return fmt.Errorf("could not add %s: %v", f.AbsPath, err)
 }
 return nil
 }

internal/command/commit.go

@@ -1,12 +1,11 @@
 package command
 
 import (
-"errors"
+"fmt"
 "time"
 
 giterr "github.com/isacikgoz/gitbatch/internal/errors"
 "github.com/isacikgoz/gitbatch/internal/git"
-log "github.com/sirupsen/logrus"
 gogit "gopkg.in/src-d/go-git.v4"
 "gopkg.in/src-d/go-git.v4/plumbing/object"
 )
@@ -33,7 +32,7 @@ func Commit(r *git.Repository, o *CommitOptions) (err error) {
 case ModeNative:
 return commitWithGoGit(r, o)
 }
-return errors.New("Unhandled commit operation")
+return fmt.Errorf("unhandled commit operation")
 }
 
 // commitWithGit is simply a bare git commit -m <msg> command which is flexible
@@ -46,7 +45,6 @@ func commitWithGit(r *git.Repository, opt *CommitOptions) (err error) {
 args = append(args, opt.CommitMsg)
 }
 if out, err := Run(r.AbsPath, "git", args); err != nil {
-log.Warn("Error at git command (commit)")
 r.Refresh()
 return giterr.ParseGitError(out, err)
 }

internal/command/config.go

@@ -1,10 +1,9 @@
 package command
 
 import (
-"errors"
+"fmt"
 
 "github.com/isacikgoz/gitbatch/internal/git"
-log "github.com/sirupsen/logrus"
 )
 
 // ConfigOptions defines the rules for commit operation
@@ -40,7 +39,7 @@ func Config(r *git.Repository, o *ConfigOptions) (value string, err error) {
 case ModeNative:
 return configWithGoGit(r, o)
 }
-return value, errors.New("Unhandled config operation")
+return value, fmt.Errorf("unhandled config operation")
 }
 
 // configWithGit is simply a bare git config --site <option>.<section> command which is flexible
@@ -90,7 +89,6 @@ func addConfigWithGit(r *git.Repository, options *ConfigOptions, value string) (
 args = append(args, value)
 }
 if _, err := Run(r.AbsPath, "git", args); err != nil {
-log.Warn("Error at git command (config)")
 return err
 }
 // till this step everything should be ok