Merge branch 'master' of github.com:meinto/git-semver

Author: Tobias Meinhardt

.gitignore

@@ -1,7 +1,10 @@
 semver
+git-semver
 build
 dist
 buildAssets
 glow.private.json
 
+on/
+
 debug

VERSION

@@ -1 +1 @@
-4.1.12
+4.1.16

formula/git-semver.rb

@@ -2,9 +2,9 @@
 class GitSemver < Formula
   desc ""
   homepage ""
-  url "https://github.com/meinto/git-semver/releases/download/v4.1.8/git-semver_4.1.8_Darwin_x86_64.tar.gz"
-  version "4.1.8"
-  sha256 "e9d215884f46128c5c9ec1ef169ffb3b0c1100d018d90ec2b637d8cc97bccc91"
+  url "https://github.com/meinto/git-semver/releases/download/v4.1.16/semver_4.1.16_darwin_x86_64.tar.gz"
+  version "4.1.16"
+  sha256 "8568bab964d15bda6a1094ac0247f49d113779d04549f199a41875f13b3b0e3e"
 
   depends_on "git"
 

git/service.go

@@ -30,30 +30,36 @@ func NewGitService(gitPath string) Service {
 
 func (s service) GitRepoPath() (string, error) {
 	cmd := exec.Command(s.gitPath, "rev-parse", "--show-toplevel")
-	var stdout bytes.Buffer
+	var stdout, stderr bytes.Buffer
+	cmd.Stderr = &stderr
 	cmd.Stdout = &stdout
 	err := cmd.Run()
-	return strings.TrimSuffix(stdout.String(), "\n"), err
+	return strings.TrimSuffix(stdout.String(), "\n"), errors.Wrap(err, fmt.Sprintf("pkg(git) GitRepoPath(): %s", stderr.String()))
 }
 
 func (s service) IsRepoClean() (bool, error) {
 	cmd := exec.Command(s.gitPath, "status", "-s")
-	var stdout bytes.Buffer
+	var stdout, stderr bytes.Buffer
+	cmd.Stderr = &stderr
 	cmd.Stdout = &stdout
 	err := cmd.Run()
-	return stdout.String() == "", err
+	return stdout.String() == "", errors.Wrap(err, fmt.Sprintf("pkg(git) IsRepoClean(): %s", stderr.String()))
 }
 
 func (s service) CreateTag(version string) error {
 	cmd := exec.Command(s.gitPath, "tag", "-a", "v"+version, "-m", fmt.Sprintf("create new tag v%s", version))
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
 	err := cmd.Run()
-	return errors.Wrap(err, "error creating git tag")
+	return errors.Wrap(err, fmt.Sprintf("pkg(git) CreateTag(): %s", stderr.String()))
 }
 
 func (s service) Push() error {
 	cmd := exec.Command(s.gitPath, "push", "--follow-tags")
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
 	err := cmd.Run()
-	return errors.Wrap(err, "error creating git tag")
+	return errors.Wrap(err, fmt.Sprintf("pkg(git) Push(): %s", stderr.String()))
 }
 
 func (s service) AddVersionChanges(filename string) error {
@@ -63,12 +69,16 @@ func (s service) AddVersionChanges(filename string) error {
 	}
 	filePath := repoPath + "/" + filename
 	cmd := exec.Command(s.gitPath, "add", filePath)
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
 	err = cmd.Run()
-	return errors.Wrap(err, "error adding version changes")
+	return errors.Wrap(err, fmt.Sprintf("pkg(git) AddVersionChanges(): %s", stderr.String()))
 }
 
 func (s service) CommitVersionChanges(version string) error {
 	cmd := exec.Command(s.gitPath, "commit", "-m", fmt.Sprintf("add changes for version %s", version))
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
 	err := cmd.Run()
-	return errors.Wrap(err, "error committing added changes")
+	return errors.Wrap(err, fmt.Sprintf("pkg(git) CommitVersionChanges(): %s", stderr.String()))
 }

pkg/cli/cmd/get.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/meinto/git-semver"
+	semver "github.com/meinto/git-semver"
 	"github.com/meinto/git-semver/file"
 	"github.com/meinto/git-semver/git"
 	"github.com/meinto/git-semver/pkg/cli/cmd/internal"

pkg/cli/cmd/install.go

@@ -82,7 +82,7 @@ func fileList(rootPath string) ([]string, error) {
 	var files []string
 
 	err := filepath.Walk(rootPath, func(path string, info os.FileInfo, err error) error {
-		if !strings.HasPrefix(path, "semver_") {
+		if !strings.HasPrefix(path, "semver") && !strings.HasPrefix(path, "git-semver") {
 			return nil
 		}
 		files = append(files, path)

pkg/cli/cmd/root.go

@@ -40,6 +40,18 @@ func init() {
 var rootCmd = &cobra.Command{
 	Use:   "semver",
 	Short: "standalone tool to version your gitlab repo with semver",
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		g := git.NewGitService(viper.GetString("gitPath"))
+		repoPath, _ := g.GitRepoPath()
+
+		viper.SetConfigName("semver.config")
+		viper.SetConfigType("json")
+		viper.AddConfigPath(repoPath)
+		err := viper.ReadInConfig()
+		if err != nil {
+			log.Println("there is no semver.config file: ", err)
+		}
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 
 		g := git.NewGitService(viper.GetString("gitPath"))

pkg/cli/main.go

@@ -3,24 +3,9 @@ package main
 //go:generate ../../.circleci/generate-assets.sh
 
 import (
-	"log"
-
-	"github.com/meinto/git-semver/git"
 	"github.com/meinto/git-semver/pkg/cli/cmd"
-	"github.com/spf13/viper"
 )
 
 func main() {
-	g := git.NewGitService(viper.GetString("gitPath"))
-	repoPath, _ := g.GitRepoPath()
-
-	viper.SetConfigName("semver.config")
-	viper.SetConfigType("json")
-	viper.AddConfigPath(repoPath)
-	err := viper.ReadInConfig()
-	if err != nil {
-		log.Println("there is no semver.config file: ", err)
-	}
-
 	cmd.Execute()
 }

version.go

@@ -35,22 +35,30 @@ func (v *version) Get(vt string) (string, error) {
 
 	numbers := strings.Split(v.current, ".")
 
+	for i, n := range numbers {
+		numbers[i] = strings.TrimSuffix(n, "\n")
+	}
+
+	var err error
 	switch versionType {
 	case MAJOR:
-		major, _ := strconv.Atoi(numbers[0])
+		major, e := strconv.Atoi(numbers[0])
+		err = e
 		numbers[0] = strconv.Itoa(major + 1)
 		numbers[1] = "0"
 		numbers[2] = "0"
 	case MINOR:
-		minor, _ := strconv.Atoi(numbers[1])
+		minor, e := strconv.Atoi(numbers[1])
+		err = e
 		numbers[1] = strconv.Itoa(minor + 1)
 		numbers[2] = "0"
 	case PATCH:
-		patch, _ := strconv.Atoi(numbers[2])
+		patch, e := strconv.Atoi(numbers[2])
+		err = e
 		numbers[2] = strconv.Itoa(patch + 1)
 	}
 
-	return strings.Join(numbers, "."), nil
+	return strings.Join(numbers, "."), err
 }
 
 func (v *version) SetNext(vt string) (string, error) {