didericis
cd9f023f3d
prd-number-check / require-numbered-prds (pull_request) Successful in 11s
tracker-policy-pr / check-pr (pull_request) Successful in 14s
test / unit (pull_request) Successful in 59s
test / integration-docker (pull_request) Successful in 1m6s
test / coverage (push) Successful in 21s
test / image-input-builds (push) Successful in 44s
test / image-input-builds (pull_request) Successful in 1m15s
test / unit (push) Successful in 57s
test / coverage (pull_request) Successful in 20s
lint / lint (push) Successful in 1m3s
Update Quality Badges / update-badges (push) Successful in 1m12s
test / integration-docker (push) Successful in 1m0s
`doctor` told users to run `./cli.py backend setup`. cli.py is a four-line wrapper at the repo root that calls bot_bottle.cli:main, and it does not ship — [tool.setuptools.packages.find] includes only bot_bottle*, so anyone who installed rather than cloned has no such file. Confirmed against a real install: the user's tree contains exactly one executable, `bot-bottle`, and no cli.py anywhere, while doctor recommended `./cli.py` three times. Invisible in development, where ./cli.py works fine from a checkout, which is why only a clean-install test surfaced it. The two entry points are the same code, so the fix is to name the one that always exists. 141 replacements across 45 files: the runtime messages that caused this, plus README, docs, PRDs, research notes and test prose, so nothing teaches the invocation a user cannot run. scripts/demo.sh is deliberately untouched — it *executes* ./cli.py from a checkout, where that is the correct and available path. Verified end to end: a sandbox install now reports "Run: bot-bottle backend setup --backend=firecracker", and bot-bottle is on that user's PATH. Unit suite unchanged against the pre-existing baseline. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WEfZZhakx13bxTfXcZCoS5
80 lines
2.5 KiB
Python
80 lines
2.5 KiB
Python
"""Host setup + status for the macOS Apple Container backend.
|
|
|
|
Like Docker, this backend needs no privileged network-pool provisioning
|
|
— it wants Apple's `container` CLI installed and its system service
|
|
running. `setup()` points at the install/`container system start` steps;
|
|
`status()` reports readiness. Reached via
|
|
`MacosContainerBottleBackend.setup` / `.status`, dispatched from the
|
|
generic `bot-bottle backend {setup,status}`.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
|
|
from . import util as _container
|
|
|
|
|
|
def _service_running() -> bool:
|
|
if shutil.which("container") is None:
|
|
return False
|
|
return subprocess.run(
|
|
["container", "system", "status"],
|
|
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=False,
|
|
).returncode == 0
|
|
|
|
|
|
def setup() -> int:
|
|
if not _container.is_macos():
|
|
sys.stderr.write("macos-container backend requires macOS.\n")
|
|
return 1
|
|
if shutil.which("container") is None:
|
|
sys.stderr.write("Apple Container is required but was not found on PATH.\n")
|
|
sys.stderr.write("Install: https://github.com/apple/container/releases\n")
|
|
return 1
|
|
if not _service_running():
|
|
sys.stderr.write(
|
|
"Apple Container is installed but its system service isn't "
|
|
"running. Start it with: container system start\n"
|
|
)
|
|
return 1
|
|
sys.stderr.write(
|
|
"macos-container backend: ready — no privileged host setup required.\n"
|
|
)
|
|
return 0
|
|
|
|
|
|
def teardown() -> int:
|
|
sys.stderr.write(
|
|
"macos-container backend: nothing to undo — it provisions no "
|
|
"privileged host state. The Apple Container CLI and its system "
|
|
"service are left as-is (stop the service yourself with "
|
|
"`container system stop` if you want).\n"
|
|
)
|
|
return 0
|
|
|
|
|
|
def status() -> int:
|
|
ok = True
|
|
if _container.is_macos():
|
|
sys.stderr.write("host: macOS\n")
|
|
else:
|
|
sys.stderr.write("host: NOT macOS (backend unsupported here)\n")
|
|
ok = False
|
|
if shutil.which("container") is not None:
|
|
sys.stderr.write("container CLI on PATH: yes\n")
|
|
else:
|
|
sys.stderr.write("container CLI on PATH: NO\n")
|
|
ok = False
|
|
if ok:
|
|
sys.stderr.write(
|
|
f"container system service: {'running' if _service_running() else 'NOT running'}\n"
|
|
)
|
|
if not _service_running():
|
|
ok = False
|
|
if not ok:
|
|
sys.stderr.write("\nRun: bot-bottle backend setup --backend=macos-container\n")
|
|
return 0 if ok else 1
|