Merge pull request #13 from homebysix/1.0.4

Add check for approved catalogs

README.md

@@ -13,7 +13,7 @@ For any hook in this repo you wish to use, add the following to your pre-commit
 
 ```
 -   repo: https://github.com/homebysix/pre-commit-macadmin
-    rev: v1.0.0
+    rev: v1.0.4
     hooks:
     -   id: check-plists
     # -   id: ...
@@ -63,6 +63,8 @@ For any hook in this repo you wish to use, add the following to your pre-commit
 
     This hook checks Munki pkginfo files to ensure they are valid.
 
+    - Specify your preferred list of pkginfo catalogs, if you wish to enforce it:  
+        `[--catalogs, testing, stable]`
     - Specify your preferred list of pkginfo categories, if you wish to enforce it:  
         `[--categories, Productivity, Design, Utilities, 'Web Browsers']`
     - Specify required pkginfo keys:  

pre_commit_hooks/check_munki_pkgsinfo.py

@@ -17,6 +17,7 @@ def build_argument_parser():
     )
     parser.add_argument("filenames", nargs="*", help="Filenames to check.")
     parser.add_argument("--categories", nargs="+", help="List of approved categories.")
+    parser.add_argument("--catalogs", nargs="+", help="List of approved catalogs.")
     parser.add_argument(
         "--required-keys",
         nargs="+",
@@ -68,6 +69,17 @@ def main(argv=None):
             )
             retval = 1
 
+        # Check for rogue catalogs.
+        if args.catalogs:
+            for catalog in pkginfo.get("catalogs"):
+                if catalog not in args.catalogs:
+                    print(
+                        '{}: catalog "{}" is not in approved list'.format(
+                            filename, catalog
+                        )
+                    )
+                    retval = 1
+
         # Check for pkg filenames showing signs of duplicate imports.
         if pkginfo.get("installer_item_location", "").endswith(tuple(dupe_suffixes)):
             print(

pre_commit_hooks/util.py

@@ -4,7 +4,7 @@
 
 
 def validate_pkginfo_key_types(pkginfo, filename):
-    """Main process."""
+    """Validation of pkginfo key types. Used for AutoPkg- and Munki-related hooks."""
 
     # Pkginfo keys and their known types. Omitted keys are left unvalidated.
     # Source: https://github.com/munki/munki/wiki/Supported-Pkginfo-Keys

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.0.0",
+    version="1.0.4",
     author="Elliot Jordan",
     author_email="elliot@elliotjordan.com",
     packages=["pre_commit_hooks"],