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
110 lines
3.8 KiB
Python
110 lines
3.8 KiB
Python
from __future__ import annotations
|
|
|
|
import runpy
|
|
import sys
|
|
import unittest
|
|
from unittest.mock import patch
|
|
|
|
|
|
class TestIntegrationBranchCommands(unittest.TestCase):
|
|
"""
|
|
Integration tests for the `pkgmgr branch` CLI wiring.
|
|
|
|
These tests execute the real entry point (main.py) and mock
|
|
the high-level helpers to ensure that argument parsing and
|
|
dispatch behave as expected.
|
|
"""
|
|
|
|
def _run_pkgmgr(self, extra_args: list[str]) -> None:
|
|
"""
|
|
Run the main entry point with the given extra args, as if called via:
|
|
|
|
pkgmgr <extra_args...>
|
|
|
|
We explicitly set sys.argv and execute main.py as __main__ using runpy.
|
|
"""
|
|
original_argv = list(sys.argv)
|
|
try:
|
|
# argv[0] is the program name; the rest are CLI arguments.
|
|
sys.argv = ["pkgmgr"] + list(extra_args)
|
|
runpy.run_module("main", run_name="__main__")
|
|
finally:
|
|
sys.argv = original_argv
|
|
|
|
@patch("pkgmgr.cli.commands.branch.open_branch")
|
|
def test_branch_open_with_name_and_base(self, mock_open_branch) -> None:
|
|
"""
|
|
`pkgmgr branch open feature/test --base develop` must forward
|
|
the name and base branch to open_branch() with cwd=".".
|
|
"""
|
|
self._run_pkgmgr(
|
|
["branch", "open", "feature/test", "--base", "develop"]
|
|
)
|
|
|
|
mock_open_branch.assert_called_once()
|
|
_, kwargs = mock_open_branch.call_args
|
|
self.assertEqual(kwargs.get("name"), "feature/test")
|
|
self.assertEqual(kwargs.get("base_branch"), "develop")
|
|
self.assertEqual(kwargs.get("cwd"), ".")
|
|
|
|
@patch("pkgmgr.cli.commands.branch.open_branch")
|
|
def test_branch_open_without_name_uses_default_base(
|
|
self,
|
|
mock_open_branch,
|
|
) -> None:
|
|
"""
|
|
`pkgmgr branch open` without a name must still call open_branch(),
|
|
passing name=None and the default base branch 'main'.
|
|
"""
|
|
self._run_pkgmgr(["branch", "open"])
|
|
|
|
mock_open_branch.assert_called_once()
|
|
_, kwargs = mock_open_branch.call_args
|
|
self.assertIsNone(kwargs.get("name"))
|
|
self.assertEqual(kwargs.get("base_branch"), "main")
|
|
self.assertEqual(kwargs.get("cwd"), ".")
|
|
|
|
# ------------------------------------------------------------------
|
|
# close subcommand
|
|
# ------------------------------------------------------------------
|
|
|
|
@patch("pkgmgr.cli.commands.branch.close_branch")
|
|
def test_branch_close_with_name_and_base(self, mock_close_branch) -> None:
|
|
"""
|
|
`pkgmgr branch close feature/test --base develop` must forward
|
|
the name and base branch to close_branch() with cwd=".".
|
|
"""
|
|
self._run_pkgmgr(
|
|
["branch", "close", "feature/test", "--base", "develop"]
|
|
)
|
|
|
|
mock_close_branch.assert_called_once()
|
|
_, kwargs = mock_close_branch.call_args
|
|
self.assertEqual(kwargs.get("name"), "feature/test")
|
|
self.assertEqual(kwargs.get("base_branch"), "develop")
|
|
self.assertEqual(kwargs.get("cwd"), ".")
|
|
|
|
@patch("pkgmgr.cli.commands.branch.close_branch")
|
|
def test_branch_close_without_name_uses_default_base(
|
|
self,
|
|
mock_close_branch,
|
|
) -> None:
|
|
"""
|
|
`pkgmgr branch close` without a name must still call close_branch(),
|
|
passing name=None and the default base branch 'main'.
|
|
|
|
The branch helper will then resolve the actual base (main/master)
|
|
internally.
|
|
"""
|
|
self._run_pkgmgr(["branch", "close"])
|
|
|
|
mock_close_branch.assert_called_once()
|
|
_, kwargs = mock_close_branch.call_args
|
|
self.assertIsNone(kwargs.get("name"))
|
|
self.assertEqual(kwargs.get("base_branch"), "main")
|
|
self.assertEqual(kwargs.get("cwd"), ".")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|