Merge pull request #109 from homebysix/dev

1.23.0 merge to main

Author: homebysix

CHANGELOG.md

@@ -12,9 +12,14 @@ All notable changes to this project will be documented in this file. This projec
 
 ## [Unreleased]
 
+Nothing yet.
+
+## [1.23.0] - 2026-03-19
+
 ### Added
 
 - Added support for minimum AutoPkg version validation for new [VariableSetter](https://github.com/autopkg/autopkg/wiki/Processor-VariableSetter) processor.
+- `check-munkiadmin-scripts` and `check-outset-scripts` now support the `--valid-shebangs` argument for specifying additional valid interpreter paths.
 
 ### Changed
 
@@ -453,7 +458,8 @@ All notable changes to this project will be documented in this file. This projec
 
 - Initial release
 
-[Unreleased]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.22.0...HEAD
+[Unreleased]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.23.0...HEAD
+[1.23.0]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.22.0...v1.23.0
 [1.22.0]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.21.0...v1.22.0
 [1.21.0]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.20.0...v1.21.0
 [1.20.0]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.19.0...v1.20.0

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.1
+    rev: v1.23.0
     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.1
+    rev: v1.23.0
     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.1
+    rev: v1.23.0
     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.1
+    rev: v1.23.0
     hooks:
     -   id: check-munki-pkgsinfo
         args: [

pre_commit_macadmin_hooks/check_munkiadmin_scripts.py

@@ -15,6 +15,12 @@ def build_argument_parser() -> argparse.ArgumentParser:
         description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
     )
     parser.add_argument("filenames", nargs="*", help="Filenames to check.")
+    parser.add_argument(
+        "--valid-shebangs",
+        nargs="+",
+        default=[],
+        help="Add other valid shebangs for your environment",
+    )
     return parser
 
 
@@ -48,7 +54,7 @@ def main(argv: Optional[List[str]] = None) -> int:
         # Ensure scripts have a proper shebang
         with open(filename, encoding="utf-8") as openfile:
             script_content = openfile.read()
-        if not validate_shebangs(script_content, filename):
+        if not validate_shebangs(script_content, filename, args.valid_shebangs):
             print(f"{filename}: does not start with a valid shebang")
             retval = 1
 

pre_commit_macadmin_hooks/check_outset_scripts.py

@@ -15,6 +15,12 @@ def build_argument_parser() -> argparse.ArgumentParser:
         description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
     )
     parser.add_argument("filenames", nargs="*", help="Filenames to check.")
+    parser.add_argument(
+        "--valid-shebangs",
+        nargs="+",
+        default=[],
+        help="Add other valid shebangs for your environment",
+    )
     return parser
 
 
@@ -34,7 +40,7 @@ def main(argv: Optional[List[str]] = None) -> int:
         # Ensure scripts have a proper shebang
         with open(filename, encoding="utf-8") as openfile:
             script_content = openfile.read()
-        if not validate_shebangs(script_content, filename):
+        if not validate_shebangs(script_content, filename, args.valid_shebangs):
             print(f"{filename}: does not start with a valid shebang")
             retval = 1
 

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

tests/test_check_autopkg_recipe_list.py

@@ -165,7 +165,7 @@ def test_yaml_parsing_error(self):
         with tempfile.TemporaryDirectory() as tmpdir:
             yaml_file = os.path.join(tmpdir, "bad.yaml")
             with open(yaml_file, "w", encoding="utf-8") as f:
-                f.write(":\n-")
+                f.write(":\n  :\n-\n :")
             retval, output = self.run_main_with_files([yaml_file])
             self.assertEqual(retval, 1)
             self.assertIn("yaml parsing error", output)