Build a dtrun zipapp.

Author: DavidCEllis

src/ducktools/env/__main__.py

@@ -431,7 +431,7 @@ def delete_env_command(manager, args):
     return 0
 
 
-def main() -> int:
+def main_command() -> int:
     executable_name = os.path.splitext(os.path.basename(sys.executable))[0]
 
     if zipapp_path := globals().get("zipapp_path"):
@@ -485,13 +485,16 @@ def main() -> int:
             raise RuntimeError(f"Invalid Command {args.command!r}")
 
 
-if __name__ == "__main__":
+def main() -> int:
     try:
-        result = main()
+        result = main_command()
     except (RuntimeError, EnvError) as e:
         errors = "\n".join(e.args) + "\n"
         if sys.stderr:
             sys.stderr.write(errors)
-        sys.exit(1)
+        return 1
+    return 0
+
 
-    sys.exit(result)
+if __name__ == "__main__":
+    sys.exit(main())

src/ducktools/env/_run.py

@@ -65,6 +65,6 @@ def run():
         msg = "\n".join(e.args) + "\n"
         if sys.stderr:
             sys.stderr.write(msg)
-        sys.exit(1)
+        return 1
 
-    sys.exit(0)
+    return 0

src/ducktools/env/bootstrapping/bootstrap.py

@@ -102,28 +102,24 @@ def update_libraries():
 
 def launch_script(script_file, zipapp_path, args, lockdata=None):
     sys.path.insert(0, default_paths.env_folder)
-    try:
-        from ducktools.env.manager import Manager
-        manager = Manager(project_name=PROJECT_NAME)
-        returncode = manager.run_bundle(
-            script_path=script_file,
-            script_args=args,
-            lockdata=lockdata,
-            zipapp_path=zipapp_path,
-        )
-    finally:
-        sys.path.pop(0)
-
+    from ducktools.env.manager import Manager
+    manager = Manager(project_name=PROJECT_NAME)
+    returncode = manager.run_bundle(
+        script_path=script_file,
+        script_args=args,
+        lockdata=lockdata,
+        zipapp_path=zipapp_path,
+    )
     return returncode
 
 
 def launch_ducktools():
-    zipapp_path = sys.argv[0]
-    init_globals = {"zipapp_path": zipapp_path}
-
-    import runpy
-    runpy.run_path(
-        default_paths.env_folder,
-        init_globals=init_globals,
-        run_name="__main__"
-    )
+    sys.path.insert(0, default_paths.env_folder)
+    from ducktools.env.__main__ import main
+    return main()
+
+
+def launch_dtrun():
+    sys.path.insert(0, default_paths.env_folder)
+    from ducktools.env._run import run
+    return run()

src/ducktools/env/bootstrapping/zipapp_main_dtrun.py

@@ -0,0 +1,38 @@
+# ducktools.env
+# MIT License
+# 
+# Copyright (c) 2024 David C Ellis
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+"""
+This is the bootstrapping script for the ducktools-env.pyz bundle itself
+"""
+import sys
+
+from _version_check import version_check  # type: ignore
+version_check()
+
+
+if __name__ == "__main__":
+    from _bootstrap import update_libraries, launch_dtrun  # type: ignore
+    update_libraries()
+    returncode = launch_dtrun()
+
+    sys.exit(returncode)

src/ducktools/env/scripts/create_zipapp.py

@@ -144,6 +144,7 @@ def build_zipapp(
     clear_old_builds=True
 ) -> None:
     archive_name = "ducktools-env.pyz"
+    dtrun_name = "dtrun.pyz"
 
     with paths.build_folder() as build_folder:
 
@@ -227,3 +228,14 @@ def build_zipapp(
             target=dist_folder / archive_name,
             interpreter="/usr/bin/env python"
         )
+
+        print(f"Creating {dtrun_name}")
+        with importlib.resources.as_file(resources) as env_folder:
+            main_dtrun_path = env_folder / "bootstrapping" / "zipapp_main_dtrun.py"
+            shutil.copy(main_dtrun_path, build_path / "__main__.py")
+
+        zipapp.create_archive(
+            source=build_folder,
+            target=dist_folder / dtrun_name,
+            interpreter="/usr/bin/env python"
+        )