1.0.1

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
+## [1.0.1] - 2021-07-27
+### Fixed
+- Files in nested directories are unreachable
+
+### Changed
+- Support whitespaces in Docker label definition
+
 ## [1.0.0] - 2021-07-27
 _First release_
 
+[0.1.1]: https://github.com/anton-yurchenko/version-bump/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/anton-yurchenko/version-bump/releases/tag/v1.0.0

bump/bump.go

@@ -2,6 +2,7 @@ package bump
 
 import (
 	"fmt"
+	"path"
 	"regexp"
 	"strings"
 
@@ -197,6 +198,7 @@ func (b *Bump) bumpComponent(name string, l Language, action int, versions map[s
 		}
 
 		modifiedFiles, err := b.incrementVersion(
+			dir,
 			filterFiles(langSettings.Files, f),
 			*langSettings,
 			action,
@@ -213,12 +215,13 @@ func (b *Bump) bumpComponent(name string, l Language, action int, versions map[s
 	return files, nil
 }
 
-func (b *Bump) incrementVersion(files []string, lang langs.Language, action int, versions map[string]int, version *string) ([]string, error) {
+func (b *Bump) incrementVersion(dir string, files []string, lang langs.Language, action int, versions map[string]int, version *string) ([]string, error) {
 	var identified bool
 	modifiedFiles := make([]string, 0)
 
 	for _, file := range files {
-		fileContent, err := readFile(b.FS, file)
+		filepath := path.Join(dir, file)
+		fileContent, err := readFile(b.FS, filepath)
 		if err != nil {
 			return []string{}, errors.Wrapf(err, "error reading a file %v", file)
 		}
@@ -233,7 +236,7 @@ func (b *Bump) incrementVersion(files []string, lang langs.Language, action int,
 					if regex.MatchString(line) {
 						oldVersion, err = semver.StrictNewVersion(regex.ReplaceAllString(line, "${1}"))
 						if err != nil {
-							return []string{}, errors.Wrapf(err, "error parsing semantic version at file %v", file)
+							return []string{}, errors.Wrapf(err, "error parsing semantic version at file %v", filepath)
 						}
 						break outer
 					}
@@ -245,7 +248,7 @@ func (b *Bump) incrementVersion(files []string, lang langs.Language, action int,
 			for _, field := range *lang.JSONFields {
 				oldVersion, err = semver.StrictNewVersion(gjson.Get(strings.Join(fileContent, ""), field).String())
 				if err != nil {
-					return []string{}, errors.Wrapf(err, "error parsing semantic version at file %v", file)
+					return []string{}, errors.Wrapf(err, "error parsing semantic version at file %v", filepath)
 				}
 				break
 			}
@@ -263,7 +266,7 @@ func (b *Bump) incrementVersion(files []string, lang langs.Language, action int,
 				newVersion = oldVersion.IncPatch()
 			}
 
-			console.VersionUpdate(oldVersion.String(), newVersion.String(), file)
+			console.VersionUpdate(oldVersion.String(), newVersion.String(), filepath)
 			*version = newVersion.String()
 			identified = true
 			versions[oldVersion.String()]++
@@ -289,11 +292,11 @@ func (b *Bump) incrementVersion(files []string, lang langs.Language, action int,
 				}
 
 				newContent = append(newContent, "")
-				if err := writeFile(b.FS, file, strings.Join(newContent, "\n")); err != nil {
-					return []string{}, errors.Wrapf(err, "error writing to file %v", file)
+				if err := writeFile(b.FS, filepath, strings.Join(newContent, "\n")); err != nil {
+					return []string{}, errors.Wrapf(err, "error writing to file %v", filepath)
 				}
 
-				modifiedFiles = append(modifiedFiles, file)
+				modifiedFiles = append(modifiedFiles, filepath)
 			}
 
 			if lang.JSONFields != nil {
@@ -304,11 +307,11 @@ func (b *Bump) incrementVersion(files []string, lang langs.Language, action int,
 							return []string{}, errors.Wrapf(err, "error setting new version on content of a file %v", file)
 						}
 
-						if err := writeFile(b.FS, file, newContent); err != nil {
-							return []string{}, errors.Wrapf(err, "error writing to file %v", file)
+						if err := writeFile(b.FS, filepath, newContent); err != nil {
+							return []string{}, errors.Wrapf(err, "error writing to file %v", filepath)
 						}
 
-						modifiedFiles = append(modifiedFiles, file)
+						modifiedFiles = append(modifiedFiles, filepath)
 					}
 				}
 			}

bump/bump_test.go

@@ -360,7 +360,7 @@ func main() {
 import "fmt"
 
 const (
-	Version                                          string = "1.2.3"
+	Version                                          string = "1.2.4"
 	SomeVeryLongVariableNameThatAddsALotOfWhitespace string = "abc"
 )
 

bump/modal.go

@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	Version string = "1.0.0"
+	Version string = "1.0.1"
 	Patch   int    = 3
 	Minor   int    = 2
 	Major   int    = 1

langs/docker.go

@@ -7,5 +7,5 @@ import (
 )
 
 var dockerRegex = []string{
-	fmt.Sprintf("^LABEL \"[vV]ersion\"=\"[vV]?(?P<version>%v)\"", changelog.SemVerRegex),
+	fmt.Sprintf("^LABEL\\s+\"[vV]ersion\"\\s*=\\s*\"[vV]?(?P<version>%v)\"", changelog.SemVerRegex),
 }

langs/langs_test.go

@@ -13,7 +13,7 @@ func TestNew(t *testing.T) {
 	a := assert.New(t)
 
 	var dockerRegex = []string{
-		fmt.Sprintf("^LABEL \"[vV]ersion\"=\"[vV]?(?P<version>%v)\"", changelog.SemVerRegex),
+		fmt.Sprintf("^LABEL\\s+\"[vV]ersion\"\\s*=\\s*\"[vV]?(?P<version>%v)\"", changelog.SemVerRegex),
 	}
 
 	var golangRegex = []string{