autopkg-wrapper 2024.5.1__py3-none-any.whl → 2024.5.3__py3-none-any.whl

autopkg_wrapper/__init__.py

@@ -1 +1 @@
-__version__ = "2024.5.1"
+__version__ = "2024.5.3"

autopkg_wrapper/autopkg_wrapper.py

@@ -4,6 +4,7 @@ import logging
 import plistlib
 import subprocess
 import sys
+from datetime import datetime
 from itertools import chain
 from pathlib import Path
 
@@ -32,8 +33,10 @@ class Recipe(object):
 
         return name
 
-    def verify_trust_info(self):
-        cmd = ["/usr/local/bin/autopkg", "verify-trust-info", self.filename, "-v"]
+    def verify_trust_info(self, debug):
+        verbose_output = ["-vvvv"]
+        cmd = ["/usr/local/bin/autopkg", "verify-trust-info", self.filename]
+        cmd = cmd + verbose_output if debug else cmd
         cmd = " ".join(cmd)
         logging.debug(f"cmd: {str(cmd)}")
 
@@ -77,26 +80,32 @@ class Recipe(object):
 
         return {"imported": imported_items, "failed": failed_items}
 
-    def run(self):
+    def run(self, debug):
         if self.verified is False:
             self.error = True
             self.results["failed"] = True
             self.results["imported"] = ""
         else:
-            report = Path("/tmp/autopkg.plist")
+            report_dir = Path("/tmp/autopkg")
+            report_time = datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
+            report_name = Path(f"{self.name}-{report_time}.plist")
+
+            report_dir.mkdir(parents=True, exist_ok=True)
+            report = report_dir / report_name
             report.touch(exist_ok=True)
 
             try:
                 post_processor_cmd = list(chain.from_iterable([("--post", processor) for processor in self.post_processors])) if self.post_processors else None
-                initial_cmd = [
+                verbose_output = ["-vvvv"]
+                cmd = [
                     "/usr/local/bin/autopkg",
                     "run",
                     self.filename,
-                    "-v",
                     "--report-plist",
                     str(report),
                 ]
-                cmd = initial_cmd + post_processor_cmd if post_processor_cmd else initial_cmd
+                cmd = cmd + post_processor_cmd if post_processor_cmd else cmd
+                cmd = cmd + verbose_output if debug else cmd
                 cmd = " ".join(cmd)
 
                 logging.debug(f"cmd: {str(cmd)}")
@@ -192,21 +201,23 @@ def parse_recipe_list(recipes, recipe_file, post_processors):
     logging.info(f"Recipes: {recipes}") if recipes else None
     logging.info(f"Recipe List: {recipe_file}") if recipe_file else None
 
-    if recipe_file.suffix == ".json":
-        with open(recipe_file, "r") as f:
-            recipe_list = json.load(f)
-    elif recipe_file.suffix == ".txt":
-        with open(recipe_file, "r") as f:
-            recipe_list = f.read().splitlines()
-    elif isinstance(recipes, list):
-        recipe_list = recipes
-    elif isinstance(recipes, str):
-        if recipes.find(",") != -1:
-            # Assuming recipes separated by commas
-            recipe_list = [recipe.strip() for recipe in recipes.split(",") if recipe]
-        else:
-            # Assuming recipes separated by space
-            recipe_list = [recipe.strip() for recipe in recipes.split(" ") if recipe]
+    if recipe_file:
+        if recipe_file.suffix == ".json":
+            with open(recipe_file, "r") as f:
+                recipe_list = json.load(f)
+        elif recipe_file.suffix == ".txt":
+            with open(recipe_file, "r") as f:
+                recipe_list = f.read().splitlines()
+    if recipes:
+        if isinstance(recipes, list):
+            recipe_list = recipes
+        elif isinstance(recipes, str):
+            if recipes.find(",") != -1:
+                # Assuming recipes separated by commas
+                recipe_list = [recipe.strip() for recipe in recipes.split(",") if recipe]
+            else:
+                # Assuming recipes separated by space
+                recipe_list = [recipe.strip() for recipe in recipes.split(" ") if recipe]
 
     if recipe_list is None:
         logging.error(
@@ -245,21 +256,21 @@ def parse_post_processors(post_processors):
     return post_processors_list
 
 
-def process_recipe(recipe, disable_recipe_trust_check):
+def process_recipe(recipe, disable_recipe_trust_check, debug):
     if disable_recipe_trust_check:
         logging.debug("Setting Recipe verification to None")
         recipe.verified = None
     else:
         logging.debug("Checking Recipe verification")
-        recipe.verify_trust_info()
+        recipe.verify_trust_info(debug)
 
     match recipe.verified:
         case False | None if disable_recipe_trust_check:
             logging.debug("Running Recipe without verification")
-            recipe.run()
+            recipe.run(debug)
         case True:
             logging.debug("Running Recipe after successful verification")
-            recipe.run()
+            recipe.run(debug)
         case False:
             recipe.update_trust_info()
 
@@ -267,7 +278,6 @@ def process_recipe(recipe, disable_recipe_trust_check):
 
 
 def main():
-    print("Hello World")
     args = setup_args()
     setup_logger(args.debug if args.debug else False)
     logging.info("Running autopkg_wrapper")
@@ -279,7 +289,7 @@ def main():
 
     for recipe in recipe_list:
         logging.info(f"Processing Recipe: {recipe.name}")
-        process_recipe(recipe=recipe, disable_recipe_trust_check=args.disable_recipe_trust_check)
+        process_recipe(recipe=recipe, disable_recipe_trust_check=args.disable_recipe_trust_check, debug=args.debug)
         update_recipe_repo(git_info=override_repo_info, recipe=recipe, disable_recipe_trust_check=args.disable_recipe_trust_check, args=args)
         slack.send_notification(recipe=recipe, token=args.slack_token) if args.slack_token else None
 

{autopkg_wrapper-2024.5.1.dist-info → autopkg_wrapper-2024.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autopkg-wrapper
-Version: 2024.5.1
+Version: 2024.5.3
 Summary: A package used to execute some autopkg functions, primarily within the context of a GitHub Actions runner.
 Home-page: https://github.com/smithjw/autopkg-wrapper
 License: BSD-3-Clause

{autopkg_wrapper-2024.5.1.dist-info → autopkg_wrapper-2024.5.3.dist-info}/RECORD

@@ -1,13 +1,13 @@
-autopkg_wrapper/__init__.py,sha256=ly1en_JSfV6yl3MywS5v9X79jzBFerSzKgmYFN0jEpY,25
-autopkg_wrapper/autopkg_wrapper.py,sha256=umW-gp7osxSFnMeZqVcLhAJODHHzoOhJbaTjuAndKnc,10410
+autopkg_wrapper/__init__.py,sha256=sEEjA7US77WrM1AT1k9D_cLsb_eUPgC78YSEwNKoE2c,25
+autopkg_wrapper/autopkg_wrapper.py,sha256=9t3d58w24P2yU3jZGsmO_hjPK4vFlW4meJ_hBuHgcuo,10940
 autopkg_wrapper/notifier/__init__.py,sha256=ShXQBVjyiSOHxoQJS2BvNG395W4KZfqMxZWBAR0MZrE,22
 autopkg_wrapper/notifier/slack.py,sha256=nKHeSmgDaTaSUo19ZgnjjjKzeWgg34fMHUwNj9C5FMY,1982
 autopkg_wrapper/utils/__init__.py,sha256=ShXQBVjyiSOHxoQJS2BvNG395W4KZfqMxZWBAR0MZrE,22
 autopkg_wrapper/utils/args.py,sha256=BGbskLzeBeq7ae0Vp1XuoAD5gqKGILOTaNUHvo2DhNY,3934
 autopkg_wrapper/utils/git_functions.py,sha256=zMMzwRG9V2VFaQk3y_o1H63_hzI1qohwBKaetNDS2mY,2975
 autopkg_wrapper/utils/logging.py,sha256=3knpMViO_zAU8WM5bSImQaz5M01vMFk_raB4lt1cbvo,324
-autopkg_wrapper-2024.5.1.dist-info/LICENSE,sha256=PpNOQjZGcsKFuA0wU16YU7PueVxqPX4OnyZ7TlLQlq4,1602
-autopkg_wrapper-2024.5.1.dist-info/METADATA,sha256=EK8JgUOWqYPN0cCC_d6EwsPonPO2Q5p-FzviiPXnovQ,2659
-autopkg_wrapper-2024.5.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-autopkg_wrapper-2024.5.1.dist-info/entry_points.txt,sha256=w9VfrX4aY0ZzJndvzjSI5lLe_sCP2tIq0I5bRLlEKJc,125
-autopkg_wrapper-2024.5.1.dist-info/RECORD,,
+autopkg_wrapper-2024.5.3.dist-info/LICENSE,sha256=PpNOQjZGcsKFuA0wU16YU7PueVxqPX4OnyZ7TlLQlq4,1602
+autopkg_wrapper-2024.5.3.dist-info/METADATA,sha256=zpWifwE0cHU6s4cdS0BqkKNAOcVwQhdHCmbfjqeuEF0,2659
+autopkg_wrapper-2024.5.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+autopkg_wrapper-2024.5.3.dist-info/entry_points.txt,sha256=w9VfrX4aY0ZzJndvzjSI5lLe_sCP2tIq0I5bRLlEKJc,125
+autopkg_wrapper-2024.5.3.dist-info/RECORD,,