autopkg-wrapper 2024.5.1__tar.gz → 2024.5.2__tar.gz

{autopkg_wrapper-2024.5.1 → autopkg_wrapper-2024.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autopkg-wrapper
-Version: 2024.5.1
+Version: 2024.5.2
 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.2/autopkg_wrapper/__init__.py

@@ -0,0 +1 @@
+__version__ = "2024.5.2"

{autopkg_wrapper-2024.5.1 → autopkg_wrapper-2024.5.2}/autopkg_wrapper/autopkg_wrapper.py

@@ -32,8 +32,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,7 +79,7 @@ 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
@@ -88,15 +90,16 @@ class Recipe(object):
 
             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)}")
@@ -245,21 +248,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 +270,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 +281,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 → autopkg_wrapper-2024.5.2}/pyproject.toml

@@ -5,7 +5,7 @@
     name = "autopkg-wrapper"
     readme = "README.md"
     repository = "https://github.com/smithjw/autopkg-wrapper"
-    version = "2024.5.1"
+    version = "2024.5.2"
 
     [tool.poetry.scripts]
         # When built and installed by pip, the command autopkg_wrapper will be availble in to run within that environment

autopkg_wrapper-2024.5.1/autopkg_wrapper/__init__.py

@@ -1 +0,0 @@
-__version__ = "2024.5.1"