cyclo-manager 0.2.0.dev3__tar.gz → 0.2.0.dev5__tar.gz

{cyclo_manager-0.2.0.dev3 → cyclo_manager-0.2.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 0.2.0.dev3
+Version: 0.2.0.dev5
 Summary: cyclo_manager CLI: pip-installable launcher for cyclo_manager server and UI containers. Run 'cyclo_manager up' to start Docker stack.
 License-Expression: Apache-2.0
 Requires-Python: >=3.10

{cyclo_manager-0.2.0.dev3 → cyclo_manager-0.2.0.dev5}/cyclo_host_agent/routers/repos.py

@@ -19,10 +19,8 @@
 """Repository management endpoints."""
 
 import asyncio
-import json
 import os
 import re
-import urllib.request
 from pathlib import Path
 from typing import Optional
 
@@ -46,9 +44,9 @@ GIT_TIMEOUT = 120.0
 
 
 def _resolve_home() -> Path:
-    sudo_user = os.environ.get('SUDO_USER')
-    if sudo_user:
-        return Path(f'/home/{sudo_user}')
+    user_home = os.environ.get('CYCLO_MANAGER_USER_HOME')
+    if user_home:
+        return Path(user_home)
     return Path.home()
 
 
@@ -87,8 +85,10 @@ def _fmt_cmd(cmd: str, output: str) -> str:
 # ── git helpers ────────────────────────────────────────────────────────────────
 
 async def _git(args: list[str], cwd: Optional[Path] = None) -> tuple[int, str, str]:
+    user = os.environ.get('CYCLO_MANAGER_USER')
+    cmd = ['runuser', '-u', user, '--', 'git', *args] if user else ['git', *args]
     proc = await asyncio.create_subprocess_exec(
-        'git', *args,
+        *cmd,
         cwd=str(cwd) if cwd else None,
         stdout=asyncio.subprocess.PIPE,
         stderr=asyncio.subprocess.PIPE,
@@ -133,21 +133,14 @@ def _is_newer(latest: str, current: str) -> bool:
     return _parse_version(latest) > _parse_version(current)
 
 
-def _parse_github_slug(remote_url: str) -> Optional[str]:
-    https_match = re.match(r'https?://github\.com/([^/]+/[^/]+?)(?:\.git)?/?$', remote_url)
+def _is_managed_remote(remote_url: str) -> bool:
+    https_match = re.match(r'https?://github\.com/([^/]+)/', remote_url)
     if https_match:
-        return https_match.group(1)
-    ssh_match = re.match(r'git@github\.com:([^/]+/[^/]+?)(?:\.git)?$', remote_url)
+        return https_match.group(1).lower() == MANAGED_GITHUB_ORG.lower()
+    ssh_match = re.match(r'git@github\.com:([^/]+)/', remote_url)
     if ssh_match:
-        return ssh_match.group(1)
-    return None
-
-
-def _is_managed_remote(remote_url: str) -> bool:
-    slug = _parse_github_slug(remote_url)
-    if not slug:
-        return False
-    return slug.split('/')[0].lower() == MANAGED_GITHUB_ORG.lower()
+        return ssh_match.group(1).lower() == MANAGED_GITHUB_ORG.lower()
+    return False
 
 
 def _read_package_xml_version(repo_path: Path) -> Optional[str]:
@@ -164,15 +157,18 @@ def _read_package_xml_version(repo_path: Path) -> Optional[str]:
     return None
 
 
-def _fetch_github_latest(slug: str) -> Optional[str]:
-    url = f'https://api.github.com/repos/{slug}/releases/latest'
-    req = urllib.request.Request(url, headers={'User-Agent': 'cyclo-manager/1.0'})
-    try:
-        with urllib.request.urlopen(req, timeout=10) as resp:
-            data = json.loads(resp.read().decode())
-            return (data.get('tag_name') or '').strip() or None
-    except Exception:
+async def _fetch_latest_tag(remote_url: str) -> Optional[str]:
+    rc, out, _ = await _git(['ls-remote', '--tags', remote_url])
+    if rc != 0:
+        return None
+    tags = []
+    for line in out.splitlines():
+        if 'refs/tags/' not in line or '^{}' in line:
+            continue
+        tags.append(line.split('refs/tags/')[-1].strip())
+    if not tags:
         return None
+    return max(tags, key=_parse_version)
 
 
 async def _repo_update_status(repo_path: Path) -> Optional[RepoUpdateStatus]:
@@ -182,12 +178,11 @@ async def _repo_update_status(repo_path: Path) -> Optional[RepoUpdateStatus]:
     if not remote_url or not _is_managed_remote(remote_url):
         return None
 
-    slug = _parse_github_slug(remote_url)
     current = _read_package_xml_version(repo_path)
     if not current:
         return RepoUpdateStatus(name=repo_path.name, has_update=False)
 
-    latest = await asyncio.to_thread(_fetch_github_latest, slug)
+    latest = await _fetch_latest_tag(remote_url)
     if not latest:
         return RepoUpdateStatus(name=repo_path.name, current_version=current, has_update=False)
 

{cyclo_manager-0.2.0.dev3 → cyclo_manager-0.2.0.dev5}/cyclo_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 0.2.0.dev3
+Version: 0.2.0.dev5
 Summary: cyclo_manager CLI: pip-installable launcher for cyclo_manager server and UI containers. Run 'cyclo_manager up' to start Docker stack.
 License-Expression: Apache-2.0
 Requires-Python: >=3.10

{cyclo_manager-0.2.0.dev3 → cyclo_manager-0.2.0.dev5}/cyclo_manager_cli/cli.py

@@ -87,11 +87,6 @@ def _setup_socket_dir(user: str) -> bool:
             check=True,
             capture_output=True,
         )
-        subprocess.run(
-            ['sudo', 'chown', f'{user}:{user}', HOST_AGENT_SOCKET_DIR],
-            check=True,
-            capture_output=True,
-        )
         subprocess.run(
             ['sudo', 'rm', '-f', HOST_AGENT_SOCKET],
             check=True,
@@ -134,10 +129,9 @@ After=network.target
 
 [Service]
 Type=simple
-User={user}
-Group={user}
 ExecStart={agent_exe}
-Environment=HOME={user_home}
+Environment=CYCLO_MANAGER_USER={user}
+Environment=CYCLO_MANAGER_USER_HOME={user_home}
 Restart=always
 RestartSec=3
 

{cyclo_manager-0.2.0.dev3 → cyclo_manager-0.2.0.dev5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cyclo-manager"
-version = "0.2.0.dev3"
+version = "0.2.0.dev5"
 description = "cyclo_manager CLI: pip-installable launcher for cyclo_manager server and UI containers. Run 'cyclo_manager up' to start Docker stack."
 readme = "README.md"
 license = "Apache-2.0"