Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22efe0b32e | ||
|
|
d23a0a94d5 | ||
|
|
e42b79c9d8 | ||
|
|
3b2c657bfa | ||
|
|
e335ab05a1 | ||
|
|
75f963d6e2 |
10
CHANGELOG.md
10
CHANGELOG.md
@@ -1,3 +1,13 @@
|
|||||||
|
## [0.7.13] - 2025-12-10
|
||||||
|
|
||||||
|
* Automated release.
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.12] - 2025-12-09
|
||||||
|
|
||||||
|
* Fixed self refering alias during setup
|
||||||
|
|
||||||
|
|
||||||
## [0.7.11] - 2025-12-09
|
## [0.7.11] - 2025-12-09
|
||||||
|
|
||||||
* test: fix installer unit tests for OS packages and Nix dev shell
|
* test: fix installer unit tests for OS packages and Nix dev shell
|
||||||
|
|||||||
2
PKGBUILD
2
PKGBUILD
@@ -1,7 +1,7 @@
|
|||||||
# Maintainer: Kevin Veen-Birkenbach <info@veen.world>
|
# Maintainer: Kevin Veen-Birkenbach <info@veen.world>
|
||||||
|
|
||||||
pkgname=package-manager
|
pkgname=package-manager
|
||||||
pkgver=0.7.11
|
pkgver=0.7.13
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Local-flake wrapper for Kevin's package-manager (Nix-based)."
|
pkgdesc="Local-flake wrapper for Kevin's package-manager (Nix-based)."
|
||||||
arch=('any')
|
arch=('any')
|
||||||
|
|||||||
12
debian/changelog
vendored
12
debian/changelog
vendored
@@ -1,3 +1,15 @@
|
|||||||
|
package-manager (0.7.13-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Automated release.
|
||||||
|
|
||||||
|
-- Kevin Veen-Birkenbach <kevin@veen.world> Wed, 10 Dec 2025 10:27:24 +0100
|
||||||
|
|
||||||
|
package-manager (0.7.12-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Fixed self refering alias during setup
|
||||||
|
|
||||||
|
-- Kevin Veen-Birkenbach <kevin@veen.world> Tue, 09 Dec 2025 23:36:35 +0100
|
||||||
|
|
||||||
package-manager (0.7.11-1) unstable; urgency=medium
|
package-manager (0.7.11-1) unstable; urgency=medium
|
||||||
|
|
||||||
* test: fix installer unit tests for OS packages and Nix dev shell
|
* test: fix installer unit tests for OS packages and Nix dev shell
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
rec {
|
rec {
|
||||||
pkgmgr = pyPkgs.buildPythonApplication {
|
pkgmgr = pyPkgs.buildPythonApplication {
|
||||||
pname = "package-manager";
|
pname = "package-manager";
|
||||||
version = "0.7.11";
|
version = "0.7.13";
|
||||||
|
|
||||||
# Use the git repo as source
|
# Use the git repo as source
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
Name: package-manager
|
Name: package-manager
|
||||||
Version: 0.7.11
|
Version: 0.7.13
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Wrapper that runs Kevin's package-manager via Nix flake
|
Summary: Wrapper that runs Kevin's package-manager via Nix flake
|
||||||
|
|
||||||
@@ -77,6 +77,12 @@ echo ">>> package-manager removed. Nix itself was not removed."
|
|||||||
/usr/lib/package-manager/
|
/usr/lib/package-manager/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 10 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 0.7.13-1
|
||||||
|
- Automated release.
|
||||||
|
|
||||||
|
* Tue Dec 09 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 0.7.12-1
|
||||||
|
- Fixed self refering alias during setup
|
||||||
|
|
||||||
* Tue Dec 09 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 0.7.11-1
|
* Tue Dec 09 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 0.7.11-1
|
||||||
- test: fix installer unit tests for OS packages and Nix dev shell
|
- test: fix installer unit tests for OS packages and Nix dev shell
|
||||||
|
|
||||||
|
|||||||
@@ -8,46 +8,73 @@ from typing import Any, Dict, List
|
|||||||
from pkgmgr .cli .context import CLIContext
|
from pkgmgr .cli .context import CLIContext
|
||||||
from pkgmgr .core .command .run import run_command
|
from pkgmgr .core .command .run import run_command
|
||||||
from pkgmgr .core .repository .identifier import get_repo_identifier
|
from pkgmgr .core .repository .identifier import get_repo_identifier
|
||||||
|
from pkgmgr .core .repository .dir import get_repo_dir
|
||||||
|
|
||||||
|
|
||||||
Repository = Dict[str, Any]
|
Repository = Dict[str, Any]
|
||||||
|
|
||||||
|
|
||||||
|
def _resolve_repository_path(repository: Repository, ctx: CLIContext) -> str:
|
||||||
|
"""
|
||||||
|
Resolve the filesystem path for a repository.
|
||||||
|
|
||||||
|
Priority:
|
||||||
|
1. Use explicit keys if present (directory / path / workspace / workspace_dir).
|
||||||
|
2. Fallback to get_repo_dir(...) using the repositories base directory
|
||||||
|
from the CLI context.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# 1) Explicit path-like keys on the repository object
|
||||||
|
for key in ("directory", "path", "workspace", "workspace_dir"):
|
||||||
|
value = repository.get(key)
|
||||||
|
if value:
|
||||||
|
return value
|
||||||
|
|
||||||
|
# 2) Fallback: compute from base dir + repository metadata
|
||||||
|
base_dir = (
|
||||||
|
getattr(ctx, "repositories_base_dir", None)
|
||||||
|
or getattr(ctx, "repositories_dir", None)
|
||||||
|
)
|
||||||
|
if not base_dir:
|
||||||
|
raise RuntimeError(
|
||||||
|
"Cannot resolve repositories base directory from context; "
|
||||||
|
"expected ctx.repositories_base_dir or ctx.repositories_dir."
|
||||||
|
)
|
||||||
|
|
||||||
|
return get_repo_dir(base_dir, repository)
|
||||||
|
|
||||||
|
|
||||||
def handle_tools_command(
|
def handle_tools_command(
|
||||||
args,
|
args,
|
||||||
ctx: CLIContext,
|
ctx: CLIContext,
|
||||||
selected: List[Repository],
|
selected: List[Repository],
|
||||||
) -> None:
|
) -> None:
|
||||||
"""
|
|
||||||
Handle integration commands:
|
|
||||||
- explore (file manager)
|
|
||||||
- terminal (GNOME Terminal)
|
|
||||||
- code (VS Code workspace)
|
|
||||||
"""
|
|
||||||
|
|
||||||
# --------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
# explore
|
# nautilus "explore" command
|
||||||
# --------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
if args.command == "explore":
|
if args.command == "explore":
|
||||||
for repository in selected:
|
for repository in selected:
|
||||||
|
repo_path = _resolve_repository_path(repository, ctx)
|
||||||
run_command(
|
run_command(
|
||||||
f"nautilus {repository['directory']} & disown"
|
f'nautilus "{repo_path}" & disown'
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
# --------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
# terminal
|
# GNOME terminal command
|
||||||
# --------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
if args.command == "terminal":
|
if args.command == "terminal":
|
||||||
for repository in selected:
|
for repository in selected:
|
||||||
|
repo_path = _resolve_repository_path(repository, ctx)
|
||||||
run_command(
|
run_command(
|
||||||
f'gnome-terminal --tab --working-directory="{repository["directory"]}"'
|
f'gnome-terminal --tab --working-directory="{repo_path}"'
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
# --------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
# code
|
# VS Code workspace command
|
||||||
# --------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
if args.command == "code":
|
if args.command == "code":
|
||||||
if not selected:
|
if not selected:
|
||||||
print("No repositories selected.")
|
print("No repositories selected.")
|
||||||
@@ -60,20 +87,25 @@ def handle_tools_command(
|
|||||||
sorted_identifiers = sorted(identifiers)
|
sorted_identifiers = sorted(identifiers)
|
||||||
workspace_name = "_".join(sorted_identifiers) + ".code-workspace"
|
workspace_name = "_".join(sorted_identifiers) + ".code-workspace"
|
||||||
|
|
||||||
|
directories_cfg = ctx.config_merged.get("directories") or {}
|
||||||
workspaces_dir = os.path.expanduser(
|
workspaces_dir = os.path.expanduser(
|
||||||
ctx.config_merged.get("directories").get("workspaces")
|
directories_cfg.get("workspaces", "~/Workspaces")
|
||||||
)
|
)
|
||||||
os.makedirs(workspaces_dir, exist_ok=True)
|
os.makedirs(workspaces_dir, exist_ok=True)
|
||||||
workspace_file = os.path.join(workspaces_dir, workspace_name)
|
workspace_file = os.path.join(workspaces_dir, workspace_name)
|
||||||
|
|
||||||
folders = [{"path": repository["directory"]} for repository in selected]
|
folders = [
|
||||||
|
{"path": _resolve_repository_path(repository, ctx)}
|
||||||
|
for repository in selected
|
||||||
|
]
|
||||||
|
|
||||||
workspace_data = {
|
workspace_data = {
|
||||||
"folders": folders,
|
"folders": folders,
|
||||||
"settings": {},
|
"settings": {},
|
||||||
}
|
}
|
||||||
|
|
||||||
if not os.path.exists(workspace_file):
|
if not os.path.exists(workspace_file):
|
||||||
with open(workspace_file, "w") as f:
|
with open(workspace_file, "w", encoding="utf-8") as f:
|
||||||
json.dump(workspace_data, f, indent=4)
|
json.dump(workspace_data, f, indent=4)
|
||||||
print(f"Created workspace file: {workspace_file}")
|
print(f"Created workspace file: {workspace_file}")
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -6,8 +6,14 @@ from pkgmgr.core.repository.identifier import get_repo_identifier
|
|||||||
from pkgmgr.core.repository.dir import get_repo_dir
|
from pkgmgr.core.repository.dir import get_repo_dir
|
||||||
|
|
||||||
|
|
||||||
def create_ink(repo, repositories_base_dir, bin_dir, all_repos,
|
def create_ink(
|
||||||
quiet=False, preview=False):
|
repo,
|
||||||
|
repositories_base_dir,
|
||||||
|
bin_dir,
|
||||||
|
all_repos,
|
||||||
|
quiet: bool = False,
|
||||||
|
preview: bool = False,
|
||||||
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Create a symlink for the repository's command.
|
Create a symlink for the repository's command.
|
||||||
|
|
||||||
@@ -18,6 +24,11 @@ def create_ink(repo, repositories_base_dir, bin_dir, all_repos,
|
|||||||
Behavior:
|
Behavior:
|
||||||
- If repo["command"] is defined → create a symlink to it.
|
- If repo["command"] is defined → create a symlink to it.
|
||||||
- If repo["command"] is missing or None → do NOT create a link.
|
- If repo["command"] is missing or None → do NOT create a link.
|
||||||
|
|
||||||
|
Safety:
|
||||||
|
- If the resolved command path is identical to the final link target,
|
||||||
|
we skip symlink creation to avoid self-referential symlinks that
|
||||||
|
would break shell resolution ("too many levels of symbolic links").
|
||||||
"""
|
"""
|
||||||
|
|
||||||
repo_identifier = get_repo_identifier(repo, all_repos)
|
repo_identifier = get_repo_identifier(repo, all_repos)
|
||||||
@@ -31,6 +42,27 @@ def create_ink(repo, repositories_base_dir, bin_dir, all_repos,
|
|||||||
|
|
||||||
link_path = os.path.join(bin_dir, repo_identifier)
|
link_path = os.path.join(bin_dir, repo_identifier)
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
# Safety guard: avoid self-referential symlinks
|
||||||
|
#
|
||||||
|
# Example of a broken situation we must avoid:
|
||||||
|
# - command = ~/.local/bin/package-manager
|
||||||
|
# - link_path = ~/.local/bin/package-manager
|
||||||
|
# - create_ink() removes the real binary and creates a symlink
|
||||||
|
# pointing to itself → zsh: too many levels of symbolic links
|
||||||
|
#
|
||||||
|
# If the resolved command already lives exactly at the target path,
|
||||||
|
# we treat it as "already installed" and skip any modification.
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
if os.path.abspath(command) == os.path.abspath(link_path):
|
||||||
|
if not quiet:
|
||||||
|
print(
|
||||||
|
f"[pkgmgr] Command for '{repo_identifier}' already lives at "
|
||||||
|
f"'{link_path}'. Skipping symlink creation to avoid a "
|
||||||
|
"self-referential link."
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
if preview:
|
if preview:
|
||||||
print(f"[Preview] Would link {link_path} → {command}")
|
print(f"[Preview] Would link {link_path} → {command}")
|
||||||
return
|
return
|
||||||
@@ -65,7 +97,10 @@ def create_ink(repo, repositories_base_dir, bin_dir, all_repos,
|
|||||||
|
|
||||||
if alias_name == repo_identifier:
|
if alias_name == repo_identifier:
|
||||||
if not quiet:
|
if not quiet:
|
||||||
print(f"Alias '{alias_name}' equals identifier. Skipping alias creation.")
|
print(
|
||||||
|
f"Alias '{alias_name}' equals identifier. "
|
||||||
|
"Skipping alias creation."
|
||||||
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "package-manager"
|
name = "package-manager"
|
||||||
version = "0.7.11"
|
version = "0.7.13"
|
||||||
description = "Kevin's package-manager tool (pkgmgr)"
|
description = "Kevin's package-manager tool (pkgmgr)"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
|
|||||||
93
tests/e2e/test_clone_all.py
Normal file
93
tests/e2e/test_clone_all.py
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
"""
|
||||||
|
Integration test: clone all configured repositories using
|
||||||
|
--clone-mode https and --no-verification.
|
||||||
|
|
||||||
|
This test is intended to be run inside the Docker container where:
|
||||||
|
- network access is available,
|
||||||
|
- the config/config.yaml is present,
|
||||||
|
- and it is safe to perform real git operations.
|
||||||
|
|
||||||
|
It passes if the command completes without raising an exception.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import runpy
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from test_install_pkgmgr_shallow import (
|
||||||
|
nix_profile_list_debug,
|
||||||
|
remove_pkgmgr_from_nix_profile,
|
||||||
|
pkgmgr_help_debug,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestIntegrationCloneAllHttps(unittest.TestCase):
|
||||||
|
def _run_pkgmgr_clone_all_https(self) -> None:
|
||||||
|
"""
|
||||||
|
Helper that runs the CLI command via main.py and provides
|
||||||
|
extra diagnostics if the command exits with a non-zero code.
|
||||||
|
"""
|
||||||
|
cmd_repr = "pkgmgr clone --all --clone-mode https --no-verification"
|
||||||
|
original_argv = sys.argv
|
||||||
|
try:
|
||||||
|
sys.argv = [
|
||||||
|
"pkgmgr",
|
||||||
|
"clone",
|
||||||
|
"--all",
|
||||||
|
"--clone-mode",
|
||||||
|
"https",
|
||||||
|
"--no-verification",
|
||||||
|
]
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Execute main.py as if it was called from CLI.
|
||||||
|
# This will run the full clone pipeline inside the container.
|
||||||
|
runpy.run_module("main", run_name="__main__")
|
||||||
|
except SystemExit as exc:
|
||||||
|
# Convert SystemExit into a more helpful assertion with debug output.
|
||||||
|
exit_code = exc.code if isinstance(exc.code, int) else str(exc.code)
|
||||||
|
|
||||||
|
print("\n[TEST] pkgmgr clone --all failed with SystemExit")
|
||||||
|
print(f"[TEST] Command : {cmd_repr}")
|
||||||
|
print(f"[TEST] Exit code: {exit_code}")
|
||||||
|
|
||||||
|
# Additional Nix profile debug on failure (may still be useful
|
||||||
|
# if the clone step interacts with Nix-based tooling).
|
||||||
|
nix_profile_list_debug("ON FAILURE (AFTER SystemExit)")
|
||||||
|
|
||||||
|
raise AssertionError(
|
||||||
|
f"{cmd_repr!r} failed with exit code {exit_code}. "
|
||||||
|
"Scroll up to see the full pkgmgr/make output inside the container."
|
||||||
|
) from exc
|
||||||
|
|
||||||
|
finally:
|
||||||
|
sys.argv = original_argv
|
||||||
|
|
||||||
|
def test_clone_all_repositories_https(self) -> None:
|
||||||
|
"""
|
||||||
|
Run: pkgmgr clone --all --clone-mode https --no-verification
|
||||||
|
|
||||||
|
This will perform real git clone operations inside the container.
|
||||||
|
The test succeeds if no exception is raised and `pkgmgr --help`
|
||||||
|
works in a fresh interactive bash session afterwards.
|
||||||
|
"""
|
||||||
|
# Debug before cleanup (reusing the same helpers as the install test).
|
||||||
|
nix_profile_list_debug("BEFORE CLEANUP")
|
||||||
|
|
||||||
|
# Cleanup: aggressively try to drop any pkgmgr/profile entries
|
||||||
|
# (harmless for a pure clone test but keeps environments comparable).
|
||||||
|
remove_pkgmgr_from_nix_profile()
|
||||||
|
|
||||||
|
# Debug after cleanup
|
||||||
|
nix_profile_list_debug("AFTER CLEANUP")
|
||||||
|
|
||||||
|
# Run the actual clone with extended diagnostics
|
||||||
|
self._run_pkgmgr_clone_all_https()
|
||||||
|
|
||||||
|
# After successful clone: show `pkgmgr --help`
|
||||||
|
# via interactive bash (same helper as in the install test).
|
||||||
|
pkgmgr_help_debug()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
74
tests/e2e/test_tools_help.py
Normal file
74
tests/e2e/test_tools_help.py
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
"""
|
||||||
|
E2E/Integration tests for the tool-related subcommands' --help output.
|
||||||
|
|
||||||
|
We assert that calling:
|
||||||
|
- pkgmgr explore --help
|
||||||
|
- pkgmgr terminal --help
|
||||||
|
- pkgmgr code --help
|
||||||
|
|
||||||
|
completes successfully. For --help, argparse exits with SystemExit(0),
|
||||||
|
which we treat as success and suppress in the helper.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
import runpy
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
from typing import List
|
||||||
|
|
||||||
|
|
||||||
|
# Resolve project root (the repo where main.py lives, e.g. /src)
|
||||||
|
PROJECT_ROOT = os.path.abspath(
|
||||||
|
os.path.join(os.path.dirname(__file__), "..", "..")
|
||||||
|
)
|
||||||
|
MAIN_PATH = os.path.join(PROJECT_ROOT, "main.py")
|
||||||
|
|
||||||
|
|
||||||
|
def _run_main(argv: List[str]) -> None:
|
||||||
|
"""
|
||||||
|
Helper to run main.py with the given argv.
|
||||||
|
|
||||||
|
This mimics a "pkgmgr ..." invocation in the E2E container.
|
||||||
|
|
||||||
|
For --help invocations, argparse will call sys.exit(0), which raises
|
||||||
|
SystemExit(0). We treat this as success and only re-raise non-zero
|
||||||
|
exit codes.
|
||||||
|
"""
|
||||||
|
old_argv = sys.argv
|
||||||
|
try:
|
||||||
|
sys.argv = ["pkgmgr"] + argv
|
||||||
|
try:
|
||||||
|
runpy.run_path(MAIN_PATH, run_name="__main__")
|
||||||
|
except SystemExit as exc: # argparse uses this for --help
|
||||||
|
# SystemExit.code can be int, str or None; for our purposes:
|
||||||
|
code = exc.code
|
||||||
|
if code not in (0, None):
|
||||||
|
# Non-zero exit code -> real error.
|
||||||
|
raise
|
||||||
|
# For 0/None: treat as success and swallow the exception.
|
||||||
|
finally:
|
||||||
|
sys.argv = old_argv
|
||||||
|
|
||||||
|
|
||||||
|
class TestToolsHelp(unittest.TestCase):
|
||||||
|
"""
|
||||||
|
E2E/Integration tests for tool commands' --help screens.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def test_explore_help(self) -> None:
|
||||||
|
"""Ensure `pkgmgr explore --help` runs successfully."""
|
||||||
|
_run_main(["explore", "--help"])
|
||||||
|
|
||||||
|
def test_terminal_help(self) -> None:
|
||||||
|
"""Ensure `pkgmgr terminal --help` runs successfully."""
|
||||||
|
_run_main(["terminal", "--help"])
|
||||||
|
|
||||||
|
def test_code_help(self) -> None:
|
||||||
|
"""Ensure `pkgmgr code --help` runs successfully."""
|
||||||
|
_run_main(["code", "--help"])
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
"""
|
"""
|
||||||
Integration test: install all configured repositories using
|
Integration test: update all configured repositories using
|
||||||
--clone-mode shallow (HTTPS shallow clone) and --no-verification.
|
--clone-mode https and --no-verification.
|
||||||
|
|
||||||
This test is intended to be run inside the Docker container where:
|
This test is intended to be run inside the Docker container where:
|
||||||
- network access is available,
|
- network access is available,
|
||||||
@@ -21,37 +21,38 @@ from test_install_pkgmgr_shallow import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class TestIntegrationInstallAllShallow(unittest.TestCase):
|
class TestIntegrationUpdateAllHttps(unittest.TestCase):
|
||||||
def _run_pkgmgr_install_all(self) -> None:
|
def _run_pkgmgr_update_all_https(self) -> None:
|
||||||
"""
|
"""
|
||||||
Helper that runs the CLI command via main.py and provides
|
Helper that runs the CLI command via main.py and provides
|
||||||
extra diagnostics if the command exits with a non-zero code.
|
extra diagnostics if the command exits with a non-zero code.
|
||||||
"""
|
"""
|
||||||
cmd_repr = "pkgmgr install --all --clone-mode shallow --no-verification"
|
cmd_repr = "pkgmgr update --all --clone-mode https --no-verification"
|
||||||
original_argv = sys.argv
|
original_argv = sys.argv
|
||||||
try:
|
try:
|
||||||
sys.argv = [
|
sys.argv = [
|
||||||
"pkgmgr",
|
"pkgmgr",
|
||||||
"install",
|
"update",
|
||||||
"--all",
|
"--all",
|
||||||
"--clone-mode",
|
"--clone-mode",
|
||||||
"shallow",
|
"https",
|
||||||
"--no-verification",
|
"--no-verification",
|
||||||
]
|
]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# Execute main.py as if it was called from CLI.
|
# Execute main.py as if it was called from CLI.
|
||||||
# This will run the full install pipeline inside the container.
|
# This will run the full update pipeline inside the container.
|
||||||
runpy.run_module("main", run_name="__main__")
|
runpy.run_module("main", run_name="__main__")
|
||||||
except SystemExit as exc:
|
except SystemExit as exc:
|
||||||
# Convert SystemExit into a more helpful assertion with debug output.
|
# Convert SystemExit into a more helpful assertion with debug output.
|
||||||
exit_code = exc.code if isinstance(exc.code, int) else str(exc.code)
|
exit_code = exc.code if isinstance(exc.code, int) else str(exc.code)
|
||||||
|
|
||||||
print("\n[TEST] pkgmgr install --all failed with SystemExit")
|
print("\n[TEST] pkgmgr update --all failed with SystemExit")
|
||||||
print(f"[TEST] Command : {cmd_repr}")
|
print(f"[TEST] Command : {cmd_repr}")
|
||||||
print(f"[TEST] Exit code: {exit_code}")
|
print(f"[TEST] Exit code: {exit_code}")
|
||||||
|
|
||||||
# Additional Nix profile debug on failure
|
# Additional Nix profile debug on failure (useful if any update
|
||||||
|
# step interacts with Nix-based tooling).
|
||||||
nix_profile_list_debug("ON FAILURE (AFTER SystemExit)")
|
nix_profile_list_debug("ON FAILURE (AFTER SystemExit)")
|
||||||
|
|
||||||
raise AssertionError(
|
raise AssertionError(
|
||||||
@@ -62,11 +63,11 @@ class TestIntegrationInstallAllShallow(unittest.TestCase):
|
|||||||
finally:
|
finally:
|
||||||
sys.argv = original_argv
|
sys.argv = original_argv
|
||||||
|
|
||||||
def test_install_all_repositories_shallow(self) -> None:
|
def test_update_all_repositories_https(self) -> None:
|
||||||
"""
|
"""
|
||||||
Run: pkgmgr install --all --clone-mode shallow --no-verification
|
Run: pkgmgr update --all --clone-mode https --no-verification
|
||||||
|
|
||||||
This will perform real installations/clones inside the container.
|
This will perform real git update operations inside the container.
|
||||||
The test succeeds if no exception is raised and `pkgmgr --help`
|
The test succeeds if no exception is raised and `pkgmgr --help`
|
||||||
works in a fresh interactive bash session afterwards.
|
works in a fresh interactive bash session afterwards.
|
||||||
"""
|
"""
|
||||||
@@ -74,16 +75,17 @@ class TestIntegrationInstallAllShallow(unittest.TestCase):
|
|||||||
nix_profile_list_debug("BEFORE CLEANUP")
|
nix_profile_list_debug("BEFORE CLEANUP")
|
||||||
|
|
||||||
# Cleanup: aggressively try to drop any pkgmgr/profile entries
|
# Cleanup: aggressively try to drop any pkgmgr/profile entries
|
||||||
|
# (keeps the environment comparable to other integration tests).
|
||||||
remove_pkgmgr_from_nix_profile()
|
remove_pkgmgr_from_nix_profile()
|
||||||
|
|
||||||
# Debug after cleanup
|
# Debug after cleanup
|
||||||
nix_profile_list_debug("AFTER CLEANUP")
|
nix_profile_list_debug("AFTER CLEANUP")
|
||||||
|
|
||||||
# Run the actual install with extended diagnostics
|
# Run the actual update with extended diagnostics
|
||||||
self._run_pkgmgr_install_all()
|
self._run_pkgmgr_update_all_https()
|
||||||
|
|
||||||
# After successful installation: show `pkgmgr --help`
|
# After successful update: show `pkgmgr --help`
|
||||||
# via interactive bash (same as the pkgmgr-only test).
|
# via interactive bash (same helper as in the other integration tests).
|
||||||
pkgmgr_help_debug()
|
pkgmgr_help_debug()
|
||||||
|
|
||||||
|
|
||||||
168
tests/unit/pkgmgr/cli/commands/test_tools.py
Normal file
168
tests/unit/pkgmgr/cli/commands/test_tools.py
Normal file
@@ -0,0 +1,168 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
from types import SimpleNamespace
|
||||||
|
from typing import Any, Dict, List
|
||||||
|
|
||||||
|
from pkgmgr.cli.commands.tools import handle_tools_command
|
||||||
|
|
||||||
|
Repository = Dict[str, Any]
|
||||||
|
|
||||||
|
|
||||||
|
class _Args:
|
||||||
|
"""
|
||||||
|
Simple helper object to mimic argparse.Namespace for handle_tools_command.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, command: str) -> None:
|
||||||
|
self.command = command
|
||||||
|
|
||||||
|
|
||||||
|
class TestHandleToolsCommand(unittest.TestCase):
|
||||||
|
"""
|
||||||
|
Unit tests for pkgmgr.cli.commands.tools.handle_tools_command.
|
||||||
|
|
||||||
|
We focus on:
|
||||||
|
- Correct path resolution for repositories that have a 'directory' key.
|
||||||
|
- Correct shell commands for 'explore' and 'terminal'.
|
||||||
|
- Proper workspace creation and invocation of 'code' for the 'code' command.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def setUp(self) -> None:
|
||||||
|
# Two fake repositories with explicit 'directory' entries so that
|
||||||
|
# _resolve_repository_path() does not need to call get_repo_dir().
|
||||||
|
self.repos: List[Repository] = [
|
||||||
|
{"alias": "repo1", "directory": "/tmp/repo1"},
|
||||||
|
{"alias": "repo2", "directory": "/tmp/repo2"},
|
||||||
|
]
|
||||||
|
|
||||||
|
# Minimal CLI context; only attributes used in tools.py are provided.
|
||||||
|
self.ctx = SimpleNamespace(
|
||||||
|
config_merged={"directories": {"workspaces": "~/Workspaces"}},
|
||||||
|
all_repositories=self.repos,
|
||||||
|
repositories_base_dir="/base/dir",
|
||||||
|
)
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------ #
|
||||||
|
# Helper
|
||||||
|
# ------------------------------------------------------------------ #
|
||||||
|
|
||||||
|
def _patch_run_command(self):
|
||||||
|
"""
|
||||||
|
Convenience context manager for patching run_command in tools module.
|
||||||
|
"""
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
return patch("pkgmgr.cli.commands.tools.run_command")
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------ #
|
||||||
|
# Tests for 'explore'
|
||||||
|
# ------------------------------------------------------------------ #
|
||||||
|
|
||||||
|
def test_explore_uses_directory_paths(self) -> None:
|
||||||
|
"""
|
||||||
|
The 'explore' command should call Nautilus with the resolved
|
||||||
|
repository paths and use '& disown' as in the implementation.
|
||||||
|
"""
|
||||||
|
from unittest.mock import call
|
||||||
|
|
||||||
|
args = _Args(command="explore")
|
||||||
|
|
||||||
|
with self._patch_run_command() as mock_run_command:
|
||||||
|
handle_tools_command(args, self.ctx, self.repos)
|
||||||
|
|
||||||
|
expected_calls = [
|
||||||
|
call('nautilus "/tmp/repo1" & disown'),
|
||||||
|
call('nautilus "/tmp/repo2" & disown'),
|
||||||
|
]
|
||||||
|
self.assertEqual(mock_run_command.call_args_list, expected_calls)
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------ #
|
||||||
|
# Tests for 'terminal'
|
||||||
|
# ------------------------------------------------------------------ #
|
||||||
|
|
||||||
|
def test_terminal_uses_directory_paths(self) -> None:
|
||||||
|
"""
|
||||||
|
The 'terminal' command should open a GNOME Terminal tab with the
|
||||||
|
repository as its working directory.
|
||||||
|
"""
|
||||||
|
from unittest.mock import call
|
||||||
|
|
||||||
|
args = _Args(command="terminal")
|
||||||
|
|
||||||
|
with self._patch_run_command() as mock_run_command:
|
||||||
|
handle_tools_command(args, self.ctx, self.repos)
|
||||||
|
|
||||||
|
expected_calls = [
|
||||||
|
call('gnome-terminal --tab --working-directory="/tmp/repo1"'),
|
||||||
|
call('gnome-terminal --tab --working-directory="/tmp/repo2"'),
|
||||||
|
]
|
||||||
|
self.assertEqual(mock_run_command.call_args_list, expected_calls)
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------ #
|
||||||
|
# Tests for 'code'
|
||||||
|
# ------------------------------------------------------------------ #
|
||||||
|
|
||||||
|
def test_code_creates_workspace_and_calls_code(self) -> None:
|
||||||
|
"""
|
||||||
|
The 'code' command should:
|
||||||
|
|
||||||
|
- Build a workspace file name from sorted repository identifiers.
|
||||||
|
- Resolve the repository paths into VS Code 'folders'.
|
||||||
|
- Create the workspace file if it does not exist.
|
||||||
|
- Call 'code "<workspace_file>"' via run_command.
|
||||||
|
"""
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
args = _Args(command="code")
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
|
# Patch expanduser so that the configured '~/Workspaces'
|
||||||
|
# resolves into our temporary directory.
|
||||||
|
with patch(
|
||||||
|
"pkgmgr.cli.commands.tools.os.path.expanduser"
|
||||||
|
) as mock_expanduser:
|
||||||
|
mock_expanduser.return_value = tmpdir
|
||||||
|
|
||||||
|
# Patch get_repo_identifier so the resulting workspace file
|
||||||
|
# name is deterministic and easy to assert.
|
||||||
|
with patch(
|
||||||
|
"pkgmgr.cli.commands.tools.get_repo_identifier"
|
||||||
|
) as mock_get_identifier:
|
||||||
|
mock_get_identifier.side_effect = ["repo-b", "repo-a"]
|
||||||
|
|
||||||
|
with self._patch_run_command() as mock_run_command:
|
||||||
|
handle_tools_command(args, self.ctx, self.repos)
|
||||||
|
|
||||||
|
# The identifiers are ['repo-b', 'repo-a'], which are
|
||||||
|
# sorted to ['repo-a', 'repo-b'] and joined with '_'.
|
||||||
|
expected_workspace_name = "repo-a_repo-b.code-workspace"
|
||||||
|
expected_workspace_file = os.path.join(
|
||||||
|
tmpdir, expected_workspace_name
|
||||||
|
)
|
||||||
|
|
||||||
|
# Workspace file should have been created.
|
||||||
|
self.assertTrue(
|
||||||
|
os.path.exists(expected_workspace_file),
|
||||||
|
"Workspace file was not created.",
|
||||||
|
)
|
||||||
|
|
||||||
|
# The content of the workspace must be valid JSON with
|
||||||
|
# the expected folder paths.
|
||||||
|
with open(expected_workspace_file, "r", encoding="utf-8") as f:
|
||||||
|
data = json.load(f)
|
||||||
|
|
||||||
|
self.assertIn("folders", data)
|
||||||
|
folder_paths = {f["path"] for f in data["folders"]}
|
||||||
|
self.assertEqual(
|
||||||
|
folder_paths,
|
||||||
|
{"/tmp/repo1", "/tmp/repo2"},
|
||||||
|
)
|
||||||
|
|
||||||
|
# And VS Code must have been invoked with that workspace.
|
||||||
|
mock_run_command.assert_called_once_with(
|
||||||
|
f'code "{expected_workspace_file}"'
|
||||||
|
)
|
||||||
0
tests/unit/pkgmgr/core/command/__init__.py
Normal file
0
tests/unit/pkgmgr/core/command/__init__.py
Normal file
108
tests/unit/pkgmgr/core/command/test_ink.py
Normal file
108
tests/unit/pkgmgr/core/command/test_ink.py
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
import os
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
from pkgmgr.core.command.ink import create_ink
|
||||||
|
|
||||||
|
|
||||||
|
class TestCreateInk(unittest.TestCase):
|
||||||
|
@patch("pkgmgr.core.command.ink.get_repo_dir")
|
||||||
|
@patch("pkgmgr.core.command.ink.get_repo_identifier")
|
||||||
|
def test_self_referential_command_skips_symlink(
|
||||||
|
self,
|
||||||
|
mock_get_repo_identifier,
|
||||||
|
mock_get_repo_dir,
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
If the resolved command path is identical to the final link target,
|
||||||
|
create_ink() must NOT replace it with a self-referential symlink.
|
||||||
|
|
||||||
|
This simulates the situation where the command already lives at
|
||||||
|
~/.local/bin/<identifier> and we would otherwise create a symlink
|
||||||
|
pointing to itself.
|
||||||
|
"""
|
||||||
|
mock_get_repo_identifier.return_value = "package-manager"
|
||||||
|
mock_get_repo_dir.return_value = "/fake/repo"
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as bin_dir:
|
||||||
|
# Simulate an existing real binary at the final link location.
|
||||||
|
command_path = os.path.join(bin_dir, "package-manager")
|
||||||
|
with open(command_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write("#!/bin/sh\necho package-manager\n")
|
||||||
|
|
||||||
|
# Sanity check: not a symlink yet.
|
||||||
|
self.assertTrue(os.path.exists(command_path))
|
||||||
|
self.assertFalse(os.path.islink(command_path))
|
||||||
|
|
||||||
|
repo = {"command": command_path}
|
||||||
|
|
||||||
|
# This must NOT turn the file into a self-referential symlink.
|
||||||
|
create_ink(
|
||||||
|
repo=repo,
|
||||||
|
repositories_base_dir="/fake/base",
|
||||||
|
bin_dir=bin_dir,
|
||||||
|
all_repos=[],
|
||||||
|
quiet=True,
|
||||||
|
preview=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
# After create_ink(), the file must still exist and must not be a symlink.
|
||||||
|
self.assertTrue(os.path.exists(command_path))
|
||||||
|
self.assertFalse(
|
||||||
|
os.path.islink(command_path),
|
||||||
|
"create_ink() must not create a self-referential symlink "
|
||||||
|
"when command == link_path",
|
||||||
|
)
|
||||||
|
|
||||||
|
@patch("pkgmgr.core.command.ink.get_repo_dir")
|
||||||
|
@patch("pkgmgr.core.command.ink.get_repo_identifier")
|
||||||
|
def test_create_symlink_for_normal_command(
|
||||||
|
self,
|
||||||
|
mock_get_repo_identifier,
|
||||||
|
mock_get_repo_dir,
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
In the normal case (command path != link target), create_ink()
|
||||||
|
must create a symlink in bin_dir pointing to the given command,
|
||||||
|
and optionally an alias symlink when repo['alias'] is set.
|
||||||
|
"""
|
||||||
|
mock_get_repo_identifier.return_value = "mytool"
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as repo_dir, tempfile.TemporaryDirectory() as bin_dir:
|
||||||
|
mock_get_repo_dir.return_value = repo_dir
|
||||||
|
|
||||||
|
# Create a fake executable inside the repository.
|
||||||
|
command_path = os.path.join(repo_dir, "main.sh")
|
||||||
|
with open(command_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write("#!/bin/sh\necho mytool\n")
|
||||||
|
os.chmod(command_path, 0o755)
|
||||||
|
|
||||||
|
repo = {
|
||||||
|
"command": command_path,
|
||||||
|
"alias": "mt",
|
||||||
|
}
|
||||||
|
|
||||||
|
create_ink(
|
||||||
|
repo=repo,
|
||||||
|
repositories_base_dir="/fake/base",
|
||||||
|
bin_dir=bin_dir,
|
||||||
|
all_repos=[],
|
||||||
|
quiet=True,
|
||||||
|
preview=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
link_path = os.path.join(bin_dir, "mytool")
|
||||||
|
alias_path = os.path.join(bin_dir, "mt")
|
||||||
|
|
||||||
|
# Main link must exist and point to the command.
|
||||||
|
self.assertTrue(os.path.islink(link_path))
|
||||||
|
self.assertEqual(os.readlink(link_path), command_path)
|
||||||
|
|
||||||
|
# Alias must exist and point to the main link.
|
||||||
|
self.assertTrue(os.path.islink(alias_path))
|
||||||
|
self.assertEqual(os.readlink(alias_path), link_path)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
Reference in New Issue
Block a user