release

Author: lsbardel

Makefile

@@ -27,7 +27,7 @@ lint: 			## run linters
 .PHONY: test
 test:			## test with coverage
 	@poetry run \
-		pytest -v --cov --cov-report xml --cov-report html
+		pytest -v --cov --cov-report xml --cov-report html -x
 
 .PHONY: test-lint
 test-lint:		## run linters

metablock/__init__.py

@@ -5,7 +5,7 @@
 from .spaces import Block, Service, Space, SpaceExtension
 from .user import User
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 
 __all__ = [
     "Metablock",

metablock/cli.py

@@ -1,12 +1,12 @@
 import asyncio
 import os
-import zipfile
 from pathlib import Path
 
 import click
 import yaml
 
-from metablock import Metablock
+from metablock import Metablock, __version__
+from metablock.utils import temp_zipfile
 
 METABLOCK_SPACE = os.environ.get("METABLOCK_SPACE", "")
 METABLOCK_ENV = os.environ.get("METABLOCK_ENV", "prod")
@@ -20,6 +20,7 @@ def manifest(file_path: Path) -> dict:
 
 
 @click.group()
+@click.version_option(version=__version__)
 def main() -> None:
     pass
 
@@ -131,25 +132,13 @@ async def _ship(path: str, env: str, block_id: str, name: str, token: str) -> No
         click.echo("metablock block-id is required", err=True)
         raise click.Abort()
     p = Path(path)
-    if not p.is_dir():
-        click.echo(f"path {p} does not exist", err=True)
-        raise click.Abort()
-
-    # Create a zip file from the directory
-    zip_path = p.with_suffix(".zip")
     try:
-        with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
-            for file in p.rglob("*"):  # Recursively add all files in the directory
-                arcname = file.relative_to(p)  # Preserve relative paths in the archive
-                zipf.write(file, arcname)
-        click.echo(f"Created zip file: {zip_path}")
-
-        async with Metablock(auth_key=token) as mb:
-            block = await mb.blocks.get(block_id)
-            await block.ship(zip_path, name=name, env=env)
-            click.echo(f"shipped {zip_path} to {block.name} {env}")
-    finally:
-        # Clean up the zip file after shipping
-        if zip_path.exists():
-            zip_path.unlink()
-            click.echo(f"Removed temporary zip file: {zip_path}")
+        with temp_zipfile(p) as zip_path:
+            click.echo(f"Created zip file: {zip_path}")
+            async with Metablock(auth_key=token) as mb:
+                block = await mb.blocks.get(block_id)
+                await block.ship(zip_path, name=name, env=env, timeout=10)
+                click.echo(f"shipped {zip_path} to {block.name} {env}")
+    except ValueError as e:
+        click.echo(str(e), err=True)
+        raise click.Abort() from None

metablock/spaces.py

@@ -46,15 +46,14 @@ async def ship(
         bundle_path: str | Path,
         name: str = "",
         env: str = "stage",
-        *,
-        callback: Any = None,
+        **kwargs: Any,
     ) -> dict:
-        bundle = str(bundle_path)
+        p = Path(bundle_path)
         return await self.cli.post(
             f"{self.url}/deployments",
             data=dict(name=name, env=env),
-            files=dict(bundle=(bundle, open(bundle, "rb"))),
-            callback=callback,
+            files=dict(bundle=(p.name, p.read_bytes())),
+            **kwargs,
         )
 
     async def add_route(self, *, callback: Any = None, **kwargs: Any) -> dict:

metablock/utils.py

@@ -1,4 +1,7 @@
-from typing import Any
+import zipfile
+from contextlib import contextmanager
+from pathlib import Path
+from typing import Any, Iterator
 
 from multidict import MultiDict
 
@@ -11,3 +14,24 @@ def as_params(*, params: dict | None = None, **kwargs: Any) -> MultiDict:
     d = MultiDict(params if params is not None else {})
     d.update(kwargs)
     return d
+
+
+@contextmanager
+def temp_zipfile(path: str | Path) -> Iterator[Path]:
+    """Create a temporary zip file."""
+    p = Path(path)
+    if not p.is_dir():
+        raise ValueError(f"Path {p} is not a directory")
+
+    # Create a zip file from the directory
+    zip_path = p.with_suffix(".zip")
+    try:
+        with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
+            for file in p.rglob("*"):  # Recursively add all files in the directory
+                arcname = file.relative_to(p)  # Preserve relative paths in the archive
+                zipf.write(file, arcname)
+        yield zip_path
+    finally:
+        # Clean up the zip file after shipping
+        if zip_path.exists():
+            zip_path.unlink()

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "metablock"
-version = "1.0.1"
+version = "1.0.2"
 description = "Metablock cloud python client"
 authors = ["Luca <[email protected]>"]
 license = "BSD"

pyproject.toml

@@ -34,3 +34,12 @@ alternatively, you can pass it to the client constructor:
 ```python
 cli = Metablock(auth_key="your-token")
 ```
+
+
+## Command line
+
+You can also use the client from the command line
+
+```bash
+metablock --help
+```

readme.md

@@ -17,3 +17,8 @@ def invalid_headers(cli):
 @pytest.fixture
 async def org(cli: Metablock):
     return await cli.orgs.get("metablock")
+
+
+@pytest.fixture
+def ship_block_id():
+    return "d90de3e3435d4c93b1d1c3a3c6888075"

tests/conftest.py

@@ -22,3 +22,15 @@ def test_cli_apply():
     result = runner.invoke(main, ["apply", "tests/blocks", "--space", "mblock"])
     assert result.exit_code == 0
     assert result.output.endswith("updated block test\n")
+
+
+def test_cli_ship(ship_block_id: str):
+    runner = CliRunner()
+    result = runner.invoke(
+        main,
+        ["ship", "tests/blocks", "--block-id", ship_block_id, "--name", "just a test"],
+    )
+    assert result.exit_code == 0
+    lines = result.output.splitlines()
+    assert lines[0] == "Created zip file: tests/blocks.zip"
+    assert lines[1] == "shipped tests/blocks.zip to test prod"