fix: fix typo in the getDeb function (#30)

* fix: fix typo in the getDeb function that prevented the deb distributions from being used when chglog is being used as a cli * fix: fix lint issues
goreleaser · Nov 9, 2020 · 9c6b268 · 9c6b268
1 parent f4b552e
commit 9c6b268
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 65 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ dist
 bin
 coverage.out
 chglog
+!chglog/
diff --git a/.golangci.yml b/.golangci.yml
@@ -5,6 +5,7 @@ linters:
     - wsl
     - testpackage
     - gofumpt
+    - exhaustivestruct
 linters-settings:
   maligned:
     # print struct with more effective memory layout or not, false by default

diff --git a/add.go b/add.go
@@ -32,20 +32,20 @@ func AddEntry(
 	)
 
 	if ref, err = gitRepo.Head(); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error adding entry: %w", err)
 	}
 	from = ref.Hash()
 
 	to = plumbing.ZeroHash
 	if len(current) > 0 {
 		if to, err = GitHashFotTag(gitRepo, current[0].Semver); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error adding entry: %w", err)
 		}
 	}
 
 	cle = append(cle, current...)
 	if commits, err = CommitsBetween(gitRepo, to, from); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error adding entry: %w", err)
 	}
 
 	if len(commits) == 0 {

diff --git a/cmd/chglog/main.go b/cmd/chglog/main.go
@@ -25,17 +25,8 @@ func main() {
 	}
 	cwd, _ := os.Getwd()
 	cfgFile := path.Join(cwd, fmt.Sprintf(".%s.yml", pkgName))
-	debug := false
 	config := setupConfig(cfgFile)
 
-	cmdRoot.PersistentFlags().BoolVarP(
-		&debug,
-		"debug",
-		"",
-		debug,
-		``)
-	config.BindPFlag("debug", cmdRoot.PersistentFlags().Lookup("debug"))
-
 	cmdRoot.PersistentFlags().StringVarP(
 		&cfgFile,
 		"config-file",

diff --git a/conventional_commits.go b/conventional_commits.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-// nolint: gochecknoglobals,gocritic
+// nolint:gocritic
 var expectedFormatRegex = regexp.MustCompile(`(?s)^(?P<category>\S+?)?(?P<scope>\(\S+\))?(?P<breaking>!?)?: (?P<description>[^\n\r]+)?([\n\r]{2}(?P<body>.*))?`)
 
 // ParseConventionalCommit takes a commits message and parses it into usable blocks.

diff --git a/files.go b/files.go
@@ -1,6 +1,7 @@
 package chglog
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
 
@@ -17,12 +18,14 @@ func Parse(file string) (entries ChangeLogEntries, err error) {
 	case os.IsNotExist(err):
 		return make(ChangeLogEntries, 0), nil
 	case err != nil:
-		return nil, err
+		return nil, fmt.Errorf("error parsing %s: %w", file, err)
 	}
 
-	err = yaml.Unmarshal(body, &entries)
+	if err = yaml.Unmarshal(body, &entries); err != nil {
+		return entries, fmt.Errorf("error parsing %s: %w", file, err)
+	}
 
-	return entries, err
+	return entries, nil
 }
 
 // Save save ChangeLogEntries to a yml file.

diff --git a/format.go b/format.go
@@ -2,13 +2,16 @@ package chglog
 
 import (
 	"bytes"
+	"fmt"
 	"text/template"
 )
 
 // FormatChangelog format pkgLogs from a text/template.
 func FormatChangelog(pkgLogs *PackageChangeLog, tpl *template.Template) (string, error) {
 	var data bytes.Buffer
-	err := tpl.Execute(&data, pkgLogs)
+	if err := tpl.Execute(&data, pkgLogs); err != nil {
+		return data.String(), fmt.Errorf("error formatting: %w", err)
+	}
 
-	return data.String(), err
+	return data.String(), nil
 }
diff --git a/format_test.go b/format_test.go
@@ -19,6 +19,7 @@ func TestFormatChangelog(t *testing.T) {
 		gitRepo *git.Repository
 		testCLE ChangeLogEntries
 	)
+	t.Parallel()
 	if gitRepo, err = GitRepo("./testdata/init-repo", false); err != nil {
 		log.Fatal(err)
 	}

diff --git a/git.go b/git.go
@@ -2,6 +2,8 @@ package chglog
 
 import (
 	"errors"
+	"fmt"
+	"strings"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -21,11 +23,11 @@ func GitRepo(gitPath string, detectDotGit bool) (*git.Repository, error) {
 func GitHashFotTag(gitRepo *git.Repository, tagName string) (hash plumbing.Hash, err error) {
 	var ref *plumbing.Reference
 	ref, err = gitRepo.Tag(tagName)
-	if errors.Is(err, git.ErrTagNotFound) {
+	if errors.Is(err, git.ErrTagNotFound) && !strings.HasPrefix(tagName, "v") {
 		ref, err = gitRepo.Tag("v" + tagName)
 	}
 	if err != nil {
-		return plumbing.ZeroHash, err
+		return plumbing.ZeroHash, fmt.Errorf("error getting commit for tag %s: %w", tagName, err)
 	}
 
 	return ref.Hash(), nil
@@ -52,7 +54,7 @@ func CommitsBetween(gitRepo *git.Repository, start, end plumbing.Hash) (commits
 	})
 
 	if err != nil && !errors.Is(err, errReachedToCommit) {
-		return nil, err
+		return nil, fmt.Errorf("error getting commits between %v & %v: %w", start, end, err)
 	}
 
 	return commits, nil

diff --git a/go.mod b/go.mod
@@ -7,24 +7,29 @@ require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/Masterminds/semver/v3 v3.1.0
 	github.com/Masterminds/sprig v2.22.0+incompatible
+	github.com/Microsoft/go-winio v0.4.15 // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/go-git/go-git/v5 v5.2.0
 	github.com/google/go-cmp v0.5.2
-	github.com/google/uuid v1.1.1 // indirect
+	github.com/google/uuid v1.1.2 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
+	github.com/imdario/mergo v0.3.11 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
+	github.com/magiconair/properties v1.8.4 // indirect
 	github.com/mitchellh/copystructure v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v1.3.2 // indirect
+	github.com/mitchellh/mapstructure v1.3.3 // indirect
 	github.com/mitchellh/reflectwalk v1.0.1 // indirect
-	github.com/pelletier/go-toml v1.8.0 // indirect
-	github.com/spf13/afero v1.3.2 // indirect
+	github.com/pelletier/go-toml v1.8.1 // indirect
+	github.com/spf13/afero v1.4.1 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/viper v1.7.1
-	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
-	golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
-	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
-	golang.org/x/text v0.3.3 // indirect
-	gopkg.in/ini.v1 v1.57.0 // indirect
+	github.com/xanzy/ssh-agent v0.3.0 // indirect
+	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
+	golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 // indirect
+	golang.org/x/sys v0.0.0-20201109165425-215b40eba54c // indirect
+	golang.org/x/text v0.3.4 // indirect
+	gopkg.in/ini.v1 v1.62.0 // indirect
 	gopkg.in/yaml.v2 v2.3.0
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ dist @@
     bin
     coverage.out
     chglog
+    !chglog/