Update .gitignore to exclude log files and remove job_logs.txt

version bump

.github/workflows/galaxy.yml

@@ -1,7 +1,6 @@
----
 name: Build and Publish Collection to Ansible Galaxy
 
-'on':
+on:
   release:
     types: [published]
   workflow_dispatch:
@@ -14,18 +13,46 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout git repo
+      - name: Checkout repo
         uses: actions/checkout@v5
         with:
           path: collections/ansible_collections/kewlfft/aur
 
-      - name: Ensure that `version:` in `galaxy.yml` matches `GITHUB_REF`
-        id: version
-        run: |
-          [ "$(cat galaxy.yml | grep version: | awk '{print $2}')" = $(awk -F '/' '{print substr($3, 2)}' <<< ${GITHUB_REF}) ] || exit 1
-          echo "version=$(awk -F '/' '{print substr($3, 2)}' <<< ${GITHUB_REF})" >> $GITHUB_OUTPUT
+      - name: Debug workflow version
+        run: echo "=== RUNNING UPDATED WORKFLOW ==="
 
-      - name: Deploy collection
+      - name: Verify version in galaxy.yml matches release tag
         run: |
-          ansible-galaxy collection build
-          ansible-galaxy collection publish --api-key ${{ secrets.GALAXY_API_KEY }} "./kewlfft-aur-${{ steps.version.outputs.version }}.tar.gz"
+          tag_version="${GITHUB_REF##*/}"   # e.g., v0.12.2
+          tag_version="${tag_version#v}"    # strip leading 'v' if present
+          file_version=$(awk '/^version:/ {print $2}' galaxy.yml)
+
+          if [ "${GITHUB_EVENT_NAME}" != "workflow_dispatch" ] && [ "$file_version" != "$tag_version" ]; then
+              echo "❌ galaxy.yml version ($file_version) does not match tag ($tag_version)"
+              exit 1
+          fi
+          echo "✅ Version check passed: $file_version"
+
+      - name: Build collection
+        run: |
+          path=$(ansible-galaxy collection build | awk '/Created collection/ {print $NF}')
+          echo "TARBALL=$path" >> $GITHUB_ENV
+          echo "📦 Built collection at $path"
+
+      - name: Upload built collection artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ansible-collection-tarball
+          path: ${{ env.TARBALL }}
+
+      - name: Debug tarball before publish
+        run: |
+          echo "🔎 Checking tarball path..."
+          echo "TARBALL=$TARBALL"
+          ls -l "$(dirname "$TARBALL")"
+
+      - name: Publish collection
+        run: |
+          echo "📤 Publishing $TARBALL ..."
+          ansible-galaxy collection publish "$TARBALL" \
+            --api-key "${{ secrets.ANSIBLE_GALAXY_API_KEY }}"

.gitignore

@@ -1,2 +1,4 @@
 kewlfft-aur-*.tar.gz
 *.swp
+*.log
+job_logs.txt

galaxy.yml

@@ -8,7 +8,7 @@ namespace: kewlfft
 name: aur
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 0.12.1
+version: 0.13.1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

plugins/modules/aur.py

@@ -155,7 +155,9 @@ def check_packages(module, packages):
     """
     Inform the user what would change if the module were run
     """
-    would_be_changed = [package for package in packages if not package_installed(module, package)]
+    rc, stdout, stderr = module.run_command(['pacman', '-T'] + packages, check_rc=False)
+    missing = set(stdout.splitlines())
+    would_be_changed = [package for package in packages if package in missing]
     diff = {'before': '', 'after': '\n'.join(package for package in would_be_changed if module._diff)}
 
     if would_be_changed:
@@ -166,10 +168,7 @@ def check_packages(module, packages):
             message = 'package would be installed'
     else:
         status = False
-        if len(packages) > 1:
-            message = 'all packages are already installed'
-        else:
-            message = 'package is already installed'
+        message = 'all packages are already installed' if len(packages) > 1 else 'package is already installed'
     module.exit_json(changed=status, msg=message, diff=diff)
 
 
@@ -177,7 +176,9 @@ def check_packages_absent(module, packages):
     """
     Inform the user what would change if the module were run with state=absent
     """
-    would_be_changed = [package for package in packages if package_installed(module, package)]
+    rc, stdout, stderr = module.run_command(['pacman', '-T'] + packages, check_rc=False)
+    missing = set(stdout.splitlines())
+    would_be_changed = [package for package in packages if package not in missing]
     diff = {'before': '\n'.join(pkg for pkg in would_be_changed if module._diff), 'after': ''}
 
     if would_be_changed:
@@ -188,10 +189,7 @@ def check_packages_absent(module, packages):
             message = 'package would be removed'
     else:
         status = False
-        if len(packages) > 1:
-            message = 'all packages are already absent'
-        else:
-            message = 'package is already absent'
+        message = 'all packages are already absent' if len(packages) > 1 else 'package is already absent'
     module.exit_json(changed=status, msg=message, diff=diff)
 
 
@@ -298,6 +296,9 @@ def install_packages(module, packages, use, extra_args, state, skip_pgp_check, i
     installed_pkgs = []
     updated_pkgs = []
 
+    if use != 'makepkg' and not local_pkgbuild:
+        base_command = build_command_prefix(use, extra_args, aur_only=aur_only, update_cache=update_cache)
+
     for package in packages:
         was_installed = package_installed(module, package)
         if state == 'present' and was_installed:
@@ -308,8 +309,7 @@ def install_packages(module, packages, use, extra_args, state, skip_pgp_check, i
         elif local_pkgbuild:
             rc, out, err = install_local_package(module, package, use, extra_args, local_pkgbuild)
         else:
-            command = build_command_prefix(use, extra_args, aur_only=aur_only, update_cache=update_cache)
-            command.append(package)
+            command = base_command + [package]
             rc, out, err = module.run_command(command, check_rc=True)
 
         changed_pkg = not (out == '' or 'up-to-date -- skipping' in out or 'nothing to do' in out.lower())
@@ -350,14 +350,15 @@ def remove_packages(module, packages, use, extra_args):
     rc = 0
     used_helper = use
 
+    base_cmd, helper = base_remove_cmd(use)
+    used_helper = helper
+    if extra_args:
+        base_cmd += shlex.split(extra_args)
+
     for package in packages:
         if not package_installed(module, package):
             continue
-        command, helper = base_remove_cmd(use)
-        used_helper = helper
-        if extra_args:
-            command += shlex.split(extra_args)
-        command.append(package)
+        command = base_cmd + [package]
         rc, out, err = module.run_command(command, check_rc=True)
         changed_iter |= (rc == 0)