Merge pull request #7 from rimi-itk/hotfix/changelog-release

Fixed URL parsing

Author: rimi-itk

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* [PR-7](https://github.com/rimi-itk/gh-itkdev/pull/7)
+  Fixed URL parsing
+
 ## [v0.0.1] - 2024-04-03
 
 * [PR-6](https://github.com/rimi-itk/gh-itkdev/pull/6)

changelog/release.go

@@ -27,7 +27,8 @@ func createReleaseBranch(release string, base string) (string, error) {
 func updateReleaseChangelog(changelog string, release string) (string, error) {
 	headerPattern := regexp.MustCompile(`(?i)^\#+ +\[unreleased\]`)
 	unreleasedHeaderIndex := -1
-	linkUnreleasedPattern := regexp.MustCompile(`(?i)^\[unreleased\]: (.+)`)
+	// Match a URL on the form scheme://domain/user/repo
+	linkUnreleasedPattern := regexp.MustCompile(`(?i)^\[unreleased\]: (?P<url>[a-z]+?://[^/]+/(?P<user>[^/]+)/(?P<repo>[^/]+))`)
 	linkUnreleasedIndex := -1
 
 	var lines []string
@@ -62,7 +63,9 @@ func updateReleaseChangelog(changelog string, release string) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("invalid url: %s", match[1])
 	}
-	url.Path = fmt.Sprintf("compare/%s...HEAD", release)
+
+	path := url.Path
+	url.Path = fmt.Sprintf("%s/compare/%s...HEAD", path, release)
 	unreleasedLink := fmt.Sprintf("[Unreleased]: %s", url)
 
 	if insertIndex < len(lines) {
@@ -75,9 +78,9 @@ func updateReleaseChangelog(changelog string, release string) (string, error) {
 		} else {
 			log.Fatalf("cannot find previous version from %q", line)
 		}
-		url.Path = fmt.Sprintf("compare/%s...%s", previousRelease, release)
+		url.Path = fmt.Sprintf("%s/compare/%s...%s", path, previousRelease, release)
 	} else {
-		url.Path = fmt.Sprintf("releases/tag/%s", release)
+		url.Path = fmt.Sprintf("%s/releases/tag/%s", path, release)
 	}
 
 	releaseLink := fmt.Sprintf("[%s]: %s", release, url)

changelog/release_test.go

@@ -13,86 +13,112 @@ func TestRelease(t *testing.T) {
 		changelog string
 		release   string
 		expected  string
+		errorText string
 	}{
 		{
 			`## [Unreleased]
 
-[Unreleased]: https://example.com/
+[Unreleased]: https://git.example.com
 `,
 			"v0.0.0",
 			`## [Unreleased]
 
 ## [v0.0.0] - %TODAY%
 
-[Unreleased]: https://example.com/compare/v0.0.0...HEAD
-[v0.0.0]: https://example.com/releases/tag/v0.0.0
+[Unreleased]: https://git.example.com/compare/v0.0.0...HEAD
+[v0.0.0]: https://git.example.com/releases/tag/v0.0.0
 `,
+			"cannot find \"Unreleased\" link",
 		},
 
 		{
 			`## [Unreleased]
 
-* [PR-42](https://example.com/pr/42)
+[Unreleased]: https://git.example.com/user/repo/
+`,
+			"v0.0.0",
+			`## [Unreleased]
+
+## [v0.0.0] - %TODAY%
+
+[Unreleased]: https://git.example.com/user/repo/compare/v0.0.0...HEAD
+[v0.0.0]: https://git.example.com/user/repo/releases/tag/v0.0.0
+`,
+			"",
+		},
+
+		{
+			`## [Unreleased]
+
+* [PR-42](https://git.example.com/user/repo/pr/42)
   Added the meaning
 
 ## [v0.0.0] - 2001-01-01
 
-[Unreleased]: https://example.com/compare/v0.0.0...HEAD
-[v0.0.0]: https://example.com/releases/tag/v0.0.0
+[Unreleased]: https://git.example.com/user/repo/compare/v0.0.0...HEAD
+[v0.0.0]: https://git.example.com/user/repo/releases/tag/v0.0.0
 `,
 			"v0.1.0",
 			`## [Unreleased]
 
 ## [v0.1.0] - %TODAY%
 
-* [PR-42](https://example.com/pr/42)
+* [PR-42](https://git.example.com/user/repo/pr/42)
   Added the meaning
 
 ## [v0.0.0] - 2001-01-01
 
-[Unreleased]: https://example.com/compare/v0.1.0...HEAD
-[v0.1.0]: https://example.com/compare/v0.0.0...v0.1.0
-[v0.0.0]: https://example.com/releases/tag/v0.0.0
+[Unreleased]: https://git.example.com/user/repo/compare/v0.1.0...HEAD
+[v0.1.0]: https://git.example.com/user/repo/compare/v0.0.0...v0.1.0
+[v0.0.0]: https://git.example.com/user/repo/releases/tag/v0.0.0
 `,
+			"",
 		},
 
 		{
 			`## [Unreleased]
 
-* [PR-42](https://example.com/pr/42)
+* [PR-42](https://git.example.com/user/repo/pr/42)
   Added the meaning
 
 ## [v0.1.0] - 2002-01-01
 
 ## [v0.0.0] - 2001-01-01
 
-[Unreleased]: https://example.com/compare/v0.1.0...HEAD
-[v0.1.0]: https://example.com/compare/v0.0.0...v0.1.0
-[v0.0.0]: https://example.com/releases/tag/v0.0.0
+[Unreleased]: https://git.example.com/user/repo/compare/v0.1.0...HEAD
+[v0.1.0]: https://git.example.com/user/repo/compare/v0.0.0...v0.1.0
+[v0.0.0]: https://git.example.com/user/repo/releases/tag/v0.0.0
 `,
 			"v0.1.1",
 			`## [Unreleased]
 
 ## [v0.1.1] - %TODAY%
 
-* [PR-42](https://example.com/pr/42)
+* [PR-42](https://git.example.com/user/repo/pr/42)
   Added the meaning
 
 ## [v0.1.0] - 2002-01-01
 
 ## [v0.0.0] - 2001-01-01
 
-[Unreleased]: https://example.com/compare/v0.1.1...HEAD
-[v0.1.1]: https://example.com/compare/v0.1.0...v0.1.1
-[v0.1.0]: https://example.com/compare/v0.0.0...v0.1.0
-[v0.0.0]: https://example.com/releases/tag/v0.0.0
+[Unreleased]: https://git.example.com/user/repo/compare/v0.1.1...HEAD
+[v0.1.1]: https://git.example.com/user/repo/compare/v0.1.0...v0.1.1
+[v0.1.0]: https://git.example.com/user/repo/compare/v0.0.0...v0.1.0
+[v0.0.0]: https://git.example.com/user/repo/releases/tag/v0.0.0
 `,
+			"",
 		},
 	}
 
 	for _, testCase := range testCases {
-		actual, _ := updateReleaseChangelog(testCase.changelog, testCase.release)
-
-		assert.Equal(t, strings.ReplaceAll(testCase.expected, "%TODAY%", time.Now().Format("2006-01-02")), actual)
+		actual, err := updateReleaseChangelog(testCase.changelog, testCase.release)
+
+		if testCase.errorText != "" {
+			assert.NotNil(t, err)
+			assert.EqualError(t, err, testCase.errorText)
+		} else {
+			assert.Nil(t, err)
+			assert.Equal(t, strings.ReplaceAll(testCase.expected, "%TODAY%", time.Now().Format("2006-01-02")), actual)
+		}
 	}
 }