Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-04-21 13:37:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 91

Shorten Grammarly Desktop version and outputs (#43524)

Browse source 
Add a 3-part version shortener for Grammarly Desktop and register it in
the Homebrew ingester functions. Update tests to include the
grammarly-desktop case to ensure versions like "1.160.0.0" become
"1.160.0". Update the grammarly-desktop darwin output to use the
shortened version in the version field and patched query (installer_url
left pointing to the original full version). Files changed: main.go,
version_shortener.go, version_shortener_test.go, and
outputs/grammarly-desktop/darwin.json.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **New Features**
* Added Grammarly Desktop support for macOS with version normalization.

* **Tests**
* Expanded test coverage with comprehensive version shortening
scenarios.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Allen Houchins 2026-04-14 11:37:04 -05:00 committed by GitHub
parent 703e825105
commit 0dbc1c6898
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ee/maintained-apps/ingesters/homebrew/external_refs/main.go
View file

@ -38,6 +38,7 @@ var Funcs = map[string][]func(*maintained_apps.FMAManifestApp) (*maintained_apps
"sublime-merge/darwin": {SublimeVersionTransformer},
"mysqlworkbench/darwin": {MySQLWorkbenchVersionTransformer},
"lens/darwin": {LensVersionTransformer},
"grammarly-desktop/darwin": {GrammarlyDesktopVersionShortener},
}
func ChromePKGInstaller(app *maintained_apps.FMAManifestApp) (*maintained_apps.FMAManifestApp, error) {

1
ee/maintained-apps/ingesters/homebrew/external_refs/version_shortener.go
View file

@ -36,6 +36,7 @@ var (
ElgatoStreamDeckVersionShortener = makeVersionShortener(3) // "7.3.1.22604" → "7.3.1"
FileMakerProVersionShortener = makeVersionShortener(3) // "22.0.5.500" → "22.0.5"
RoyalTSXVersionShortener = makeVersionShortener(3) // "6.4.2.1000" → "6.4.2"
GrammarlyDesktopVersionShortener = makeVersionShortener(3) // "1.160.0.0" → "1.160.0"
)
// SublimeVersionTransformer prepends "Build " to match what macOS reports as

22
ee/maintained-apps/ingesters/homebrew/external_refs/version_shortener_test.go
View file

@ -41,10 +41,24 @@ func TestMakeVersionShortener(t *testing.T) {
func TestMakeVersionShortenerKeep3(t *testing.T) {
shortener := makeVersionShortener(3)
app := &maintained_apps.FMAManifestApp{Version: "25.11.1.42", Slug: "citrix-workspace"}
result, err := shortener(app)
require.NoError(t, err)
assert.Equal(t, "25.11.1", result.Version)
tcs := []struct {
name string
version string
slug string
expected string
}{
{name: "citrix workspace", version: "25.11.1.42", slug: "citrix-workspace", expected: "25.11.1"},
{name: "grammarly desktop", version: "1.160.0.0", slug: "grammarly-desktop", expected: "1.160.0"},
}
for _, tc := range tcs {
t.Run(tc.name, func(t *testing.T) {
app := &maintained_apps.FMAManifestApp{Version: tc.version, Slug: tc.slug}
result, err := shortener(app)
require.NoError(t, err)
assert.Equal(t, tc.expected, result.Version)
})
}
}
func TestSublimeVersionTransformer(t *testing.T) {

4
ee/maintained-apps/outputs/grammarly-desktop/darwin.json
View file

@ -1,10 +1,10 @@
{
"versions": [
{
"version": "1.160.0.0",
"version": "1.160.0",
"queries": {
"exists": "SELECT 1 FROM apps WHERE bundle_identifier = 'com.grammarly.ProjectLlama';",
"patched": "SELECT 1 WHERE NOT EXISTS (SELECT 1 FROM apps WHERE bundle_identifier = 'com.grammarly.ProjectLlama' AND version_compare(bundle_short_version, '1.160.0.0') < 0);"
"patched": "SELECT 1 WHERE NOT EXISTS (SELECT 1 FROM apps WHERE bundle_identifier = 'com.grammarly.ProjectLlama' AND version_compare(bundle_short_version, '1.160.0') < 0);"
},
"installer_url": "https://download-mac.grammarly.com/versions/1.160.0.0/Grammarly.dmg",
"install_script_ref": "962d8d13",