Merge pull request #431 from lbedner/v0.5.1-rc3

v0.5.1-rc3

Author: lbedner

CLAUDE.md

@@ -32,7 +32,7 @@ Each generated project includes:
 
 ## Installation
 
-**Current Version**: v0.5.1-rc2
+**Current Version**: v0.5.1-rc3
 
 ```bash
 pip install aegis-stack

aegis/__init__.py

@@ -2,4 +2,4 @@
 Aegis Stack CLI - Component generation and project management tools.
 """
 
-__version__ = "0.5.1-rc2"
+__version__ = "0.5.1-rc3"

aegis/commands/update.py

@@ -6,6 +6,7 @@
 """
 
 import os
+import re
 import subprocess
 from pathlib import Path
 
@@ -361,6 +362,19 @@ def update_command(
             target_path, include_migrations=include_migrations
         )
 
+        # Update __aegis_version__ directly (Copier doesn't re-render unchanged files)
+        init_file = target_path / "app" / "__init__.py"
+        if init_file.exists():
+            content = init_file.read_text()
+            updated_content = re.sub(
+                r'__aegis_version__\s*=\s*(["\'])[^"\']*\1',
+                f'__aegis_version__ = "{aegis_version}"',
+                content,
+            )
+            if updated_content != content:
+                init_file.write_text(updated_content)
+                typer.echo(f"   Updated __aegis_version__ to {aegis_version}")
+
         # Show update result
         typer.echo("")
         if tasks_success:

aegis/core/copier_updater.py

@@ -480,6 +480,131 @@ def validate_clean_git_tree(project_path: Path) -> tuple[bool, str]:
         return False, f"Error checking git status: {e}"
 
 
+def _format_commits_as_changelog(
+    commits: list[tuple[str, str]], github_url: str
+) -> str:
+    """
+    Format a list of (hash, message) commits as a categorized changelog.
+
+    Args:
+        commits: List of (commit_hash, message) tuples
+        github_url: Base GitHub URL for commit links
+
+    Returns:
+        Formatted changelog string
+    """
+    if not commits:
+        return "No changes"
+
+    features: list[tuple[str, str]] = []
+    fixes: list[tuple[str, str]] = []
+    breaking: list[tuple[str, str]] = []
+    other: list[tuple[str, str]] = []
+
+    for commit_hash, message in commits:
+        message_lower = message.lower()
+        if "breaking:" in message_lower or "breaking change" in message_lower:
+            breaking.append((commit_hash, message))
+        elif message.startswith("feat:") or message.startswith("feature:"):
+            features.append((commit_hash, message))
+        elif message.startswith("fix:"):
+            fixes.append((commit_hash, message))
+        else:
+            other.append((commit_hash, message))
+
+    def format_commit(commit_hash: str, message: str) -> str:
+        """Format commit with GitHub link."""
+        if commit_hash:
+            return f"  • {message} ([{commit_hash}]({github_url}/commit/{commit_hash}))"
+        return f"  • {message}"
+
+    lines = []
+
+    if breaking:
+        lines.append("Breaking Changes:")
+        for commit_hash, message in breaking:
+            lines.append(format_commit(commit_hash, message))
+        lines.append("")
+
+    if features:
+        lines.append("New Features:")
+        for commit_hash, message in features:
+            lines.append(format_commit(commit_hash, message))
+        lines.append("")
+
+    if fixes:
+        lines.append("Bug Fixes:")
+        for commit_hash, message in fixes:
+            lines.append(format_commit(commit_hash, message))
+        lines.append("")
+
+    if other:
+        lines.append("Other Changes:")
+        for commit_hash, message in other:
+            lines.append(format_commit(commit_hash, message))
+
+    return "\n".join(lines).strip()
+
+
+def _get_changelog_from_github(from_ref: str, to_ref: str) -> str:
+    """
+    Fetch changelog from GitHub Compare API when not in a git repo.
+
+    Used when running from installed package (pip/uvx) instead of git checkout.
+
+    Args:
+        from_ref: Starting git reference (commit hash)
+        to_ref: Ending git reference (commit, tag, or "HEAD")
+
+    Returns:
+        Formatted changelog string or error message with fallback link
+    """
+    import json
+    import urllib.request
+    from urllib.parse import urlparse
+
+    github_url = GITHUB_REPO_URL
+
+    # Extract owner/repo from GITHUB_REPO_URL (e.g., "lbedner/aegis-stack")
+    parsed = urlparse(github_url)
+    repo_path = parsed.path.strip("/")  # "lbedner/aegis-stack"
+
+    # Normalize refs (HEAD -> main for API)
+    base = from_ref
+    head = "main" if to_ref == "HEAD" else to_ref
+
+    api_url = f"https://api.github.com/repos/{repo_path}/compare/{base}...{head}"
+
+    try:
+        req = urllib.request.Request(
+            api_url,
+            headers={
+                "Accept": "application/vnd.github.v3+json",
+                "User-Agent": "aegis-stack-cli",
+            },
+        )
+        with urllib.request.urlopen(req, timeout=10) as response:
+            data = json.loads(response.read().decode())
+
+        api_commits = data.get("commits", [])
+        if not api_commits:
+            return "No changes"
+
+        # Extract (hash, message) tuples from API response
+        commits = [
+            (c["sha"][:7], c["commit"]["message"].split("\n")[0]) for c in api_commits
+        ]
+
+        return _format_commits_as_changelog(commits, github_url)
+
+    except Exception as e:
+        # Fallback to compare link
+        return (
+            f"Changelog not available: {e}\n"
+            f"View changes: {github_url}/compare/{from_ref}...main"
+        )
+
+
 def get_changelog(from_ref: str, to_ref: str, template_root: Path | None = None) -> str:
     """
     Get changelog between two git references.
@@ -495,6 +620,10 @@ def get_changelog(from_ref: str, to_ref: str, template_root: Path | None = None)
     if template_root is None:
         template_root = get_template_root()
 
+    # Check if we're in a git repository (not installed package mode)
+    if not (template_root / ".git").exists():
+        return _get_changelog_from_github(from_ref, to_ref)
+
     try:
         # Get commit log between refs (hash|message format for GitHub links)
         result = subprocess.run(
@@ -515,65 +644,17 @@ def get_changelog(from_ref: str, to_ref: str, template_root: Path | None = None)
         if not result.stdout.strip():
             return "No changes"
 
-        # GitHub repository URL for commit links
-        github_url = GITHUB_REPO_URL
-
-        # Parse commits and categorize
+        # Parse commits from git output
         raw_commits = result.stdout.strip().split("\n")
-        features: list[tuple[str, str]] = []  # (hash, message)
-        fixes: list[tuple[str, str]] = []
-        breaking: list[tuple[str, str]] = []
-        other: list[tuple[str, str]] = []
-
+        commits = []
         for line in raw_commits:
             if "|" in line:
                 commit_hash, message = line.split("|", 1)
             else:
                 commit_hash, message = "", line
+            commits.append((commit_hash, message))
 
-            message_lower = message.lower()
-            if "breaking:" in message_lower or "breaking change" in message_lower:
-                breaking.append((commit_hash, message))
-            elif message.startswith("feat:") or message.startswith("feature:"):
-                features.append((commit_hash, message))
-            elif message.startswith("fix:"):
-                fixes.append((commit_hash, message))
-            else:
-                other.append((commit_hash, message))
-
-        def format_commit(commit_hash: str, message: str) -> str:
-            """Format commit with GitHub link."""
-            if commit_hash:
-                return f"  • {message} ([{commit_hash}]({github_url}/commit/{commit_hash}))"
-            return f"  • {message}"
-
-        # Format changelog
-        lines = []
-
-        if breaking:
-            lines.append("Breaking Changes:")
-            for commit_hash, message in breaking:
-                lines.append(format_commit(commit_hash, message))
-            lines.append("")
-
-        if features:
-            lines.append("New Features:")
-            for commit_hash, message in features:
-                lines.append(format_commit(commit_hash, message))
-            lines.append("")
-
-        if fixes:
-            lines.append("Bug Fixes:")
-            for commit_hash, message in fixes:
-                lines.append(format_commit(commit_hash, message))
-            lines.append("")
-
-        if other:
-            lines.append("Other Changes:")
-            for commit_hash, message in other:
-                lines.append(format_commit(commit_hash, message))
-
-        return "\n".join(lines).strip()
+        return _format_commits_as_changelog(commits, GITHUB_REPO_URL)
 
     except Exception as e:
         return f"Error generating changelog: {e}"

copier.yml

@@ -6,7 +6,7 @@
 # - Update support
 
 _min_copier_version: "9.0.0"
-_version: "0.5.1-rc2"
+_version: "0.5.1-rc3"
 
 # IMPORTANT: Template content is in subdirectory
 # This allows the template to be recognized as git-tracked (aegis-stack repo root has .git)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aegis-stack"
-version = "0.5.1-rc2"
+version = "0.5.1-rc3"
 description = "A production-ready Python foundation for builders who refuse to wait. Try: uvx aegis-stack init my-project"
 readme = "README.md"
 requires-python = ">=3.11,<3.15"

tests/core/test_copier_updater.py

@@ -10,6 +10,8 @@
 import pytest
 
 from aegis.core.copier_updater import (
+    _format_commits_as_changelog,
+    _get_changelog_from_github,
     analyze_conflict_files,
     cleanup_backup_tag,
     create_backup_point,
@@ -258,3 +260,95 @@ def test_returns_empty_for_no_conflicts(self) -> None:
         report = format_conflict_report([])
 
         assert report == ""
+
+
+class TestFormatCommitsAsChangelog:
+    """Tests for _format_commits_as_changelog function."""
+
+    def test_empty_commits_returns_no_changes(self) -> None:
+        """Test that empty commits list returns 'No changes'."""
+        result = _format_commits_as_changelog([], "https://github.com/test/repo")
+        assert result == "No changes"
+
+    def test_categorizes_breaking_changes(self) -> None:
+        """Test that breaking changes are categorized correctly."""
+        commits = [
+            ("abc1234", "breaking: Remove deprecated API"),
+            ("def5678", "Other change"),
+        ]
+        result = _format_commits_as_changelog(commits, "https://github.com/test/repo")
+
+        assert "Breaking Changes:" in result
+        assert "Remove deprecated API" in result
+
+    def test_categorizes_features(self) -> None:
+        """Test that features are categorized correctly."""
+        commits = [
+            ("abc1234", "feat: Add new feature"),
+            ("def5678", "feature: Another feature"),
+        ]
+        result = _format_commits_as_changelog(commits, "https://github.com/test/repo")
+
+        assert "New Features:" in result
+        assert "Add new feature" in result
+        assert "Another feature" in result
+
+    def test_categorizes_fixes(self) -> None:
+        """Test that fixes are categorized correctly."""
+        commits = [
+            ("abc1234", "fix: Fix a bug"),
+        ]
+        result = _format_commits_as_changelog(commits, "https://github.com/test/repo")
+
+        assert "Bug Fixes:" in result
+        assert "Fix a bug" in result
+
+    def test_categorizes_other_changes(self) -> None:
+        """Test that non-categorized commits go to Other Changes."""
+        commits = [
+            ("abc1234", "Update documentation"),
+            ("def5678", "Refactor code"),
+        ]
+        result = _format_commits_as_changelog(commits, "https://github.com/test/repo")
+
+        assert "Other Changes:" in result
+        assert "Update documentation" in result
+        assert "Refactor code" in result
+
+    def test_includes_github_links(self) -> None:
+        """Test that commit hashes are linked to GitHub."""
+        commits = [("abc1234", "Some change")]
+        github_url = "https://github.com/test/repo"
+        result = _format_commits_as_changelog(commits, github_url)
+
+        assert f"[abc1234]({github_url}/commit/abc1234)" in result
+
+    def test_handles_empty_commit_hash(self) -> None:
+        """Test that commits without hash are formatted without links."""
+        commits = [("", "Some change")]
+        result = _format_commits_as_changelog(commits, "https://github.com/test/repo")
+
+        assert "• Some change" in result
+        assert "[" not in result  # No link brackets
+
+
+class TestGetChangelogFromGithub:
+    """Tests for _get_changelog_from_github function."""
+
+    def test_normalizes_head_to_main(self) -> None:
+        """Test that HEAD is normalized to main for API calls."""
+        # This test verifies the URL construction logic
+        # We can't easily test the actual API call without mocking
+        # but we can verify the function handles the HEAD -> main conversion
+        # by checking it doesn't crash and returns a string
+        result = _get_changelog_from_github("abc1234", "HEAD")
+        # Should return either changelog or fallback message
+        assert isinstance(result, str)
+        assert len(result) > 0
+
+    def test_returns_fallback_on_invalid_ref(self) -> None:
+        """Test that invalid refs return a fallback message."""
+        result = _get_changelog_from_github("invalid_ref_123", "HEAD")
+        # Should contain fallback message with "Changelog not available" or actual changelog
+        assert isinstance(result, str)
+        assert "Changelog not available" in result or "Changes:" in result