support disconnected bump of version as output (#7)

support disconnected bump of version as output

Author: sstarcher

cmd/root.go

@@ -8,13 +8,15 @@ import (
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"github.com/sstarcher/helm-release/git"
 	"github.com/sstarcher/helm-release/helm"
 )
 
 var cfgFile string
 var tag string
 var tagPath string
 var printComputedVersion bool
+var bump string
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
@@ -29,18 +31,28 @@ var rootCmd = &cobra.Command{
 			dir = args[0]
 		}
 
-		chart, err := helm.New(dir)
+		git, err := git.New(dir)
 		if err != nil {
 			return err
 		}
 
-		version, err := chart.Version()
+		if printComputedVersion {
+			version, err := git.BumpVersion(bump)
+			if err != nil {
+				return err
+			}
+
+			_, err = os.Stdout.WriteString(*version)
+			return err
+		}
+
+		chart, err := helm.New(dir)
 		if err != nil {
 			return err
 		}
 
-		if printComputedVersion {
-			_, err = os.Stdout.WriteString(*version)
+		version, err := git.NextVersion()
+		if err != nil {
 			return err
 		}
 
@@ -81,6 +93,7 @@ func init() {
 	rootCmd.Flags().StringVarP(&tag, "tag", "t", "", "Sets the docker image tag in values.yaml")
 	rootCmd.Flags().StringVar(&tagPath, "path", helm.DefaultTagPath, "Sets the path to the image tag to modify in values.yaml")
 	rootCmd.Flags().BoolVar(&printComputedVersion, "print-computed-version", false, "Print the computed version string to stdout")
+	rootCmd.Flags().StringVar(&bump, "bump", "", "Specifies to bump major, minor, or patch when using print-computed-version")
 }
 
 // initConfig reads in config file and ENV variables if set.

git/git.go

@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/Masterminds/semver"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -19,6 +20,8 @@ type Gitter interface {
 	Sha() (sha string, err error)
 	Branch() (string, error)
 	IsTagged() bool
+	NextVersion() (*string, error)
+	BumpVersion(string) (*string, error)
 }
 
 type git struct {
@@ -38,9 +41,8 @@ func New(directory string) (Gitter, error) {
 
 // ~r4.8-40-g56a99c2~
 func (g *git) Tag() (tag string, err error) {
-	tag = os.Getenv("LAST_TAG")
-
-	if tag != "" {
+	tag, exists := os.LookupEnv("LAST_TAG")
+	if exists {
 		return
 	}
 
@@ -162,6 +164,101 @@ func (g *git) Branch() (string, error) {
 	return strings.ToLower(branch), err
 }
 
+func (g *git) gitSemVersion() (*semver.Version, error) {
+	tag, err := g.Tag()
+	if err != nil || tag == "" {
+		tag = "0.0.1"
+		log.Infof("unable to find any git tags using %s", tag)
+	}
+
+	tag = strings.TrimPrefix(tag, "v")
+	tag = strings.TrimPrefix(tag, "r")
+	ver, err := semver.NewVersion(tag)
+	if err != nil {
+		return nil, fmt.Errorf("%s %s", tag, err)
+	}
+	return ver, nil
+}
+
+func (g *git) BumpVersion(bump string) (*string, error) {
+	ver, err := g.gitSemVersion()
+	if err != nil {
+		return nil, err
+	}
+
+	version := *ver
+	if bump == "major" {
+		version = version.IncMajor()
+	} else if bump == "minor" {
+		version = version.IncMinor()
+	} else {
+		version = version.IncPatch()
+	}
+
+	verStr := version.String()
+	return &verStr, err
+}
+
+// NextVersion determines the correct version
+func (g *git) NextVersion() (*string, error) {
+	commits, err := g.Commits()
+	if err != nil {
+		return nil, err
+	}
+
+	sha, err := g.Sha()
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch git sha %s", err)
+	}
+
+	branch, err := g.Branch()
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch git branch %s", err)
+	}
+
+	ver, err := g.gitSemVersion()
+	if err != nil {
+		return nil, err
+	}
+
+	version := *ver
+	prerel := ""
+	tagged := g.IsTagged()
+	if !tagged {
+		if branch == "head" && commits == 0 {
+			return nil, errors.New("this is likely an light-weight git tag. please use a annotated tag for helm release to function properly")
+		}
+		version = version.IncPatch()
+		if branch != "master" {
+			prerel = "0." + branch
+		}
+	}
+
+	if branch == "master" {
+		if commits != 0 {
+			if prerel != "" {
+				prerel += "."
+			}
+			prerel += strconv.Itoa(commits)
+		}
+	}
+
+	if prerel != "" {
+		version, err = version.SetPrerelease(prerel)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	version, err = version.SetMetadata(sha)
+	if err != nil {
+		return nil, err
+	}
+
+	verStr := version.String()
+	return &verStr, err
+}
+
 func validate(dir string) error {
 	cmd := exec.Command("git", "rev-parse", "--git-dir")
 	cmd.Dir = dir

helm/helm.go

@@ -7,14 +7,9 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"strconv"
 	"strings"
 
 	"gopkg.in/yaml.v2"
-
-	"github.com/Masterminds/semver"
-	log "github.com/sirupsen/logrus"
-	"github.com/sstarcher/helm-release/git"
 )
 
 // DefaultTagPath is the default path to the image tag in a helm values.yaml
@@ -25,7 +20,6 @@ type Chart struct {
 	Name    string
 	path    string
 	TagPath string
-	git     git.Gitter
 }
 
 // New finds the helm chart in the directory and returns a Chart object
@@ -44,11 +38,6 @@ func New(dir string) (*Chart, error) {
 	chart := charts[0]
 	chart.TagPath = "image.tag"
 
-	var err error
-	chart.git, err = git.New(chart.path)
-	if err != nil {
-		return nil, err
-	}
 	return &chart, nil
 }
 
@@ -68,82 +57,6 @@ func findCharts(dir string) []Chart {
 	return charts
 }
 
-func (c *Chart) gitSemVersion() (*semver.Version, error) {
-	tag, err := c.git.Tag()
-	if err != nil {
-		tag = "0.0.1"
-		log.Infof("unable to find any git tags using %s", tag)
-	}
-
-	tag = strings.TrimPrefix(tag, "v")
-	tag = strings.TrimPrefix(tag, "r")
-	ver, err := semver.NewVersion(tag)
-	if err != nil {
-		return nil, fmt.Errorf("%s %s", tag, err)
-	}
-	return ver, nil
-}
-
-// Version determines the correct version for the chart
-func (c *Chart) Version() (*string, error) {
-	commits, err := c.git.Commits()
-	if err != nil {
-		return nil, err
-	}
-
-	sha, err := c.git.Sha()
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch git sha %s", err)
-	}
-
-	branch, err := c.git.Branch()
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch git branch %s", err)
-	}
-
-	ver, err := c.gitSemVersion()
-	if err != nil {
-		return nil, err
-	}
-
-	version := *ver
-	prerel := ""
-	tagged := c.git.IsTagged()
-	if !tagged {
-		if branch == "head" && commits == 0 {
-			return nil, errors.New("this is likely an light-weight git tag. please use a annotated tag for helm release to function properly")
-		}
-		version = version.IncPatch()
-		if branch != "master" {
-			prerel = "0." + branch
-		}
-	}
-
-	if branch == "master" {
-		if commits != 0 {
-			if prerel != "" {
-				prerel += "."
-			}
-			prerel += strconv.Itoa(commits)
-		}
-	}
-
-	if prerel != "" {
-		version, err = version.SetPrerelease(prerel)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	version, err = version.SetMetadata(sha)
-	if err != nil {
-		return nil, err
-	}
-
-	verStr := version.String()
-	return &verStr, err
-}
-
 // UpdateChartVersion updates the version of the helm chart
 func (c *Chart) UpdateChartVersion(chartVersion string) error {
 	var config map[interface{}]interface{}

helm/helm_test.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 	"testing"
 
+	"github.com/sstarcher/helm-release/git"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -52,18 +53,6 @@ func TestUpdateImageInvalidPath(t *testing.T) {
 	assert.NotNil(err)
 }
 
-func TestVersion(t *testing.T) {
-	assert := assert.New(t)
-
-	chart, err := New(noTags)
-	assert.Nil(err)
-	assert.NotNil(chart)
-
-	version, err := chart.Version()
-	assert.Nil(err)
-	assert.NotNil(version)
-}
-
 var versionTests = []struct {
 	branch   string
 	tag      string
@@ -95,7 +84,10 @@ func TestVersions(t *testing.T) {
 		os.Setenv("COMMITS", tt.commits)
 		os.Setenv("IS_TAGGED", strconv.FormatBool(tt.tagged))
 
-		actual, err := chart.Version()
+		git, err := git.New(".")
+		assert.Nil(err)
+
+		actual, err := git.NextVersion()
 		assert.Nil(err)
 		if actual != nil {
 			assert.Equal(tt.expected, *actual)

plugin.yaml

@@ -1,5 +1,5 @@
 name: "release"
-version: "0.1.11"
+version: "0.2.1"
 usage: "Determines the charts next release number"
 description: |-
   This plugin will use environment variables and git history to divine the next chart version.