diff --git a/README.md b/README.md index 66b5bce..cbbbf34 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,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.5.1 + rev: v1.5.2 hooks: - id: check-plists # - id: ... @@ -114,7 +114,7 @@ When combining arguments that take lists (for example: `--required-keys`, `--cat ```yaml - repo: https://github.com/homebysix/pre-commit-macadmin - rev: v1.5.1 + rev: v1.5.2 hooks: - id: check-munki-pkgsinfo args: ['--catalogs', 'testing', 'stable', '--'] @@ -124,7 +124,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.5.1 + rev: v1.5.2 hooks: - id: check-munki-pkgsinfo args: ['--catalogs', 'testing', 'stable', '--categories', 'Design', 'Engineering', 'Web Browsers', '--'] @@ -136,7 +136,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.5.1 + rev: v1.5.2 hooks: - id: check-munki-pkgsinfo args: [ diff --git a/pre_commit_hooks/check_autopkg_recipes.py b/pre_commit_hooks/check_autopkg_recipes.py index c0f62e7..299f021 100755 --- a/pre_commit_hooks/check_autopkg_recipes.py +++ b/pre_commit_hooks/check_autopkg_recipes.py @@ -58,7 +58,7 @@ def validate_recipe_prefix(recipe, filename, prefix): print( "{}: identifier does not start with {}".format( filename, - 'one of: "%s"' % ", ".join(prefix) if len(prefix) > 1 else prefix[0], + 'one of: "%s"' % '", "'.join(prefix) if len(prefix) > 1 else prefix[0], ) ) passed = False @@ -182,6 +182,7 @@ def validate_minimumversion(process, min_vers, ignore_min_vers_before, filename) "StopProcessingIf": "0.1.0", "Symlinker": "0.1.0", "Unarchiver": "0.1.0", + "URLGetter": "1.4", "URLTextSearcher": "0.2.9", "Versioner": "0.1.0", } @@ -297,7 +298,9 @@ def validate_required_proc_for_types(process, filename): # For each recipe type, this is the list of processors that # MUST exist in that type. Uses "OR" logic, not "AND." required_proc_for_type = { - "download": ["EndOfCheckPhase"], + # Skipping EndOfCheckPhase because validate_endofcheckphase() + # already tests this. + # "download": ["EndOfCheckPhase"], "munki": ["MunkiImporter"], "pkg": ["AppPkgCreator", "PkgCreator", "PkgCopier"], "install": ["InstallFromDMG", "Installer"], diff --git a/setup.py b/setup.py index 75e1cef..fd6e57a 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,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.5.1", + version="1.5.2", author="Elliot Jordan", author_email="elliot@elliotjordan.com", packages=["pre_commit_hooks"],