fix(catalog): improve version detection and install methods

CybotTM · CybotTM · commit fd095ba2e3c2 · 2025-12-20T14:17:12.000+01:00
- ansible-core: add binary_name for version detection
- git: add PPA for latest versions
- git-filter-repo: add version_command (--version outputs git hash)
- glab: change github_repo to gitlab_project
- node: add version_command for nvm default
- python: add version_command for uv-managed Python
- pnpm: add available_methods for reconcile system
- pip/pipx/poetry/yarn: minor fixes
diff --git a/catalog/ansible-core.json b/catalog/ansible-core.json
@@ -1,6 +1,6 @@
 {
   "name": "ansible-core",
-  "install_method": "pipx",
+  "install_method": "uv_tool",
   "description": "Ansible core automation engine",
   "homepage": "https://ansible.com",
   "github_repo": "ansible/ansible",
diff --git a/catalog/docker.json b/catalog/docker.json
@@ -10,6 +10,5 @@
     "display_name": "Docker CLI",
     "install_action": "install",
     "order": 200
-  },
-  "pinned_version": "29.0.0"
+  }
 }
diff --git a/catalog/git-filter-repo.json b/catalog/git-filter-repo.json
@@ -3,5 +3,7 @@
   "install_method": "uv_tool",
   "description": "Versatile tool for rewriting git history (replacement for git filter-branch)",
   "homepage": "https://github.com/newren/git-filter-repo",
-  "package_name": "git-filter-repo"
+  "package_name": "git-filter-repo",
+  "binary_name": "git-filter-repo",
+  "version_command": "uv tool list 2>/dev/null | grep '^git-filter-repo ' | sed 's/git-filter-repo //' | tr -d 'v'"
 }
diff --git a/catalog/git.json b/catalog/git.json
@@ -5,11 +5,12 @@
   "homepage": "https://git-scm.com",
   "github_repo": "git/git",
   "binary_name": "git",
+  "ppa": "git-core/ppa",
   "packages": {
     "apt": "git",
     "brew": "git",
     "dnf": "git",
     "pacman": "git"
   },
-  "notes": "For latest version on Ubuntu, use PPA: add-apt-repository ppa:git-core/ppa"
+  "notes": "Uses git-core PPA for latest version on Ubuntu/Debian"
 }
diff --git a/catalog/glab.json b/catalog/glab.json
@@ -3,7 +3,7 @@
   "install_method": "github_release_binary",
   "description": "GitLab CLI tool bringing GitLab to your command line",
   "homepage": "https://gitlab.com/gitlab-org/cli",
-  "github_repo": "gitlab-org/cli",
+  "gitlab_project": "gitlab-org/cli",
   "binary_name": "glab",
   "download_url_template": "https://gitlab.com/api/v4/projects/gitlab-org%2Fcli/packages/generic/glab/{version_nov}/glab_{version_nov}_linux_{arch}.tar.gz",
   "arch_map": {
diff --git a/catalog/node.json b/catalog/node.json
@@ -6,10 +6,10 @@
   "github_repo": "nodejs/node",
   "binary_name": "node",
   "script": "install_node.sh",
+  "version_command": ". ~/.nvm/nvm.sh 2>/dev/null && nvm version default 2>/dev/null | tr -d 'v'",
   "guide": {
     "display_name": "Node.js stack",
     "install_action": "reconcile",
     "order": 40
-  },
-  "pinned_version": "25.0.0"
+  }
 }
diff --git a/catalog/pip.json b/catalog/pip.json
@@ -11,6 +11,5 @@
     "dnf": "python3-pip",
     "pacman": "python-pip"
   },
-  "notes": "pip typically comes with Python 3. Use python3 -m pip if pip command is not available.",
-  "pinned_version": "never"
+  "notes": "pip typically comes with Python 3. Use python3 -m pip if pip command is not available."
 }
diff --git a/catalog/pipx.json b/catalog/pipx.json
@@ -10,6 +10,5 @@
     "brew": "pipx",
     "dnf": "pipx",
     "pacman": "python-pipx"
-  },
-  "pinned_version": "never"
+  }
 }
diff --git a/catalog/pnpm.json b/catalog/pnpm.json
@@ -5,11 +5,28 @@
   "homepage": "https://pnpm.io/",
   "package_name": "pnpm",
   "binary_name": "pnpm",
-  "packages": {
-    "apt": "pnpm",
-    "brew": "pnpm",
-    "dnf": "pnpm",
-    "pacman": "pnpm"
-  },
+  "available_methods": [
+    {
+      "method": "npm",
+      "priority": 1,
+      "config": {
+        "package": "pnpm"
+      }
+    },
+    {
+      "method": "apt",
+      "priority": 2,
+      "config": {
+        "package": "pnpm"
+      }
+    },
+    {
+      "method": "brew",
+      "priority": 3,
+      "config": {
+        "formula": "pnpm"
+      }
+    }
+  ],
   "notes": "Can be installed via npm (npm install -g pnpm), apt, or brew"
 }
diff --git a/catalog/poetry.json b/catalog/poetry.json
@@ -11,6 +11,5 @@
     "dnf": "poetry",
     "pacman": "python-poetry"
   },
-  "notes": "Some distributions may require installing via pipx or the official installer: curl -sSL https://install.python-poetry.org | python3 -",
-  "pinned_version": "never"
+  "notes": "Some distributions may require installing via pipx or the official installer: curl -sSL https://install.python-poetry.org | python3 -"
 }
diff --git a/catalog/python.json b/catalog/python.json
@@ -5,8 +5,9 @@
   "homepage": "https://www.python.org",
   "github_repo": "python/cpython",
   "binary_name": "python3",
-  "script": "install_python.sh"
-  ,"guide": {
+  "script": "install_python.sh",
+  "version_command": "uv python list --only-installed 2>/dev/null | grep -E '^cpython-[0-9]' | head -1 | sed 's/cpython-\\([0-9.]*\\).*/\\1/'",
+  "guide": {
     "display_name": "Python stack",
     "install_action": "update",
     "order": 30
diff --git a/catalog/yarn.json b/catalog/yarn.json
@@ -11,6 +11,5 @@
     "display_name": "Yarn",
     "install_action": "update",
     "order": 151
-  },
-  "pinned_version": "never"
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ansible-core",`
`3`		`- "install_method": "pipx",`
	`3`	`+ "install_method": "uv_tool",`
`4`	`4`	`"description": "Ansible core automation engine",`
`5`	`5`	`"homepage": "https://ansible.com",`
`6`	`6`	`"github_repo": "ansible/ansible",`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,5 @@`
`10`	`10`	`"display_name": "Docker CLI",`
`11`	`11`	`"install_action": "install",`
`12`	`12`	`"order": 200`
`13`		`- },`
`14`		`- "pinned_version": "29.0.0"`
	`13`	`+ }`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,7 @@`
`3`	`3`	`"install_method": "uv_tool",`
`4`	`4`	`"description": "Versatile tool for rewriting git history (replacement for git filter-branch)",`
`5`	`5`	`"homepage": "https://github.com/newren/git-filter-repo",`
`6`		`- "package_name": "git-filter-repo"`
	`6`	`+ "package_name": "git-filter-repo",`
	`7`	`+ "binary_name": "git-filter-repo",`
	`8`	`+ "version_command": "uv tool list 2>/dev/null \| grep '^git-filter-repo ' \| sed 's/git-filter-repo //' \| tr -d 'v'"`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,5 @@`
`11`	`11`	`"dnf": "python3-pip",`
`12`	`12`	`"pacman": "python-pip"`
`13`	`13`	`},`
`14`		`- "notes": "pip typically comes with Python 3. Use python3 -m pip if pip command is not available.",`
`15`		`- "pinned_version": "never"`
	`14`	`+ "notes": "pip typically comes with Python 3. Use python3 -m pip if pip command is not available."`
`16`	`15`	`}`