chatup 0.2.7__tar.gz → 0.2.9__tar.gz

{chatup-0.2.7/src/chatup.egg-info → chatup-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatup
-Version: 0.2.7
+Version: 0.2.9
 Summary: ChatArch setup CLI extracted from ChatTool
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT

{chatup-0.2.7 → chatup-0.2.9}/src/chatup/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.2.7"
+__version__ = "0.2.9"

chatup-0.2.9/src/chatup/cli.py

@@ -0,0 +1,111 @@
+from __future__ import annotations
+
+import inspect
+
+import click
+
+from chatup import __version__
+from chatup.commands.chrome_for_testing import cli as chrome_for_testing_cli
+from chatup.commands.chromedriver import cli as chromedriver_cli
+from chatup.commands.playwright import cli as playwright_cli
+from chatup.setup.cli import register_setup_commands
+
+
+def _purpose(command: click.Command) -> str:
+    text = command.short_help or inspect.getdoc(command.callback) or ""
+    return " ".join(text.strip().split()).rstrip(".")
+
+
+def _parameter_piece(parameter: click.Parameter) -> str | None:
+    if getattr(parameter, "hidden", False) or parameter.name == "help":
+        return None
+    if isinstance(parameter, click.Argument):
+        piece = parameter.name.upper().replace("_", "-")
+        if not parameter.required:
+            piece = f"[{piece}]"
+        if parameter.nargs == -1:
+            piece = f"{piece}..."
+        return piece
+    if not isinstance(parameter, click.Option):
+        return None
+    option_names = [name for name in (*parameter.opts, *parameter.secondary_opts) if name.startswith("--")]
+    if not option_names:
+        option_names = [name for name in (*parameter.opts, *parameter.secondary_opts) if name.startswith("-")]
+    if not option_names:
+        return None
+    if parameter.is_flag or parameter.flag_value is not None:
+        piece = "/".join(option_names)
+    else:
+        metavar = parameter.metavar or parameter.name.upper().replace("_", "-")
+        piece = f"{'/'.join(option_names)} {metavar}"
+    if not parameter.required:
+        piece = f"[{piece}]"
+    return piece
+
+
+def _command_signature(name: str, command: click.Command) -> str:
+    pieces = [piece for piece in (_parameter_piece(parameter) for parameter in command.params) if piece]
+    return " ".join([name, *pieces])
+
+
+def _render_command_tree(command: click.Command, name: str, prefix: str, is_last: bool, lines: list[str]) -> None:
+    connector = "└── " if is_last else "├── "
+    line = f"{prefix}{connector}{_command_signature(name, command)}"
+    purpose = _purpose(command)
+    if purpose:
+        line = f"{line}  # {purpose}"
+    lines.append(line)
+    if not isinstance(command, click.Group):
+        return
+    children = [(child_name, child) for child_name, child in command.commands.items() if not child.hidden]
+    child_prefix = prefix + ("    " if is_last else "│   ")
+    for index, (child_name, child) in enumerate(children):
+        _render_command_tree(child, child_name, child_prefix, index == len(children) - 1, lines)
+
+
+def _render_cli_tree(root: click.Group) -> str:
+    children = [(name, command) for name, command in root.commands.items() if not command.hidden]
+    lines = [f"chatup  # {_purpose(root)}"]
+    root_options = [
+        ("--help", "Show help for the current command."),
+        ("--version", "Show package version."),
+        ("--tree", "Print the registered CLI tree."),
+    ]
+    for index, (option, purpose) in enumerate(root_options):
+        is_last = not children and index == len(root_options) - 1
+        lines.append(f"{'└──' if is_last else '├──'} {option}  # {purpose}")
+    for index, (child_name, child) in enumerate(children):
+        _render_command_tree(child, child_name, "", index == len(children) - 1, lines)
+    return "\n".join(lines)
+
+
+@click.group(
+    context_settings={"help_option_names": ["-h", "--help"]},
+    invoke_without_command=True,
+    no_args_is_help=True,
+)
+@click.version_option(__version__, prog_name="chatup")
+@click.option("--tree", "show_tree", is_flag=True, is_eager=True, help="Print the registered CLI tree.")
+@click.pass_context
+def main(ctx: click.Context, show_tree: bool) -> None:
+    """ChatUp CLI for ChatArch bootstrap workflows."""
+
+    if show_tree:
+        click.echo(_render_cli_tree(ctx.command))
+        ctx.exit()
+
+
+@main.command(name="doctor")
+def doctor() -> None:
+    """Check that ChatUp is installed and callable."""
+    click.echo(f"chatup {__version__} ok")
+
+
+register_setup_commands(main)
+main.add_command(chrome_for_testing_cli)
+main.add_command(chromedriver_cli)
+main.add_command(playwright_cli)
+
+
+if __name__ == "__main__":
+    main()

{chatup-0.2.7 → chatup-0.2.9}/src/chatup/setup/zulip.py

@@ -119,6 +119,7 @@ services:
   memcached:
     image: "memcached:alpine"
     restart: unless-stopped
+    user: "0:0"
     command:
       - "sh"
       - "-euc"
@@ -126,7 +127,8 @@ services:
         echo 'mech_list: plain' > "$$SASL_CONF_PATH"
         echo "zulip@$$HOSTNAME:$$(cat $$MEMCACHED_PASSWORD_FILE)" > "$$MEMCACHED_SASL_PWDB"
         echo "zulip@localhost:$$(cat $$MEMCACHED_PASSWORD_FILE)" >> "$$MEMCACHED_SASL_PWDB"
-        exec memcached -S
+        chown memcache:memcache "$$SASL_CONF_PATH" "$$MEMCACHED_SASL_PWDB"
+        exec memcached -S -u memcache
     secrets:
       - zulip__memcached_password
     environment:

{chatup-0.2.7 → chatup-0.2.9/src/chatup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatup
-Version: 0.2.7
+Version: 0.2.9
 Summary: ChatArch setup CLI extracted from ChatTool
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT

{chatup-0.2.7 → chatup-0.2.9}/tests/test_service_installers.py

@@ -78,6 +78,9 @@ def test_zulip_setup_writes_compose_with_bind_mounts_and_hidden_admin_password(t
     assert "ZULIP_ADMIN_PASSWORD=secret-password" in admin_env.read_text(encoding="utf-8")
     text = compose.read_text(encoding="utf-8")
     assert "127.0.0.1:3099:80" in text
+    assert 'user: "0:0"' in text
+    assert "chown memcache:memcache" in text
+    assert "exec memcached -S -u memcache" in text
     assert str(home / "data" / "postgresql-14") in text
     assert str(home / "data" / "zulip") in text
     assert "SETTING_ZULIP_ADMINISTRATOR: \"admin@example.com\"" in text

chatup-0.2.9/tests/test_version.py

@@ -0,0 +1,45 @@
+from click.testing import CliRunner
+
+from chatup import __version__
+from chatup.cli import main
+
+
+def test_version_present():
+    assert __version__ == "0.2.9"
+
+
+def test_cli_help():
+    result = CliRunner().invoke(main, ["--help"])
+
+    assert result.exit_code == 0
+    assert "ChatUp CLI" in result.output
+    assert "doctor" in result.output
+    assert "--tree" in result.output
+
+
+def test_cli_tree_lists_registered_command_surface():
+    result = CliRunner().invoke(main, ["--tree"])
+
+    assert result.exit_code == 0, result.output
+    assert "chatup  # ChatUp CLI for ChatArch bootstrap workflows" in result.output
+    assert "├── --help  # Show help for the current command." in result.output
+    assert "├── --version  # Show package version." in result.output
+    assert "├── --tree  # Print the registered CLI tree." in result.output
+    for command in [
+        "doctor",
+        "workspace",
+        "chrome-for-testing",
+        "chromedriver",
+        "playwright",
+    ]:
+        assert command in result.output
+    assert "chrome-for-testing" in result.output
+    assert "│   ├── install" in result.output
+    assert "│   └── gc" in result.output
+
+
+def test_cli_doctor():
+    result = CliRunner().invoke(main, ["doctor"])
+
+    assert result.exit_code == 0
+    assert "chatup 0.2.9 ok" in result.output

chatup-0.2.7/src/chatup/cli.py

@@ -1,31 +0,0 @@
-from __future__ import annotations
-
-import click
-
-from chatup import __version__
-from chatup.commands.chrome_for_testing import cli as chrome_for_testing_cli
-from chatup.commands.chromedriver import cli as chromedriver_cli
-from chatup.commands.playwright import cli as playwright_cli
-from chatup.setup.cli import register_setup_commands
-
-
-@click.group(context_settings={"help_option_names": ["-h", "--help"]})
-@click.version_option(__version__, prog_name="chatup")
-def main() -> None:
-    """ChatUp CLI for ChatArch bootstrap workflows."""
-
-
-@main.command(name="doctor")
-def doctor() -> None:
-    """Check that ChatUp is installed and callable."""
-    click.echo(f"chatup {__version__} ok")
-
-
-register_setup_commands(main)
-main.add_command(chrome_for_testing_cli)
-main.add_command(chromedriver_cli)
-main.add_command(playwright_cli)
-
-
-if __name__ == "__main__":
-    main()

chatup-0.2.7/tests/test_version.py

@@ -1,23 +0,0 @@
-from click.testing import CliRunner
-
-from chatup import __version__
-from chatup.cli import main
-
-
-def test_version_present():
-    assert __version__ == "0.2.7"
-
-
-def test_cli_help():
-    result = CliRunner().invoke(main, ["--help"])
-
-    assert result.exit_code == 0
-    assert "ChatUp CLI" in result.output
-    assert "doctor" in result.output
-
-
-def test_cli_doctor():
-    result = CliRunner().invoke(main, ["doctor"])
-
-    assert result.exit_code == 0
-    assert "chatup 0.2.7 ok" in result.output