Compare commits
14 Commits
v1.6.4
...
9485bc9e3f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9485bc9e3f | ||
|
|
dcda23435d | ||
|
|
a69e81c44b | ||
|
|
2ca004d056 | ||
|
|
f7bd5bfd0b | ||
|
|
2c15a4016b | ||
|
|
9e3ce34626 | ||
|
|
1a13fcaa4e | ||
|
|
48a0d1d458 | ||
|
|
783d2b921a | ||
|
|
6effacefef | ||
|
|
65903e740b | ||
|
|
aa80a2ddb4 | ||
|
|
9456ad4475 |
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
@@ -28,8 +28,8 @@ jobs:
|
|||||||
test-virgin-root:
|
test-virgin-root:
|
||||||
uses: ./.github/workflows/test-virgin-root.yml
|
uses: ./.github/workflows/test-virgin-root.yml
|
||||||
|
|
||||||
linter-shell:
|
lint-shell:
|
||||||
uses: ./.github/workflows/linter-shell.yml
|
uses: ./.github/workflows/lint-shell.yml
|
||||||
|
|
||||||
linter-python:
|
lint-python:
|
||||||
uses: ./.github/workflows/linter-python.yml
|
uses: ./.github/workflows/lint-python.yml
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ on:
|
|||||||
workflow_call:
|
workflow_call:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
linter-python:
|
lint-python:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@@ -4,7 +4,7 @@ on:
|
|||||||
workflow_call:
|
workflow_call:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
linter-shell:
|
lint-shell:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
12
.github/workflows/mark-stable.yml
vendored
12
.github/workflows/mark-stable.yml
vendored
@@ -29,16 +29,16 @@ jobs:
|
|||||||
test-virgin-root:
|
test-virgin-root:
|
||||||
uses: ./.github/workflows/test-virgin-root.yml
|
uses: ./.github/workflows/test-virgin-root.yml
|
||||||
|
|
||||||
linter-shell:
|
lint-shell:
|
||||||
uses: ./.github/workflows/linter-shell.yml
|
uses: ./.github/workflows/lint-shell.yml
|
||||||
|
|
||||||
linter-python:
|
lint-python:
|
||||||
uses: ./.github/workflows/linter-python.yml
|
uses: ./.github/workflows/lint-python.yml
|
||||||
|
|
||||||
mark-stable:
|
mark-stable:
|
||||||
needs:
|
needs:
|
||||||
- linter-shell
|
- lint-shell
|
||||||
- linter-python
|
- lint-python
|
||||||
- test-unit
|
- test-unit
|
||||||
- test-integration
|
- test-integration
|
||||||
- test-env-nix
|
- test-env-nix
|
||||||
|
|||||||
33
CHANGELOG.md
33
CHANGELOG.md
@@ -1,3 +1,36 @@
|
|||||||
|
## [1.8.0] - 2025-12-15
|
||||||
|
|
||||||
|
* *** New Features: ***
|
||||||
|
- **Silent Updates**: You can now use the `--silent` flag during installs and updates to suppress error messages for individual repositories and get a single summary at the end. This ensures the process continues even if some repositories fail, while still preserving interactive checks when not in silent mode.
|
||||||
|
- **Repository Scaffolding**: The process for creating new repositories has been improved. You can now use templates to scaffold repositories with a preview and automatic mirror setup.
|
||||||
|
|
||||||
|
*** Bug Fixes: ***
|
||||||
|
- **Pip Installation**: Pip is now installed automatically on all supported systems. This includes `python-pip` for Arch and `python3-pip` for CentOS, Debian, Fedora, and Ubuntu, ensuring that pip is available for Python package installations.
|
||||||
|
- **Pacman Keyring**: Fixed an issue on Arch Linux where package installation would fail due to missing keys. The pacman keyring is now properly initialized before installing packages.
|
||||||
|
|
||||||
|
|
||||||
|
## [1.7.2] - 2025-12-15
|
||||||
|
|
||||||
|
* * Git mirrors are now resolved consistently (origin → MIRRORS file → config → default).
|
||||||
|
* The `origin` remote is always enforced to use the primary URL for both fetch and push.
|
||||||
|
* Additional mirrors are added as extra push targets without duplication.
|
||||||
|
* Local and remote mirror setup behaves more predictably and consistently.
|
||||||
|
* Improved test coverage ensures stable origin and push URL handling.
|
||||||
|
|
||||||
|
|
||||||
|
## [1.7.1] - 2025-12-14
|
||||||
|
|
||||||
|
* Patched package-manager to kpmx to publish on pypi
|
||||||
|
|
||||||
|
|
||||||
|
## [1.7.0] - 2025-12-14
|
||||||
|
|
||||||
|
* * New *pkgmgr publish* command to publish repository artifacts to PyPI based on the *MIRRORS* file.
|
||||||
|
* Automatically selects the current repository when no explicit selection is given.
|
||||||
|
* Publishes only when a semantic version tag is present on *HEAD*; otherwise skips with a clear info message.
|
||||||
|
* Supports non-interactive mode for CI environments via *--non-interactive*.
|
||||||
|
|
||||||
|
|
||||||
## [1.6.4] - 2025-12-14
|
## [1.6.4] - 2025-12-14
|
||||||
|
|
||||||
* * Improved reliability of Nix installs and updates, including automatic resolution of profile conflicts and better handling of GitHub 403 rate limits.
|
* * Improved reliability of Nix installs and updates, including automatic resolution of profile conflicts and better handling of GitHub 403 rate limits.
|
||||||
|
|||||||
1
MIRRORS
1
MIRRORS
@@ -1,3 +1,4 @@
|
|||||||
git@github.com:kevinveenbirkenbach/package-manager.git
|
git@github.com:kevinveenbirkenbach/package-manager.git
|
||||||
ssh://git@git.veen.world:2201/kevinveenbirkenbach/pkgmgr.git
|
ssh://git@git.veen.world:2201/kevinveenbirkenbach/pkgmgr.git
|
||||||
ssh://git@code.infinito.nexus:2201/kevinveenbirkenbach/pkgmgr.git
|
ssh://git@code.infinito.nexus:2201/kevinveenbirkenbach/pkgmgr.git
|
||||||
|
https://pypi.org/project/kpmx/
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
rec {
|
rec {
|
||||||
pkgmgr = pyPkgs.buildPythonApplication {
|
pkgmgr = pyPkgs.buildPythonApplication {
|
||||||
pname = "package-manager";
|
pname = "package-manager";
|
||||||
version = "1.6.4";
|
version = "1.8.0";
|
||||||
|
|
||||||
# Use the git repo as source
|
# Use the git repo as source
|
||||||
src = ./.;
|
src = ./.;
|
||||||
@@ -49,6 +49,7 @@
|
|||||||
# Runtime dependencies (matches [project.dependencies] in pyproject.toml)
|
# Runtime dependencies (matches [project.dependencies] in pyproject.toml)
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
pyPkgs.pyyaml
|
pyPkgs.pyyaml
|
||||||
|
pyPkgs.jinja2
|
||||||
pyPkgs.pip
|
pyPkgs.pip
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -78,6 +79,7 @@
|
|||||||
pythonWithDeps = python.withPackages (ps: [
|
pythonWithDeps = python.withPackages (ps: [
|
||||||
ps.pip
|
ps.pip
|
||||||
ps.pyyaml
|
ps.pyyaml
|
||||||
|
ps.jinja2
|
||||||
]);
|
]);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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=1.6.4
|
pkgver=1.8.0
|
||||||
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')
|
||||||
|
|||||||
@@ -1,3 +1,40 @@
|
|||||||
|
package-manager (1.8.0-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* *** New Features: ***
|
||||||
|
- **Silent Updates**: You can now use the `--silent` flag during installs and updates to suppress error messages for individual repositories and get a single summary at the end. This ensures the process continues even if some repositories fail, while still preserving interactive checks when not in silent mode.
|
||||||
|
- **Repository Scaffolding**: The process for creating new repositories has been improved. You can now use templates to scaffold repositories with a preview and automatic mirror setup.
|
||||||
|
|
||||||
|
*** Bug Fixes: ***
|
||||||
|
- **Pip Installation**: Pip is now installed automatically on all supported systems. This includes `python-pip` for Arch and `python3-pip` for CentOS, Debian, Fedora, and Ubuntu, ensuring that pip is available for Python package installations.
|
||||||
|
- **Pacman Keyring**: Fixed an issue on Arch Linux where package installation would fail due to missing keys. The pacman keyring is now properly initialized before installing packages.
|
||||||
|
|
||||||
|
-- Kevin Veen-Birkenbach <kevin@veen.world> Mon, 15 Dec 2025 13:37:42 +0100
|
||||||
|
|
||||||
|
package-manager (1.7.2-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* * Git mirrors are now resolved consistently (origin → MIRRORS file → config → default).
|
||||||
|
* The `origin` remote is always enforced to use the primary URL for both fetch and push.
|
||||||
|
* Additional mirrors are added as extra push targets without duplication.
|
||||||
|
* Local and remote mirror setup behaves more predictably and consistently.
|
||||||
|
* Improved test coverage ensures stable origin and push URL handling.
|
||||||
|
|
||||||
|
-- Kevin Veen-Birkenbach <kevin@veen.world> Mon, 15 Dec 2025 00:53:26 +0100
|
||||||
|
|
||||||
|
package-manager (1.7.1-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Patched package-manager to kpmx to publish on pypi
|
||||||
|
|
||||||
|
-- Kevin Veen-Birkenbach <kevin@veen.world> Sun, 14 Dec 2025 21:19:11 +0100
|
||||||
|
|
||||||
|
package-manager (1.7.0-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* * New *pkgmgr publish* command to publish repository artifacts to PyPI based on the *MIRRORS* file.
|
||||||
|
* Automatically selects the current repository when no explicit selection is given.
|
||||||
|
* Publishes only when a semantic version tag is present on *HEAD*; otherwise skips with a clear info message.
|
||||||
|
* Supports non-interactive mode for CI environments via *--non-interactive*.
|
||||||
|
|
||||||
|
-- Kevin Veen-Birkenbach <kevin@veen.world> Sun, 14 Dec 2025 21:10:06 +0100
|
||||||
|
|
||||||
package-manager (1.6.4-1) unstable; urgency=medium
|
package-manager (1.6.4-1) unstable; urgency=medium
|
||||||
|
|
||||||
* * Improved reliability of Nix installs and updates, including automatic resolution of profile conflicts and better handling of GitHub 403 rate limits.
|
* * Improved reliability of Nix installs and updates, including automatic resolution of profile conflicts and better handling of GitHub 403 rate limits.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
Name: package-manager
|
Name: package-manager
|
||||||
Version: 1.6.4
|
Version: 1.8.0
|
||||||
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
|
||||||
|
|
||||||
@@ -74,6 +74,31 @@ echo ">>> package-manager removed. Nix itself was not removed."
|
|||||||
/usr/lib/package-manager/
|
/usr/lib/package-manager/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 15 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 1.8.0-1
|
||||||
|
- *** New Features: ***
|
||||||
|
- **Silent Updates**: You can now use the `--silent` flag during installs and updates to suppress error messages for individual repositories and get a single summary at the end. This ensures the process continues even if some repositories fail, while still preserving interactive checks when not in silent mode.
|
||||||
|
- **Repository Scaffolding**: The process for creating new repositories has been improved. You can now use templates to scaffold repositories with a preview and automatic mirror setup.
|
||||||
|
|
||||||
|
*** Bug Fixes: ***
|
||||||
|
- **Pip Installation**: Pip is now installed automatically on all supported systems. This includes `python-pip` for Arch and `python3-pip` for CentOS, Debian, Fedora, and Ubuntu, ensuring that pip is available for Python package installations.
|
||||||
|
- **Pacman Keyring**: Fixed an issue on Arch Linux where package installation would fail due to missing keys. The pacman keyring is now properly initialized before installing packages.
|
||||||
|
|
||||||
|
* Mon Dec 15 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 1.7.2-1
|
||||||
|
- * Git mirrors are now resolved consistently (origin → MIRRORS file → config → default).
|
||||||
|
* The `origin` remote is always enforced to use the primary URL for both fetch and push.
|
||||||
|
* Additional mirrors are added as extra push targets without duplication.
|
||||||
|
* Local and remote mirror setup behaves more predictably and consistently.
|
||||||
|
* Improved test coverage ensures stable origin and push URL handling.
|
||||||
|
|
||||||
|
* Sun Dec 14 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 1.7.1-1
|
||||||
|
- Patched package-manager to kpmx to publish on pypi
|
||||||
|
|
||||||
|
* Sun Dec 14 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 1.7.0-1
|
||||||
|
- * New *pkgmgr publish* command to publish repository artifacts to PyPI based on the *MIRRORS* file.
|
||||||
|
* Automatically selects the current repository when no explicit selection is given.
|
||||||
|
* Publishes only when a semantic version tag is present on *HEAD*; otherwise skips with a clear info message.
|
||||||
|
* Supports non-interactive mode for CI environments via *--non-interactive*.
|
||||||
|
|
||||||
* Sun Dec 14 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 1.6.4-1
|
* Sun Dec 14 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 1.6.4-1
|
||||||
- * Improved reliability of Nix installs and updates, including automatic resolution of profile conflicts and better handling of GitHub 403 rate limits.
|
- * Improved reliability of Nix installs and updates, including automatic resolution of profile conflicts and better handling of GitHub 403 rate limits.
|
||||||
* More stable launcher behavior in packaged and virtual-env setups.
|
* More stable launcher behavior in packaged and virtual-env setups.
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ requires = [
|
|||||||
build-backend = "setuptools.build_meta"
|
build-backend = "setuptools.build_meta"
|
||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "package-manager"
|
name = "kpmx"
|
||||||
version = "1.6.4"
|
version = "1.8.0"
|
||||||
description = "Kevin's package-manager tool (pkgmgr)"
|
description = "Kevin's package-manager tool (pkgmgr)"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.9"
|
requires-python = ">=3.9"
|
||||||
@@ -21,6 +21,7 @@ authors = [
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"PyYAML>=6.0",
|
"PyYAML>=6.0",
|
||||||
"tomli; python_version < \"3.11\"",
|
"tomli; python_version < \"3.11\"",
|
||||||
|
"jinja2>=3.1"
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
|
|||||||
@@ -6,6 +6,13 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|||||||
echo "[arch/dependencies] Installing Arch build dependencies..."
|
echo "[arch/dependencies] Installing Arch build dependencies..."
|
||||||
|
|
||||||
pacman -Syu --noconfirm
|
pacman -Syu --noconfirm
|
||||||
|
|
||||||
|
if ! pacman-key --list-sigs &>/dev/null; then
|
||||||
|
echo "[arch/dependencies] Initializing pacman keyring..."
|
||||||
|
pacman-key --init
|
||||||
|
pacman-key --populate archlinux
|
||||||
|
fi
|
||||||
|
|
||||||
pacman -S --noconfirm --needed \
|
pacman -S --noconfirm --needed \
|
||||||
base-devel \
|
base-devel \
|
||||||
git \
|
git \
|
||||||
@@ -13,6 +20,7 @@ pacman -S --noconfirm --needed \
|
|||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
python \
|
python \
|
||||||
|
python-pip \
|
||||||
xz
|
xz
|
||||||
|
|
||||||
pacman -Scc --noconfirm
|
pacman -Scc --noconfirm
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ dnf -y install \
|
|||||||
curl-minimal \
|
curl-minimal \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
python3 \
|
python3 \
|
||||||
|
python3-pip \
|
||||||
sudo \
|
sudo \
|
||||||
xz
|
xz
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
|||||||
ca-certificates \
|
ca-certificates \
|
||||||
python3 \
|
python3 \
|
||||||
python3-venv \
|
python3-venv \
|
||||||
|
python3-pip \
|
||||||
xz-utils
|
xz-utils
|
||||||
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ dnf -y install \
|
|||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
python3 \
|
python3 \
|
||||||
|
python3-pip \
|
||||||
xz
|
xz
|
||||||
|
|
||||||
dnf clean all
|
dnf clean all
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
|||||||
make \
|
make \
|
||||||
python3 \
|
python3 \
|
||||||
python3-venv \
|
python3-venv \
|
||||||
|
python3-pip \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
xz-utils
|
xz-utils
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ Responsibilities:
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from typing import Any, Dict, List, Optional
|
from typing import Any, Dict, List, Optional, Tuple
|
||||||
|
|
||||||
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
|
from pkgmgr.core.repository.dir import get_repo_dir
|
||||||
@@ -93,6 +93,7 @@ def _verify_repo(
|
|||||||
repo_dir: str,
|
repo_dir: str,
|
||||||
no_verification: bool,
|
no_verification: bool,
|
||||||
identifier: str,
|
identifier: str,
|
||||||
|
silent: bool,
|
||||||
) -> bool:
|
) -> bool:
|
||||||
"""
|
"""
|
||||||
Verify a repository using the configured verification data.
|
Verify a repository using the configured verification data.
|
||||||
@@ -111,6 +112,11 @@ def _verify_repo(
|
|||||||
print(f"Warning: Verification failed for {identifier}:")
|
print(f"Warning: Verification failed for {identifier}:")
|
||||||
for err in errors:
|
for err in errors:
|
||||||
print(f" - {err}")
|
print(f" - {err}")
|
||||||
|
|
||||||
|
if silent:
|
||||||
|
# Non-interactive mode: continue with a warning.
|
||||||
|
print(f"[Warning] Continuing despite verification failure for {identifier} (--silent).")
|
||||||
|
else:
|
||||||
choice = input("Continue anyway? [y/N]: ").strip().lower()
|
choice = input("Continue anyway? [y/N]: ").strip().lower()
|
||||||
if choice != "y":
|
if choice != "y":
|
||||||
print(f"Skipping installation for {identifier}.")
|
print(f"Skipping installation for {identifier}.")
|
||||||
@@ -163,6 +169,8 @@ def install_repos(
|
|||||||
clone_mode: str,
|
clone_mode: str,
|
||||||
update_dependencies: bool,
|
update_dependencies: bool,
|
||||||
force_update: bool = False,
|
force_update: bool = False,
|
||||||
|
silent: bool = False,
|
||||||
|
emit_summary: bool = True,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Install one or more repositories according to the configured installers
|
Install one or more repositories according to the configured installers
|
||||||
@@ -170,12 +178,17 @@ def install_repos(
|
|||||||
|
|
||||||
If force_update=True, installers of the currently active layer are allowed
|
If force_update=True, installers of the currently active layer are allowed
|
||||||
to run again (upgrade/refresh), even if that layer is already loaded.
|
to run again (upgrade/refresh), even if that layer is already loaded.
|
||||||
|
|
||||||
|
If silent=True, repository failures are downgraded to warnings and the
|
||||||
|
overall command never exits non-zero because of per-repository failures.
|
||||||
"""
|
"""
|
||||||
pipeline = InstallationPipeline(INSTALLERS)
|
pipeline = InstallationPipeline(INSTALLERS)
|
||||||
|
failures: List[Tuple[str, str]] = []
|
||||||
|
|
||||||
for repo in selected_repos:
|
for repo in selected_repos:
|
||||||
identifier = get_repo_identifier(repo, all_repos)
|
identifier = get_repo_identifier(repo, all_repos)
|
||||||
|
|
||||||
|
try:
|
||||||
repo_dir = _ensure_repo_dir(
|
repo_dir = _ensure_repo_dir(
|
||||||
repo=repo,
|
repo=repo,
|
||||||
repositories_base_dir=repositories_base_dir,
|
repositories_base_dir=repositories_base_dir,
|
||||||
@@ -186,6 +199,7 @@ def install_repos(
|
|||||||
identifier=identifier,
|
identifier=identifier,
|
||||||
)
|
)
|
||||||
if not repo_dir:
|
if not repo_dir:
|
||||||
|
failures.append((identifier, "clone/ensure repo directory failed"))
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not _verify_repo(
|
if not _verify_repo(
|
||||||
@@ -193,6 +207,7 @@ def install_repos(
|
|||||||
repo_dir=repo_dir,
|
repo_dir=repo_dir,
|
||||||
no_verification=no_verification,
|
no_verification=no_verification,
|
||||||
identifier=identifier,
|
identifier=identifier,
|
||||||
|
silent=silent,
|
||||||
):
|
):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@@ -212,3 +227,23 @@ def install_repos(
|
|||||||
)
|
)
|
||||||
|
|
||||||
pipeline.run(ctx)
|
pipeline.run(ctx)
|
||||||
|
|
||||||
|
except SystemExit as exc:
|
||||||
|
code = exc.code if isinstance(exc.code, int) else str(exc.code)
|
||||||
|
failures.append((identifier, f"installer failed (exit={code})"))
|
||||||
|
if not quiet:
|
||||||
|
print(f"[Warning] install: repository {identifier} failed (exit={code}). Continuing...")
|
||||||
|
continue
|
||||||
|
except Exception as exc:
|
||||||
|
failures.append((identifier, f"unexpected error: {exc}"))
|
||||||
|
if not quiet:
|
||||||
|
print(f"[Warning] install: repository {identifier} hit an unexpected error: {exc}. Continuing...")
|
||||||
|
continue
|
||||||
|
|
||||||
|
if failures and emit_summary and not quiet:
|
||||||
|
print("\n[pkgmgr] Installation finished with warnings:")
|
||||||
|
for ident, msg in failures:
|
||||||
|
print(f" - {ident}: {msg}")
|
||||||
|
|
||||||
|
if failures and not silent:
|
||||||
|
raise SystemExit(1)
|
||||||
|
|||||||
@@ -1,20 +1,15 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
from typing import List, Optional, Set
|
||||||
|
|
||||||
from pkgmgr.core.command.run import run_command
|
from pkgmgr.core.command.run import run_command
|
||||||
from pkgmgr.core.git import GitError, run_git
|
from pkgmgr.core.git import GitError, run_git
|
||||||
from typing import List, Optional, Set
|
|
||||||
|
|
||||||
from .types import MirrorMap, RepoMirrorContext, Repository
|
from .types import MirrorMap, RepoMirrorContext, Repository
|
||||||
|
|
||||||
|
|
||||||
def build_default_ssh_url(repo: Repository) -> Optional[str]:
|
def build_default_ssh_url(repo: Repository) -> Optional[str]:
|
||||||
"""
|
|
||||||
Build a simple SSH URL from repo config if no explicit mirror is defined.
|
|
||||||
|
|
||||||
Example: git@github.com:account/repository.git
|
|
||||||
"""
|
|
||||||
provider = repo.get("provider")
|
provider = repo.get("provider")
|
||||||
account = repo.get("account")
|
account = repo.get("account")
|
||||||
name = repo.get("repository")
|
name = repo.get("repository")
|
||||||
@@ -23,95 +18,82 @@ def build_default_ssh_url(repo: Repository) -> Optional[str]:
|
|||||||
if not provider or not account or not name:
|
if not provider or not account or not name:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
provider = str(provider)
|
|
||||||
account = str(account)
|
|
||||||
name = str(name)
|
|
||||||
|
|
||||||
if port:
|
if port:
|
||||||
return f"ssh://git@{provider}:{port}/{account}/{name}.git"
|
return f"ssh://git@{provider}:{port}/{account}/{name}.git"
|
||||||
|
|
||||||
# GitHub-style shorthand
|
|
||||||
return f"git@{provider}:{account}/{name}.git"
|
return f"git@{provider}:{account}/{name}.git"
|
||||||
|
|
||||||
|
|
||||||
def determine_primary_remote_url(
|
def determine_primary_remote_url(
|
||||||
repo: Repository,
|
repo: Repository,
|
||||||
resolved_mirrors: MirrorMap,
|
ctx: RepoMirrorContext,
|
||||||
) -> Optional[str]:
|
) -> Optional[str]:
|
||||||
"""
|
"""
|
||||||
Determine the primary remote URL in a consistent way:
|
Priority order:
|
||||||
|
1. origin from resolved mirrors
|
||||||
1. resolved_mirrors["origin"]
|
2. MIRRORS file order
|
||||||
2. any resolved mirror (first by name)
|
3. config mirrors order
|
||||||
3. default SSH URL from provider/account/repository
|
4. default SSH URL
|
||||||
"""
|
"""
|
||||||
if "origin" in resolved_mirrors:
|
resolved = ctx.resolved_mirrors
|
||||||
return resolved_mirrors["origin"]
|
|
||||||
|
|
||||||
if resolved_mirrors:
|
if resolved.get("origin"):
|
||||||
first_name = sorted(resolved_mirrors.keys())[0]
|
return resolved["origin"]
|
||||||
return resolved_mirrors[first_name]
|
|
||||||
|
for mirrors in (ctx.file_mirrors, ctx.config_mirrors):
|
||||||
|
for _, url in mirrors.items():
|
||||||
|
if url:
|
||||||
|
return url
|
||||||
|
|
||||||
return build_default_ssh_url(repo)
|
return build_default_ssh_url(repo)
|
||||||
|
|
||||||
|
|
||||||
def _safe_git_output(args: List[str], cwd: str) -> Optional[str]:
|
def _safe_git_output(args: List[str], cwd: str) -> Optional[str]:
|
||||||
"""
|
|
||||||
Run a Git command via run_git and return its stdout, or None on failure.
|
|
||||||
"""
|
|
||||||
try:
|
try:
|
||||||
return run_git(args, cwd=cwd)
|
return run_git(args, cwd=cwd)
|
||||||
except GitError:
|
except GitError:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def current_origin_url(repo_dir: str) -> Optional[str]:
|
|
||||||
"""
|
|
||||||
Return the current URL for remote 'origin', or None if not present.
|
|
||||||
"""
|
|
||||||
output = _safe_git_output(["remote", "get-url", "origin"], cwd=repo_dir)
|
|
||||||
if not output:
|
|
||||||
return None
|
|
||||||
url = output.strip()
|
|
||||||
return url or None
|
|
||||||
|
|
||||||
|
|
||||||
def has_origin_remote(repo_dir: str) -> bool:
|
def has_origin_remote(repo_dir: str) -> bool:
|
||||||
"""
|
out = _safe_git_output(["remote"], cwd=repo_dir)
|
||||||
Check whether a remote called 'origin' exists in the repository.
|
return bool(out and "origin" in out.split())
|
||||||
"""
|
|
||||||
output = _safe_git_output(["remote"], cwd=repo_dir)
|
|
||||||
if not output:
|
|
||||||
return False
|
|
||||||
names = output.split()
|
|
||||||
return "origin" in names
|
|
||||||
|
|
||||||
|
|
||||||
def _ensure_push_urls_for_origin(
|
def _set_origin_fetch_and_push(repo_dir: str, url: str, preview: bool) -> None:
|
||||||
|
fetch = f"git remote set-url origin {url}"
|
||||||
|
push = f"git remote set-url --push origin {url}"
|
||||||
|
|
||||||
|
if preview:
|
||||||
|
print(f"[PREVIEW] Would run in {repo_dir!r}: {fetch}")
|
||||||
|
print(f"[PREVIEW] Would run in {repo_dir!r}: {push}")
|
||||||
|
return
|
||||||
|
|
||||||
|
run_command(fetch, cwd=repo_dir, preview=False)
|
||||||
|
run_command(push, cwd=repo_dir, preview=False)
|
||||||
|
|
||||||
|
|
||||||
|
def _ensure_additional_push_urls(
|
||||||
repo_dir: str,
|
repo_dir: str,
|
||||||
mirrors: MirrorMap,
|
mirrors: MirrorMap,
|
||||||
|
primary: str,
|
||||||
preview: bool,
|
preview: bool,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""
|
desired: Set[str] = {u for u in mirrors.values() if u and u != primary}
|
||||||
Ensure that all mirror URLs are present as push URLs on 'origin'.
|
|
||||||
"""
|
|
||||||
desired: Set[str] = {url for url in mirrors.values() if url}
|
|
||||||
if not desired:
|
if not desired:
|
||||||
return
|
return
|
||||||
|
|
||||||
existing_output = _safe_git_output(
|
out = _safe_git_output(
|
||||||
["remote", "get-url", "--push", "--all", "origin"],
|
["remote", "get-url", "--push", "--all", "origin"],
|
||||||
cwd=repo_dir,
|
cwd=repo_dir,
|
||||||
)
|
)
|
||||||
existing = set(existing_output.splitlines()) if existing_output else set()
|
existing = set(out.splitlines()) if out else set()
|
||||||
|
|
||||||
missing = sorted(desired - existing)
|
for url in sorted(desired - existing):
|
||||||
for url in missing:
|
|
||||||
cmd = f"git remote set-url --add --push origin {url}"
|
cmd = f"git remote set-url --add --push origin {url}"
|
||||||
if preview:
|
if preview:
|
||||||
print(f"[PREVIEW] Would run in {repo_dir!r}: {cmd}")
|
print(f"[PREVIEW] Would run in {repo_dir!r}: {cmd}")
|
||||||
else:
|
else:
|
||||||
print(f"[INFO] Adding push URL to 'origin': {url}")
|
|
||||||
run_command(cmd, cwd=repo_dir, preview=False)
|
run_command(cmd, cwd=repo_dir, preview=False)
|
||||||
|
|
||||||
|
|
||||||
@@ -120,60 +102,32 @@ def ensure_origin_remote(
|
|||||||
ctx: RepoMirrorContext,
|
ctx: RepoMirrorContext,
|
||||||
preview: bool,
|
preview: bool,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""
|
|
||||||
Ensure that a usable 'origin' remote exists and has all push URLs.
|
|
||||||
"""
|
|
||||||
repo_dir = ctx.repo_dir
|
repo_dir = ctx.repo_dir
|
||||||
resolved_mirrors = ctx.resolved_mirrors
|
|
||||||
|
|
||||||
if not os.path.isdir(os.path.join(repo_dir, ".git")):
|
if not os.path.isdir(os.path.join(repo_dir, ".git")):
|
||||||
print(f"[WARN] {repo_dir} is not a Git repository (no .git directory).")
|
print(f"[WARN] {repo_dir} is not a Git repository.")
|
||||||
return
|
return
|
||||||
|
|
||||||
url = determine_primary_remote_url(repo, resolved_mirrors)
|
primary = determine_primary_remote_url(repo, ctx)
|
||||||
|
if not primary:
|
||||||
|
print("[WARN] No primary mirror URL could be determined.")
|
||||||
|
return
|
||||||
|
|
||||||
if not has_origin_remote(repo_dir):
|
if not has_origin_remote(repo_dir):
|
||||||
if not url:
|
cmd = f"git remote add origin {primary}"
|
||||||
print(
|
|
||||||
"[WARN] Could not determine URL for 'origin' remote. "
|
|
||||||
"Please configure mirrors or provider/account/repository."
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
cmd = f"git remote add origin {url}"
|
|
||||||
if preview:
|
if preview:
|
||||||
print(f"[PREVIEW] Would run in {repo_dir!r}: {cmd}")
|
print(f"[PREVIEW] Would run in {repo_dir!r}: {cmd}")
|
||||||
else:
|
else:
|
||||||
print(f"[INFO] Adding 'origin' remote in {repo_dir}: {url}")
|
|
||||||
run_command(cmd, cwd=repo_dir, preview=False)
|
run_command(cmd, cwd=repo_dir, preview=False)
|
||||||
else:
|
|
||||||
current = current_origin_url(repo_dir)
|
|
||||||
if current == url or not url:
|
|
||||||
print(
|
|
||||||
"[INFO] 'origin' already points to "
|
|
||||||
f"{current or '<unknown>'} (no change needed)."
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
# We do not auto-change origin here, only log the mismatch.
|
|
||||||
print(
|
|
||||||
"[INFO] 'origin' exists with URL "
|
|
||||||
f"{current or '<unknown>'}; not changing to {url}."
|
|
||||||
)
|
|
||||||
|
|
||||||
# Ensure all mirrors are present as push URLs
|
_set_origin_fetch_and_push(repo_dir, primary, preview)
|
||||||
_ensure_push_urls_for_origin(repo_dir, resolved_mirrors, preview)
|
|
||||||
|
_ensure_additional_push_urls(repo_dir, ctx.resolved_mirrors, primary, preview)
|
||||||
|
|
||||||
|
|
||||||
def is_remote_reachable(url: str, cwd: Optional[str] = None) -> bool:
|
def is_remote_reachable(url: str, cwd: Optional[str] = None) -> bool:
|
||||||
"""
|
|
||||||
Check whether a remote repository is reachable via `git ls-remote`.
|
|
||||||
|
|
||||||
This does NOT modify anything; it only probes the remote.
|
|
||||||
"""
|
|
||||||
workdir = cwd or os.getcwd()
|
|
||||||
try:
|
try:
|
||||||
# --exit-code → non-zero exit code if the remote does not exist
|
run_git(["ls-remote", "--exit-code", url], cwd=cwd or os.getcwd())
|
||||||
run_git(["ls-remote", "--exit-code", url], cwd=workdir)
|
|
||||||
return True
|
return True
|
||||||
except GitError:
|
except GitError:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
# src/pkgmgr/actions/mirror/remote_provision.py
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from typing import List
|
from typing import List
|
||||||
@@ -19,36 +18,28 @@ def ensure_remote_repository(
|
|||||||
preview: bool,
|
preview: bool,
|
||||||
) -> None:
|
) -> None:
|
||||||
ctx = build_context(repo, repositories_base_dir, all_repos)
|
ctx = build_context(repo, repositories_base_dir, all_repos)
|
||||||
resolved_mirrors = ctx.resolved_mirrors
|
|
||||||
|
|
||||||
primary_url = determine_primary_remote_url(repo, resolved_mirrors)
|
primary_url = determine_primary_remote_url(repo, ctx)
|
||||||
if not primary_url:
|
if not primary_url:
|
||||||
print("[INFO] No remote URL could be derived; skipping remote provisioning.")
|
print("[INFO] No primary URL found; skipping remote provisioning.")
|
||||||
return
|
return
|
||||||
|
|
||||||
host_raw, owner_from_url, name_from_url = parse_repo_from_git_url(primary_url)
|
host_raw, owner, name = parse_repo_from_git_url(primary_url)
|
||||||
host = normalize_provider_host(host_raw)
|
host = normalize_provider_host(host_raw)
|
||||||
|
|
||||||
if not host or not owner_from_url or not name_from_url:
|
if not host or not owner or not name:
|
||||||
print("[WARN] Could not derive host/owner/repository from URL; cannot ensure remote repo.")
|
print("[WARN] Could not parse remote URL:", primary_url)
|
||||||
print(f" url={primary_url!r}")
|
|
||||||
print(f" host={host!r}, owner={owner_from_url!r}, repository={name_from_url!r}")
|
|
||||||
return
|
return
|
||||||
|
|
||||||
print("------------------------------------------------------------")
|
|
||||||
print(f"[REMOTE ENSURE] {ctx.identifier}")
|
|
||||||
print(f"[REMOTE ENSURE] host: {host}")
|
|
||||||
print("------------------------------------------------------------")
|
|
||||||
|
|
||||||
spec = RepoSpec(
|
spec = RepoSpec(
|
||||||
host=str(host),
|
host=host,
|
||||||
owner=str(owner_from_url),
|
owner=owner,
|
||||||
name=str(name_from_url),
|
name=name,
|
||||||
private=bool(repo.get("private", True)),
|
private=bool(repo.get("private", True)),
|
||||||
description=str(repo.get("description", "")),
|
description=str(repo.get("description", "")),
|
||||||
)
|
)
|
||||||
|
|
||||||
provider_kind = str(repo.get("provider", "")).strip().lower() or None
|
provider_kind = str(repo.get("provider", "")).lower() or None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
result = ensure_remote_repo(
|
result = ensure_remote_repo(
|
||||||
@@ -66,5 +57,3 @@ def ensure_remote_repository(
|
|||||||
print(f"[REMOTE ENSURE] URL: {result.url}")
|
print(f"[REMOTE ENSURE] URL: {result.url}")
|
||||||
except Exception as exc: # noqa: BLE001
|
except Exception as exc: # noqa: BLE001
|
||||||
print(f"[ERROR] Remote provisioning failed: {exc}")
|
print(f"[ERROR] Remote provisioning failed: {exc}")
|
||||||
|
|
||||||
print()
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
# src/pkgmgr/actions/mirror/setup_cmd.py
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from typing import List
|
from typing import List
|
||||||
@@ -9,6 +8,7 @@ from .remote_check import probe_mirror
|
|||||||
from .remote_provision import ensure_remote_repository
|
from .remote_provision import ensure_remote_repository
|
||||||
from .types import Repository
|
from .types import Repository
|
||||||
|
|
||||||
|
|
||||||
def _setup_local_mirrors_for_repo(
|
def _setup_local_mirrors_for_repo(
|
||||||
repo: Repository,
|
repo: Repository,
|
||||||
repositories_base_dir: str,
|
repositories_base_dir: str,
|
||||||
@@ -22,7 +22,7 @@ def _setup_local_mirrors_for_repo(
|
|||||||
print(f"[MIRROR SETUP:LOCAL] dir: {ctx.repo_dir}")
|
print(f"[MIRROR SETUP:LOCAL] dir: {ctx.repo_dir}")
|
||||||
print("------------------------------------------------------------")
|
print("------------------------------------------------------------")
|
||||||
|
|
||||||
ensure_origin_remote(repo, ctx, preview=preview)
|
ensure_origin_remote(repo, ctx, preview)
|
||||||
print()
|
print()
|
||||||
|
|
||||||
|
|
||||||
@@ -34,7 +34,6 @@ def _setup_remote_mirrors_for_repo(
|
|||||||
ensure_remote: bool,
|
ensure_remote: bool,
|
||||||
) -> None:
|
) -> None:
|
||||||
ctx = build_context(repo, repositories_base_dir, all_repos)
|
ctx = build_context(repo, repositories_base_dir, all_repos)
|
||||||
resolved_mirrors = ctx.resolved_mirrors
|
|
||||||
|
|
||||||
print("------------------------------------------------------------")
|
print("------------------------------------------------------------")
|
||||||
print(f"[MIRROR SETUP:REMOTE] {ctx.identifier}")
|
print(f"[MIRROR SETUP:REMOTE] {ctx.identifier}")
|
||||||
@@ -44,37 +43,28 @@ def _setup_remote_mirrors_for_repo(
|
|||||||
if ensure_remote:
|
if ensure_remote:
|
||||||
ensure_remote_repository(
|
ensure_remote_repository(
|
||||||
repo,
|
repo,
|
||||||
repositories_base_dir=repositories_base_dir,
|
repositories_base_dir,
|
||||||
all_repos=all_repos,
|
all_repos,
|
||||||
preview=preview,
|
preview,
|
||||||
)
|
)
|
||||||
|
|
||||||
if not resolved_mirrors:
|
if not ctx.resolved_mirrors:
|
||||||
primary_url = determine_primary_remote_url(repo, resolved_mirrors)
|
primary = determine_primary_remote_url(repo, ctx)
|
||||||
if not primary_url:
|
if not primary:
|
||||||
print("[INFO] No mirrors configured and no primary URL available.")
|
return
|
||||||
|
|
||||||
|
ok, msg = probe_mirror(primary, ctx.repo_dir)
|
||||||
|
print("[OK]" if ok else "[WARN]", primary)
|
||||||
|
if msg:
|
||||||
|
print(msg)
|
||||||
print()
|
print()
|
||||||
return
|
return
|
||||||
|
|
||||||
ok, error_message = probe_mirror(primary_url, ctx.repo_dir)
|
for name, url in ctx.resolved_mirrors.items():
|
||||||
if ok:
|
ok, msg = probe_mirror(url, ctx.repo_dir)
|
||||||
print(f"[OK] primary: {primary_url}")
|
print(f"[OK] {name}: {url}" if ok else f"[WARN] {name}: {url}")
|
||||||
else:
|
if msg:
|
||||||
print(f"[WARN] primary: {primary_url}")
|
print(msg)
|
||||||
for line in error_message.splitlines():
|
|
||||||
print(f" {line}")
|
|
||||||
|
|
||||||
print()
|
|
||||||
return
|
|
||||||
|
|
||||||
for name, url in sorted(resolved_mirrors.items()):
|
|
||||||
ok, error_message = probe_mirror(url, ctx.repo_dir)
|
|
||||||
if ok:
|
|
||||||
print(f"[OK] {name}: {url}")
|
|
||||||
else:
|
|
||||||
print(f"[WARN] {name}: {url}")
|
|
||||||
for line in error_message.splitlines():
|
|
||||||
print(f" {line}")
|
|
||||||
|
|
||||||
print()
|
print()
|
||||||
|
|
||||||
@@ -91,17 +81,17 @@ def setup_mirrors(
|
|||||||
for repo in selected_repos:
|
for repo in selected_repos:
|
||||||
if local:
|
if local:
|
||||||
_setup_local_mirrors_for_repo(
|
_setup_local_mirrors_for_repo(
|
||||||
repo=repo,
|
repo,
|
||||||
repositories_base_dir=repositories_base_dir,
|
repositories_base_dir,
|
||||||
all_repos=all_repos,
|
all_repos,
|
||||||
preview=preview,
|
preview,
|
||||||
)
|
)
|
||||||
|
|
||||||
if remote:
|
if remote:
|
||||||
_setup_remote_mirrors_for_repo(
|
_setup_remote_mirrors_for_repo(
|
||||||
repo=repo,
|
repo,
|
||||||
repositories_base_dir=repositories_base_dir,
|
repositories_base_dir,
|
||||||
all_repos=all_repos,
|
all_repos,
|
||||||
preview=preview,
|
preview,
|
||||||
ensure_remote=ensure_remote,
|
ensure_remote,
|
||||||
)
|
)
|
||||||
|
|||||||
5
src/pkgmgr/actions/publish/__init__.py
Normal file
5
src/pkgmgr/actions/publish/__init__.py
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from .workflow import publish
|
||||||
|
|
||||||
|
__all__ = ["publish"]
|
||||||
17
src/pkgmgr/actions/publish/git_tags.py
Normal file
17
src/pkgmgr/actions/publish/git_tags.py
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from pkgmgr.core.git import run_git
|
||||||
|
from pkgmgr.core.version.semver import SemVer, is_semver_tag
|
||||||
|
|
||||||
|
|
||||||
|
def head_semver_tags(cwd: str = ".") -> list[str]:
|
||||||
|
out = run_git(["tag", "--points-at", "HEAD"], cwd=cwd)
|
||||||
|
if not out:
|
||||||
|
return []
|
||||||
|
|
||||||
|
tags = [t.strip() for t in out.splitlines() if t.strip()]
|
||||||
|
tags = [t for t in tags if is_semver_tag(t) and t.startswith("v")]
|
||||||
|
if not tags:
|
||||||
|
return []
|
||||||
|
|
||||||
|
return sorted(tags, key=SemVer.parse)
|
||||||
24
src/pkgmgr/actions/publish/pypi_url.py
Normal file
24
src/pkgmgr/actions/publish/pypi_url.py
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
from .types import PyPITarget
|
||||||
|
|
||||||
|
|
||||||
|
def parse_pypi_project_url(url: str) -> PyPITarget | None:
|
||||||
|
u = (url or "").strip()
|
||||||
|
if not u:
|
||||||
|
return None
|
||||||
|
|
||||||
|
parsed = urlparse(u)
|
||||||
|
host = (parsed.netloc or "").lower()
|
||||||
|
path = (parsed.path or "").strip("/")
|
||||||
|
|
||||||
|
if host not in ("pypi.org", "test.pypi.org"):
|
||||||
|
return None
|
||||||
|
|
||||||
|
parts = [p for p in path.split("/") if p]
|
||||||
|
if len(parts) >= 2 and parts[0] == "project":
|
||||||
|
return PyPITarget(host=host, project=parts[1])
|
||||||
|
|
||||||
|
return None
|
||||||
9
src/pkgmgr/actions/publish/types.py
Normal file
9
src/pkgmgr/actions/publish/types.py
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from dataclasses import dataclass
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class PyPITarget:
|
||||||
|
host: str
|
||||||
|
project: str
|
||||||
112
src/pkgmgr/actions/publish/workflow.py
Normal file
112
src/pkgmgr/actions/publish/workflow.py
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import glob
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
from pkgmgr.actions.mirror.io import read_mirrors_file
|
||||||
|
from pkgmgr.actions.mirror.types import Repository
|
||||||
|
from pkgmgr.core.credentials.resolver import ResolutionOptions, TokenResolver
|
||||||
|
from pkgmgr.core.version.semver import SemVer
|
||||||
|
|
||||||
|
from .git_tags import head_semver_tags
|
||||||
|
from .pypi_url import parse_pypi_project_url
|
||||||
|
|
||||||
|
|
||||||
|
def _require_tool(module: str) -> None:
|
||||||
|
try:
|
||||||
|
subprocess.run(
|
||||||
|
["python", "-m", module, "--help"],
|
||||||
|
stdout=subprocess.DEVNULL,
|
||||||
|
stderr=subprocess.DEVNULL,
|
||||||
|
check=True,
|
||||||
|
)
|
||||||
|
except Exception as exc:
|
||||||
|
raise RuntimeError(
|
||||||
|
f"Required Python module '{module}' is not available. "
|
||||||
|
f"Install it via: pip install {module}"
|
||||||
|
) from exc
|
||||||
|
|
||||||
|
|
||||||
|
def publish(
|
||||||
|
repo: Repository,
|
||||||
|
repo_dir: str,
|
||||||
|
*,
|
||||||
|
preview: bool = False,
|
||||||
|
interactive: bool = True,
|
||||||
|
allow_prompt: bool = True,
|
||||||
|
) -> None:
|
||||||
|
mirrors = read_mirrors_file(repo_dir)
|
||||||
|
|
||||||
|
targets = []
|
||||||
|
for url in mirrors.values():
|
||||||
|
t = parse_pypi_project_url(url)
|
||||||
|
if t:
|
||||||
|
targets.append(t)
|
||||||
|
|
||||||
|
if not targets:
|
||||||
|
print("[INFO] No PyPI mirror found. Skipping publish.")
|
||||||
|
return
|
||||||
|
|
||||||
|
if len(targets) > 1:
|
||||||
|
raise RuntimeError("Multiple PyPI mirrors found; refusing to publish.")
|
||||||
|
|
||||||
|
tags = head_semver_tags(cwd=repo_dir)
|
||||||
|
if not tags:
|
||||||
|
print("[INFO] No version tag on HEAD. Skipping publish.")
|
||||||
|
return
|
||||||
|
|
||||||
|
tag = max(tags, key=SemVer.parse)
|
||||||
|
target = targets[0]
|
||||||
|
|
||||||
|
print(f"[INFO] Publishing {target.project} for tag {tag}")
|
||||||
|
|
||||||
|
if preview:
|
||||||
|
print("[PREVIEW] Would build and upload to PyPI.")
|
||||||
|
return
|
||||||
|
|
||||||
|
_require_tool("build")
|
||||||
|
_require_tool("twine")
|
||||||
|
|
||||||
|
dist_dir = os.path.join(repo_dir, "dist")
|
||||||
|
if os.path.isdir(dist_dir):
|
||||||
|
shutil.rmtree(dist_dir, ignore_errors=True)
|
||||||
|
|
||||||
|
subprocess.run(
|
||||||
|
["python", "-m", "build"],
|
||||||
|
cwd=repo_dir,
|
||||||
|
check=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
artifacts = sorted(glob.glob(os.path.join(dist_dir, "*")))
|
||||||
|
if not artifacts:
|
||||||
|
raise RuntimeError("No build artifacts found in dist/.")
|
||||||
|
|
||||||
|
resolver = TokenResolver()
|
||||||
|
|
||||||
|
# Store PyPI token per OS user (keyring is already user-scoped).
|
||||||
|
# Do NOT scope by project name.
|
||||||
|
token = resolver.get_token(
|
||||||
|
provider_kind="pypi",
|
||||||
|
host=target.host,
|
||||||
|
owner=None,
|
||||||
|
options=ResolutionOptions(
|
||||||
|
interactive=interactive,
|
||||||
|
allow_prompt=allow_prompt,
|
||||||
|
save_prompt_token_to_keyring=True,
|
||||||
|
),
|
||||||
|
).token
|
||||||
|
|
||||||
|
env = dict(os.environ)
|
||||||
|
env["TWINE_USERNAME"] = "__token__"
|
||||||
|
env["TWINE_PASSWORD"] = token
|
||||||
|
|
||||||
|
subprocess.run(
|
||||||
|
["python", "-m", "twine", "upload", *artifacts],
|
||||||
|
cwd=repo_dir,
|
||||||
|
env=env,
|
||||||
|
check=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
print("[INFO] Publish completed.")
|
||||||
@@ -1,143 +1,257 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from typing import Any, Dict, Optional, Tuple
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
from pkgmgr.actions.mirror.io import write_mirrors_file
|
||||||
|
from pkgmgr.actions.mirror.setup_cmd import setup_mirrors
|
||||||
|
from pkgmgr.actions.repository.scaffold import render_default_templates
|
||||||
from pkgmgr.core.command.alias import generate_alias
|
from pkgmgr.core.command.alias import generate_alias
|
||||||
from pkgmgr.core.config.save import save_user_config
|
from pkgmgr.core.config.save import save_user_config
|
||||||
|
|
||||||
def create_repo(identifier, config_merged, user_config_path, bin_dir, remote=False, preview=False):
|
Repository = Dict[str, Any]
|
||||||
"""
|
|
||||||
Creates a new repository by performing the following steps:
|
|
||||||
|
|
||||||
1. Parses the identifier (provider:port/account/repository) and adds a new entry to the user config
|
_NAME_RE = re.compile(r"^[a-z0-9_-]+$")
|
||||||
if it is not already present. The provider part is split into provider and port (if provided).
|
|
||||||
2. Creates the local repository directory and initializes a Git repository.
|
|
||||||
3. If --remote is set, checks for an existing "origin" remote (removing it if found),
|
@dataclass(frozen=True)
|
||||||
adds the remote using a URL built from provider, port, account, and repository,
|
class RepoParts:
|
||||||
creates an initial commit (e.g. with a README.md), and pushes to the remote.
|
host: str
|
||||||
The push is attempted on both "main" and "master" branches.
|
port: Optional[str]
|
||||||
"""
|
owner: str
|
||||||
parts = identifier.split("/")
|
name: str
|
||||||
|
|
||||||
|
|
||||||
|
def _run(cmd: str, cwd: str, preview: bool) -> None:
|
||||||
|
if preview:
|
||||||
|
print(f"[Preview] Would run in {cwd}: {cmd}")
|
||||||
|
return
|
||||||
|
subprocess.run(cmd, cwd=cwd, shell=True, check=True)
|
||||||
|
|
||||||
|
|
||||||
|
def _git_get(key: str) -> str:
|
||||||
|
try:
|
||||||
|
out = subprocess.run(
|
||||||
|
f"git config --get {key}",
|
||||||
|
shell=True,
|
||||||
|
check=False,
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
)
|
||||||
|
return (out.stdout or "").strip()
|
||||||
|
except Exception:
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
||||||
|
def _split_host_port(host_with_port: str) -> Tuple[str, Optional[str]]:
|
||||||
|
if ":" in host_with_port:
|
||||||
|
host, port = host_with_port.split(":", 1)
|
||||||
|
return host, port or None
|
||||||
|
return host_with_port, None
|
||||||
|
|
||||||
|
|
||||||
|
def _strip_git_suffix(name: str) -> str:
|
||||||
|
return name[:-4] if name.endswith(".git") else name
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_git_url(url: str) -> RepoParts:
|
||||||
|
if url.startswith("git@") and "://" not in url:
|
||||||
|
left, right = url.split(":", 1)
|
||||||
|
host = left.split("@", 1)[1]
|
||||||
|
path = right.lstrip("/")
|
||||||
|
owner, name = path.split("/", 1)
|
||||||
|
return RepoParts(host=host, port=None, owner=owner, name=_strip_git_suffix(name))
|
||||||
|
|
||||||
|
parsed = urlparse(url)
|
||||||
|
host = (parsed.hostname or "").strip()
|
||||||
|
port = str(parsed.port) if parsed.port else None
|
||||||
|
path = (parsed.path or "").strip("/")
|
||||||
|
|
||||||
|
if not host or not path or "/" not in path:
|
||||||
|
raise ValueError(f"Could not parse git URL: {url}")
|
||||||
|
|
||||||
|
owner, name = path.split("/", 1)
|
||||||
|
return RepoParts(host=host, port=port, owner=owner, name=_strip_git_suffix(name))
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_identifier(identifier: str) -> RepoParts:
|
||||||
|
ident = identifier.strip()
|
||||||
|
|
||||||
|
if "://" in ident or ident.startswith("git@"):
|
||||||
|
return _parse_git_url(ident)
|
||||||
|
|
||||||
|
parts = ident.split("/")
|
||||||
if len(parts) != 3:
|
if len(parts) != 3:
|
||||||
print("Identifier must be in the format 'provider:port/account/repository' (port is optional).")
|
raise ValueError("Identifier must be URL or 'provider(:port)/owner/repo'.")
|
||||||
|
|
||||||
|
host_with_port, owner, name = parts
|
||||||
|
host, port = _split_host_port(host_with_port)
|
||||||
|
return RepoParts(host=host, port=port, owner=owner, name=name)
|
||||||
|
|
||||||
|
|
||||||
|
def _ensure_valid_repo_name(name: str) -> None:
|
||||||
|
if not name or not _NAME_RE.fullmatch(name):
|
||||||
|
raise ValueError("Repository name must match: lowercase a-z, 0-9, '_' and '-'.")
|
||||||
|
|
||||||
|
|
||||||
|
def _repo_homepage(host: str, owner: str, name: str) -> str:
|
||||||
|
return f"https://{host}/{owner}/{name}"
|
||||||
|
|
||||||
|
|
||||||
|
def _build_default_primary_url(parts: RepoParts) -> str:
|
||||||
|
if parts.port:
|
||||||
|
return f"ssh://git@{parts.host}:{parts.port}/{parts.owner}/{parts.name}.git"
|
||||||
|
return f"git@{parts.host}:{parts.owner}/{parts.name}.git"
|
||||||
|
|
||||||
|
|
||||||
|
def _write_default_mirrors(repo_dir: str, primary: str, name: str, preview: bool) -> None:
|
||||||
|
mirrors = {"origin": primary, "pypi": f"https://pypi.org/project/{name}/"}
|
||||||
|
write_mirrors_file(repo_dir, mirrors, preview=preview)
|
||||||
|
|
||||||
|
|
||||||
|
def _git_init_and_initial_commit(repo_dir: str, preview: bool) -> None:
|
||||||
|
_run("git init", cwd=repo_dir, preview=preview)
|
||||||
|
_run("git add -A", cwd=repo_dir, preview=preview)
|
||||||
|
|
||||||
|
if preview:
|
||||||
|
print(f'[Preview] Would run in {repo_dir}: git commit -m "Initial commit"')
|
||||||
return
|
return
|
||||||
|
|
||||||
provider_with_port, account, repository = parts
|
subprocess.run('git commit -m "Initial commit"', cwd=repo_dir, shell=True, check=False)
|
||||||
# Split provider and port if a colon is present.
|
|
||||||
if ":" in provider_with_port:
|
|
||||||
provider_name, port = provider_with_port.split(":", 1)
|
|
||||||
else:
|
|
||||||
provider_name = provider_with_port
|
|
||||||
port = None
|
|
||||||
|
|
||||||
# Check if the repository is already present in the merged config (including port)
|
|
||||||
exists = False
|
def _git_push_main_or_master(repo_dir: str, preview: bool) -> None:
|
||||||
for repo in config_merged.get("repositories", []):
|
_run("git branch -M main", cwd=repo_dir, preview=preview)
|
||||||
if (repo.get("provider") == provider_name and
|
try:
|
||||||
repo.get("account") == account and
|
_run("git push -u origin main", cwd=repo_dir, preview=preview)
|
||||||
repo.get("repository") == repository):
|
return
|
||||||
exists = True
|
except subprocess.CalledProcessError:
|
||||||
print(f"Repository {identifier} already exists in the configuration.")
|
pass
|
||||||
break
|
|
||||||
|
try:
|
||||||
|
_run("git branch -M master", cwd=repo_dir, preview=preview)
|
||||||
|
_run("git push -u origin master", cwd=repo_dir, preview=preview)
|
||||||
|
except subprocess.CalledProcessError as exc:
|
||||||
|
print(f"[WARN] Push failed: {exc}")
|
||||||
|
|
||||||
|
|
||||||
|
def create_repo(
|
||||||
|
identifier: str,
|
||||||
|
config_merged: Dict[str, Any],
|
||||||
|
user_config_path: str,
|
||||||
|
bin_dir: str,
|
||||||
|
*,
|
||||||
|
remote: bool = False,
|
||||||
|
preview: bool = False,
|
||||||
|
) -> None:
|
||||||
|
parts = _parse_identifier(identifier)
|
||||||
|
_ensure_valid_repo_name(parts.name)
|
||||||
|
|
||||||
|
directories = config_merged.get("directories") or {}
|
||||||
|
base_dir = os.path.expanduser(str(directories.get("repositories", "~/Repositories")))
|
||||||
|
repo_dir = os.path.join(base_dir, parts.host, parts.owner, parts.name)
|
||||||
|
|
||||||
|
author_name = _git_get("user.name") or "Unknown Author"
|
||||||
|
author_email = _git_get("user.email") or "unknown@example.invalid"
|
||||||
|
|
||||||
|
homepage = _repo_homepage(parts.host, parts.owner, parts.name)
|
||||||
|
primary_url = _build_default_primary_url(parts)
|
||||||
|
|
||||||
|
repositories = config_merged.get("repositories") or []
|
||||||
|
exists = any(
|
||||||
|
(
|
||||||
|
r.get("provider") == parts.host
|
||||||
|
and r.get("account") == parts.owner
|
||||||
|
and r.get("repository") == parts.name
|
||||||
|
)
|
||||||
|
for r in repositories
|
||||||
|
)
|
||||||
|
|
||||||
if not exists:
|
if not exists:
|
||||||
# Create a new entry with an automatically generated alias.
|
new_entry: Repository = {
|
||||||
new_entry = {
|
"provider": parts.host,
|
||||||
"provider": provider_name,
|
"port": parts.port,
|
||||||
"port": port,
|
"account": parts.owner,
|
||||||
"account": account,
|
"repository": parts.name,
|
||||||
"repository": repository,
|
"homepage": homepage,
|
||||||
"alias": generate_alias({"repository": repository, "provider": provider_name, "account": account}, bin_dir, existing_aliases=set()),
|
"alias": generate_alias(
|
||||||
"verified": {} # No initial verification info
|
{"repository": parts.name, "provider": parts.host, "account": parts.owner},
|
||||||
|
bin_dir,
|
||||||
|
existing_aliases=set(),
|
||||||
|
),
|
||||||
|
"verified": {},
|
||||||
}
|
}
|
||||||
# Load or initialize the user configuration.
|
|
||||||
if os.path.exists(user_config_path):
|
if os.path.exists(user_config_path):
|
||||||
with open(user_config_path, "r") as f:
|
with open(user_config_path, "r", encoding="utf-8") as f:
|
||||||
user_config = yaml.safe_load(f) or {}
|
user_config = yaml.safe_load(f) or {}
|
||||||
else:
|
else:
|
||||||
user_config = {"repositories": []}
|
user_config = {"repositories": []}
|
||||||
|
|
||||||
user_config.setdefault("repositories", [])
|
user_config.setdefault("repositories", [])
|
||||||
user_config["repositories"].append(new_entry)
|
user_config["repositories"].append(new_entry)
|
||||||
save_user_config(user_config, user_config_path)
|
|
||||||
print(f"Repository {identifier} added to the configuration.")
|
|
||||||
# Also update the merged configuration object.
|
|
||||||
config_merged.setdefault("repositories", []).append(new_entry)
|
|
||||||
|
|
||||||
# Create the local repository directory based on the configured base directory.
|
|
||||||
base_dir = os.path.expanduser(config_merged["directories"]["repositories"])
|
|
||||||
repo_dir = os.path.join(base_dir, provider_name, account, repository)
|
|
||||||
if not os.path.exists(repo_dir):
|
|
||||||
os.makedirs(repo_dir, exist_ok=True)
|
|
||||||
print(f"Local repository directory created: {repo_dir}")
|
|
||||||
else:
|
|
||||||
print(f"Local repository directory already exists: {repo_dir}")
|
|
||||||
|
|
||||||
# Initialize a Git repository if not already initialized.
|
|
||||||
if not os.path.exists(os.path.join(repo_dir, ".git")):
|
|
||||||
cmd_init = "git init"
|
|
||||||
if preview:
|
if preview:
|
||||||
print(f"[Preview] Would execute: '{cmd_init}' in {repo_dir}")
|
print(f"[Preview] Would save user config: {user_config_path}")
|
||||||
else:
|
else:
|
||||||
subprocess.run(cmd_init, cwd=repo_dir, shell=True, check=True)
|
save_user_config(user_config, user_config_path)
|
||||||
print(f"Git repository initialized in {repo_dir}.")
|
|
||||||
|
config_merged.setdefault("repositories", []).append(new_entry)
|
||||||
|
repo = new_entry
|
||||||
|
print(f"[INFO] Added repository to configuration: {parts.host}/{parts.owner}/{parts.name}")
|
||||||
else:
|
else:
|
||||||
print("Git repository is already initialized.")
|
repo = next(
|
||||||
|
r
|
||||||
|
for r in repositories
|
||||||
|
if (
|
||||||
|
r.get("provider") == parts.host
|
||||||
|
and r.get("account") == parts.owner
|
||||||
|
and r.get("repository") == parts.name
|
||||||
|
)
|
||||||
|
)
|
||||||
|
print(f"[INFO] Repository already in configuration: {parts.host}/{parts.owner}/{parts.name}")
|
||||||
|
|
||||||
|
if preview:
|
||||||
|
print(f"[Preview] Would ensure directory exists: {repo_dir}")
|
||||||
|
else:
|
||||||
|
os.makedirs(repo_dir, exist_ok=True)
|
||||||
|
|
||||||
|
tpl_context = {
|
||||||
|
"provider": parts.host,
|
||||||
|
"port": parts.port,
|
||||||
|
"account": parts.owner,
|
||||||
|
"repository": parts.name,
|
||||||
|
"homepage": homepage,
|
||||||
|
"author_name": author_name,
|
||||||
|
"author_email": author_email,
|
||||||
|
"license_text": f"All rights reserved by {author_name}",
|
||||||
|
"primary_remote": primary_url,
|
||||||
|
}
|
||||||
|
|
||||||
|
render_default_templates(repo_dir, context=tpl_context, preview=preview)
|
||||||
|
_git_init_and_initial_commit(repo_dir, preview=preview)
|
||||||
|
|
||||||
|
_write_default_mirrors(repo_dir, primary=primary_url, name=parts.name, preview=preview)
|
||||||
|
|
||||||
|
repo.setdefault("mirrors", {})
|
||||||
|
repo["mirrors"].setdefault("origin", primary_url)
|
||||||
|
repo["mirrors"].setdefault("pypi", f"https://pypi.org/project/{parts.name}/")
|
||||||
|
|
||||||
|
setup_mirrors(
|
||||||
|
selected_repos=[repo],
|
||||||
|
repositories_base_dir=base_dir,
|
||||||
|
all_repos=config_merged.get("repositories", []),
|
||||||
|
preview=preview,
|
||||||
|
local=True,
|
||||||
|
remote=True,
|
||||||
|
ensure_remote=bool(remote),
|
||||||
|
)
|
||||||
|
|
||||||
if remote:
|
if remote:
|
||||||
# Create a README.md if it does not exist to have content for an initial commit.
|
_git_push_main_or_master(repo_dir, preview=preview)
|
||||||
readme_path = os.path.join(repo_dir, "README.md")
|
|
||||||
if not os.path.exists(readme_path):
|
|
||||||
if preview:
|
|
||||||
print(f"[Preview] Would create README.md in {repo_dir}.")
|
|
||||||
else:
|
|
||||||
with open(readme_path, "w") as f:
|
|
||||||
f.write(f"# {repository}\n")
|
|
||||||
subprocess.run("git add README.md", cwd=repo_dir, shell=True, check=True)
|
|
||||||
subprocess.run('git commit -m "Initial commit"', cwd=repo_dir, shell=True, check=True)
|
|
||||||
print("README.md created and initial commit made.")
|
|
||||||
|
|
||||||
# Build the remote URL.
|
|
||||||
if provider_name.lower() == "github.com":
|
|
||||||
remote_url = f"git@{provider_name}:{account}/{repository}.git"
|
|
||||||
else:
|
|
||||||
if port:
|
|
||||||
remote_url = f"ssh://git@{provider_name}:{port}/{account}/{repository}.git"
|
|
||||||
else:
|
|
||||||
remote_url = f"ssh://git@{provider_name}/{account}/{repository}.git"
|
|
||||||
|
|
||||||
# Check if the remote "origin" already exists.
|
|
||||||
cmd_list = "git remote"
|
|
||||||
if preview:
|
|
||||||
print(f"[Preview] Would check for existing remotes in {repo_dir}")
|
|
||||||
remote_exists = False # Assume no remote in preview mode.
|
|
||||||
else:
|
|
||||||
result = subprocess.run(cmd_list, cwd=repo_dir, shell=True, capture_output=True, text=True, check=True)
|
|
||||||
remote_list = result.stdout.strip().split()
|
|
||||||
remote_exists = "origin" in remote_list
|
|
||||||
|
|
||||||
if remote_exists:
|
|
||||||
# Remove the existing remote "origin".
|
|
||||||
cmd_remove = "git remote remove origin"
|
|
||||||
if preview:
|
|
||||||
print(f"[Preview] Would execute: '{cmd_remove}' in {repo_dir}")
|
|
||||||
else:
|
|
||||||
subprocess.run(cmd_remove, cwd=repo_dir, shell=True, check=True)
|
|
||||||
print("Existing remote 'origin' removed.")
|
|
||||||
|
|
||||||
# Now add the new remote.
|
|
||||||
cmd_remote = f"git remote add origin {remote_url}"
|
|
||||||
if preview:
|
|
||||||
print(f"[Preview] Would execute: '{cmd_remote}' in {repo_dir}")
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
subprocess.run(cmd_remote, cwd=repo_dir, shell=True, check=True)
|
|
||||||
print(f"Remote 'origin' added: {remote_url}")
|
|
||||||
except subprocess.CalledProcessError:
|
|
||||||
print(f"Failed to add remote using URL: {remote_url}.")
|
|
||||||
|
|
||||||
# Push the initial commit to the remote repository
|
|
||||||
cmd_push = "git push -u origin master"
|
|
||||||
if preview:
|
|
||||||
print(f"[Preview] Would execute: '{cmd_push}' in {repo_dir}")
|
|
||||||
else:
|
|
||||||
subprocess.run(cmd_push, cwd=repo_dir, shell=True, check=True)
|
|
||||||
print("Initial push to the remote repository completed.")
|
|
||||||
|
|||||||
105
src/pkgmgr/actions/repository/scaffold.py
Normal file
105
src/pkgmgr/actions/repository/scaffold.py
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Any, Dict, Optional
|
||||||
|
|
||||||
|
try:
|
||||||
|
from jinja2 import Environment, FileSystemLoader, StrictUndefined
|
||||||
|
except Exception as exc: # pragma: no cover
|
||||||
|
Environment = None # type: ignore[assignment]
|
||||||
|
FileSystemLoader = None # type: ignore[assignment]
|
||||||
|
StrictUndefined = None # type: ignore[assignment]
|
||||||
|
_JINJA_IMPORT_ERROR = exc
|
||||||
|
else:
|
||||||
|
_JINJA_IMPORT_ERROR = None
|
||||||
|
|
||||||
|
|
||||||
|
def _repo_root_from_here(anchor: Optional[Path] = None) -> str:
|
||||||
|
"""
|
||||||
|
Prefer git root (robust in editable installs / different layouts).
|
||||||
|
Fallback to a conservative relative parent lookup.
|
||||||
|
"""
|
||||||
|
here = (anchor or Path(__file__)).resolve().parent
|
||||||
|
try:
|
||||||
|
r = subprocess.run(
|
||||||
|
["git", "rev-parse", "--show-toplevel"],
|
||||||
|
cwd=str(here),
|
||||||
|
check=False,
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
)
|
||||||
|
if r.returncode == 0:
|
||||||
|
top = (r.stdout or "").strip()
|
||||||
|
if top:
|
||||||
|
return top
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Fallback: src/pkgmgr/actions/repository/scaffold.py -> <repo root> = parents[5]
|
||||||
|
p = (anchor or Path(__file__)).resolve()
|
||||||
|
if len(p.parents) < 6:
|
||||||
|
raise RuntimeError(f"Unexpected path depth for: {p}")
|
||||||
|
return str(p.parents[5])
|
||||||
|
|
||||||
|
|
||||||
|
def _templates_dir() -> str:
|
||||||
|
return os.path.join(_repo_root_from_here(), "templates", "default")
|
||||||
|
|
||||||
|
|
||||||
|
def render_default_templates(
|
||||||
|
repo_dir: str,
|
||||||
|
*,
|
||||||
|
context: Dict[str, Any],
|
||||||
|
preview: bool,
|
||||||
|
) -> None:
|
||||||
|
"""
|
||||||
|
Render templates/default/*.j2 into repo_dir.
|
||||||
|
Keeps create.py clean: create.py calls this function only.
|
||||||
|
"""
|
||||||
|
tpl_dir = _templates_dir()
|
||||||
|
if not os.path.isdir(tpl_dir):
|
||||||
|
raise RuntimeError(f"Templates directory not found: {tpl_dir}")
|
||||||
|
|
||||||
|
# Preview mode: do not require Jinja2 at all. We only print planned outputs.
|
||||||
|
if preview:
|
||||||
|
for root, _, files in os.walk(tpl_dir):
|
||||||
|
for fn in files:
|
||||||
|
if not fn.endswith(".j2"):
|
||||||
|
continue
|
||||||
|
abs_src = os.path.join(root, fn)
|
||||||
|
rel_src = os.path.relpath(abs_src, tpl_dir)
|
||||||
|
rel_out = rel_src[:-3]
|
||||||
|
print(f"[Preview] Would render template: {rel_src} -> {rel_out}")
|
||||||
|
return
|
||||||
|
|
||||||
|
if Environment is None or FileSystemLoader is None or StrictUndefined is None:
|
||||||
|
raise RuntimeError(
|
||||||
|
"Jinja2 is required for repo templates but is not available. "
|
||||||
|
f"Import error: {_JINJA_IMPORT_ERROR}"
|
||||||
|
)
|
||||||
|
|
||||||
|
env = Environment(
|
||||||
|
loader=FileSystemLoader(tpl_dir),
|
||||||
|
undefined=StrictUndefined,
|
||||||
|
autoescape=False,
|
||||||
|
keep_trailing_newline=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
for root, _, files in os.walk(tpl_dir):
|
||||||
|
for fn in files:
|
||||||
|
if not fn.endswith(".j2"):
|
||||||
|
continue
|
||||||
|
|
||||||
|
abs_src = os.path.join(root, fn)
|
||||||
|
rel_src = os.path.relpath(abs_src, tpl_dir)
|
||||||
|
rel_out = rel_src[:-3]
|
||||||
|
abs_out = os.path.join(repo_dir, rel_out)
|
||||||
|
|
||||||
|
os.makedirs(os.path.dirname(abs_out), exist_ok=True)
|
||||||
|
template = env.get_template(rel_src)
|
||||||
|
rendered = template.render(**context)
|
||||||
|
|
||||||
|
with open(abs_out, "w", encoding="utf-8") as f:
|
||||||
|
f.write(rendered)
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from typing import Any, Iterable
|
from typing import Any, Iterable, List, Tuple
|
||||||
|
|
||||||
from pkgmgr.actions.update.system_updater import SystemUpdater
|
from pkgmgr.actions.update.system_updater import SystemUpdater
|
||||||
|
|
||||||
@@ -30,22 +30,42 @@ class UpdateManager:
|
|||||||
quiet: bool,
|
quiet: bool,
|
||||||
update_dependencies: bool,
|
update_dependencies: bool,
|
||||||
clone_mode: str,
|
clone_mode: str,
|
||||||
|
silent: bool = False,
|
||||||
force_update: bool = True,
|
force_update: bool = True,
|
||||||
) -> None:
|
) -> None:
|
||||||
from pkgmgr.actions.install import install_repos
|
from pkgmgr.actions.install import install_repos
|
||||||
from pkgmgr.actions.repository.pull import pull_with_verification
|
from pkgmgr.actions.repository.pull import pull_with_verification
|
||||||
|
from pkgmgr.core.repository.identifier import get_repo_identifier
|
||||||
|
|
||||||
|
failures: List[Tuple[str, str]] = []
|
||||||
|
|
||||||
|
for repo in list(selected_repos):
|
||||||
|
identifier = get_repo_identifier(repo, all_repos)
|
||||||
|
|
||||||
|
try:
|
||||||
pull_with_verification(
|
pull_with_verification(
|
||||||
selected_repos,
|
[repo],
|
||||||
repositories_base_dir,
|
repositories_base_dir,
|
||||||
all_repos,
|
all_repos,
|
||||||
[],
|
[],
|
||||||
no_verification,
|
no_verification,
|
||||||
preview,
|
preview,
|
||||||
)
|
)
|
||||||
|
except SystemExit as exc:
|
||||||
|
code = exc.code if isinstance(exc.code, int) else str(exc.code)
|
||||||
|
failures.append((identifier, f"pull failed (exit={code})"))
|
||||||
|
if not quiet:
|
||||||
|
print(f"[Warning] update: pull failed for {identifier} (exit={code}). Continuing...")
|
||||||
|
continue
|
||||||
|
except Exception as exc:
|
||||||
|
failures.append((identifier, f"pull failed: {exc}"))
|
||||||
|
if not quiet:
|
||||||
|
print(f"[Warning] update: pull failed for {identifier}: {exc}. Continuing...")
|
||||||
|
continue
|
||||||
|
|
||||||
|
try:
|
||||||
install_repos(
|
install_repos(
|
||||||
selected_repos,
|
[repo],
|
||||||
repositories_base_dir,
|
repositories_base_dir,
|
||||||
bin_dir,
|
bin_dir,
|
||||||
all_repos,
|
all_repos,
|
||||||
@@ -55,7 +75,28 @@ class UpdateManager:
|
|||||||
clone_mode,
|
clone_mode,
|
||||||
update_dependencies,
|
update_dependencies,
|
||||||
force_update=force_update,
|
force_update=force_update,
|
||||||
|
silent=silent,
|
||||||
|
emit_summary=False,
|
||||||
)
|
)
|
||||||
|
except SystemExit as exc:
|
||||||
|
code = exc.code if isinstance(exc.code, int) else str(exc.code)
|
||||||
|
failures.append((identifier, f"install failed (exit={code})"))
|
||||||
|
if not quiet:
|
||||||
|
print(f"[Warning] update: install failed for {identifier} (exit={code}). Continuing...")
|
||||||
|
continue
|
||||||
|
except Exception as exc:
|
||||||
|
failures.append((identifier, f"install failed: {exc}"))
|
||||||
|
if not quiet:
|
||||||
|
print(f"[Warning] update: install failed for {identifier}: {exc}. Continuing...")
|
||||||
|
continue
|
||||||
|
|
||||||
|
if failures and not quiet:
|
||||||
|
print("\n[pkgmgr] Update finished with warnings:")
|
||||||
|
for ident, msg in failures:
|
||||||
|
print(f" - {ident}: {msg}")
|
||||||
|
|
||||||
|
if failures and not silent:
|
||||||
|
raise SystemExit(1)
|
||||||
|
|
||||||
if system_update:
|
if system_update:
|
||||||
self._system_updater.run(preview=preview)
|
self._system_updater.run(preview=preview)
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ from .repos import handle_repos_command
|
|||||||
from .config import handle_config
|
from .config import handle_config
|
||||||
from .tools import handle_tools_command
|
from .tools import handle_tools_command
|
||||||
from .release import handle_release
|
from .release import handle_release
|
||||||
|
from .publish import handle_publish
|
||||||
from .version import handle_version
|
from .version import handle_version
|
||||||
from .make import handle_make
|
from .make import handle_make
|
||||||
from .changelog import handle_changelog
|
from .changelog import handle_changelog
|
||||||
@@ -13,6 +14,7 @@ __all__ = [
|
|||||||
"handle_config",
|
"handle_config",
|
||||||
"handle_tools_command",
|
"handle_tools_command",
|
||||||
"handle_release",
|
"handle_release",
|
||||||
|
"handle_publish",
|
||||||
"handle_version",
|
"handle_version",
|
||||||
"handle_make",
|
"handle_make",
|
||||||
"handle_changelog",
|
"handle_changelog",
|
||||||
|
|||||||
34
src/pkgmgr/cli/commands/publish.py
Normal file
34
src/pkgmgr/cli/commands/publish.py
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
from typing import Any, Dict, List
|
||||||
|
|
||||||
|
from pkgmgr.actions.publish import publish
|
||||||
|
from pkgmgr.cli.context import CLIContext
|
||||||
|
from pkgmgr.core.repository.dir import get_repo_dir
|
||||||
|
from pkgmgr.core.repository.identifier import get_repo_identifier
|
||||||
|
|
||||||
|
Repository = Dict[str, Any]
|
||||||
|
|
||||||
|
|
||||||
|
def handle_publish(args, ctx: CLIContext, selected: List[Repository]) -> None:
|
||||||
|
if not selected:
|
||||||
|
print("[pkgmgr] No repositories selected for publish.")
|
||||||
|
return
|
||||||
|
|
||||||
|
for repo in selected:
|
||||||
|
identifier = get_repo_identifier(repo, ctx.all_repositories)
|
||||||
|
repo_dir = repo.get("directory") or get_repo_dir(ctx.repositories_base_dir, repo)
|
||||||
|
|
||||||
|
if not os.path.isdir(repo_dir):
|
||||||
|
print(f"[WARN] Skipping {identifier}: directory missing.")
|
||||||
|
continue
|
||||||
|
|
||||||
|
print(f"[pkgmgr] Publishing repository {identifier}...")
|
||||||
|
publish(
|
||||||
|
repo=repo,
|
||||||
|
repo_dir=repo_dir,
|
||||||
|
preview=getattr(args, "preview", False),
|
||||||
|
interactive=not getattr(args, "non_interactive", False),
|
||||||
|
allow_prompt=not getattr(args, "non_interactive", False),
|
||||||
|
)
|
||||||
@@ -1,31 +1,17 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
"""
|
|
||||||
Release command wiring for the pkgmgr CLI.
|
|
||||||
|
|
||||||
This module implements the `pkgmgr release` subcommand on top of the
|
|
||||||
generic selection logic from cli.dispatch. It does not define its
|
|
||||||
own subparser; the CLI surface is configured in cli.parser.
|
|
||||||
|
|
||||||
Responsibilities:
|
|
||||||
- Take the parsed argparse.Namespace for the `release` command.
|
|
||||||
- Use the list of selected repositories provided by dispatch_command().
|
|
||||||
- Optionally list affected repositories when --list is set.
|
|
||||||
- For each selected repository, run pkgmgr.actions.release.release(...) in
|
|
||||||
the context of that repository directory.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
import sys
|
||||||
from typing import Any, Dict, List
|
from typing import Any, Dict, List
|
||||||
|
|
||||||
|
from pkgmgr.actions.publish import publish as run_publish
|
||||||
|
from pkgmgr.actions.release import release as run_release
|
||||||
from pkgmgr.cli.context import CLIContext
|
from pkgmgr.cli.context import CLIContext
|
||||||
from pkgmgr.core.repository.dir import get_repo_dir
|
from pkgmgr.core.repository.dir import get_repo_dir
|
||||||
from pkgmgr.core.repository.identifier import get_repo_identifier
|
from pkgmgr.core.repository.identifier import get_repo_identifier
|
||||||
from pkgmgr.actions.release import release as run_release
|
|
||||||
|
|
||||||
|
|
||||||
Repository = Dict[str, Any]
|
Repository = Dict[str, Any]
|
||||||
|
|
||||||
@@ -35,23 +21,10 @@ def handle_release(
|
|||||||
ctx: CLIContext,
|
ctx: CLIContext,
|
||||||
selected: List[Repository],
|
selected: List[Repository],
|
||||||
) -> None:
|
) -> None:
|
||||||
"""
|
|
||||||
Handle the `pkgmgr release` subcommand.
|
|
||||||
|
|
||||||
Flow:
|
|
||||||
1) Use the `selected` repositories as computed by dispatch_command().
|
|
||||||
2) If --list is given, print the identifiers of the selected repos
|
|
||||||
and return without running any release.
|
|
||||||
3) For each selected repository:
|
|
||||||
- Resolve its identifier and local directory.
|
|
||||||
- Change into that directory.
|
|
||||||
- Call pkgmgr.actions.release.release(...) with the parsed options.
|
|
||||||
"""
|
|
||||||
if not selected:
|
if not selected:
|
||||||
print("[pkgmgr] No repositories selected for release.")
|
print("[pkgmgr] No repositories selected for release.")
|
||||||
return
|
return
|
||||||
|
|
||||||
# List-only mode: show which repositories would be affected.
|
|
||||||
if getattr(args, "list", False):
|
if getattr(args, "list", False):
|
||||||
print("[pkgmgr] Repositories that would be affected by this release:")
|
print("[pkgmgr] Repositories that would be affected by this release:")
|
||||||
for repo in selected:
|
for repo in selected:
|
||||||
@@ -62,29 +35,22 @@ def handle_release(
|
|||||||
for repo in selected:
|
for repo in selected:
|
||||||
identifier = get_repo_identifier(repo, ctx.all_repositories)
|
identifier = get_repo_identifier(repo, ctx.all_repositories)
|
||||||
|
|
||||||
repo_dir = repo.get("directory")
|
|
||||||
if not repo_dir:
|
|
||||||
try:
|
try:
|
||||||
repo_dir = get_repo_dir(ctx.repositories_base_dir, repo)
|
repo_dir = repo.get("directory") or get_repo_dir(ctx.repositories_base_dir, repo)
|
||||||
except Exception:
|
except Exception as exc:
|
||||||
repo_dir = None
|
print(f"[WARN] Skipping repository {identifier}: failed to resolve directory: {exc}")
|
||||||
|
|
||||||
if not repo_dir or not os.path.isdir(repo_dir):
|
|
||||||
print(
|
|
||||||
f"[WARN] Skipping repository {identifier}: "
|
|
||||||
"local directory does not exist."
|
|
||||||
)
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
print(
|
if not os.path.isdir(repo_dir):
|
||||||
f"[pkgmgr] Running release for repository {identifier} "
|
print(f"[WARN] Skipping repository {identifier}: directory missing.")
|
||||||
f"in '{repo_dir}'..."
|
continue
|
||||||
)
|
|
||||||
|
print(f"[pkgmgr] Running release for repository {identifier}...")
|
||||||
|
|
||||||
# Change to repo directory and invoke the helper.
|
|
||||||
cwd_before = os.getcwd()
|
cwd_before = os.getcwd()
|
||||||
try:
|
try:
|
||||||
os.chdir(repo_dir)
|
os.chdir(repo_dir)
|
||||||
|
|
||||||
run_release(
|
run_release(
|
||||||
pyproject_path="pyproject.toml",
|
pyproject_path="pyproject.toml",
|
||||||
changelog_path="CHANGELOG.md",
|
changelog_path="CHANGELOG.md",
|
||||||
@@ -94,5 +60,17 @@ def handle_release(
|
|||||||
force=getattr(args, "force", False),
|
force=getattr(args, "force", False),
|
||||||
close=getattr(args, "close", False),
|
close=getattr(args, "close", False),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if not getattr(args, "no_publish", False):
|
||||||
|
print(f"[pkgmgr] Running publish for repository {identifier}...")
|
||||||
|
is_tty = sys.stdin.isatty()
|
||||||
|
run_publish(
|
||||||
|
repo=repo,
|
||||||
|
repo_dir=repo_dir,
|
||||||
|
preview=getattr(args, "preview", False),
|
||||||
|
interactive=is_tty,
|
||||||
|
allow_prompt=is_tty,
|
||||||
|
)
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
os.chdir(cwd_before)
|
os.chdir(cwd_before)
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ def handle_repos_command(
|
|||||||
args.clone_mode,
|
args.clone_mode,
|
||||||
args.dependencies,
|
args.dependencies,
|
||||||
force_update=getattr(args, "update", False),
|
force_update=getattr(args, "update", False),
|
||||||
|
silent=getattr(args, "silent", False),
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import os
|
import os
|
||||||
@@ -16,6 +13,7 @@ from pkgmgr.cli.commands import (
|
|||||||
handle_repos_command,
|
handle_repos_command,
|
||||||
handle_tools_command,
|
handle_tools_command,
|
||||||
handle_release,
|
handle_release,
|
||||||
|
handle_publish,
|
||||||
handle_version,
|
handle_version,
|
||||||
handle_config,
|
handle_config,
|
||||||
handle_make,
|
handle_make,
|
||||||
@@ -24,40 +22,20 @@ from pkgmgr.cli.commands import (
|
|||||||
handle_mirror_command,
|
handle_mirror_command,
|
||||||
)
|
)
|
||||||
|
|
||||||
def _has_explicit_selection(args) -> bool:
|
|
||||||
"""
|
|
||||||
Return True if the user explicitly selected repositories via
|
|
||||||
identifiers / --all / --category / --tag / --string.
|
|
||||||
"""
|
|
||||||
identifiers = getattr(args, "identifiers", []) or []
|
|
||||||
use_all = getattr(args, "all", False)
|
|
||||||
categories = getattr(args, "category", []) or []
|
|
||||||
tags = getattr(args, "tag", []) or []
|
|
||||||
string_filter = getattr(args, "string", "") or ""
|
|
||||||
|
|
||||||
|
def _has_explicit_selection(args) -> bool:
|
||||||
return bool(
|
return bool(
|
||||||
use_all
|
getattr(args, "all", False)
|
||||||
or identifiers
|
or getattr(args, "identifiers", [])
|
||||||
or categories
|
or getattr(args, "category", [])
|
||||||
or tags
|
or getattr(args, "tag", [])
|
||||||
or string_filter
|
or getattr(args, "string", "")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def _select_repo_for_current_directory(
|
def _select_repo_for_current_directory(ctx: CLIContext) -> List[Dict[str, Any]]:
|
||||||
ctx: CLIContext,
|
|
||||||
) -> List[Dict[str, Any]]:
|
|
||||||
"""
|
|
||||||
Heuristic: find the repository whose local directory matches the
|
|
||||||
current working directory or is the closest parent.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
- Repo directory: /home/kevin/Repositories/foo
|
|
||||||
- CWD: /home/kevin/Repositories/foo/subdir
|
|
||||||
→ 'foo' is selected.
|
|
||||||
"""
|
|
||||||
cwd = os.path.abspath(os.getcwd())
|
cwd = os.path.abspath(os.getcwd())
|
||||||
candidates: List[tuple[str, Dict[str, Any]]] = []
|
matches = []
|
||||||
|
|
||||||
for repo in ctx.all_repositories:
|
for repo in ctx.all_repositories:
|
||||||
repo_dir = repo.get("directory")
|
repo_dir = repo.get("directory")
|
||||||
@@ -65,33 +43,24 @@ def _select_repo_for_current_directory(
|
|||||||
try:
|
try:
|
||||||
repo_dir = get_repo_dir(ctx.repositories_base_dir, repo)
|
repo_dir = get_repo_dir(ctx.repositories_base_dir, repo)
|
||||||
except Exception:
|
except Exception:
|
||||||
repo_dir = None
|
|
||||||
if not repo_dir:
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
repo_dir_abs = os.path.abspath(os.path.expanduser(repo_dir))
|
repo_dir = os.path.abspath(os.path.expanduser(repo_dir))
|
||||||
if cwd == repo_dir_abs or cwd.startswith(repo_dir_abs + os.sep):
|
if cwd == repo_dir or cwd.startswith(repo_dir + os.sep):
|
||||||
candidates.append((repo_dir_abs, repo))
|
matches.append((repo_dir, repo))
|
||||||
|
|
||||||
if not candidates:
|
if not matches:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
# Pick the repo with the longest (most specific) path.
|
matches.sort(key=lambda x: len(x[0]), reverse=True)
|
||||||
candidates.sort(key=lambda item: len(item[0]), reverse=True)
|
return [matches[0][1]]
|
||||||
return [candidates[0][1]]
|
|
||||||
|
|
||||||
|
|
||||||
def dispatch_command(args, ctx: CLIContext) -> None:
|
def dispatch_command(args, ctx: CLIContext) -> None:
|
||||||
"""
|
|
||||||
Dispatch the parsed arguments to the appropriate command handler.
|
|
||||||
"""
|
|
||||||
|
|
||||||
# First: proxy commands (git / docker / docker compose / make wrapper etc.)
|
|
||||||
if maybe_handle_proxy(args, ctx):
|
if maybe_handle_proxy(args, ctx):
|
||||||
return
|
return
|
||||||
|
|
||||||
# Commands that operate on repository selections
|
commands_with_selection = {
|
||||||
commands_with_selection: List[str] = [
|
|
||||||
"install",
|
"install",
|
||||||
"update",
|
"update",
|
||||||
"deinstall",
|
"deinstall",
|
||||||
@@ -103,31 +72,25 @@ def dispatch_command(args, ctx: CLIContext) -> None:
|
|||||||
"list",
|
"list",
|
||||||
"make",
|
"make",
|
||||||
"release",
|
"release",
|
||||||
|
"publish",
|
||||||
"version",
|
"version",
|
||||||
"changelog",
|
"changelog",
|
||||||
"explore",
|
"explore",
|
||||||
"terminal",
|
"terminal",
|
||||||
"code",
|
"code",
|
||||||
"mirror",
|
"mirror",
|
||||||
]
|
}
|
||||||
|
|
||||||
if getattr(args, "command", None) in commands_with_selection:
|
if args.command in commands_with_selection:
|
||||||
if _has_explicit_selection(args):
|
selected = (
|
||||||
# Classic selection logic (identifiers / --all / filters)
|
get_selected_repos(args, ctx.all_repositories)
|
||||||
selected = get_selected_repos(args, ctx.all_repositories)
|
if _has_explicit_selection(args)
|
||||||
else:
|
else _select_repo_for_current_directory(ctx)
|
||||||
# Default per help text: repository of current folder.
|
)
|
||||||
selected = _select_repo_for_current_directory(ctx)
|
|
||||||
# If none is found, leave 'selected' empty.
|
|
||||||
# Individual handlers will then emit a clear message instead
|
|
||||||
# of silently picking an unrelated repository.
|
|
||||||
else:
|
else:
|
||||||
selected = []
|
selected = []
|
||||||
|
|
||||||
# ------------------------------------------------------------------ #
|
if args.command in {
|
||||||
# Repos-related commands
|
|
||||||
# ------------------------------------------------------------------ #
|
|
||||||
if args.command in (
|
|
||||||
"install",
|
"install",
|
||||||
"deinstall",
|
"deinstall",
|
||||||
"delete",
|
"delete",
|
||||||
@@ -136,15 +99,13 @@ def dispatch_command(args, ctx: CLIContext) -> None:
|
|||||||
"shell",
|
"shell",
|
||||||
"create",
|
"create",
|
||||||
"list",
|
"list",
|
||||||
):
|
}:
|
||||||
handle_repos_command(args, ctx, selected)
|
handle_repos_command(args, ctx, selected)
|
||||||
return
|
return
|
||||||
|
|
||||||
# ------------------------------------------------------------
|
|
||||||
# update
|
|
||||||
# ------------------------------------------------------------
|
|
||||||
if args.command == "update":
|
if args.command == "update":
|
||||||
from pkgmgr.actions.update import UpdateManager
|
from pkgmgr.actions.update import UpdateManager
|
||||||
|
|
||||||
UpdateManager().run(
|
UpdateManager().run(
|
||||||
selected_repos=selected,
|
selected_repos=selected,
|
||||||
repositories_base_dir=ctx.repositories_base_dir,
|
repositories_base_dir=ctx.repositories_base_dir,
|
||||||
@@ -156,25 +117,23 @@ def dispatch_command(args, ctx: CLIContext) -> None:
|
|||||||
quiet=args.quiet,
|
quiet=args.quiet,
|
||||||
update_dependencies=args.dependencies,
|
update_dependencies=args.dependencies,
|
||||||
clone_mode=args.clone_mode,
|
clone_mode=args.clone_mode,
|
||||||
|
silent=getattr(args, "silent", False),
|
||||||
force_update=True,
|
force_update=True,
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
# ------------------------------------------------------------------ #
|
|
||||||
# Tools (explore / terminal / code)
|
|
||||||
# ------------------------------------------------------------------ #
|
|
||||||
if args.command in ("explore", "terminal", "code"):
|
if args.command in ("explore", "terminal", "code"):
|
||||||
handle_tools_command(args, ctx, selected)
|
handle_tools_command(args, ctx, selected)
|
||||||
return
|
return
|
||||||
|
|
||||||
# ------------------------------------------------------------------ #
|
|
||||||
# Release / Version / Changelog / Config / Make / Branch
|
|
||||||
# ------------------------------------------------------------------ #
|
|
||||||
if args.command == "release":
|
if args.command == "release":
|
||||||
handle_release(args, ctx, selected)
|
handle_release(args, ctx, selected)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if args.command == "publish":
|
||||||
|
handle_publish(args, ctx, selected)
|
||||||
|
return
|
||||||
|
|
||||||
if args.command == "version":
|
if args.command == "version":
|
||||||
handle_version(args, ctx, selected)
|
handle_version(args, ctx, selected)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -1,68 +1,73 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
|
|
||||||
from pkgmgr.cli.proxy import register_proxy_commands
|
from pkgmgr.cli.proxy import register_proxy_commands
|
||||||
|
|
||||||
from .common import SortedSubParsersAction
|
|
||||||
from .install_update import add_install_update_subparsers
|
|
||||||
from .config_cmd import add_config_subparsers
|
|
||||||
from .navigation_cmd import add_navigation_subparsers
|
|
||||||
from .branch_cmd import add_branch_subparsers
|
from .branch_cmd import add_branch_subparsers
|
||||||
from .release_cmd import add_release_subparser
|
|
||||||
from .version_cmd import add_version_subparser
|
|
||||||
from .changelog_cmd import add_changelog_subparser
|
from .changelog_cmd import add_changelog_subparser
|
||||||
|
from .common import SortedSubParsersAction
|
||||||
|
from .config_cmd import add_config_subparsers
|
||||||
|
from .install_update import add_install_update_subparsers
|
||||||
from .list_cmd import add_list_subparser
|
from .list_cmd import add_list_subparser
|
||||||
from .make_cmd import add_make_subparsers
|
from .make_cmd import add_make_subparsers
|
||||||
from .mirror_cmd import add_mirror_subparsers
|
from .mirror_cmd import add_mirror_subparsers
|
||||||
|
from .navigation_cmd import add_navigation_subparsers
|
||||||
|
from .publish_cmd import add_publish_subparser
|
||||||
|
from .release_cmd import add_release_subparser
|
||||||
|
from .version_cmd import add_version_subparser
|
||||||
|
|
||||||
|
|
||||||
def create_parser(description_text: str) -> argparse.ArgumentParser:
|
def create_parser(description_text: str) -> argparse.ArgumentParser:
|
||||||
"""
|
|
||||||
Create the top-level argument parser for pkgmgr.
|
|
||||||
"""
|
|
||||||
parser = argparse.ArgumentParser(
|
parser = argparse.ArgumentParser(
|
||||||
description=description_text,
|
description=description_text,
|
||||||
formatter_class=argparse.RawTextHelpFormatter,
|
formatter_class=argparse.RawTextHelpFormatter,
|
||||||
)
|
)
|
||||||
|
|
||||||
subparsers = parser.add_subparsers(
|
subparsers = parser.add_subparsers(
|
||||||
dest="command",
|
dest="command",
|
||||||
help="Subcommands",
|
help="Subcommands",
|
||||||
action=SortedSubParsersAction,
|
action=SortedSubParsersAction,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Core repo operations
|
# create
|
||||||
|
p_create = subparsers.add_parser(
|
||||||
|
"create",
|
||||||
|
help="Create a new repository (scaffold + config).",
|
||||||
|
)
|
||||||
|
p_create.add_argument(
|
||||||
|
"identifiers",
|
||||||
|
nargs="+",
|
||||||
|
help="Repository identifier(s): URL or 'provider(:port)/owner/repo'.",
|
||||||
|
)
|
||||||
|
p_create.add_argument(
|
||||||
|
"--remote",
|
||||||
|
action="store_true",
|
||||||
|
help="Also push an initial commit to the remote (main/master).",
|
||||||
|
)
|
||||||
|
p_create.add_argument(
|
||||||
|
"--preview",
|
||||||
|
action="store_true",
|
||||||
|
help="Print actions without writing files or executing commands.",
|
||||||
|
)
|
||||||
|
|
||||||
add_install_update_subparsers(subparsers)
|
add_install_update_subparsers(subparsers)
|
||||||
add_config_subparsers(subparsers)
|
add_config_subparsers(subparsers)
|
||||||
|
|
||||||
# Navigation / tooling around repos
|
|
||||||
add_navigation_subparsers(subparsers)
|
add_navigation_subparsers(subparsers)
|
||||||
|
|
||||||
# Branch & release workflow
|
|
||||||
add_branch_subparsers(subparsers)
|
add_branch_subparsers(subparsers)
|
||||||
add_release_subparser(subparsers)
|
add_release_subparser(subparsers)
|
||||||
|
add_publish_subparser(subparsers)
|
||||||
|
|
||||||
# Info commands
|
|
||||||
add_version_subparser(subparsers)
|
add_version_subparser(subparsers)
|
||||||
add_changelog_subparser(subparsers)
|
add_changelog_subparser(subparsers)
|
||||||
add_list_subparser(subparsers)
|
add_list_subparser(subparsers)
|
||||||
|
|
||||||
# Make wrapper
|
|
||||||
add_make_subparsers(subparsers)
|
add_make_subparsers(subparsers)
|
||||||
|
|
||||||
# Mirror management
|
|
||||||
add_mirror_subparsers(subparsers)
|
add_mirror_subparsers(subparsers)
|
||||||
|
|
||||||
# Proxy commands (git, docker, docker compose, ...)
|
|
||||||
register_proxy_commands(subparsers)
|
register_proxy_commands(subparsers)
|
||||||
|
|
||||||
return parser
|
return parser
|
||||||
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = ["create_parser", "SortedSubParsersAction"]
|
||||||
"create_parser",
|
|
||||||
"SortedSubParsersAction",
|
|
||||||
]
|
|
||||||
|
|||||||
@@ -168,3 +168,10 @@ def add_install_update_arguments(subparser: argparse.ArgumentParser) -> None:
|
|||||||
default="ssh",
|
default="ssh",
|
||||||
help="Specify clone mode (default: ssh).",
|
help="Specify clone mode (default: ssh).",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
_add_option_if_missing(
|
||||||
|
subparser,
|
||||||
|
"--silent",
|
||||||
|
action="store_true",
|
||||||
|
help="Continue with other repositories if one fails; downgrade errors to warnings.",
|
||||||
|
)
|
||||||
|
|||||||
19
src/pkgmgr/cli/parser/publish_cmd.py
Normal file
19
src/pkgmgr/cli/parser/publish_cmd.py
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
|
||||||
|
from .common import add_identifier_arguments
|
||||||
|
|
||||||
|
|
||||||
|
def add_publish_subparser(subparsers: argparse._SubParsersAction) -> None:
|
||||||
|
parser = subparsers.add_parser(
|
||||||
|
"publish",
|
||||||
|
help="Publish repository artifacts (e.g. PyPI) based on MIRRORS.",
|
||||||
|
)
|
||||||
|
add_identifier_arguments(parser)
|
||||||
|
|
||||||
|
parser.add_argument(
|
||||||
|
"--non-interactive",
|
||||||
|
action="store_true",
|
||||||
|
help="Disable interactive credential prompts (CI mode).",
|
||||||
|
)
|
||||||
@@ -21,22 +21,22 @@ def add_release_subparser(
|
|||||||
"and updating the changelog."
|
"and updating the changelog."
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
release_parser.add_argument(
|
release_parser.add_argument(
|
||||||
"release_type",
|
"release_type",
|
||||||
choices=["major", "minor", "patch"],
|
choices=["major", "minor", "patch"],
|
||||||
help="Type of version increment for the release (major, minor, patch).",
|
help="Type of version increment for the release (major, minor, patch).",
|
||||||
)
|
)
|
||||||
|
|
||||||
release_parser.add_argument(
|
release_parser.add_argument(
|
||||||
"-m",
|
"-m",
|
||||||
"--message",
|
"--message",
|
||||||
default=None,
|
default=None,
|
||||||
help=(
|
help="Optional release message to add to the changelog and tag.",
|
||||||
"Optional release message to add to the changelog and tag."
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
# Generic selection / preview / list / extra_args
|
|
||||||
add_identifier_arguments(release_parser)
|
add_identifier_arguments(release_parser)
|
||||||
# Close current branch after successful release
|
|
||||||
release_parser.add_argument(
|
release_parser.add_argument(
|
||||||
"--close",
|
"--close",
|
||||||
action="store_true",
|
action="store_true",
|
||||||
@@ -45,7 +45,7 @@ def add_release_subparser(
|
|||||||
"repository, if it is not main/master."
|
"repository, if it is not main/master."
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
# Force: skip preview+confirmation and run release directly
|
|
||||||
release_parser.add_argument(
|
release_parser.add_argument(
|
||||||
"-f",
|
"-f",
|
||||||
"--force",
|
"--force",
|
||||||
@@ -55,3 +55,9 @@ def add_release_subparser(
|
|||||||
"release directly."
|
"release directly."
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
release_parser.add_argument(
|
||||||
|
"--no-publish",
|
||||||
|
action="store_true",
|
||||||
|
help="Do not run publish automatically after a successful release.",
|
||||||
|
)
|
||||||
|
|||||||
5
templates/default/.gitignore.j2
Normal file
5
templates/default/.gitignore.j2
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
.venv/
|
||||||
|
dist/
|
||||||
|
build/
|
||||||
|
__pycache__/
|
||||||
|
*.pyc
|
||||||
1
templates/default/LICENSE.j2
Normal file
1
templates/default/LICENSE.j2
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{{ license_text }}
|
||||||
6
templates/default/README.md.j2
Normal file
6
templates/default/README.md.j2
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
# {{ repository }}
|
||||||
|
|
||||||
|
Homepage: {{ homepage }}
|
||||||
|
|
||||||
|
## Author
|
||||||
|
{{ author_name }} <{{ author_email }}>
|
||||||
11
templates/default/flake.nix.j2
Normal file
11
templates/default/flake.nix.j2
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
description = "{{ repository }}";
|
||||||
|
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
|
outputs = { self, nixpkgs }:
|
||||||
|
let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; };
|
||||||
|
in {
|
||||||
|
devShells.${system}.default = pkgs.mkShell {
|
||||||
|
packages = with pkgs; [ python312 python312Packages.pytest python312Packages.ruff ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
21
templates/default/pyproject.toml.j2
Normal file
21
templates/default/pyproject.toml.j2
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
[build-system]
|
||||||
|
requires = ["setuptools>=68", "wheel"]
|
||||||
|
build-backend = "setuptools.build_meta"
|
||||||
|
|
||||||
|
[project]
|
||||||
|
name = "{{ repository }}"
|
||||||
|
version = "0.1.0"
|
||||||
|
description = ""
|
||||||
|
readme = "README.md"
|
||||||
|
requires-python = ">=3.10"
|
||||||
|
authors = [{ name = "{{ author_name }}", email = "{{ author_email }}" }]
|
||||||
|
license = { text = "{{ license_text }}" }
|
||||||
|
urls = { Homepage = "{{ homepage }}" }
|
||||||
|
|
||||||
|
dependencies = []
|
||||||
|
|
||||||
|
[tool.setuptools]
|
||||||
|
package-dir = {"" = "src"}
|
||||||
|
|
||||||
|
[tool.setuptools.packages.find]
|
||||||
|
where = ["src"]
|
||||||
70
tests/e2e/test_publish_commands.py
Normal file
70
tests/e2e/test_publish_commands.py
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
|
||||||
|
PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
|
||||||
|
|
||||||
|
|
||||||
|
def _run_help(cmd: list[str], label: str) -> str:
|
||||||
|
print(f"\n[TEST] Running ({label}): {' '.join(cmd)}")
|
||||||
|
proc = subprocess.run(
|
||||||
|
cmd,
|
||||||
|
cwd=PROJECT_ROOT,
|
||||||
|
text=True,
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.STDOUT,
|
||||||
|
check=False,
|
||||||
|
env=os.environ.copy(),
|
||||||
|
)
|
||||||
|
print(proc.stdout.rstrip())
|
||||||
|
|
||||||
|
# For --help we expect success (0). Anything else is an error.
|
||||||
|
if proc.returncode != 0:
|
||||||
|
raise AssertionError(
|
||||||
|
f"[TEST] Help command failed ({label}).\n"
|
||||||
|
f"Command: {' '.join(cmd)}\n"
|
||||||
|
f"Exit code: {proc.returncode}\n"
|
||||||
|
f"--- output ---\n{proc.stdout}\n"
|
||||||
|
)
|
||||||
|
|
||||||
|
return proc.stdout
|
||||||
|
|
||||||
|
|
||||||
|
class TestPublishHelpE2E(unittest.TestCase):
|
||||||
|
def test_pkgmgr_publish_help(self) -> None:
|
||||||
|
out = _run_help(["pkgmgr", "publish", "--help"], "pkgmgr publish --help")
|
||||||
|
self.assertIn("usage:", out)
|
||||||
|
self.assertIn("publish", out)
|
||||||
|
|
||||||
|
def test_pkgmgr_help_mentions_publish(self) -> None:
|
||||||
|
out = _run_help(["pkgmgr", "--help"], "pkgmgr --help")
|
||||||
|
self.assertIn("publish", out)
|
||||||
|
|
||||||
|
def test_nix_run_pkgmgr_publish_help(self) -> None:
|
||||||
|
if shutil.which("nix") is None:
|
||||||
|
self.skipTest("nix is not available in this environment")
|
||||||
|
|
||||||
|
out = _run_help(
|
||||||
|
["nix", "run", ".#pkgmgr", "--", "publish", "--help"],
|
||||||
|
"nix run .#pkgmgr -- publish --help",
|
||||||
|
)
|
||||||
|
self.assertIn("usage:", out)
|
||||||
|
self.assertIn("publish", out)
|
||||||
|
|
||||||
|
def test_nix_run_pkgmgr_help_mentions_publish(self) -> None:
|
||||||
|
if shutil.which("nix") is None:
|
||||||
|
self.skipTest("nix is not available in this environment")
|
||||||
|
|
||||||
|
out = _run_help(
|
||||||
|
["nix", "run", ".#pkgmgr", "--", "--help"],
|
||||||
|
"nix run .#pkgmgr -- --help",
|
||||||
|
)
|
||||||
|
self.assertIn("publish", out)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
42
tests/e2e/test_repos_create_preview_output.py
Normal file
42
tests/e2e/test_repos_create_preview_output.py
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import io
|
||||||
|
import unittest
|
||||||
|
from contextlib import redirect_stdout
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
from pkgmgr.actions.repository.create import create_repo
|
||||||
|
|
||||||
|
|
||||||
|
class TestE2ECreateRepoPreviewOutput(unittest.TestCase):
|
||||||
|
def test_create_repo_preview_prints_expected_steps(self) -> None:
|
||||||
|
cfg = {"directories": {"repositories": "/tmp/Repositories"}, "repositories": []}
|
||||||
|
|
||||||
|
out = io.StringIO()
|
||||||
|
with (
|
||||||
|
redirect_stdout(out),
|
||||||
|
patch("pkgmgr.actions.repository.create.os.path.exists", return_value=False),
|
||||||
|
patch("pkgmgr.actions.repository.create.generate_alias", return_value="repo"),
|
||||||
|
patch("pkgmgr.actions.repository.create.save_user_config"),
|
||||||
|
patch("pkgmgr.actions.repository.create.os.makedirs"),
|
||||||
|
patch("pkgmgr.actions.repository.create.render_default_templates"),
|
||||||
|
patch("pkgmgr.actions.repository.create.write_mirrors_file"),
|
||||||
|
patch("pkgmgr.actions.repository.create.setup_mirrors"),
|
||||||
|
patch("pkgmgr.actions.repository.create.subprocess.run"),
|
||||||
|
):
|
||||||
|
create_repo(
|
||||||
|
"github.com/acme/repo",
|
||||||
|
cfg,
|
||||||
|
"/tmp/user.yml",
|
||||||
|
"/tmp/bin",
|
||||||
|
remote=False,
|
||||||
|
preview=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
s = out.getvalue()
|
||||||
|
self.assertIn("[Preview] Would save user config:", s)
|
||||||
|
self.assertIn("[Preview] Would ensure directory exists:", s)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -96,6 +96,7 @@ class TestIntegrationUpdateAllshallowNoSystem(unittest.TestCase):
|
|||||||
"--clone-mode",
|
"--clone-mode",
|
||||||
"shallow",
|
"shallow",
|
||||||
"--no-verification",
|
"--no-verification",
|
||||||
|
"--silent",
|
||||||
]
|
]
|
||||||
self._run_cmd(["pkgmgr", *args], label="pkgmgr", env=env)
|
self._run_cmd(["pkgmgr", *args], label="pkgmgr", env=env)
|
||||||
pkgmgr_help_debug()
|
pkgmgr_help_debug()
|
||||||
@@ -110,6 +111,7 @@ class TestIntegrationUpdateAllshallowNoSystem(unittest.TestCase):
|
|||||||
"--clone-mode",
|
"--clone-mode",
|
||||||
"shallow",
|
"shallow",
|
||||||
"--no-verification",
|
"--no-verification",
|
||||||
|
"--silent",
|
||||||
]
|
]
|
||||||
self._run_cmd(
|
self._run_cmd(
|
||||||
["nix", "run", ".#pkgmgr", "--", *args],
|
["nix", "run", ".#pkgmgr", "--", *args],
|
||||||
|
|||||||
119
tests/integration/test_publish_integration.py
Normal file
119
tests/integration/test_publish_integration.py
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import io
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
from contextlib import redirect_stdout
|
||||||
|
from types import SimpleNamespace
|
||||||
|
|
||||||
|
from pkgmgr.cli.commands.publish import handle_publish
|
||||||
|
|
||||||
|
|
||||||
|
def _run(cmd: list[str], cwd: str) -> None:
|
||||||
|
subprocess.run(
|
||||||
|
cmd,
|
||||||
|
cwd=cwd,
|
||||||
|
check=True,
|
||||||
|
stdout=subprocess.DEVNULL,
|
||||||
|
stderr=subprocess.DEVNULL,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestIntegrationPublish(unittest.TestCase):
|
||||||
|
def setUp(self) -> None:
|
||||||
|
if shutil.which("git") is None:
|
||||||
|
self.skipTest("git is required for this integration test")
|
||||||
|
|
||||||
|
self.tmp = tempfile.TemporaryDirectory()
|
||||||
|
self.repo_dir = self.tmp.name
|
||||||
|
|
||||||
|
# Initialize git repository
|
||||||
|
_run(["git", "init"], cwd=self.repo_dir)
|
||||||
|
_run(["git", "config", "user.email", "ci@example.invalid"], cwd=self.repo_dir)
|
||||||
|
_run(["git", "config", "user.name", "CI"], cwd=self.repo_dir)
|
||||||
|
|
||||||
|
with open(os.path.join(self.repo_dir, "README.md"), "w", encoding="utf-8") as f:
|
||||||
|
f.write("test\n")
|
||||||
|
|
||||||
|
_run(["git", "add", "README.md"], cwd=self.repo_dir)
|
||||||
|
_run(["git", "commit", "-m", "init"], cwd=self.repo_dir)
|
||||||
|
_run(["git", "tag", "-a", "v1.2.3", "-m", "v1.2.3"], cwd=self.repo_dir)
|
||||||
|
|
||||||
|
# Create MIRRORS file with PyPI target
|
||||||
|
with open(os.path.join(self.repo_dir, "MIRRORS"), "w", encoding="utf-8") as f:
|
||||||
|
f.write("https://pypi.org/project/pkgmgr/\n")
|
||||||
|
|
||||||
|
def tearDown(self) -> None:
|
||||||
|
self.tmp.cleanup()
|
||||||
|
|
||||||
|
def test_publish_preview_end_to_end(self) -> None:
|
||||||
|
ctx = SimpleNamespace(
|
||||||
|
repositories_base_dir=self.repo_dir,
|
||||||
|
all_repositories=[
|
||||||
|
{
|
||||||
|
"name": "pkgmgr",
|
||||||
|
"directory": self.repo_dir,
|
||||||
|
}
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
selected = [
|
||||||
|
{
|
||||||
|
"name": "pkgmgr",
|
||||||
|
"directory": self.repo_dir,
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
args = SimpleNamespace(
|
||||||
|
preview=True,
|
||||||
|
non_interactive=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
buf = io.StringIO()
|
||||||
|
with redirect_stdout(buf):
|
||||||
|
handle_publish(args=args, ctx=ctx, selected=selected)
|
||||||
|
|
||||||
|
out = buf.getvalue()
|
||||||
|
|
||||||
|
self.assertIn("[pkgmgr] Publishing repository", out)
|
||||||
|
self.assertIn("[INFO] Publishing pkgmgr for tag v1.2.3", out)
|
||||||
|
self.assertIn("[PREVIEW] Would build and upload to PyPI.", out)
|
||||||
|
|
||||||
|
# Preview must not create dist/
|
||||||
|
self.assertFalse(os.path.isdir(os.path.join(self.repo_dir, "dist")))
|
||||||
|
|
||||||
|
def test_publish_skips_without_pypi_mirror(self) -> None:
|
||||||
|
with open(os.path.join(self.repo_dir, "MIRRORS"), "w", encoding="utf-8") as f:
|
||||||
|
f.write("git@github.com:example/example.git\n")
|
||||||
|
|
||||||
|
ctx = SimpleNamespace(
|
||||||
|
repositories_base_dir=self.repo_dir,
|
||||||
|
all_repositories=[
|
||||||
|
{
|
||||||
|
"name": "pkgmgr",
|
||||||
|
"directory": self.repo_dir,
|
||||||
|
}
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
selected = [
|
||||||
|
{
|
||||||
|
"name": "pkgmgr",
|
||||||
|
"directory": self.repo_dir,
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
args = SimpleNamespace(
|
||||||
|
preview=True,
|
||||||
|
non_interactive=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
buf = io.StringIO()
|
||||||
|
with redirect_stdout(buf):
|
||||||
|
handle_publish(args=args, ctx=ctx, selected=selected)
|
||||||
|
|
||||||
|
out = buf.getvalue()
|
||||||
|
self.assertIn("[INFO] No PyPI mirror found. Skipping publish.", out)
|
||||||
66
tests/integration/test_release_publish_hook.py
Normal file
66
tests/integration/test_release_publish_hook.py
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
from types import SimpleNamespace
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
|
||||||
|
class TestIntegrationReleasePublishHook(unittest.TestCase):
|
||||||
|
def _ctx(self) -> SimpleNamespace:
|
||||||
|
# Minimal CLIContext shape used by handle_release()
|
||||||
|
return SimpleNamespace(
|
||||||
|
repositories_base_dir="/tmp",
|
||||||
|
all_repositories=[],
|
||||||
|
)
|
||||||
|
|
||||||
|
def _parse(self, argv: list[str]):
|
||||||
|
from pkgmgr.cli.parser import create_parser
|
||||||
|
|
||||||
|
parser = create_parser("pkgmgr test")
|
||||||
|
return parser.parse_args(argv)
|
||||||
|
|
||||||
|
def test_release_runs_publish_by_default_and_respects_tty(self) -> None:
|
||||||
|
from pkgmgr.cli.commands.release import handle_release
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as td:
|
||||||
|
selected = [{"directory": td}]
|
||||||
|
|
||||||
|
# Go through real parser to ensure CLI surface is wired correctly
|
||||||
|
args = self._parse(["release", "patch"])
|
||||||
|
|
||||||
|
with patch("pkgmgr.cli.commands.release.run_release") as m_release, patch(
|
||||||
|
"pkgmgr.cli.commands.release.run_publish"
|
||||||
|
) as m_publish, patch(
|
||||||
|
"pkgmgr.cli.commands.release.sys.stdin.isatty", return_value=False
|
||||||
|
):
|
||||||
|
handle_release(args=args, ctx=self._ctx(), selected=selected)
|
||||||
|
|
||||||
|
m_release.assert_called_once()
|
||||||
|
m_publish.assert_called_once()
|
||||||
|
|
||||||
|
_, kwargs = m_publish.call_args
|
||||||
|
self.assertEqual(kwargs["repo"], selected[0])
|
||||||
|
self.assertEqual(kwargs["repo_dir"], td)
|
||||||
|
self.assertFalse(kwargs["interactive"])
|
||||||
|
self.assertFalse(kwargs["allow_prompt"])
|
||||||
|
|
||||||
|
def test_release_skips_publish_when_no_publish_flag_set(self) -> None:
|
||||||
|
from pkgmgr.cli.commands.release import handle_release
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as td:
|
||||||
|
selected = [{"directory": td}]
|
||||||
|
|
||||||
|
args = self._parse(["release", "patch", "--no-publish"])
|
||||||
|
|
||||||
|
with patch("pkgmgr.cli.commands.release.run_release") as m_release, patch(
|
||||||
|
"pkgmgr.cli.commands.release.run_publish"
|
||||||
|
) as m_publish:
|
||||||
|
handle_release(args=args, ctx=self._ctx(), selected=selected)
|
||||||
|
|
||||||
|
m_release.assert_called_once()
|
||||||
|
m_publish.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
53
tests/integration/test_repos_create_preview.py
Normal file
53
tests/integration/test_repos_create_preview.py
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import importlib
|
||||||
|
import io
|
||||||
|
import unittest
|
||||||
|
from contextlib import redirect_stdout
|
||||||
|
from types import SimpleNamespace
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
|
||||||
|
class TestIntegrationReposCreatePreview(unittest.TestCase):
|
||||||
|
def test_repos_create_preview_wires_create_repo(self) -> None:
|
||||||
|
# Import lazily to avoid hard-failing if the CLI module/function name differs.
|
||||||
|
try:
|
||||||
|
repos_mod = importlib.import_module("pkgmgr.cli.commands.repos")
|
||||||
|
except Exception as exc:
|
||||||
|
self.skipTest(f"CLI module not available: {exc}")
|
||||||
|
|
||||||
|
handle = getattr(repos_mod, "handle_repos_command", None)
|
||||||
|
if handle is None:
|
||||||
|
self.skipTest("handle_repos_command not found in pkgmgr.cli.commands.repos")
|
||||||
|
|
||||||
|
ctx = SimpleNamespace(
|
||||||
|
repositories_base_dir="/tmp/Repositories",
|
||||||
|
binaries_dir="/tmp/bin",
|
||||||
|
all_repositories=[],
|
||||||
|
config_merged={"directories": {"repositories": "/tmp/Repositories"}, "repositories": []},
|
||||||
|
user_config_path="/tmp/user.yml",
|
||||||
|
)
|
||||||
|
|
||||||
|
args = SimpleNamespace(
|
||||||
|
command="create",
|
||||||
|
identifiers=["github.com/acme/repo"],
|
||||||
|
remote=False,
|
||||||
|
preview=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
out = io.StringIO()
|
||||||
|
with (
|
||||||
|
redirect_stdout(out),
|
||||||
|
patch("pkgmgr.cli.commands.repos.create_repo") as create_repo,
|
||||||
|
):
|
||||||
|
handle(args, ctx, selected=[])
|
||||||
|
|
||||||
|
create_repo.assert_called_once()
|
||||||
|
called = create_repo.call_args.kwargs
|
||||||
|
self.assertEqual(called["remote"], False)
|
||||||
|
self.assertEqual(called["preview"], True)
|
||||||
|
self.assertEqual(create_repo.call_args.args[0], "github.com/acme/repo")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
110
tests/integration/test_update_silent_continues.py
Normal file
110
tests/integration/test_update_silent_continues.py
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
from pkgmgr.actions.update.manager import UpdateManager
|
||||||
|
|
||||||
|
|
||||||
|
class TestUpdateSilentContinues(unittest.TestCase):
|
||||||
|
def test_update_continues_on_failures_and_silent_controls_exit_code(self) -> None:
|
||||||
|
"""
|
||||||
|
Integration test for UpdateManager:
|
||||||
|
- pull failure on repo A should not stop repo B/C
|
||||||
|
- install failure on repo B should not stop repo C
|
||||||
|
- without silent -> SystemExit(1) at end if any failures
|
||||||
|
- with silent -> no SystemExit even if there are failures
|
||||||
|
"""
|
||||||
|
|
||||||
|
repos = [
|
||||||
|
{"provider": "github", "account": "example", "repository": "repo-a"},
|
||||||
|
{"provider": "github", "account": "example", "repository": "repo-b"},
|
||||||
|
{"provider": "github", "account": "example", "repository": "repo-c"},
|
||||||
|
]
|
||||||
|
|
||||||
|
# We patch the internal calls used by UpdateManager:
|
||||||
|
# - pull_with_verification is called once per repo
|
||||||
|
# - install_repos is called once per repo that successfully pulled
|
||||||
|
#
|
||||||
|
# We simulate:
|
||||||
|
# repo-a: pull fails
|
||||||
|
# repo-b: pull ok, install fails
|
||||||
|
# repo-c: pull ok, install ok
|
||||||
|
pull_calls = []
|
||||||
|
install_calls = []
|
||||||
|
|
||||||
|
def pull_side_effect(selected_repos, *_args, **_kwargs):
|
||||||
|
# selected_repos is a list with exactly one repo in our implementation.
|
||||||
|
repo = selected_repos[0]
|
||||||
|
pull_calls.append(repo["repository"])
|
||||||
|
if repo["repository"] == "repo-a":
|
||||||
|
raise SystemExit(2)
|
||||||
|
return None
|
||||||
|
|
||||||
|
def install_side_effect(selected_repos, *_args, **kwargs):
|
||||||
|
repo = selected_repos[0]
|
||||||
|
install_calls.append((repo["repository"], kwargs.get("silent"), kwargs.get("emit_summary")))
|
||||||
|
if repo["repository"] == "repo-b":
|
||||||
|
raise SystemExit(3)
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Patch at the exact import locations used inside UpdateManager.run()
|
||||||
|
with patch("pkgmgr.actions.repository.pull.pull_with_verification", side_effect=pull_side_effect), patch(
|
||||||
|
"pkgmgr.actions.install.install_repos", side_effect=install_side_effect
|
||||||
|
):
|
||||||
|
# 1) silent=True: should NOT raise (even though failures happened)
|
||||||
|
UpdateManager().run(
|
||||||
|
selected_repos=repos,
|
||||||
|
repositories_base_dir="/tmp/repos",
|
||||||
|
bin_dir="/tmp/bin",
|
||||||
|
all_repos=repos,
|
||||||
|
no_verification=True,
|
||||||
|
system_update=False,
|
||||||
|
preview=True,
|
||||||
|
quiet=True,
|
||||||
|
update_dependencies=False,
|
||||||
|
clone_mode="shallow",
|
||||||
|
silent=True,
|
||||||
|
force_update=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Ensure it tried all pulls, and installs happened for B and C only.
|
||||||
|
self.assertEqual(pull_calls, ["repo-a", "repo-b", "repo-c"])
|
||||||
|
self.assertEqual([r for r, _silent, _emit in install_calls], ["repo-b", "repo-c"])
|
||||||
|
|
||||||
|
# Ensure UpdateManager suppressed install summary spam by passing emit_summary=False.
|
||||||
|
for _repo_name, _silent, emit_summary in install_calls:
|
||||||
|
self.assertFalse(emit_summary)
|
||||||
|
|
||||||
|
# Reset tracking for the non-silent run
|
||||||
|
pull_calls.clear()
|
||||||
|
install_calls.clear()
|
||||||
|
|
||||||
|
# 2) silent=False: should raise SystemExit(1) at end due to failures
|
||||||
|
with self.assertRaises(SystemExit) as cm:
|
||||||
|
UpdateManager().run(
|
||||||
|
selected_repos=repos,
|
||||||
|
repositories_base_dir="/tmp/repos",
|
||||||
|
bin_dir="/tmp/bin",
|
||||||
|
all_repos=repos,
|
||||||
|
no_verification=True,
|
||||||
|
system_update=False,
|
||||||
|
preview=True,
|
||||||
|
quiet=True,
|
||||||
|
update_dependencies=False,
|
||||||
|
clone_mode="shallow",
|
||||||
|
silent=False,
|
||||||
|
force_update=True,
|
||||||
|
)
|
||||||
|
self.assertEqual(cm.exception.code, 1)
|
||||||
|
|
||||||
|
# Still must have processed all repos (continue-on-failure behavior).
|
||||||
|
self.assertEqual(pull_calls, ["repo-a", "repo-b", "repo-c"])
|
||||||
|
self.assertEqual([r for r, _silent, _emit in install_calls], ["repo-b", "repo-c"])
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -1,6 +1,3 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
@@ -9,117 +6,61 @@ from unittest.mock import patch
|
|||||||
from pkgmgr.actions.mirror.git_remote import (
|
from pkgmgr.actions.mirror.git_remote import (
|
||||||
build_default_ssh_url,
|
build_default_ssh_url,
|
||||||
determine_primary_remote_url,
|
determine_primary_remote_url,
|
||||||
current_origin_url,
|
|
||||||
has_origin_remote,
|
has_origin_remote,
|
||||||
)
|
)
|
||||||
from pkgmgr.actions.mirror.types import MirrorMap, Repository
|
from pkgmgr.actions.mirror.types import RepoMirrorContext
|
||||||
|
|
||||||
|
|
||||||
class TestMirrorGitRemote(unittest.TestCase):
|
class TestMirrorGitRemote(unittest.TestCase):
|
||||||
"""
|
def _ctx(self, *, file=None, config=None) -> RepoMirrorContext:
|
||||||
Unit tests for SSH URL and primary remote selection logic.
|
return RepoMirrorContext(
|
||||||
"""
|
identifier="repo",
|
||||||
|
repo_dir="/tmp/repo",
|
||||||
|
config_mirrors=config or {},
|
||||||
|
file_mirrors=file or {},
|
||||||
|
)
|
||||||
|
|
||||||
def test_build_default_ssh_url_without_port(self) -> None:
|
def test_build_default_ssh_url(self) -> None:
|
||||||
repo: Repository = {
|
repo = {
|
||||||
"provider": "github.com",
|
"provider": "github.com",
|
||||||
"account": "kevinveenbirkenbach",
|
"account": "alice",
|
||||||
"repository": "package-manager",
|
"repository": "repo",
|
||||||
}
|
}
|
||||||
|
self.assertEqual(
|
||||||
|
build_default_ssh_url(repo),
|
||||||
|
"git@github.com:alice/repo.git",
|
||||||
|
)
|
||||||
|
|
||||||
url = build_default_ssh_url(repo)
|
def test_determine_primary_prefers_origin(self) -> None:
|
||||||
self.assertEqual(url, "git@github.com:kevinveenbirkenbach/package-manager.git")
|
repo = {"provider": "github.com", "account": "alice", "repository": "repo"}
|
||||||
|
ctx = self._ctx(config={"origin": "git@github.com:alice/repo.git"})
|
||||||
|
self.assertEqual(
|
||||||
|
determine_primary_remote_url(repo, ctx),
|
||||||
|
"git@github.com:alice/repo.git",
|
||||||
|
)
|
||||||
|
|
||||||
def test_build_default_ssh_url_with_port(self) -> None:
|
def test_determine_primary_uses_file_order(self) -> None:
|
||||||
repo: Repository = {
|
repo = {"provider": "github.com", "account": "alice", "repository": "repo"}
|
||||||
"provider": "code.cymais.cloud",
|
ctx = self._ctx(
|
||||||
"account": "kevinveenbirkenbach",
|
file={
|
||||||
"repository": "pkgmgr",
|
"first": "git@a/first.git",
|
||||||
"port": 2201,
|
"second": "git@a/second.git",
|
||||||
}
|
}
|
||||||
|
)
|
||||||
|
self.assertEqual(
|
||||||
|
determine_primary_remote_url(repo, ctx),
|
||||||
|
"git@a/first.git",
|
||||||
|
)
|
||||||
|
|
||||||
url = build_default_ssh_url(repo)
|
def test_determine_primary_fallback_default(self) -> None:
|
||||||
self.assertEqual(url, "ssh://git@code.cymais.cloud:2201/kevinveenbirkenbach/pkgmgr.git")
|
repo = {"provider": "github.com", "account": "alice", "repository": "repo"}
|
||||||
|
ctx = self._ctx()
|
||||||
|
self.assertEqual(
|
||||||
|
determine_primary_remote_url(repo, ctx),
|
||||||
|
"git@github.com:alice/repo.git",
|
||||||
|
)
|
||||||
|
|
||||||
def test_build_default_ssh_url_missing_fields_returns_none(self) -> None:
|
@patch("pkgmgr.actions.mirror.git_remote._safe_git_output")
|
||||||
repo: Repository = {
|
def test_has_origin_remote(self, m_out) -> None:
|
||||||
"provider": "github.com",
|
m_out.return_value = "origin\nupstream\n"
|
||||||
"account": "kevinveenbirkenbach",
|
|
||||||
}
|
|
||||||
|
|
||||||
url = build_default_ssh_url(repo)
|
|
||||||
self.assertIsNone(url)
|
|
||||||
|
|
||||||
def test_determine_primary_remote_url_prefers_origin_in_resolved_mirrors(self) -> None:
|
|
||||||
repo: Repository = {
|
|
||||||
"provider": "github.com",
|
|
||||||
"account": "kevinveenbirkenbach",
|
|
||||||
"repository": "package-manager",
|
|
||||||
}
|
|
||||||
mirrors: MirrorMap = {
|
|
||||||
"origin": "git@github.com:kevinveenbirkenbach/package-manager.git",
|
|
||||||
"backup": "ssh://git@git.veen.world:2201/kevinveenbirkenbach/pkgmgr.git",
|
|
||||||
}
|
|
||||||
|
|
||||||
url = determine_primary_remote_url(repo, mirrors)
|
|
||||||
self.assertEqual(url, "git@github.com:kevinveenbirkenbach/package-manager.git")
|
|
||||||
|
|
||||||
def test_determine_primary_remote_url_uses_any_mirror_if_no_origin(self) -> None:
|
|
||||||
repo: Repository = {
|
|
||||||
"provider": "github.com",
|
|
||||||
"account": "kevinveenbirkenbach",
|
|
||||||
"repository": "package-manager",
|
|
||||||
}
|
|
||||||
mirrors: MirrorMap = {
|
|
||||||
"backup": "ssh://git@git.veen.world:2201/kevinveenbirkenbach/pkgmgr.git",
|
|
||||||
"mirror2": "ssh://git@code.cymais.cloud:2201/kevinveenbirkenbach/pkgmgr.git",
|
|
||||||
}
|
|
||||||
|
|
||||||
url = determine_primary_remote_url(repo, mirrors)
|
|
||||||
self.assertEqual(url, "ssh://git@git.veen.world:2201/kevinveenbirkenbach/pkgmgr.git")
|
|
||||||
|
|
||||||
def test_determine_primary_remote_url_falls_back_to_default_ssh(self) -> None:
|
|
||||||
repo: Repository = {
|
|
||||||
"provider": "github.com",
|
|
||||||
"account": "kevinveenbirkenbach",
|
|
||||||
"repository": "package-manager",
|
|
||||||
}
|
|
||||||
mirrors: MirrorMap = {}
|
|
||||||
|
|
||||||
url = determine_primary_remote_url(repo, mirrors)
|
|
||||||
self.assertEqual(url, "git@github.com:kevinveenbirkenbach/package-manager.git")
|
|
||||||
|
|
||||||
@patch("pkgmgr.actions.mirror.git_remote.run_git")
|
|
||||||
def test_current_origin_url_returns_value(self, mock_run_git) -> None:
|
|
||||||
mock_run_git.return_value = "git@github.com:alice/repo.git\n"
|
|
||||||
self.assertEqual(current_origin_url("/tmp/repo"), "git@github.com:alice/repo.git")
|
|
||||||
mock_run_git.assert_called_once_with(["remote", "get-url", "origin"], cwd="/tmp/repo")
|
|
||||||
|
|
||||||
@patch("pkgmgr.actions.mirror.git_remote.run_git")
|
|
||||||
def test_current_origin_url_returns_none_on_git_error(self, mock_run_git) -> None:
|
|
||||||
from pkgmgr.core.git import GitError
|
|
||||||
|
|
||||||
mock_run_git.side_effect = GitError("fail")
|
|
||||||
self.assertIsNone(current_origin_url("/tmp/repo"))
|
|
||||||
|
|
||||||
@patch("pkgmgr.actions.mirror.git_remote.run_git")
|
|
||||||
def test_has_origin_remote_true(self, mock_run_git) -> None:
|
|
||||||
mock_run_git.return_value = "origin\nupstream\n"
|
|
||||||
self.assertTrue(has_origin_remote("/tmp/repo"))
|
self.assertTrue(has_origin_remote("/tmp/repo"))
|
||||||
mock_run_git.assert_called_once_with(["remote"], cwd="/tmp/repo")
|
|
||||||
|
|
||||||
@patch("pkgmgr.actions.mirror.git_remote.run_git")
|
|
||||||
def test_has_origin_remote_false_on_missing_remote(self, mock_run_git) -> None:
|
|
||||||
mock_run_git.return_value = "upstream\n"
|
|
||||||
self.assertFalse(has_origin_remote("/tmp/repo"))
|
|
||||||
|
|
||||||
@patch("pkgmgr.actions.mirror.git_remote.run_git")
|
|
||||||
def test_has_origin_remote_false_on_git_error(self, mock_run_git) -> None:
|
|
||||||
from pkgmgr.core.git import GitError
|
|
||||||
|
|
||||||
mock_run_git.side_effect = GitError("fail")
|
|
||||||
self.assertFalse(has_origin_remote("/tmp/repo"))
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
from pkgmgr.actions.mirror.git_remote import ensure_origin_remote
|
||||||
|
from pkgmgr.actions.mirror.types import RepoMirrorContext
|
||||||
|
|
||||||
|
|
||||||
|
class TestGitRemotePrimaryPush(unittest.TestCase):
|
||||||
|
def test_origin_created_and_extra_push_added(self) -> None:
|
||||||
|
repo = {"provider": "github.com", "account": "alice", "repository": "repo"}
|
||||||
|
ctx = RepoMirrorContext(
|
||||||
|
identifier="repo",
|
||||||
|
repo_dir="/tmp/repo",
|
||||||
|
config_mirrors={},
|
||||||
|
file_mirrors={
|
||||||
|
"primary": "git@github.com:alice/repo.git",
|
||||||
|
"backup": "git@github.com:alice/repo-backup.git",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
executed: list[str] = []
|
||||||
|
|
||||||
|
def fake_run(cmd: str, cwd: str, preview: bool) -> None:
|
||||||
|
executed.append(cmd)
|
||||||
|
|
||||||
|
def fake_git(args, cwd):
|
||||||
|
if args == ["remote"]:
|
||||||
|
return ""
|
||||||
|
if args == ["remote", "get-url", "--push", "--all", "origin"]:
|
||||||
|
return "git@github.com:alice/repo.git\n"
|
||||||
|
return ""
|
||||||
|
|
||||||
|
with patch("os.path.isdir", return_value=True), patch(
|
||||||
|
"pkgmgr.actions.mirror.git_remote.run_command", side_effect=fake_run
|
||||||
|
), patch(
|
||||||
|
"pkgmgr.actions.mirror.git_remote._safe_git_output", side_effect=fake_git
|
||||||
|
):
|
||||||
|
ensure_origin_remote(repo, ctx, preview=False)
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
executed,
|
||||||
|
[
|
||||||
|
"git remote add origin git@github.com:alice/repo.git",
|
||||||
|
"git remote set-url origin git@github.com:alice/repo.git",
|
||||||
|
"git remote set-url --push origin git@github.com:alice/repo.git",
|
||||||
|
"git remote set-url --add --push origin git@github.com:alice/repo-backup.git",
|
||||||
|
],
|
||||||
|
)
|
||||||
@@ -1,123 +1,101 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
from unittest.mock import MagicMock, PropertyMock, patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
from pkgmgr.actions.mirror.setup_cmd import setup_mirrors
|
from pkgmgr.actions.mirror.setup_cmd import setup_mirrors
|
||||||
|
from pkgmgr.actions.mirror.types import RepoMirrorContext
|
||||||
|
|
||||||
|
|
||||||
class TestMirrorSetupCmd(unittest.TestCase):
|
class TestMirrorSetupCmd(unittest.TestCase):
|
||||||
"""
|
def _ctx(
|
||||||
Unit tests for mirror setup orchestration (local + remote).
|
|
||||||
"""
|
|
||||||
|
|
||||||
@patch("pkgmgr.actions.mirror.setup_cmd.ensure_origin_remote")
|
|
||||||
@patch("pkgmgr.actions.mirror.setup_cmd.build_context")
|
|
||||||
def test_setup_mirrors_local_calls_ensure_origin_remote(
|
|
||||||
self,
|
self,
|
||||||
mock_build_context,
|
*,
|
||||||
mock_ensure_origin,
|
repo_dir: str = "/tmp/repo",
|
||||||
) -> None:
|
resolved: dict[str, str] | None = None,
|
||||||
ctx = MagicMock()
|
) -> RepoMirrorContext:
|
||||||
ctx.identifier = "repo-id"
|
# RepoMirrorContext derives resolved via property (config + file)
|
||||||
ctx.repo_dir = "/tmp/repo"
|
# We feed mirrors via file_mirrors to keep insertion order realistic.
|
||||||
ctx.config_mirrors = {}
|
return RepoMirrorContext(
|
||||||
ctx.file_mirrors = {}
|
identifier="repo-id",
|
||||||
type(ctx).resolved_mirrors = PropertyMock(return_value={})
|
repo_dir=repo_dir,
|
||||||
mock_build_context.return_value = ctx
|
config_mirrors={},
|
||||||
|
file_mirrors=resolved or {},
|
||||||
|
)
|
||||||
|
|
||||||
repo = {"provider": "github.com", "account": "alice", "repository": "repo"}
|
@patch("pkgmgr.actions.mirror.setup_cmd.build_context")
|
||||||
|
@patch("pkgmgr.actions.mirror.setup_cmd.ensure_origin_remote")
|
||||||
|
def test_setup_mirrors_local_calls_ensure_origin_remote(self, m_ensure, m_ctx) -> None:
|
||||||
|
m_ctx.return_value = self._ctx(repo_dir="/tmp/repo", resolved={"primary": "git@x/y.git"})
|
||||||
|
|
||||||
|
repos = [{"provider": "github.com", "account": "alice", "repository": "repo"}]
|
||||||
setup_mirrors(
|
setup_mirrors(
|
||||||
selected_repos=[repo],
|
selected_repos=repos,
|
||||||
repositories_base_dir="/base",
|
repositories_base_dir="/tmp",
|
||||||
all_repos=[repo],
|
all_repos=repos,
|
||||||
preview=True,
|
preview=True,
|
||||||
local=True,
|
local=True,
|
||||||
remote=False,
|
remote=False,
|
||||||
ensure_remote=False,
|
ensure_remote=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
mock_ensure_origin.assert_called_once()
|
self.assertEqual(m_ensure.call_count, 1)
|
||||||
args, kwargs = mock_ensure_origin.call_args
|
args, kwargs = m_ensure.call_args
|
||||||
self.assertEqual(args[0], repo)
|
|
||||||
self.assertEqual(kwargs.get("preview"), True)
|
# ensure_origin_remote(repo, ctx, preview) may be positional or kw.
|
||||||
|
# Accept both to avoid coupling tests to call style.
|
||||||
|
if "preview" in kwargs:
|
||||||
|
self.assertTrue(kwargs["preview"])
|
||||||
|
else:
|
||||||
|
# args: (repo, ctx, preview)
|
||||||
|
self.assertTrue(args[2])
|
||||||
|
|
||||||
@patch("pkgmgr.actions.mirror.setup_cmd.ensure_remote_repository")
|
|
||||||
@patch("pkgmgr.actions.mirror.setup_cmd.probe_mirror")
|
|
||||||
@patch("pkgmgr.actions.mirror.setup_cmd.build_context")
|
@patch("pkgmgr.actions.mirror.setup_cmd.build_context")
|
||||||
def test_setup_mirrors_remote_provisions_when_enabled(
|
|
||||||
self,
|
|
||||||
mock_build_context,
|
|
||||||
mock_probe,
|
|
||||||
mock_ensure_remote_repository,
|
|
||||||
) -> None:
|
|
||||||
ctx = MagicMock()
|
|
||||||
ctx.identifier = "repo-id"
|
|
||||||
ctx.repo_dir = "/tmp/repo"
|
|
||||||
ctx.config_mirrors = {"origin": "git@github.com:alice/repo.git"}
|
|
||||||
ctx.file_mirrors = {}
|
|
||||||
type(ctx).resolved_mirrors = PropertyMock(return_value={"origin": "git@github.com:alice/repo.git"})
|
|
||||||
mock_build_context.return_value = ctx
|
|
||||||
|
|
||||||
mock_probe.return_value = (True, "")
|
|
||||||
|
|
||||||
repo = {"provider": "github.com", "account": "alice", "repository": "repo"}
|
|
||||||
|
|
||||||
setup_mirrors(
|
|
||||||
selected_repos=[repo],
|
|
||||||
repositories_base_dir="/base",
|
|
||||||
all_repos=[repo],
|
|
||||||
preview=False,
|
|
||||||
local=False,
|
|
||||||
remote=True,
|
|
||||||
ensure_remote=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
mock_ensure_remote_repository.assert_called_once()
|
|
||||||
mock_probe.assert_called_once()
|
|
||||||
|
|
||||||
@patch("pkgmgr.actions.mirror.setup_cmd.ensure_remote_repository")
|
|
||||||
@patch("pkgmgr.actions.mirror.setup_cmd.probe_mirror")
|
@patch("pkgmgr.actions.mirror.setup_cmd.probe_mirror")
|
||||||
@patch("pkgmgr.actions.mirror.setup_cmd.build_context")
|
@patch("pkgmgr.actions.mirror.setup_cmd.determine_primary_remote_url")
|
||||||
def test_setup_mirrors_remote_probes_all_resolved_mirrors(
|
def test_setup_mirrors_remote_no_mirrors_probes_primary(self, m_primary, m_probe, m_ctx) -> None:
|
||||||
self,
|
m_ctx.return_value = self._ctx(repo_dir="/tmp/repo", resolved={})
|
||||||
mock_build_context,
|
m_primary.return_value = "git@github.com:alice/repo.git"
|
||||||
mock_probe,
|
m_probe.return_value = (True, "")
|
||||||
mock_ensure_remote_repository,
|
|
||||||
) -> None:
|
|
||||||
ctx = MagicMock()
|
|
||||||
ctx.identifier = "repo-id"
|
|
||||||
ctx.repo_dir = "/tmp/repo"
|
|
||||||
ctx.config_mirrors = {}
|
|
||||||
ctx.file_mirrors = {}
|
|
||||||
type(ctx).resolved_mirrors = PropertyMock(
|
|
||||||
return_value={
|
|
||||||
"mirror": "git@github.com:alice/repo.git",
|
|
||||||
"backup": "ssh://git@git.veen.world:2201/alice/repo.git",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
mock_build_context.return_value = ctx
|
|
||||||
|
|
||||||
mock_probe.return_value = (True, "")
|
|
||||||
|
|
||||||
repo = {"provider": "github.com", "account": "alice", "repository": "repo"}
|
|
||||||
|
|
||||||
|
repos = [{"provider": "github.com", "account": "alice", "repository": "repo"}]
|
||||||
setup_mirrors(
|
setup_mirrors(
|
||||||
selected_repos=[repo],
|
selected_repos=repos,
|
||||||
repositories_base_dir="/base",
|
repositories_base_dir="/tmp",
|
||||||
all_repos=[repo],
|
all_repos=repos,
|
||||||
preview=False,
|
preview=True,
|
||||||
local=False,
|
local=False,
|
||||||
remote=True,
|
remote=True,
|
||||||
ensure_remote=False,
|
ensure_remote=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
mock_ensure_remote_repository.assert_not_called()
|
m_primary.assert_called()
|
||||||
self.assertEqual(mock_probe.call_count, 2)
|
m_probe.assert_called_with("git@github.com:alice/repo.git", "/tmp/repo")
|
||||||
|
|
||||||
|
@patch("pkgmgr.actions.mirror.setup_cmd.build_context")
|
||||||
|
@patch("pkgmgr.actions.mirror.setup_cmd.probe_mirror")
|
||||||
|
def test_setup_mirrors_remote_with_mirrors_probes_each(self, m_probe, m_ctx) -> None:
|
||||||
|
m_ctx.return_value = self._ctx(
|
||||||
|
repo_dir="/tmp/repo",
|
||||||
|
resolved={
|
||||||
|
"origin": "git@github.com:alice/repo.git",
|
||||||
|
"backup": "ssh://git@git.veen.world:2201/alice/repo.git",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
m_probe.return_value = (True, "")
|
||||||
|
|
||||||
|
repos = [{"provider": "github.com", "account": "alice", "repository": "repo"}]
|
||||||
|
setup_mirrors(
|
||||||
|
selected_repos=repos,
|
||||||
|
repositories_base_dir="/tmp",
|
||||||
|
all_repos=repos,
|
||||||
|
preview=True,
|
||||||
|
local=False,
|
||||||
|
remote=True,
|
||||||
|
ensure_remote=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertEqual(m_probe.call_count, 2)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
0
tests/unit/pkgmgr/actions/publish/__init__.py
Normal file
0
tests/unit/pkgmgr/actions/publish/__init__.py
Normal file
20
tests/unit/pkgmgr/actions/publish/test_git_tags.py
Normal file
20
tests/unit/pkgmgr/actions/publish/test_git_tags.py
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
|
||||||
|
import unittest
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
from pkgmgr.actions.publish.git_tags import head_semver_tags
|
||||||
|
|
||||||
|
|
||||||
|
class TestHeadSemverTags(unittest.TestCase):
|
||||||
|
@patch("pkgmgr.actions.publish.git_tags.run_git")
|
||||||
|
def test_no_tags(self, mock_run_git):
|
||||||
|
mock_run_git.return_value = ""
|
||||||
|
self.assertEqual(head_semver_tags(), [])
|
||||||
|
|
||||||
|
@patch("pkgmgr.actions.publish.git_tags.run_git")
|
||||||
|
def test_filters_and_sorts_semver(self, mock_run_git):
|
||||||
|
mock_run_git.return_value = "v1.0.0\nv2.0.0\nfoo\n"
|
||||||
|
self.assertEqual(
|
||||||
|
head_semver_tags(),
|
||||||
|
["v1.0.0", "v2.0.0"],
|
||||||
|
)
|
||||||
13
tests/unit/pkgmgr/actions/publish/test_pypi_url.py
Normal file
13
tests/unit/pkgmgr/actions/publish/test_pypi_url.py
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
|
||||||
|
import unittest
|
||||||
|
from pkgmgr.actions.publish.pypi_url import parse_pypi_project_url
|
||||||
|
|
||||||
|
|
||||||
|
class TestParsePyPIUrl(unittest.TestCase):
|
||||||
|
def test_valid_pypi_url(self):
|
||||||
|
t = parse_pypi_project_url("https://pypi.org/project/example/")
|
||||||
|
self.assertIsNotNone(t)
|
||||||
|
self.assertEqual(t.project, "example")
|
||||||
|
|
||||||
|
def test_invalid_url(self):
|
||||||
|
self.assertIsNone(parse_pypi_project_url("https://example.com/foo"))
|
||||||
21
tests/unit/pkgmgr/actions/publish/test_workflow_preview.py
Normal file
21
tests/unit/pkgmgr/actions/publish/test_workflow_preview.py
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
|
||||||
|
import unittest
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
from pkgmgr.actions.publish.workflow import publish
|
||||||
|
|
||||||
|
|
||||||
|
class TestPublishWorkflowPreview(unittest.TestCase):
|
||||||
|
@patch("pkgmgr.actions.publish.workflow.read_mirrors_file")
|
||||||
|
@patch("pkgmgr.actions.publish.workflow.head_semver_tags")
|
||||||
|
def test_preview_does_not_build(self, mock_tags, mock_mirrors):
|
||||||
|
mock_mirrors.return_value = {
|
||||||
|
"pypi": "https://pypi.org/project/example/"
|
||||||
|
}
|
||||||
|
mock_tags.return_value = ["v1.0.0"]
|
||||||
|
|
||||||
|
publish(
|
||||||
|
repo={},
|
||||||
|
repo_dir=".",
|
||||||
|
preview=True,
|
||||||
|
)
|
||||||
62
tests/unit/pkgmgr/actions/repository/test_create_parsing.py
Normal file
62
tests/unit/pkgmgr/actions/repository/test_create_parsing.py
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from pkgmgr.actions.repository.create import (
|
||||||
|
RepoParts,
|
||||||
|
_parse_identifier,
|
||||||
|
_parse_git_url,
|
||||||
|
_strip_git_suffix,
|
||||||
|
_split_host_port,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestRepositoryCreateParsing(unittest.TestCase):
|
||||||
|
def test_strip_git_suffix(self) -> None:
|
||||||
|
self.assertEqual(_strip_git_suffix("repo.git"), "repo")
|
||||||
|
self.assertEqual(_strip_git_suffix("repo"), "repo")
|
||||||
|
|
||||||
|
def test_split_host_port(self) -> None:
|
||||||
|
self.assertEqual(_split_host_port("example.com"), ("example.com", None))
|
||||||
|
self.assertEqual(_split_host_port("example.com:2222"), ("example.com", "2222"))
|
||||||
|
self.assertEqual(_split_host_port("example.com:"), ("example.com", None))
|
||||||
|
|
||||||
|
def test_parse_identifier_plain(self) -> None:
|
||||||
|
parts = _parse_identifier("github.com/owner/repo")
|
||||||
|
self.assertIsInstance(parts, RepoParts)
|
||||||
|
self.assertEqual(parts.host, "github.com")
|
||||||
|
self.assertEqual(parts.port, None)
|
||||||
|
self.assertEqual(parts.owner, "owner")
|
||||||
|
self.assertEqual(parts.name, "repo")
|
||||||
|
|
||||||
|
def test_parse_identifier_with_port(self) -> None:
|
||||||
|
parts = _parse_identifier("gitea.example.com:2222/org/repo")
|
||||||
|
self.assertEqual(parts.host, "gitea.example.com")
|
||||||
|
self.assertEqual(parts.port, "2222")
|
||||||
|
self.assertEqual(parts.owner, "org")
|
||||||
|
self.assertEqual(parts.name, "repo")
|
||||||
|
|
||||||
|
def test_parse_git_url_scp_style(self) -> None:
|
||||||
|
parts = _parse_git_url("git@github.com:owner/repo.git")
|
||||||
|
self.assertEqual(parts.host, "github.com")
|
||||||
|
self.assertEqual(parts.port, None)
|
||||||
|
self.assertEqual(parts.owner, "owner")
|
||||||
|
self.assertEqual(parts.name, "repo")
|
||||||
|
|
||||||
|
def test_parse_git_url_https(self) -> None:
|
||||||
|
parts = _parse_git_url("https://github.com/owner/repo.git")
|
||||||
|
self.assertEqual(parts.host, "github.com")
|
||||||
|
self.assertEqual(parts.port, None)
|
||||||
|
self.assertEqual(parts.owner, "owner")
|
||||||
|
self.assertEqual(parts.name, "repo")
|
||||||
|
|
||||||
|
def test_parse_git_url_ssh_with_port(self) -> None:
|
||||||
|
parts = _parse_git_url("ssh://git@gitea.example.com:2222/org/repo.git")
|
||||||
|
self.assertEqual(parts.host, "gitea.example.com")
|
||||||
|
self.assertEqual(parts.port, "2222")
|
||||||
|
self.assertEqual(parts.owner, "org")
|
||||||
|
self.assertEqual(parts.name, "repo")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
from pkgmgr.actions.repository.scaffold import render_default_templates
|
||||||
|
|
||||||
|
|
||||||
|
class TestScaffoldRenderPreview(unittest.TestCase):
|
||||||
|
def test_render_preview_does_not_write(self) -> None:
|
||||||
|
with (
|
||||||
|
patch("pkgmgr.actions.repository.scaffold._templates_dir", return_value="/tpl"),
|
||||||
|
patch("pkgmgr.actions.repository.scaffold.os.path.isdir", return_value=True),
|
||||||
|
patch("pkgmgr.actions.repository.scaffold.os.walk", return_value=[("/tpl", [], ["README.md.j2"])]),
|
||||||
|
patch("pkgmgr.actions.repository.scaffold.os.path.relpath", return_value="README.md.j2"),
|
||||||
|
patch("pkgmgr.actions.repository.scaffold.os.makedirs") as mk,
|
||||||
|
patch("pkgmgr.actions.repository.scaffold.open", create=True) as op,
|
||||||
|
patch("pkgmgr.actions.repository.scaffold.Environment") as env_cls,
|
||||||
|
):
|
||||||
|
env = env_cls.return_value
|
||||||
|
env.get_template.return_value.render.return_value = "X"
|
||||||
|
|
||||||
|
render_default_templates(
|
||||||
|
"/repo",
|
||||||
|
context={"repository": "x"},
|
||||||
|
preview=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
mk.assert_not_called()
|
||||||
|
op.assert_not_called()
|
||||||
|
env.get_template.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
12
tests/unit/pkgmgr/cli/commands/test_publish.py
Normal file
12
tests/unit/pkgmgr/cli/commands/test_publish.py
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
|
||||||
|
import unittest
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
from pkgmgr.cli.commands.publish import handle_publish
|
||||||
|
|
||||||
|
|
||||||
|
class TestHandlePublish(unittest.TestCase):
|
||||||
|
@patch("pkgmgr.cli.commands.publish.publish")
|
||||||
|
def test_no_selected_repos(self, mock_publish):
|
||||||
|
handle_publish(args=object(), ctx=None, selected=[])
|
||||||
|
mock_publish.assert_not_called()
|
||||||
75
tests/unit/pkgmgr/cli/commands/test_release_publish_hook.py
Normal file
75
tests/unit/pkgmgr/cli/commands/test_release_publish_hook.py
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
from types import SimpleNamespace
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
|
||||||
|
class TestCLIReleasePublishHook(unittest.TestCase):
|
||||||
|
def _ctx(self) -> SimpleNamespace:
|
||||||
|
# Minimal CLIContext shape used by handle_release
|
||||||
|
return SimpleNamespace(
|
||||||
|
repositories_base_dir="/tmp",
|
||||||
|
all_repositories=[],
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_release_runs_publish_by_default_and_respects_tty(self) -> None:
|
||||||
|
from pkgmgr.cli.commands.release import handle_release
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as td:
|
||||||
|
repo = {"directory": td}
|
||||||
|
|
||||||
|
args = SimpleNamespace(
|
||||||
|
list=False,
|
||||||
|
release_type="patch",
|
||||||
|
message=None,
|
||||||
|
preview=False,
|
||||||
|
force=False,
|
||||||
|
close=False,
|
||||||
|
no_publish=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
with patch("pkgmgr.cli.commands.release.run_release") as m_release, patch(
|
||||||
|
"pkgmgr.cli.commands.release.run_publish"
|
||||||
|
) as m_publish, patch(
|
||||||
|
"pkgmgr.cli.commands.release.sys.stdin.isatty", return_value=False
|
||||||
|
):
|
||||||
|
handle_release(args=args, ctx=self._ctx(), selected=[repo])
|
||||||
|
|
||||||
|
m_release.assert_called_once()
|
||||||
|
m_publish.assert_called_once()
|
||||||
|
|
||||||
|
_, kwargs = m_publish.call_args
|
||||||
|
self.assertEqual(kwargs["repo"], repo)
|
||||||
|
self.assertEqual(kwargs["repo_dir"], td)
|
||||||
|
self.assertFalse(kwargs["interactive"])
|
||||||
|
self.assertFalse(kwargs["allow_prompt"])
|
||||||
|
|
||||||
|
def test_release_skips_publish_when_no_publish_flag_set(self) -> None:
|
||||||
|
from pkgmgr.cli.commands.release import handle_release
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as td:
|
||||||
|
repo = {"directory": td}
|
||||||
|
|
||||||
|
args = SimpleNamespace(
|
||||||
|
list=False,
|
||||||
|
release_type="patch",
|
||||||
|
message=None,
|
||||||
|
preview=False,
|
||||||
|
force=False,
|
||||||
|
close=False,
|
||||||
|
no_publish=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
with patch("pkgmgr.cli.commands.release.run_release") as m_release, patch(
|
||||||
|
"pkgmgr.cli.commands.release.run_publish"
|
||||||
|
) as m_publish:
|
||||||
|
handle_release(args=args, ctx=self._ctx(), selected=[repo])
|
||||||
|
|
||||||
|
m_release.assert_called_once()
|
||||||
|
m_publish.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
Reference in New Issue
Block a user