Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix version diff word detection #2124

Merged
merged 3 commits into from
Apr 27, 2023
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/query/version_diff.go
Original file line number Diff line number Diff line change
@@ -17,6 +17,12 @@ func GetVersionDiff(oldVersion, newVersion string) (left, right string) {
diffPosition := 0

checkWords := func(str string, index int, words ...string) bool {
// Make sure the word is not part of a longer word
ongoingWord := unicode.IsLetter(rune(str[index]))
if ongoingWord {
return false
}

for _, word := range words {
wordLength := len(word)

62 changes: 62 additions & 0 deletions pkg/query/version_diff_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package query

import (
"testing"

"github.com/Jguer/yay/v12/pkg/text"
)

func TestVersionDiff(t *testing.T) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you have to force text.Color = true and then unset it at the end of the test to stop the automatic tty detection from turning off colors.

One of the unfortunate places where we haven't gotten rid of globals

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the change.

testCases := []struct {
name string
a string
b string
wantDiff string
}{
{
name: "1.0.0-1 -> 1.0.0-2",
a: "1.0.0-1",
b: "1.0.0-2",
wantDiff: "1.0.0-" + text.Red("1") + " " + "1.0.0-" + text.Green("2"),
},
{
name: "1.0.0-1 -> 1.0.1-1",
a: "1.0.0-1",
b: "1.0.1-1",
wantDiff: "1.0." + text.Red("0-1") + " " + "1.0." + text.Green("1-1"),
},
{
name: "3.0.0~alpha7-3 -> 3.0.0~alpha7-4",
a: "3.0.0~alpha7-3",
b: "3.0.0~alpha7-4",
wantDiff: "3.0.0~alpha7-" + text.Red("3") + " " + "3.0.0~alpha7-" + text.Green("4"),
},
{
name: "3.0.0~beta7-3 -> 3.0.0~beta8-3",
a: "3.0.0~beta7-3",
b: "3.0.0~beta8-3",
wantDiff: "3.0.0~" + text.Red("beta7-3") + " " + "3.0.0~" + text.Green("beta8-3"),
},
{
name: "23.04.r131.b1bfe05-1 -> 23.04.r131.b1bfe07-1",
a: "23.04.r131.b1bfe05-1",
b: "23.04.r131.b1bfe07-1",
wantDiff: "23.04.r131." + text.Red("b1bfe05-1") + " " + "23.04.r131." + text.Green("b1bfe07-1"),
},
{
name: "1.0.arch0-1 -> 1.0.arch1-2",
a: "1.0.arch0-1",
b: "1.0.arch1-2",
wantDiff: "1.0." + text.Red("arch0-1") + " " + "1.0." + text.Green("arch1-2"),
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
left, right := GetVersionDiff(tc.a, tc.b)
gotDiff := left + " " + right
if gotDiff != tc.wantDiff {
t.Errorf("VersionDiff(%s, %s) = %s, want %s", tc.a, tc.b, gotDiff, tc.wantDiff)
}
})
}
}