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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: simple_module_cli
-Version: 0.0.39
+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

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

@@ -1,6 +1,6 @@
 [project]
 name = "simple_module_cli"
-version = "0.0.39"
+version = "0.0.40"
 description = "Standalone scaffolder for the SimpleModule framework — `smpy new`, `smpy create-module`, plugin host."
 readme = "README.md"
 license = "MIT"

{simple_module_cli-0.0.39 → 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.39 → 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.39 → 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.39 → 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