rxiv-maker 1.16.6__py3-none-any.whl → 1.16.7__py3-none-any.whl

rxiv_maker/__version__.py

@@ -1,3 +1,3 @@
 """Version information."""
 
-__version__ = "1.16.6"
+__version__ = "1.16.7"

rxiv_maker/cli/commands/upgrade.py

@@ -1,68 +1,18 @@
 """Upgrade command for rxiv-maker CLI."""
 
-import subprocess  # nosec B404 - needed for executing upgrade commands
 import sys
 
 import click
-from henriqueslab_updater import force_update_check
+from henriqueslab_updater import handle_upgrade_workflow
 from rich.console import Console
 
 from ... import __version__
-from ...utils.changelog_parser import fetch_and_format_changelog
-from ...utils.install_detector import detect_install_method, get_friendly_install_name, get_upgrade_command
-from ..interactive import prompt_confirm
+from ...utils.install_detector import detect_install_method
+from ...utils.rich_upgrade_notifier import RxivUpgradeNotifier
 
 console = Console()
 
 
-def _display_changelog(console: Console, current_version: str, latest_version: str) -> None:
-    """Display changelog summary for version range.
-
-    Args:
-        console: Rich console for output
-        current_version: Current installed version
-        latest_version: Latest available version
-    """
-    console.print("\n📋 What's changing:", style="bold blue")
-
-    # Fetch changelog summary
-    summary, error = fetch_and_format_changelog(
-        current_version=current_version,
-        latest_version=latest_version,
-        highlights_per_version=3,
-    )
-
-    if error:
-        console.print("   Unable to fetch changelog details", style="dim yellow")
-        console.print(
-            f"   View online: https://github.com/henriqueslab/rxiv-maker/releases/tag/v{latest_version}",
-            style="dim blue",
-        )
-        return
-
-    if summary:
-        # Display the changelog with proper formatting
-        for line in summary.split("\n"):
-            if line.startswith("⚠️"):
-                # Highlight breaking changes prominently
-                console.print(line, style="bold red")
-            elif line.startswith("What's New:"):
-                console.print(line, style="bold cyan")
-            elif line.startswith("  v"):
-                # Version headers
-                console.print(line, style="bold yellow")
-            elif line.strip().startswith(("✨", "🔄", "🐛", "🗑️", "🔒", "📝")):
-                # Change items
-                console.print(f"   {line.strip()}", style="white")
-            elif line.strip().startswith("•"):
-                # Breaking change items
-                console.print(f"   {line.strip()}", style="yellow")
-            elif line.strip():
-                console.print(f"   {line}", style="dim")
-    else:
-        console.print("   No detailed changelog available", style="dim")
-
-
 @click.command()
 @click.option("--yes", "-y", is_flag=True, help="Skip confirmation prompt")
 @click.option("--check-only", "-c", is_flag=True, help="Only check for updates, don't upgrade")
@@ -72,93 +22,31 @@ def upgrade(ctx: click.Context, yes: bool, check_only: bool) -> None:
 
     This command automatically detects how rxiv-maker was installed
     (Homebrew, pip, uv, pipx, etc.) and runs the appropriate upgrade command.
+
+    Examples:
+        rxiv upgrade              # Check and upgrade with confirmation
+        rxiv upgrade --yes        # Upgrade without confirmation
+        rxiv upgrade --check-only # Only check for updates
     """
-    # Detect installation method
+    # Handle development installations specially
     install_method = detect_install_method()
-    install_name = get_friendly_install_name(install_method)
-
-    console.print(f"🔍 Detected installation method: {install_name}", style="blue")
-
-    # Handle development installations
     if install_method == "dev":
         console.print("⚠️  Development installation detected", style="yellow")
         console.print("   To update, pull the latest changes from git:", style="yellow")
-        console.print("   cd <repo> && git pull && uv sync", style="yellow")
+        console.print("   [cyan]cd <repo> && git pull && uv sync[/cyan]", style="yellow")
         sys.exit(0)
 
-    # Check for updates
-    console.print("🔍 Checking for updates...", style="blue")
-    try:
-        update_available, latest_version = force_update_check()
-
-        if not update_available:
-            console.print(f"✅ You already have the latest version ({__version__})", style="green")
-            sys.exit(0)
-
-        console.print(f"📦 Update available: {__version__} → {latest_version}", style="green")
-
-        # Fetch and display changelog
-        _display_changelog(console, __version__, latest_version)
-
-        if check_only:
-            upgrade_cmd = get_upgrade_command(install_method)
-            console.print(f"\n   Run: {upgrade_cmd}", style="blue")
-            sys.exit(0)
-
-    except Exception as e:
-        console.print(f"⚠️  Could not check for updates: {e}", style="yellow")
-        console.print("   Proceeding with upgrade attempt...", style="yellow")
-        latest_version = "latest"
-
-    # Get upgrade command
-    upgrade_cmd = get_upgrade_command(install_method)
-
-    # Show confirmation
-    if not yes:
-        console.print(f"\n📦 About to run: {upgrade_cmd}", style="blue")
-        if not prompt_confirm("Do you want to continue?", default=True):
-            console.print("❌ Upgrade cancelled", style="yellow")
-            sys.exit(0)
-
-    # Execute upgrade command directly
-    console.print("\n🚀 Upgrading rxiv-maker...", style="blue")
-    console.print(f"   Running: {upgrade_cmd}", style="dim")
-
-    try:
-        # Split command for safer execution without shell=True
-        import shlex
-
-        cmd_parts = shlex.split(upgrade_cmd)
-        result = subprocess.run(
-            cmd_parts,
-            check=True,
-            capture_output=False,
-            timeout=300,
-        )  # nosec B603 - upgrade_cmd comes from trusted install_detector module
-        success = result.returncode == 0
-        error = None
-    except subprocess.CalledProcessError as e:
-        success = False
-        error = f"Command failed with exit code {e.returncode}"
-    except subprocess.TimeoutExpired:
-        success = False
-        error = "Upgrade timed out after 5 minutes"
-    except Exception as e:
-        success = False
-        error = str(e)
-
-    if success:
-        console.print("\n✅ Upgrade completed successfully!", style="green")
-        console.print("   Run 'rxiv --version' to verify the installation", style="blue")
+    # Use centralized upgrade workflow
+    notifier = RxivUpgradeNotifier(console)
+    success, error = handle_upgrade_workflow(
+        package_name="rxiv-maker",
+        current_version=__version__,
+        check_only=check_only,
+        skip_confirmation=yes,
+        notifier=notifier,
+        github_org="HenriquesLab",
+        github_repo="rxiv-maker",
+    )
 
-        # Show what's new in the upgraded version
-        if latest_version != "latest":
-            console.print(f"\n🎉 What's new in v{latest_version}:", style="bold green")
-            console.print(
-                f"   View full changelog: https://github.com/henriqueslab/rxiv-maker/releases/tag/v{latest_version}",
-                style="blue",
-            )
-    else:
-        console.print(f"\n❌ Upgrade failed: {error}", style="red")
-        console.print(f"   Try running manually: {upgrade_cmd}", style="yellow")
+    if not success and error:
         sys.exit(1)

rxiv_maker/utils/rich_upgrade_notifier.py

@@ -0,0 +1,162 @@
+"""Rich console adapter for upgrade notifications in rxiv-maker."""
+
+import click
+from rich.console import Console
+
+
+class RxivUpgradeNotifier:
+    """Adapt Rich console to UpgradeNotifier protocol for rxiv-maker.
+
+    Integrates with rxiv-maker's changelog parser to show rich change summaries.
+    """
+
+    def __init__(self, console: Console):
+        """Initialize with Rich console instance.
+
+        Args:
+            console: Rich Console instance for styled output
+        """
+        self.console = console
+
+    def show_checking(self) -> None:
+        """Show 'checking for updates' message."""
+        self.console.print("🔍 Checking for updates...", style="blue")
+
+    def show_version_check(self, current: str, latest: str, available: bool) -> None:
+        """Show version check results.
+
+        Args:
+            current: Current installed version
+            latest: Latest available version
+            available: Whether an update is available
+        """
+        if available:
+            self.console.print(
+                f"📦 Update available: [cyan]v{current}[/cyan] → [green bold]v{latest}[/green bold]",
+                style="yellow",
+            )
+        else:
+            self.console.print(
+                f"✅ You already have the latest version ([cyan]v{current}[/cyan])",
+                style="green",
+            )
+
+    def show_update_info(self, current: str, latest: str, release_url: str) -> None:
+        """Show update available information with changelog integration.
+
+        Args:
+            current: Current version
+            latest: Latest version
+            release_url: URL to release notes
+        """
+        # Import here to avoid circular dependencies
+        from .changelog_parser import fetch_and_format_changelog
+
+        # Fetch and display changelog
+        summary, error = fetch_and_format_changelog(
+            current_version=current,
+            latest_version=latest,
+            highlights_per_version=3,
+        )
+
+        if summary and not error:
+            self.console.print("\n📋 What's changing:", style="bold blue")
+            # Display changelog - format_summary returns rich-formatted text
+            # Parse and display with proper styling
+            for line in summary.split("\n"):
+                if line.startswith("⚠️"):
+                    # Highlight breaking changes prominently
+                    self.console.print(line, style="bold red")
+                elif "What's New:" in line or "What's changing:" in line:
+                    self.console.print(line, style="bold cyan")
+                elif line.strip().startswith("v"):
+                    # Version headers
+                    self.console.print(line, style="bold yellow")
+                elif line.strip().startswith(("✨", "🔄", "🐛", "🗑️", "🔒", "📝")):
+                    # Change items with emojis
+                    self.console.print(f"   {line.strip()}", style="white")
+                elif line.strip().startswith("•"):
+                    # Breaking change items
+                    self.console.print(f"   {line.strip()}", style="yellow")
+                elif line.strip():
+                    self.console.print(f"   {line}", style="dim")
+        else:
+            # Fallback if changelog unavailable
+            self.console.print(
+                f"\nView release notes: [link]{release_url}[/link]",
+                style="blue",
+            )
+
+    def show_installer_info(self, friendly_name: str, command: str) -> None:
+        """Show detected installer information.
+
+        Args:
+            friendly_name: Human-readable installer name
+            command: The upgrade command that will be executed
+        """
+        self.console.print()
+        self.console.print(
+            f"🔍 Detected installation method: [bold]{friendly_name}[/bold]",
+            style="blue",
+        )
+        self.console.print(f"📦 Running: [yellow]{command}[/yellow]")
+
+    def show_success(self, version: str) -> None:
+        """Show successful upgrade message.
+
+        Args:
+            version: Version that was successfully installed
+        """
+        self.console.print()
+        self.console.print("✅ Upgrade completed successfully!", style="green bold")
+        self.console.print(f"   Now running: [green]v{version}[/green]")
+        self.console.print()
+        self.console.print("   Run [blue]'rxiv --version'[/blue] to verify the installation", style="dim")
+
+    def show_error(self, error: str | None) -> None:
+        """Show upgrade error message.
+
+        Args:
+            error: Error message or None
+        """
+        self.console.print()
+        self.console.print("❌ Upgrade failed", style="red bold")
+        if error:
+            self.console.print(f"   {error}", style="red")
+
+    def show_manual_instructions(self, install_method: str) -> None:
+        """Show manual upgrade instructions.
+
+        Args:
+            install_method: The detected installation method
+        """
+        self.console.print("\n💡 Try running manually:", style="yellow bold")
+
+        if install_method == "homebrew":
+            self.console.print("   [cyan]brew update && brew upgrade rxiv-maker[/cyan]")
+        elif install_method == "pipx":
+            self.console.print("   [cyan]pipx upgrade rxiv-maker[/cyan]")
+        elif install_method == "uv":
+            self.console.print("   [cyan]uv tool upgrade rxiv-maker[/cyan]")
+        elif install_method == "dev":
+            self.console.print("   [cyan]cd <repo> && git pull && uv sync[/cyan]", style="dim")
+        else:
+            self.console.print("   [cyan]pip install --upgrade rxiv-maker[/cyan]")
+            self.console.print("   [dim]# Or with --user flag:[/dim]")
+            self.console.print("   [cyan]pip install --upgrade --user rxiv-maker[/cyan]")
+
+    def confirm_upgrade(self, version: str) -> bool:
+        """Prompt user for confirmation using click.
+
+        Args:
+            version: Version to upgrade to
+
+        Returns:
+            True if user confirms, False otherwise
+        """
+        try:
+            self.console.print()
+            return click.confirm(f"Upgrade rxiv-maker to v{version}?", default=True)
+        except (KeyboardInterrupt, EOFError):
+            self.console.print("\n⚠️  Upgrade cancelled.", style="yellow")
+            return False

{rxiv_maker-1.16.6.dist-info → rxiv_maker-1.16.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rxiv-maker
-Version: 1.16.6
+Version: 1.16.7
 Summary: Write scientific preprints in Markdown. Generate publication-ready PDFs efficiently.
 Project-URL: Homepage, https://github.com/HenriquesLab/rxiv-maker
 Project-URL: Documentation, https://github.com/HenriquesLab/rxiv-maker#readme
@@ -27,7 +27,7 @@ Requires-Python: >=3.10
 Requires-Dist: click>=8.0.0
 Requires-Dist: crossref-commons>=0.0.7
 Requires-Dist: gitpython>=3.1.0
-Requires-Dist: henriqueslab-updater>=1.1.3
+Requires-Dist: henriqueslab-updater>=1.2.0
 Requires-Dist: latex2mathml>=3.78.0
 Requires-Dist: matplotlib>=3.7.0
 Requires-Dist: numpy>=1.24.0
@@ -358,9 +358,14 @@ rxiv config --non-interactive  # Show current settings
 
 ### Maintenance
 ```bash
-rxiv upgrade               # Upgrade to latest version
-rxiv changelog             # View changelog and release notes
-rxiv changelog --recent 5  # View last 5 versions
+# Upgrade commands (auto-detects Homebrew, pip, uv, pipx)
+rxiv upgrade                 # Interactive upgrade with confirmation
+rxiv upgrade --yes           # Upgrade without confirmation
+rxiv upgrade --check-only    # Check for updates only
+
+# Changelog and version information
+rxiv changelog               # View changelog and release notes
+rxiv changelog --recent 5    # View last 5 versions
 ```
 
 > **💡 CI/Automation Note:** All interactive commands support non-interactive mode or configuration files for use in CI/CD pipelines and automated workflows. Use `--non-interactive` flag or configure via `~/.rxiv-maker/config` for non-TTY environments.

{rxiv_maker-1.16.6.dist-info → rxiv_maker-1.16.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rxiv_maker/__init__.py,sha256=p04JYC5ZhP6dLXkoWVlKNyiRvsDE1a4C88f9q4xO3tA,3268
-rxiv_maker/__version__.py,sha256=qf0GMhAIH5L_wI59eHcfpHtgoZxaqziVuvj0M1daj0g,51
+rxiv_maker/__version__.py,sha256=--L7TPRaASOQ9_Gb1AzwOD0jIisWKuGJB7fbHOHsoFs,51
 rxiv_maker/rxiv_maker_cli.py,sha256=9Lu_mhFPXwx5jzAR6StCNxwCm_fkmP5qiOYdNuh_AwI,120
 rxiv_maker/validate.py,sha256=AIzgP59KbCQJqC9WIGfUdVv0xI6ud9g1fFznQkaGz5Q,9373
 rxiv_maker/cli/__init__.py,sha256=Jw0DTFUSofN-02xpVrt1UUzRcgH5NNd-GPNidhmNwpU,77
@@ -29,7 +29,7 @@ rxiv_maker/cli/commands/repos.py,sha256=SQ9nuhSkyHKFPYn_TrOxyQoGdDRI-OBOgUSGJpRu
 rxiv_maker/cli/commands/repos_search.py,sha256=6sUMvyHlHEX1p88hPtu0_Hf8z6JpOinJ53l9ZI-rirc,7743
 rxiv_maker/cli/commands/setup.py,sha256=9ue4bDETpSPGVkWFDfpuTDsysax5-QKGxmt42Gb7oeU,2294
 rxiv_maker/cli/commands/track_changes.py,sha256=omf_77A7htRSa8naUEPTTtUTxrSwMpzHFOuU0j1xAJw,1163
-rxiv_maker/cli/commands/upgrade.py,sha256=VJ1snYyLGrb5-snF4olfsMwfQsuKkAbXEr8aQ88WYYE,6349
+rxiv_maker/cli/commands/upgrade.py,sha256=UpdqEQwbNYmDMbSrYGv_pVd-7u8PPT3US5RVENhKK4w,1852
 rxiv_maker/cli/commands/validate.py,sha256=3JghFQevJvQDQII4p_QWbQXMEUyDpM-t9-WxtaT4edo,1629
 rxiv_maker/cli/commands/version.py,sha256=VMlfSxxsrZH02d24MXLUDZfHBW39yZRpWxUpMhQ-X0Y,2737
 rxiv_maker/cli/framework/__init__.py,sha256=4FPXdP8J6v4eeEn46mwY0VtnwxjR1jnW_kTrXykQlQs,2704
@@ -165,6 +165,7 @@ rxiv_maker/utils/performance.py,sha256=EBDVNshSaeG7Nu-GCZtRAzTunGn4z_Bb2jEck045b
 rxiv_maker/utils/platform.py,sha256=DCD3gvm7_DBcT67gGIXhTDV5mPrBjWrL7R2JdsmIgng,17773
 rxiv_maker/utils/python_execution_reporter.py,sha256=l3hqLXtGAg_wKUlkikK1oaHPeBpoCkj3iR6i1fc11ys,10606
 rxiv_maker/utils/retry.py,sha256=aNsuc7HuxMwG4yubgX0GxIEZ0iF6_4lACusVMc0ZSXA,11026
+rxiv_maker/utils/rich_upgrade_notifier.py,sha256=aMqkx9l_2KtEiwVFdhOU4oqsAgdWQ86LuqWN4k_cTA0,6365
 rxiv_maker/utils/text_utils.py,sha256=ntovIx7qXB0LWO9OmCu7-rqTSfyEvthrTjYEJTbmZ_U,1972
 rxiv_maker/utils/tips.py,sha256=XHgbJkyFjYt5Pz-Rdz_yCjnRLguxIsHwdFmNSg323NA,8078
 rxiv_maker/utils/title_sync.py,sha256=C7NT80DgBJrS70mil6b7ghcZyKR2n5_MNlC6Yli_dXM,15094
@@ -187,8 +188,8 @@ rxiv_maker/validators/doi/metadata_comparator.py,sha256=euqHhKP5sHQAdZbdoAahUn6Y
 rxiv_maker/tex/template.tex,sha256=zrJ3aFfu8j9zkg1l375eE9w-j42P3rz16wMD3dSgi1I,1354
 rxiv_maker/tex/style/rxiv_maker_style.bst,sha256=jbVqrJgAm6F88cow5vtZuPBwwmlcYykclTm8RvZIo6Y,24281
 rxiv_maker/tex/style/rxiv_maker_style.cls,sha256=F2qtnS9mI6SwOIaVH76egXZkB2_GzbH4gCTG_ZcfCDQ,24253
-rxiv_maker-1.16.6.dist-info/METADATA,sha256=7_r-ZEzlmKCVaCu_a-Z8tg8pr4kzfI3tDbvfCbc1dCw,17950
-rxiv_maker-1.16.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-rxiv_maker-1.16.6.dist-info/entry_points.txt,sha256=ghCN0hI9A1GlG7QY5F6E-xYPflA8CyS4B6bTQ1YLop0,97
-rxiv_maker-1.16.6.dist-info/licenses/LICENSE,sha256=GSZFoPIhWDNJEtSHTQ5dnELN38zFwRiQO2antBezGQk,1093
-rxiv_maker-1.16.6.dist-info/RECORD,,
+rxiv_maker-1.16.7.dist-info/METADATA,sha256=6O761FLD317XmFqsnlCerTogrcC1Kq4wUJW9xnz4psM,18177
+rxiv_maker-1.16.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+rxiv_maker-1.16.7.dist-info/entry_points.txt,sha256=ghCN0hI9A1GlG7QY5F6E-xYPflA8CyS4B6bTQ1YLop0,97
+rxiv_maker-1.16.7.dist-info/licenses/LICENSE,sha256=GSZFoPIhWDNJEtSHTQ5dnELN38zFwRiQO2antBezGQk,1093
+rxiv_maker-1.16.7.dist-info/RECORD,,