Merge pull request #104 from homebysix/dev

1.22.1 merge to main

Author: homebysix

CHANGELOG.md

@@ -12,7 +12,13 @@ All notable changes to this project will be documented in this file. This projec
 
 ## [Unreleased]
 
-Nothing yet.
+### Added
+
+- Added support for minimum AutoPkg version validation for new [VariableSetter](https://github.com/autopkg/autopkg/wiki/Processor-VariableSetter) processor.
+
+### Changed
+
+- `check-munki-pkgsinfo` now skips warning about missing packages if a `PackageCompleteURL` key is set in the pkginfo.
 
 ## [1.22.0] - 2025-11-25
 

README.md

@@ -15,7 +15,7 @@ For any hook in this repo you wish to use, add the following to your pre-commit
 
 ```yaml
 -   repo: https://github.com/homebysix/pre-commit-macadmin
-    rev: v1.22.0
+    rev: v1.22.1
     hooks:
     -   id: check-plists
     # -   id: ...
@@ -147,7 +147,7 @@ When combining arguments that take lists (for example: `--required-keys`, `--cat
 
 ```yaml
 -   repo: https://github.com/homebysix/pre-commit-macadmin
-    rev: v1.22.0
+    rev: v1.22.1
     hooks:
     -   id: check-munki-pkgsinfo
         args: ['--catalogs', 'testing', 'stable', '--']
@@ -157,7 +157,7 @@ But if you also use the `--categories` argument, you would move the trailing `--
 
 ```yaml
 -   repo: https://github.com/homebysix/pre-commit-macadmin
-    rev: v1.22.0
+    rev: v1.22.1
     hooks:
     -   id: check-munki-pkgsinfo
         args: ['--catalogs', 'testing', 'stable', '--categories', 'Design', 'Engineering', 'Web Browsers', '--']
@@ -169,7 +169,7 @@ If it looks better to your eye, feel free to use a multi-line list for long argu
 
 ```yaml
 -   repo: https://github.com/homebysix/pre-commit-macadmin
-    rev: v1.22.0
+    rev: v1.22.1
     hooks:
     -   id: check-munki-pkgsinfo
         args: [

pre_commit_macadmin_hooks/check_autopkg_recipes.py

@@ -235,6 +235,7 @@ def validate_minimumversion(process, min_vers, ignore_min_vers_before, filename)
         "URLDownloader": "0.0",
         "URLDownloaderPython": "2.4.1",
         "URLTextSearcher": "0.2.9",
+        "VariableSetter": "2.9.0",
         "Versioner": "0.1.0",
     }
 

pre_commit_macadmin_hooks/check_munki_pkgsinfo.py

@@ -176,7 +176,7 @@ def main(argv: Optional[List[str]] = None) -> int:
         # Check for rogue categories.
         if args.categories and pkginfo.get("category") not in args.categories:
             print(
-                f"{filename}: category \"{pkginfo.get('category')}\" is not in list of approved categories"
+                f'{filename}: category "{pkginfo.get("category")}" is not in list of approved categories'
             )
             retval = 1
 
@@ -204,13 +204,17 @@ def main(argv: Optional[List[str]] = None) -> int:
 
         # Begin checks that apply to both installers and uninstallers
         for i_type in ("installer", "uninstaller"):
-
             # Check for missing or case-conflicted installer or uninstaller items
             if not _check_case_sensitive_path(
                 os.path.join(
                     args.munki_repo, "pkgs", pkginfo.get(f"{i_type}_item_location", "")
                 )
             ):
+                if i_type == "installer" and "PackageCompleteURL" in pkginfo:
+                    # PackageCompleteURL allows download from a URL outside of the Munki repo,
+                    # so the installer need not exist in the repo.
+                    continue
+
                 msg = f"{i_type} item does not exist or path is not case sensitive"
                 if args.warn_on_missing_installer_items:
                     print(f"{filename}: WARNING: {msg}")

setup.py

@@ -6,7 +6,7 @@
     name="pre-commit-macadmin",
     description="Pre-commit hooks for Mac admins, client engineers, and IT consultants.",
     url="https://github.com/homebysix/pre-commit-macadmin",
-    version="1.22.0",
+    version="1.22.1",
     author="Elliot Jordan",
     author_email="elliot@elliotjordan.com",
     packages=["pre_commit_macadmin_hooks"],