From aedeb2647b7d73875f650bd4ea9bd34a7c49bb1d Mon Sep 17 00:00:00 2001
From: Austin Appleby <aappleby@gmail.com>
Date: Thu, 31 Oct 2024 02:00:22 -0700
Subject: [PATCH] did I miss checking some of this in?

---
 hancho.py          | 50 ++++++++++++++++++----------------------------
 tests/run_tests.py |  2 ++
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/hancho.py b/hancho.py
index 9084be9..cd80ef8 100755
--- a/hancho.py
+++ b/hancho.py
@@ -226,8 +226,8 @@ async def await_variant(variant):
             variant = await variant.get()
             variant = await await_variant(variant)
         case Task():
-            variant = await variant.await_done()
-            variant = await await_variant(variant)
+            await variant.await_done()
+            variant = await await_variant(variant._out_files)
         case Config() | dict():
             for key, val in variant.items():
                 variant[key] = await await_variant(val)
@@ -671,8 +671,7 @@ def start(self):
 
     async def await_done(self):
         self.start()
-        assert self._promise is not None
-        return await self._promise
+        await self._promise
 
     def promise(self, *args):
         return Promise(self, *args)
@@ -768,8 +767,6 @@ async def task_main(self):
         self._state = TaskState.FINISHED
         app.tasks_finished += 1
 
-        return self._out_files
-
     #-----------------------------------------------------------------------------------------------
 
     def task_init(self):
@@ -895,7 +892,6 @@ def needs_rerun(self, force=False):
                 return f"Rebuilding because {mod_filename} has changed"
 
         # Check all dependencies in the C dependencies file, if present.
-
         if (c_deps := self.config.get("c_deps", None)) and path.exists(c_deps):
             c_depformat = self.config.get("c_depformat", "gcc")
             if debug:
@@ -1077,29 +1073,24 @@ def root(self, mod_path):
         return new_context._load_module()
 
     def _load_module(self):
-        config = self.config
-
         log(("┃ " * (len(app.dirstack) - 1)), end="")
-        log(color(128,255,128) + f"Loading {config.mod_path}" + color())
+        log(color(128,255,128) + f"Loading {self.config.mod_path}" + color())
+
+        app.loaded_files.append(self.config.mod_path)
 
-        app.loaded_files.append(config.mod_path)
+        # We're using compile() and FunctionType()() here beause exec() doesn't preserve source
+        # code for debugging.
+        file = open(self.config.mod_path, encoding="utf-8")
+        source = file.read()
+        code = compile(source, self.config.mod_path, "exec", dont_inherit=True)
 
         # We must chdir()s into the .hancho file directory before running it so that
         # glob() can resolve files relative to the .hancho file itself. We are _not_ in an async
         # context here so there should be no other threads trying to change cwd.
-        app.pushdir(path.dirname(config.mod_path))
-
-        temp_globals = {
-            "hancho" : self,
-            "__builtins__": builtins
-        }
-
-        with open(config.mod_path, encoding="utf-8") as file:
-            # We're using compile() and FunctionType()() here beause exec() doesn't preserve source
-            # code for debugging.
-            source = file.read()
-            code = compile(source, config.mod_path, "exec", dont_inherit=True)
-            types.FunctionType(code, temp_globals)()
+        app.pushdir(path.dirname(self.config.mod_path))
+        temp_globals = { "hancho" : self, "__builtins__": builtins }
+        types.FunctionType(code, temp_globals)()
+        app.popdir()
 
         # Module loaded, turn the module's globals into a Config that doesn't include __builtins__,
         # hancho, and imports so we don't have files that end up transitively containing the
@@ -1109,10 +1100,6 @@ def _load_module(self):
             if key.startswith('_') or key == 'hancho' or isinstance(val, type(sys)):
                 continue
             new_module[key] = val
-
-        # And now we chdir back out.
-        app.popdir()
-
         return new_module
 
 ####################################################################################################
@@ -1416,7 +1403,7 @@ async def async_run_tasks(self):
 
 app = App()
 
-def main():
+def main(args):
     # pylint: disable=line-too-long
     # fmt: off
     parser = argparse.ArgumentParser()
@@ -1437,7 +1424,7 @@ def main():
     parser.add_argument("--use_color",       default=False, action="store_true",  help="Use color in the console output")
     # fmt: on
 
-    (flags, unrecognized) = parser.parse_known_args(sys.argv[1:])
+    (flags, unrecognized) = parser.parse_known_args(args)
     flags = flags.__dict__
 
     # Unrecognized command line parameters also become global config fields if they are
@@ -1455,5 +1442,6 @@ def main():
 ####################################################################################################
 
 if __name__ == "__main__":
-    sys.exit(main())
+    exitcode = main(sys.argv[1:])
+    sys.exit(exitcode)
 
diff --git a/tests/run_tests.py b/tests/run_tests.py
index 45e62da..e214bf8 100755
--- a/tests/run_tests.py
+++ b/tests/run_tests.py
@@ -120,6 +120,8 @@ def create_ctx(self, flags, extra_flags):
         default_flags.merge(flags)
         default_extra_flags.merge(extra_flags)
 
+        hancho.app.flags = hancho.Config(verbose = False)
+
         ctx = hancho.app.create_root_context(default_flags.__dict__, default_extra_flags.__dict__)
         return ctx