container-magic 4.2.2__tar.gz → 4.2.3__tar.gz

{container_magic-4.2.2/src/container_magic.egg-info → container_magic-4.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: container-magic
-Version: 4.2.2
+Version: 4.2.3
 Summary: A tool for rapidly creating containerised development environments
 Author-email: Mark Hedley Jones <mark@hedleyjones.com>
 License: MIT

{container_magic-4.2.2 → container_magic-4.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "container-magic"
-version = "4.2.2"
+version = "4.2.3"
 description = "A tool for rapidly creating containerised development environments"
 authors = [
     {name = "Mark Hedley Jones", email = "mark@hedleyjones.com"}

container_magic-4.2.3/src/container_magic/__init__.py

@@ -0,0 +1,5 @@
+"""Container-magic: Rapidly create containerised development environments."""
+
+from importlib.metadata import version
+
+__version__ = version("container-magic")

{container_magic-4.2.2 → container_magic-4.2.3}/src/container_magic/cli/main.py

@@ -97,7 +97,7 @@ def cli():
     "--in-place",
     "in_place",
     is_flag=True,
-    help="Initialize in current directory instead of creating new one",
+    help="Initialise in current directory instead of creating new one",
 )
 def init(
     template: str,
@@ -122,7 +122,7 @@ def init(
 
     # Determine project path
     if in_place:
-        # Initialize in current directory
+        # Initialise in current directory
         path = Path.cwd()
     elif path is None:
         # Create new directory with project name
@@ -141,7 +141,7 @@ def init(
         click.echo(f"Creating project at {path}")
         path.mkdir(parents=True)
     else:
-        click.echo(f"Initializing in {path}")
+        click.echo(f"Initialising in {path}")
 
     # Create default config with base, development, and production stages
     # If no tag specified, append :latest
@@ -323,8 +323,6 @@ def cache_list(path: Path):
         size_mb = asset["size"] / (1024 * 1024)
         click.echo(f"  {asset['filename']} ({size_mb:.2f} MB)")
         click.echo(f"    URL: {asset['url']}")
-        if asset.get("dest"):
-            click.echo(f"    Dest: {asset['dest']}")
         click.echo(f"    Hash: {asset['hash'][:16]}...")
 
 

{container_magic-4.2.2 → container_magic-4.2.3}/src/container_magic/core/config.py

@@ -395,6 +395,10 @@ class ContainerMagicConfig(BaseModel):
         with open(path) as f:
             data = yaml.safe_load(f)
 
+        if not isinstance(data, dict):
+            print("Error: cm.yaml must contain a YAML mapping", file=sys.stderr)
+            sys.exit(1)
+
         try:
             config = cls(**data)
         except ValidationError as e:

{container_magic-4.2.2 → container_magic-4.2.3}/src/container_magic/core/runner.py

@@ -62,7 +62,7 @@ def _detect_shell(config: ContainerMagicConfig) -> str:
 
     Priority: runtime.shell > distro field > image-name detection.
     """
-    runtime_shell = config.runtime.shell if config.runtime else None
+    runtime_shell = config.runtime.shell
     if runtime_shell:
         return runtime_shell
     dev_stage = "development" if "development" in config.stages else "base"
@@ -73,14 +73,14 @@ def _detect_shell(config: ContainerMagicConfig) -> str:
     return detect_shell(resolve_base_image(dev_stage_config.frm, config.stages))
 
 
-def _build_feature_flags(config: ContainerMagicConfig) -> Dict[str, bool]:
+def build_feature_flags(config: ContainerMagicConfig) -> Dict[str, bool]:
     """Build feature flags dict from runtime config."""
-    runtime_features = config.runtime.features if config.runtime else []
+    features = config.runtime.features
     return {
-        "display": "display" in runtime_features,
-        "gpu": "gpu" in runtime_features,
-        "audio": "audio" in runtime_features,
-        "aws_credentials": "aws_credentials" in runtime_features,
+        "display": "display" in features,
+        "gpu": "gpu" in features,
+        "audio": "audio" in features,
+        "aws_credentials": "aws_credentials" in features,
     }
 
 
@@ -301,7 +301,7 @@ def run_container(
     runtime_cmd = runtime.value
     shell = _detect_shell(config)
     container_home = _detect_container_home()
-    features = _build_feature_flags(config)
+    features = build_feature_flags(config)
     image = f"{config.names.image}:development"
     container_name = f"{config.names.image}-development"
 
@@ -584,7 +584,7 @@ def stop_container(config: ContainerMagicConfig) -> int:
     )
 
     # xhost cleanup if display feature enabled with Docker
-    features = _build_feature_flags(config)
+    features = build_feature_flags(config)
     if features["display"] and runtime == Runtime.DOCKER and os.environ.get("DISPLAY"):
         try:
             subprocess.run(["xhost", "-local:"], capture_output=True)

{container_magic-4.2.2 → container_magic-4.2.3}/src/container_magic/generators/run_script.py

@@ -6,7 +6,12 @@ from pathlib import Path
 from jinja2 import Environment, PackageLoader
 
 from container_magic.core.config import ContainerMagicConfig
-from container_magic.core.templates import detect_shell, resolve_base_image, resolve_distro_shell
+from container_magic.core.runner import build_feature_flags
+from container_magic.core.templates import (
+    detect_shell,
+    resolve_base_image,
+    resolve_distro_shell,
+)
 from container_magic.core.volumes import expand_volumes_for_script, label_volumes
 
 
@@ -38,7 +43,7 @@ def generate_run_script(config: ContainerMagicConfig, project_dir: Path) -> None
         workdir = f"/home/{production_user}"
 
     # Determine interactive shell: runtime.shell > distro > image-name detection
-    runtime_shell = config.runtime.shell if config.runtime else None
+    runtime_shell = config.runtime.shell
     prod_stage = "production" if "production" in config.stages else "base"
     stage_config = config.stages[prod_stage]
     shell = (
@@ -55,17 +60,10 @@ def generate_run_script(config: ContainerMagicConfig, project_dir: Path) -> None
             cmd_copy.command = cmd_spec.command.replace("$", r"\$")
             commands_escaped[cmd_name] = cmd_copy
 
-    # Build feature flags
-    runtime_features = config.runtime.features if config.runtime else []
-    features = {
-        "display": "display" in runtime_features,
-        "gpu": "gpu" in runtime_features,
-        "audio": "audio" in runtime_features,
-        "aws_credentials": "aws_credentials" in runtime_features,
-    }
+    features = build_feature_flags(config)
 
     # Expand volume variables and apply SELinux labels for production context
-    raw_volumes = config.runtime.volumes if config.runtime else []
+    raw_volumes = config.runtime.volumes
     expanded_volumes = expand_volumes_for_script(raw_volumes, workdir)
     expanded_volumes = label_volumes(expanded_volumes)
 
@@ -75,13 +73,13 @@ def generate_run_script(config: ContainerMagicConfig, project_dir: Path) -> None
         workdir=workdir,
         shell=shell,
         backend=backend,
-        privileged=config.runtime.privileged if config.runtime else False,
-        network=config.runtime.network_mode if config.runtime else None,
+        privileged=config.runtime.privileged,
+        network=config.runtime.network_mode,
         features=features,
         volumes=expanded_volumes,
-        devices=config.runtime.devices if config.runtime else [],
+        devices=config.runtime.devices,
         commands=commands_escaped,
-        ipc=config.runtime.ipc if config.runtime else None,
+        ipc=config.runtime.ipc,
     )
 
     run_script = project_dir / "run.sh"

{container_magic-4.2.2 → container_magic-4.2.3}/src/container_magic/templates/run.sh.j2

@@ -18,7 +18,7 @@ if command -v docker >/dev/null 2>&1; then
 elif command -v podman >/dev/null 2>&1; then
 	RUNTIME="podman"
 else
-	echo "Error: Neither docker nor podman found in PATH"
+	echo "Error: Neither docker nor podman found in PATH" >&2
 	exit 1
 fi
 {%- else %}
@@ -292,6 +292,7 @@ run_{{ command_name }}() {
 	local _manifest=""
 	if [[ ${#MANIFEST_LINES[@]} -gt 0 ]]; then
 		_manifest=$(mktemp /tmp/cm-manifest-XXXXXX)
+		trap 'rm -f "$_manifest"' EXIT
 		printf '%s\n' "${MANIFEST_LINES[@]}" >"$_manifest"
 		RUN_ARGS+=("-v" "${_manifest}:/run/cm/mounts:ro,z")
 	fi

{container_magic-4.2.2 → container_magic-4.2.3/src/container_magic.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: container-magic
-Version: 4.2.2
+Version: 4.2.3
 Summary: A tool for rapidly creating containerised development environments
 Author-email: Mark Hedley Jones <mark@hedleyjones.com>
 License: MIT

{container_magic-4.2.2 → container_magic-4.2.3}/src/container_magic.egg-info/SOURCES.txt

@@ -27,6 +27,5 @@ src/container_magic/generators/dockerfile.py
 src/container_magic/generators/run_script.py
 src/container_magic/registry/__init__.py
 src/container_magic/templates/Dockerfile.j2
-src/container_magic/templates/_macros.j2
 src/container_magic/templates/build.sh.j2
 src/container_magic/templates/run.sh.j2

container_magic-4.2.2/src/container_magic/__init__.py

@@ -1,3 +0,0 @@
-"""Container-magic: Rapidly create containerised development environments."""
-
-__version__ = "0.1.0"

container_magic-4.2.2/src/container_magic/templates/_macros.j2

@@ -1,7 +0,0 @@
-{#- Shared macros for container-magic templates -#}
-
-{%- macro symlink_mounts(workspace_name, container_base, workspace_symlinks) -%}
-{% for rel_path in workspace_symlinks %}
-RUN_ARGS+=("-v" "$(pwd)/{{ workspace_name }}/{{ rel_path }}:{{ container_base }}/{{ workspace_name }}/{{ rel_path }}:z")
-{% endfor -%}
-{%- endmacro -%}