d50891dfe5
This commit introduces a large-scale structural refactor of the pkgmgr
codebase. All functionality has been moved from the previous flat
top-level layout into three clearly separated namespaces:
• pkgmgr.actions – high-level operations invoked by the CLI
• pkgmgr.core – pure logic, helpers, repository utilities,
versioning, git helpers, config IO, and
command resolution
• pkgmgr.cli – parser, dispatch, context, and command
handlers
Key improvements:
- Moved all “branch”, “release”, “changelog”, repo-management
actions, installer pipelines, and proxy execution logic into
pkgmgr.actions.<domain>.
- Reworked installer structure under
pkgmgr.actions.repository.install.installers
including OS-package installers, Nix, Python, and Makefile.
- Consolidated all low-level functionality under pkgmgr.core:
• git helpers → core/git
• config load/save → core/config
• repository helpers → core/repository
• versioning & semver → core/version
• command helpers (alias, resolve, run, ink) → core/command
- Replaced pkgmgr.cli_core with pkgmgr.cli and updated all imports.
- Added minimal __init__.py files for clean package exposure.
- Updated all E2E, integration, and unit tests with new module paths.
- Fixed patch targets so mocks point to the new structure.
- Ensured backward compatibility at the CLI boundary (pkgmgr entry point unchanged).
This refactor produces a cleaner, layered architecture:
- `core` = logic
- `actions` = orchestrated behaviour
- `cli` = user interface
Reference: ChatGPT-assisted refactor discussion
https://chatgpt.com/share/6938221c-e24c-800f-8317-7732cedf39b9
46 lines
1.2 KiB
Python
46 lines
1.2 KiB
Python
# pkgmgr/run_command.py
|
|
import subprocess
|
|
import sys
|
|
from typing import List, Optional, Union
|
|
|
|
|
|
CommandType = Union[str, List[str]]
|
|
|
|
|
|
def run_command(
|
|
cmd: CommandType,
|
|
cwd: Optional[str] = None,
|
|
preview: bool = False,
|
|
allow_failure: bool = False,
|
|
) -> subprocess.CompletedProcess:
|
|
"""
|
|
Run a command and optionally exit on error.
|
|
|
|
- If `cmd` is a string, it is executed with `shell=True`.
|
|
- If `cmd` is a list of strings, it is executed without a shell.
|
|
"""
|
|
if isinstance(cmd, str):
|
|
display = cmd
|
|
else:
|
|
display = " ".join(cmd)
|
|
|
|
where = cwd or "."
|
|
|
|
if preview:
|
|
print(f"[Preview] In '{where}': {display}")
|
|
# Fake a successful result; most callers ignore the return value anyway
|
|
return subprocess.CompletedProcess(cmd, 0) # type: ignore[arg-type]
|
|
|
|
print(f"Running in '{where}': {display}")
|
|
|
|
if isinstance(cmd, str):
|
|
result = subprocess.run(cmd, cwd=cwd, shell=True)
|
|
else:
|
|
result = subprocess.run(cmd, cwd=cwd)
|
|
|
|
if result.returncode != 0 and not allow_failure:
|
|
print(f"Command failed with exit code {result.returncode}. Exiting.")
|
|
sys.exit(result.returncode)
|
|
|
|
return result
|