helpers: Add patch version

Fixes #2832

diff --git a/helpers/hugo.go b/helpers/hugo.go
index 0a6fdebc774207bfcb3d764805b1592c70dee755..25abd2bce150b923cfe30619f8c4c330e19c45bb 100644 (file)
--- a/helpers/hugo.go
+++ b/helpers/hugo.go
@@ -19,7 +19,13 @@ import (
 
 // HugoVersionNumber represents the current build version.
 // This should be the only one
-const HugoVersionNumber = 0.19
+const (
+       // Major and minor version.
+       HugoVersionNumber = 0.19
+
+       // Increment this for bug releases
+       HugoPatchVersion = 0
+)
 
 // HugoVersionSuffix is the suffix used in the Hugo version string.
 // It will be blank for release versions.
@@ -29,23 +35,29 @@ const HugoVersionSuffix = "-DEV" // use this when not doing a release
 // HugoVersion returns the current Hugo version. It will include
 // a suffix, typically '-DEV', if it's development version.
 func HugoVersion() string {
-       return hugoVersion(HugoVersionNumber, HugoVersionSuffix)
+       return hugoVersion(HugoVersionNumber, HugoPatchVersion, HugoVersionSuffix)
 }
 
 // HugoReleaseVersion is same as HugoVersion, but no suffix.
 func HugoReleaseVersion() string {
-       return hugoVersionNoSuffix(HugoVersionNumber)
+       return hugoVersionNoSuffix(HugoVersionNumber, HugoPatchVersion)
 }
 
 // NextHugoReleaseVersion returns the next Hugo release version.
 func NextHugoReleaseVersion() string {
-       return hugoVersionNoSuffix(HugoVersionNumber + 0.01)
+       return hugoVersionNoSuffix(HugoVersionNumber+0.01, 0)
 }
 
-func hugoVersion(version float32, suffix string) string {
+func hugoVersion(version float32, patchVersion int, suffix string) string {
+       if patchVersion > 0 {
+               return fmt.Sprintf("%.2g.%d%s", version, patchVersion, suffix)
+       }
        return fmt.Sprintf("%.2g%s", version, suffix)
 }
 
-func hugoVersionNoSuffix(version float32) string {
+func hugoVersionNoSuffix(version float32, patchVersion int) string {
+       if patchVersion > 0 {
+               return fmt.Sprintf("%.2g.%d", version, patchVersion)
+       }
        return fmt.Sprintf("%.2g", version)
 }

diff --git a/helpers/hugo_test.go b/helpers/hugo_test.go
index a0012acdffc24ebc51e3ab5915de5360e4df6245..8dfa7f4348cc33074e1f10bd2c9108e7f0563402 100644 (file)
--- a/helpers/hugo_test.go
+++ b/helpers/hugo_test.go
@@ -14,11 +14,15 @@
 package helpers
 
 import (
-       "github.com/stretchr/testify/assert"
        "testing"
+
+       "github.com/stretchr/testify/assert"
 )
 
 func TestHugoVersion(t *testing.T) {
-       assert.Equal(t, "0.15-DEV", hugoVersion(0.15, "-DEV"))
-       assert.Equal(t, "0.17", hugoVersionNoSuffix(0.16+0.01))
+       assert.Equal(t, "0.15-DEV", hugoVersion(0.15, 0, "-DEV"))
+       assert.Equal(t, "0.17", hugoVersionNoSuffix(0.16+0.01, 0))
+
+       assert.Equal(t, "0.15.2-DEV", hugoVersion(0.15, 2, "-DEV"))
+       assert.Equal(t, "0.17.3", hugoVersionNoSuffix(0.16+0.01, 3))
 }