shipit-cli 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

shipit/cli.py

@@ -36,6 +36,7 @@ from shipit.version import version as shipit_version
 from shipit.generator import generate_shipit
 from shipit.providers.base import CustomCommands
 from shipit.procfile import Procfile
+from dotenv import dotenv_values
 
 
 console = Console()
@@ -877,10 +878,10 @@ class WasmerBuilder:
         )
 
     def build_serve(self, serve: Serve) -> None:
-        from tomlkit import comment, document, nl, table, aot, string
+        from tomlkit import comment, document, nl, table, aot, string, array
 
         doc = document()
-        doc.add(comment(f"File generated by Shipit {shipit_version}"))
+        doc.add(comment(f"Wasmer manifest generated with Shipit v{shipit_version}"))
         package = table()
         doc.add("package", package)
         package.add("entrypoint", "start")
@@ -953,14 +954,14 @@ class WasmerBuilder:
                 wasi_args = table()
                 if serve.cwd:
                     wasi_args.add("cwd", serve.cwd)
-                wasi_args.add("main-args", parts[1:])
+                wasi_args.add("main-args", array(parts[1:]).multiline(True))
                 env = program_binary.get("env") or {}
                 if serve.env:
                     env.update(serve.env)
                 if env:
+                    arr = array([f"{k}={v}" for k, v in env.items()]).multiline(True)
                     wasi_args.add(
-                        "env",
-                        [f"{k}={v}" for k, v in env.items()],
+                        "env", arr
                     )
                 title = string("annotations.wasi", literal=False)
                 command.add(title, wasi_args)
@@ -1038,7 +1039,7 @@ class WasmerBuilder:
             )
             yaml_config["jobs"] = jobs
 
-        app_yaml = yaml.dump(yaml_config)
+        app_yaml = yaml.dump(yaml_config,)
 
         console.print(f"\n[bold]Created app.yaml manifest ✅[/bold]")
         app_yaml_panel = Panel(
@@ -1385,6 +1386,10 @@ def auto(
         None,
         help="The start command to use (overwrites the default)",
     ),
+    env_name: Optional[str] = typer.Option(
+        None,
+        help="The environment to use (defaults to `.env`, it will use .env.<env_name> if provided)",
+    ),
 ):
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
@@ -1408,6 +1413,7 @@ def auto(
         wasmer_token=wasmer_token,
         wasmer_bin=wasmer_bin,
         skip_prepare=skip_prepare,
+        env_name=env_name,
     )
     if start or wasmer_deploy:
         serve(
@@ -1612,6 +1618,10 @@ def build(
         None,
         help="Use a specific Docker client (such as depot, podman, etc.)",
     ),
+    env_name: Optional[str] = typer.Option(
+        None,
+        help="The environment to use (defaults to `.env`, it will use .env.<env_name> if provided)",
+    ),
 ) -> None:
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
@@ -1664,6 +1674,14 @@ def build(
         "CLICOLOR": os.environ.get("CLICOLOR", "0"),
     }
     serve = next(iter(ctx.serves.values()))
+    serve.env = serve.env or {}
+    if (path / ".env").exists():
+        env_vars = dotenv_values(path / ".env")
+        serve.env.update(env_vars)
+
+    if (path / f".env.{env_name}").exists():
+        env_vars = dotenv_values(path / f".env.{env_name}")
+        serve.env.update(env_vars)
 
     # Build and serve
     builder.build(env, serve.mounts, serve.build)
@@ -1691,3 +1709,6 @@ def main() -> None:
 
 if __name__ == "__main__":
     main()
+
+def flatten(xss):
+    return [x for xs in xss for x in xs]

shipit/version.py

@@ -1,5 +1,5 @@
 __all__ = ["version", "version_info"]
 
 
-version = "0.7.0"
-version_info = (0, 7, 0, "final", 0)
+version = "0.7.1"
+version_info = (0, 7, 1, "final", 0)

{shipit_cli-0.7.0.dist-info → shipit_cli-0.7.1.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.7.0
+Version: 0.7.1
 Summary: Add your description here
 Project-URL: homepage, https://wasmer.io
 Project-URL: repository, https://github.com/wasmerio/shipit
 Project-URL: Changelog, https://github.com/wasmerio/shipit/changelog
 Requires-Python: >=3.10
+Requires-Dist: dotenv>=0.9.9
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: requests>=2.32.5
 Requires-Dist: rich>=14.1.0

{shipit_cli-0.7.0.dist-info → shipit_cli-0.7.1.dist-info}/RECORD

@@ -1,9 +1,8 @@
 shipit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shipit/cli.py,sha256=cLWFBrY24w--GQj_YtRo7U7jnGITEG_TWo4D9W6XH1Q,57549
-shipit/env.py,sha256=Bede00-iFI67RZ0bx92JyX49XL7Q91HK-QoKRpwPaGQ,725
+shipit/cli.py,sha256=1U65pviCsaH-fZO3hGYWoyO1WqXCfOxnGwPIomwc5Fg,58363
 shipit/generator.py,sha256=GFsuqZG83gn7yxphE4GHwZjEB3sToJn24yNDE-zrTtM,6400
 shipit/procfile.py,sha256=GlfdwzFUr0GWGKaaiXlLKNFInWaRNMy_wN14UEyU_5Q,2974
-shipit/version.py,sha256=myhj6JcZUHlBRvAyfRYaJ_bv3PrzoXvUd5ppXAZh014,95
+shipit/version.py,sha256=-1rPwQ4VEhKG8LAXODaAwzxwpFY9hDgohd2s_aRySc4,95
 shipit/assets/php/php.ini,sha256=f4irndAjB4GuuouEImRkNV22Q-yw1KqR-43jAMDw730,2531
 shipit/assets/wordpress/install.sh,sha256=GOIwJX3qPp7VuZXjkKVFFY6Mo9k7VFWfobS6aZYitPg,817
 shipit/assets/wordpress/wp-config.php,sha256=IdGQoeg8E89JiqwxO2i8WnGMzmhNWgRz80X6lbU5GXc,4134
@@ -18,7 +17,7 @@ shipit/providers/python.py,sha256=n0748miZ5RpQyQUCmkq3_G2Nnub8SaogZoJTNNFalZc,20
 shipit/providers/registry.py,sha256=lHUViVuPJf1OIZD8I_NTX4LP7E3Uo5-MmLfarmAA_cM,729
 shipit/providers/staticfile.py,sha256=O1D0cXa_cFZH4OXRFLjBG3e-LbjMDo7ZBC2D3CvrPo4,2218
 shipit/providers/wordpress.py,sha256=wMIcBpICqcEpbOgJCufrnM-r76AVI7_xC-NUlh9XMmE,3016
-shipit_cli-0.7.0.dist-info/METADATA,sha256=Ang6CnPqUUcKRovpIAMHMsnccw640bQUYlpPOZ3MNoA,494
-shipit_cli-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shipit_cli-0.7.0.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
-shipit_cli-0.7.0.dist-info/RECORD,,
+shipit_cli-0.7.1.dist-info/METADATA,sha256=uW1Lt7b6mOl7H5k3CPpaPPWNNr-0DHY6p5dxE4Z9B6g,523
+shipit_cli-0.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shipit_cli-0.7.1.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
+shipit_cli-0.7.1.dist-info/RECORD,,

shipit/env.py

@@ -1,30 +0,0 @@
-import shlex
-import re
-
-def parse(content):
-    """
-    Parse the content of a .env file (a line-delimited KEY=value format) into a
-    dictionary mapping keys to values.
-    """
-    values = {}
-    for line in content.splitlines():
-        lexer = shlex.shlex(line, posix=True)
-        tokens = list(lexer)
-
-        # parses the assignment statement
-        if len(tokens) < 3:
-            continue
-
-        name, op = tokens[:2]
-        value = ''.join(tokens[2:])
-
-        if op != '=':
-            continue
-        if not re.match(r'[A-Za-z_][A-Za-z_0-9]*', name):
-            continue
-
-        value = value.replace(r'\n', '\n')
-        value = value.replace(r'\t', '\t')
-        values[name] = value
-
-    return values