simple-module-cli 0.0.38__tar.gz → 0.0.40__tar.gz

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: simple_module_cli
-Version: 0.0.38
+Version: 0.0.40
 Summary: Standalone scaffolder for the SimpleModule framework — `smpy new`, `smpy create-module`, plugin host.
 Project-URL: Homepage, https://github.com/antosubash/simple_module_python
 Project-URL: Repository, https://github.com/antosubash/simple_module_python
@@ -19,8 +19,8 @@ Classifier: Topic :: Software Development :: Code Generators
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
-Requires-Dist: tomlkit>=0.13
-Requires-Dist: typer>=0.12
+Requires-Dist: tomlkit<0.16,>=0.13
+Requires-Dist: typer<0.28,>=0.12
 Description-Content-Type: text/markdown
 
 # simple_module_cli

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simple_module_cli"
-version = "0.0.38"
+version = "0.0.40"
 description = "Standalone scaffolder for the SimpleModule framework — `smpy new`, `smpy create-module`, plugin host."
 readme = "README.md"
 license = "MIT"
@@ -20,8 +20,8 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "typer>=0.12",
-    "tomlkit>=0.13",
+    "typer>=0.12,<0.28",
+    "tomlkit>=0.13,<0.16",
 ]
 
 [project.scripts]

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/simple_module_cli/git_source.py

@@ -11,12 +11,14 @@ tomlkit alone (see test_no_framework_deps.py); clones are read with tomllib.
 
 from __future__ import annotations
 
+import re
 import subprocess
 import tomllib
 from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Literal
+from urllib.parse import urlsplit
 
 __all__ = [
     "FoundModule",
@@ -84,9 +86,8 @@ def _parse_git(raw: str) -> GitAddSpec:
                 )
     ref: str | None = None
     head, sep, tail = body.rpartition("@")
-    # `@` also appears in URL userinfo (ssh://git@host/...). A ref candidate
-    # never contains "/" and what precedes it must still be a full URL.
-    if sep and tail and "/" not in tail and "://" in head:
+    # Only an @ in the URL path separates a ref; userinfo belongs to the authority.
+    if sep and tail and "://" in head and "@" in urlsplit(body).path:
         body, ref = head, tail
     if "://" not in body:
         raise SpecError(f"cannot parse a git URL out of {raw!r}")
@@ -114,7 +115,21 @@ def _cmp(a: str, b: str) -> int:
     width = max(len(ta), len(tb))
     ta += (0,) * (width - len(ta))
     tb += (0,) * (width - len(tb))
-    return (ta > tb) - (ta < tb)
+    if ta != tb:
+        return (ta > tb) - (ta < tb)
+    pa, pb = _prerelease_key(a), _prerelease_key(b)
+    return (pa > pb) - (pa < pb)
+
+
+def _prerelease_key(version: str) -> tuple[int, int]:
+    # shortcut: handles Python a/b/rc suffixes; use a full parser for other version schemes.
+    match = re.search(r"(alpha|beta|a|b|rc)(\d*)$", version, re.IGNORECASE)
+    if match is None:
+        return (3, 0)
+    return (
+        {"a": 0, "alpha": 0, "b": 1, "beta": 1, "rc": 2}[match[1].lower()],
+        int(match[2] or "0"),
+    )
 
 
 _OPS = ("<=", ">=", "==", "!=", "<", ">")

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/simple_module_cli/skills/simple-module-conventions/SKILL.md

@@ -121,6 +121,17 @@ Build a `MailMessage(to, subject, text)` and send it with `current_mail_sender()
 
 Which module holds the accounts depends on the auth provider (`users` or `keycloak`). To name, look up, search or count users, use `get_user_directory(app)` from `simple_module_core.user_directory`: `get_many(db, ids, with_roles=...)`, `search(db, term, limit=...)`, `match_ids(term)` (a subquery) and `stats(db, active_window=...)`. Name a user with `DirectoryUser.label`. `roles is None` means the provider does not know them (Keycloak) — refuse anything that needs roles rather than treating the user as role-less. Importing `users.models` from another module silently queries an empty table under Keycloak.
 
+### 13. Raise domain exceptions from services
+
+Define a per-module base error in `<module>/exceptions.py` or `errors.py` and
+subclass it for business failures. Services must not raise `HTTPException`:
+CLI commands, tasks and durable handlers need transport-independent failures.
+Follow `file_storage`: map errors in endpoints or install HTTP handlers through
+`register_exception_handlers(app)`. Preserve status codes, exact JSON bodies,
+headers and translation keys when migrating; translate at the request boundary.
+Endpoint-level `HTTPException` for pure request validation is fine. Inertia
+forms may catch domain errors to report field errors or redirect.
+
 ## Related skills
 
 - **simple-module-database** — per-module Base, mixins, session lifecycle

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/simple_module_cli/skills/simple-module-creating/SKILL.md

@@ -129,4 +129,10 @@ The new module should appear in the registered-modules log line. If it has a vie
 - **`name=` collides.** Two modules with the same `ModuleMeta.name` raise `SM008` at dev boot / `make doctor` (their lowercased names would also collide as table prefixes in the shared schema).
 - **Registered the module by hand in host code.** Don't — discovery is entry-point-only; host code never imports module code.
 
+Services raise domain exceptions derived from a per-module base in
+`exceptions.py` or `errors.py`, never `HTTPException`. Map them in endpoints or
+`register_exception_handlers(app)` (as in `file_storage`); translate at the
+request boundary. Preserve existing status codes, JSON bodies and headers.
+Endpoint-level `HTTPException` for pure request validation remains fine.
+
 For framework-wide rules that apply once the module exists (SQLModel-everywhere, file-size cap, settings layout, no `session.commit()` in services), see the **simple-module-conventions** skill. For migration mechanics see **simple-module-migrations**.

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/simple_module_cli/templates/module/__PACKAGE__/service.py.tpl

@@ -1,4 +1,10 @@
-"""{{SINGULAR_CLASS}} service implementation."""
+"""{{SINGULAR_CLASS}} service implementation.
+
+Business failures raise domain exceptions derived from a per-module base in
+exceptions.py or errors.py, never HTTPException. Map them in endpoints or via
+ModuleBase.register_exception_handlers; keep HTTP status, payload, headers and
+translation at that boundary so this service also works in CLI/tasks.
+"""
 
 from __future__ import annotations
 

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/simple_module_cli/update_cmd.py

@@ -21,7 +21,6 @@ from simple_module_cli.git_source import (
     derive_range,
     list_remote_refs,
     pick_latest_tag,
-    version_tuple,
 )
 from simple_module_cli.pyproject_edit import (
     dep_constraint,
@@ -41,11 +40,6 @@ def _groups(sources: dict[str, dict]) -> dict[str, list[str]]:
     return by_url
 
 
-def _older_tag(a: str, b: str) -> str:
-    """The lower of two v-prefixed tags — every sibling must accept the shared tag."""
-    return a if version_tuple(a[1:]) <= version_tuple(b[1:]) else b
-
-
 def run_sources_update(
     pyproject: Path,
     *,
@@ -87,12 +81,8 @@ def run_sources_update(
         if not tag_pinned:
             continue
         tags, _ = list_remote_refs(url, **git_kwargs)
-        candidate: str | None = None
-        for name in tag_pinned:
-            best = pick_latest_tag(tags, dep_constraint(doc, name))
-            if best is None:
-                continue
-            candidate = best if candidate is None else _older_tag(candidate, best)
+        constraint = ",".join(dep_constraint(doc, name) or "" for name in tag_pinned)
+        candidate = pick_latest_tag(tags, constraint)
         if candidate is None:
             continue
         current = {str(sources[n]["tag"]) for n in tag_pinned}

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/tests/conftest.py

@@ -7,6 +7,7 @@ how the factory below gets shared.
 
 from __future__ import annotations
 
+import os
 import subprocess
 import sys
 from pathlib import Path
@@ -154,3 +155,17 @@ def make_git_module_repo(tmp_path: Path):
         return repo
 
     return factory
+
+
+@pytest.fixture
+def require_cli_asset():
+    """Keep optional local tooling from silently reducing CI coverage."""
+
+    def require(available: bool, message: str) -> None:
+        if available:
+            return
+        if os.environ.get("CI"):
+            pytest.fail(f"{message}. On CI this must fail rather than skip.")
+        pytest.skip(message)
+
+    return require

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/tests/test_cli_add_spec_parse.py

@@ -50,6 +50,16 @@ def test_git_ssh_userinfo_with_ref() -> None:
     assert p.git.ref == "main"
 
 
+@pytest.mark.parametrize("scheme", ["https://", "ssh://git@"])
+def test_git_spec_ref_with_slash(scheme: str) -> None:
+    url = f"{scheme}github.com/x/repo.git"
+    p = parse_add_spec(f"git+{url}@feature/new#subdirectory=modules/blog")
+    assert p.git is not None
+    assert p.git.url == url
+    assert p.git.ref == "feature/new"
+    assert p.git.subdirectory == "modules/blog"
+
+
 def test_path_spec() -> None:
     p = parse_add_spec("../mod")
     assert p.kind == "path"
@@ -89,3 +99,24 @@ def test_pick_latest_tag() -> None:
     assert pick_latest_tag(tags, ">=1.0,<2.0") == "v1.10.0"
     assert pick_latest_tag(tags, None) == "v2.0.0"
     assert pick_latest_tag(["nope"], None) is None
+
+
+@pytest.mark.parametrize("prerelease", ["1.1.0a1", "1.1.0b1", "1.1.0rc1"])
+def test_prerelease_does_not_satisfy_final_floor(prerelease: str) -> None:
+    assert not satisfies(prerelease, ">=1.1.0")
+    assert not satisfies(prerelease, "==1.1.0")
+    assert satisfies(prerelease, "<1.1.0")
+
+
+@pytest.mark.parametrize(
+    ("tags", "expected"),
+    [
+        (["v1.1.0rc1", "v1.1.0"], "v1.1.0"),
+        (["v1.1.0rc2", "v1.1.0rc10"], "v1.1.0rc10"),
+        (["v1.1.0a1", "v1.1.0b1", "v1.1.0rc1"], "v1.1.0rc1"),
+        (["v1.1.0alpha2", "v1.1.0beta1", "v1.1.0"], "v1.1.0"),
+        (["v1.1.0alpha2", "v1.1.0beta1"], "v1.1.0beta1"),
+    ],
+)
+def test_pick_latest_tag_orders_prereleases(tags: list[str], expected: str) -> None:
+    assert pick_latest_tag(tags, None) == expected

simple_module_cli-0.0.40/tests/test_cli_asset_prerequisites.py

@@ -0,0 +1,19 @@
+"""Missing frontend prerequisites may skip locally but must fail on CI."""
+
+import pytest
+
+
+@pytest.mark.parametrize("ci", [None, "true"])
+def test_cli_missing_asset_prerequisite_fails_on_ci(monkeypatch, require_cli_asset, ci):
+    if ci:
+        monkeypatch.setenv("CI", ci)
+    else:
+        monkeypatch.delenv("CI", raising=False)
+    outcome = pytest.fail.Exception if ci else pytest.skip.Exception
+    with pytest.raises(outcome, match="missing tool"):
+        require_cli_asset(False, "missing tool")
+
+
+def test_cli_available_asset_prerequisite_runs_on_ci(monkeypatch, require_cli_asset):
+    monkeypatch.setenv("CI", "true")
+    require_cli_asset(True, "missing tool")

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/tests/test_cli_openapi_gen_types.py

@@ -185,8 +185,8 @@ def test_pinned_version_matches_the_ui_dev_dependency() -> None:
     assert ui["devDependencies"]["openapi-typescript"] == ot.OPENAPI_TYPESCRIPT_VERSION
 
 
-@pytest.mark.skipif(not LOCAL_TOOL.is_file(), reason="needs `npm install` (openapi-typescript)")
-def test_real_tool_emits_paths(importable: Path) -> None:
+def test_real_tool_emits_paths(importable: Path, require_cli_asset) -> None:
+    require_cli_asset(LOCAL_TOOL.is_file(), "needs `npm ci` (openapi-typescript)")
     targets = ot.module_targets(
         [_fake_module(importable, "gt_real", "Widgets", opted_in=True)], importable, []
     )

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/tests/test_cli_update_sources.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
+import pytest
 from simple_module_cli.update_cmd import run_sources_update
 
 
@@ -125,3 +126,37 @@ def test_no_newer_tag_is_a_quiet_noop(tmp_path: Path, capsys) -> None:
     )
     assert p.read_text(encoding="utf-8") == before
     assert "up to date" in capsys.readouterr().out
+
+
+@pytest.mark.parametrize(
+    ("blog_range", "comments_range", "expected"),
+    [
+        (">=0.3,<1.0", ">=0.1,<0.3", None),  # disjoint ranges
+        (">=0.1,<1.0,!=0.3.0", ">=0.1,<0.4", "v0.2.0"),  # hole below best tags
+        (">=0.1,<1.0", ">=0.8,<1.0", None),  # one sibling has no matching tag
+    ],
+)
+def test_group_update_requires_tag_accepted_by_every_sibling(
+    tmp_path: Path, blog_range: str, comments_range: str, expected: str | None
+) -> None:
+    p = _host(tmp_path, "https://github.com/x/mods")
+    before = (
+        p.read_text(encoding="utf-8")
+        .replace("simple_module_blog>=0.1.0,<1.0", f"simple_module_blog{blog_range}")
+        .replace("simple_module_comments>=0.1.0,<1.0", f"simple_module_comments{comments_range}")
+    )
+    p.write_text(before, encoding="utf-8")
+    calls, runner = _recorder()
+    run_sources_update(
+        p,
+        only="simple_module_blog",
+        dry_run=False,
+        git_runner=_git_stub(["v0.1.0", "v0.2.0", "v0.3.0", "v0.5.0"]),
+        exec_runner=runner,
+    )
+    after = p.read_text(encoding="utf-8")
+    if expected is None:
+        assert after == before
+        assert calls == []
+    else:
+        assert after.count(f'tag = "{expected}"') == 2

{simple_module_cli-0.0.38 → simple_module_cli-0.0.40}/tests/test_module_css_build.py

@@ -6,9 +6,8 @@ resolves the path and keeps the rule. This is the one assertion that exercises
 that whole chain, so it drives a genuine build rather than inspecting the
 generated text.
 
-Skipped where a build is impossible: CI's `python-tests` job installs Python
-deps only (`make install-py`), so `node_modules` is absent there. The JS jobs
-and local runs do have it.
+Missing build prerequisites skip locally and fail on CI, where the Python
+and JS build jobs install the required Node dependencies.
 """
 
 from __future__ import annotations
@@ -22,17 +21,21 @@ import pytest
 REPO_ROOT = Path(__file__).resolve().parents[3]
 
 pytestmark = [
-    pytest.mark.skipif(
-        not (REPO_ROOT / "node_modules").is_dir(),
-        reason="node_modules absent — run `npm install` to exercise the real build",
-    ),
-    pytest.mark.skipif(shutil.which("npm") is None, reason="npm not on PATH"),
     # Both tests rewrite the shared tree (generated manifests, host/static/dist, a
     # probe page under audit_log), so under xdist they must share one worker.
     pytest.mark.xdist_group("repo-build"),
 ]
 
 
+@pytest.fixture(autouse=True)
+def require_build_tools(require_cli_asset):
+    require_cli_asset(shutil.which("npm") is not None, "npm not on PATH")
+    require_cli_asset(
+        (REPO_ROOT / "node_modules").is_dir(),
+        "node_modules absent — run `npm ci` to exercise the real build",
+    )
+
+
 class TestModuleCssReachesBundle:
     def test_module_class_is_emitted_by_vite_build(self):
         """A class defined only in a module's styles.css appears in the built CSS.