fix(codestyle): implement changes suggested by golangci

Author: jguerreiro

.golangci.yml

@@ -9,11 +9,8 @@ linters:
     - dogsled
     - dupl
     - errcheck
-    - funlen
     - gochecknoinits
     - goconst
-    - gocritic
-    - gocyclo
     - gofmt
     - goimports
     - golint
@@ -41,6 +38,11 @@ linters:
     - wrapcheck
     - exhaustivestruct
     - errorlint
+    # temporary disables
+    - gocritic
+    - gofumpt
+    - funlen
+    - gocyclo
   disable-all: false
   presets:
     - bugs

analyzer.go

@@ -4,11 +4,11 @@ import (
 	git "gopkg.in/src-d/go-git.v4/plumbing/object"
 )
 
-// Analyzer analyzer a commit to extract its author
+// Analyzer analyzer a commit to extract its author.
 type Analyzer struct {
 }
 
-// AnalyzeCommit extracts author and commiter from a commit
-func (a *Analyzer) AnalyzeCommit(commit *git.Commit) (author git.Signature, commiter git.Signature) {
+// AnalyzeCommit extracts author and commiter from a commit.
+func (a *Analyzer) AnalyzeCommit(commit *git.Commit) (author, commiter git.Signature) {
 	return commit.Author, commit.Committer
 }

cloner.go

@@ -11,15 +11,15 @@ import (
 	"gopkg.in/src-d/go-git.v4/storage/memory"
 )
 
-// Cloner represents a cloner of git repository
+// Cloner represents a cloner of git repository.
 type Cloner interface {
 	CloneRepository(url string, auth transport.AuthMethod) (*git.Repository, error)
 }
 
-// MemoryCloner clones a git repository in memory
+// MemoryCloner clones a git repository in memory.
 type MemoryCloner struct{}
 
-// CloneRepository clones a git repository given its information
+// CloneRepository clones a git repository given its information.
 func (*MemoryCloner) CloneRepository(url string, auth transport.AuthMethod) (*git.Repository, error) {
 	return git.Clone(memory.NewStorage(), nil, &git.CloneOptions{
 		URL:      url,
@@ -28,16 +28,18 @@ func (*MemoryCloner) CloneRepository(url string, auth transport.AuthMethod) (*gi
 	})
 }
 
-// DiskCloner closes a git repository on disk in a temporary file
+// DiskCloner closes a git repository on disk in a temporary file.
 type DiskCloner struct{}
 
-// CloneRepository clones a git repository given its information
+// CloneRepository clones a git repository given its information.
 func (*DiskCloner) CloneRepository(url string, auth transport.AuthMethod) (*git.Repository, error) {
 	tmpDir, err := ioutil.TempDir("", "fs-")
 	if err != nil {
 		return nil, err
 	}
+
 	fs := osfs.New(tmpDir)
+
 	return git.Clone(filesystem.NewStorage(fs, cache.NewObjectLRUDefault()), nil, &git.CloneOptions{
 		URL:      url,
 		Progress: ioutil.Discard,

cmd/dna-collector-test/main.go

@@ -4,24 +4,22 @@ import (
 	"dnacollector"
 	"encoding/json"
 	"errors"
-	"fmt"
+	"io"
+
 	"github.com/caarlos0/env"
 	log "github.com/sirupsen/logrus"
 	git2 "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/format/diff"
 	git "gopkg.in/src-d/go-git.v4/plumbing/object"
-	"io"
 )
 
 type config struct {
 	GithubToken string `env:"GITHUB_TOKEN"`
 	GitlabToken string `env:"GITLAB_TOKEN"`
 }
 
-var (
-	// ErrGroupNotFound is the error returned when group can not be found
-	ErrFileSimplifiedCreation = errors.New("we could not instantiate GitFileSimplified from GitFile")
-)
+// ErrFileSimplifiedCreation is the error returned when GitFileSimplified can not be instantiated.
+var ErrFileSimplifiedCreation = errors.New("we could not instantiate GitFileSimplified from GitFile")
 
 type GitFileSimplified struct {
 	Name     string `json:"name"`
@@ -40,11 +38,18 @@ type CommitSimplified struct {
 
 func NewFromGitFile(file *git.File) *GitFileSimplified {
 	isBinary, _ := file.IsBinary()
+
 	return &GitFileSimplified{Name: file.Name, Sha: file.Hash.String(), IsBinary: isBinary, Size: file.Size}
 }
 
 func NewFromCommit(commit *git.Commit, files []*GitFileSimplified) *CommitSimplified {
-	return &CommitSimplified{Message: commit.Message, Sha: commit.Hash.String(), Author: commit.Author, Committer: commit.Committer, Files: files}
+	return &CommitSimplified{
+		Message:   commit.Message,
+		Sha:       commit.Hash.String(),
+		Author:    commit.Author,
+		Committer: commit.Committer,
+		Files:     files,
+	}
 }
 
 func NewFromFilePatch(filePatch diff.FilePatch) (*GitFileSimplified, error) {
@@ -54,12 +59,13 @@ func NewFromFilePatch(filePatch diff.FilePatch) (*GitFileSimplified, error) {
 	// If the patch deletes a file, "to" will be nil.
 
 	// Rare usecase
-	if to == nil && from == nil {
+	switch {
+	case to == nil && from == nil:
 		return nil, ErrFileSimplifiedCreation
-	} else if to != nil {
+	case to != nil:
 		// File creation
 		return &GitFileSimplified{Name: to.Path(), Sha: to.Hash().String(), IsBinary: isBinary, Size: 0}, nil
-	} else {
+	default:
 		// File deletion
 		return &GitFileSimplified{Name: from.Path(), Sha: from.Hash().String(), IsBinary: isBinary, Size: 0}, nil
 	}
@@ -85,22 +91,23 @@ func (a *Analyzer) GetFilesFromCommit(commit *git.Commit) ([]*GitFileSimplified,
 			return nil, err
 		}
 
-		filesIter.ForEach(func(file *git.File) error {
+		_ = filesIter.ForEach(func(file *git.File) error {
 			fileSimplified := NewFromGitFile(file)
 			log.Debugf("Appending file %s", fileSimplified.Name)
 			if fileSimplified.Size > 0 {
-				/*		fileSimplifiedJson, _ := json.Marshal(fileSimplified)*/
+				// fileSimplifiedJson, _ := json.Marshal(fileSimplified)
 				log.Info(fileSimplified)
 			}
 
 			files = append(files, fileSimplified)
+
 			return nil
 		})
-		// There is a parent, so we consider only the diff
 	} else {
+		// There is a parent, so we consider only the diff
 		patch, _ := commit.Patch(parent)
 		filePatches := patch.FilePatches()
-		//log.Info(patch.Stats())
+		// log.Info(patch.Stats())
 		for _, fp := range filePatches {
 			fileSimplified, err := NewFromFilePatch(fp)
 			//for _, chunk := range fp.Chunks() {
@@ -112,33 +119,36 @@ func (a *Analyzer) GetFilesFromCommit(commit *git.Commit) ([]*GitFileSimplified,
 				files = append(files, fileSimplified)
 			} else {
 				continue
-				//log.Error(ErrFileSimplifiedCreation)
-				//log.Warn(commit)
-				//log.Warn(fp)
-
+				// log.Error(ErrFileSimplifiedCreation)
+				// log.Warn(commit)
+				// log.Warn(fp)
 			}
 		}
 	}
 
 	return files, nil
 }
 
-// AnalyzeCommit extracts author and committer from a commit
+// AnalyzeCommit extracts author and committer from a commit.
 func (a *Analyzer) AnalyzeCommit(commit *git.Commit) string {
-    // Store commmit sha
+	// Store commmit sha
 	files, _ := a.GetFilesFromCommit(commit)
 	a.CommitsList = append(a.CommitsList, NewFromCommit(commit, files))
+
 	return commit.Hash.String()
 }
 
 func (a *Analyzer) GetStats() map[string]int {
 	res := make(map[string]int)
 	res["nb_commits"] = len(a.CommitsList)
-	nb_files_shas := 0
+	nbFilesSHAs := 0
+
 	for _, commit := range a.CommitsList {
-		nb_files_shas += len(commit.Files)
+		nbFilesSHAs += len(commit.Files)
 	}
-	res["nb_files_shas"] = nb_files_shas
+
+	res["nb_files_shas"] = nbFilesSHAs
+
 	return res
 }
 
@@ -164,7 +174,8 @@ func main() {
 	if err := env.Parse(&conf); err != nil {
 		log.Fatalf("Could not parse env: %v\n", err)
 	}
-	log.Debug(conf)
+
+	log.Debugln(conf)
 	//var cloner dnacollector.Cloner = &dnacollector.MemoryCloner{}
 	//auth := &http.BasicAuth{
 	//	Username: "ericfourrier",
@@ -173,23 +184,36 @@ func main() {
 
 	repository, err := git2.PlainOpen("/Users/ericfourrier/Documents/GGCode/dna-collector/testdata/react-vis")
 	if err != nil {
-		fmt.Print(err)
+		log.Warnln(err)
 	}
-	repository.Config()
-	//log.Infof("Cloned repo %v (size: %v)\n", repository.n, repository.GetStorageSize())
+
+	_, err = repository.Config()
+	// config is not used?
+	if err != nil {
+		log.Warnln(err)
+	}
+
+	// log.Infof("Cloned repo %v (size: %v)\n", repository.n, repository.GetStorageSize())
 	extractor, err := dnacollector.NewExtractor(repository)
+	if err != nil {
+		log.Warnln(err)
+	}
+
 	analyzer := NewAnalyzer()
+
 	for {
 		commit, err := extractor.ExtractNextCommit()
 		if err != nil && err != io.EOF {
 			log.Panic(err)
 		}
+
 		if commit == nil {
 			break
 		}
 
 		analyzer.AnalyzeCommit(commit)
 	}
+
 	res2, _ := json.Marshal(analyzer.CommitsList)
 	log.Debug(string(res2))
 	//fmt.Print(analyzer.SetCommitsSha)
@@ -200,5 +224,4 @@ func main() {
 	//}
 	log.Info(analyzer.GetStats())
 	log.Infof("Done extracting %v\n", repository)
-
 }