gitflow-analytics 3.13.5__py3-none-any.whl → 3.13.6__py3-none-any.whl

gitflow_analytics/_version.py

@@ -1,4 +1,4 @@
 """Version information for gitflow-analytics."""
 
-__version__ = "3.13.5"
+__version__ = "3.13.6"
 __version_info__ = tuple(int(x) for x in __version__.split("."))

gitflow_analytics/cli.py

@@ -1590,6 +1590,68 @@ def analyze(
                             total_commits += result["stats"]["total_commits"]
                             total_tickets += result["stats"]["unique_tickets"]
 
+                            # Fetch and enrich with GitHub PRs after data collection
+                            if repo_config.github_repo:
+                                try:
+                                    if display:
+                                        display.print_status(
+                                            "   📥 Fetching pull requests from GitHub...",
+                                            "info",
+                                        )
+
+                                    # Load commits that were just fetched from cache
+                                    with cache.get_session() as session:
+                                        from gitflow_analytics.models.database import CachedCommit
+
+                                        cached_commits = (
+                                            session.query(CachedCommit)
+                                            .filter(
+                                                CachedCommit.repo_path == str(repo_path),
+                                                CachedCommit.timestamp >= start_date,
+                                                CachedCommit.timestamp <= end_date,
+                                            )
+                                            .all()
+                                        )
+
+                                        # Convert to dict format for enrichment
+                                        commits_for_enrichment = []
+                                        for cached_commit in cached_commits:
+                                            commit_dict = {
+                                                "hash": cached_commit.commit_hash,
+                                                "author_name": cached_commit.author_name,
+                                                "author_email": cached_commit.author_email,
+                                                "date": cached_commit.timestamp,
+                                                "message": cached_commit.message,
+                                            }
+                                            commits_for_enrichment.append(commit_dict)
+
+                                    # Enrich with GitHub PR data
+                                    enrichment = orchestrator.enrich_repository_data(
+                                        repo_config, commits_for_enrichment, start_date
+                                    )
+
+                                    if enrichment["prs"]:
+                                        pr_count = len(enrichment["prs"])
+                                        if display:
+                                            display.print_status(
+                                                f"   ✅ Found {pr_count} pull requests",
+                                                "success",
+                                            )
+                                        else:
+                                            click.echo(f"   ✅ Found {pr_count} pull requests")
+
+                                except Exception as e:
+                                    logger.warning(
+                                        f"Failed to fetch PRs for {repo_config.github_repo}: {e}"
+                                    )
+                                    if display:
+                                        display.print_status(
+                                            f"   ⚠️  Could not fetch PRs: {e}",
+                                            "warning",
+                                        )
+                                    else:
+                                        click.echo(f"   ⚠️  Could not fetch PRs: {e}")
+
                             # Collect unique developers if available
                             if "developers" in result["stats"]:
                                 total_developers.update(result["stats"]["developers"])
@@ -2088,6 +2150,68 @@ def analyze(
                             total_commits += result["stats"]["total_commits"]
                             total_tickets += result["stats"]["unique_tickets"]
 
+                            # Fetch and enrich with GitHub PRs after data collection
+                            if repo_config.github_repo:
+                                try:
+                                    if display:
+                                        display.print_status(
+                                            "   📥 Fetching pull requests from GitHub...",
+                                            "info",
+                                        )
+
+                                    # Load commits that were just fetched from cache
+                                    with cache.get_session() as session:
+                                        from gitflow_analytics.models.database import CachedCommit
+
+                                        cached_commits = (
+                                            session.query(CachedCommit)
+                                            .filter(
+                                                CachedCommit.repo_path == str(repo_path),
+                                                CachedCommit.timestamp >= start_date,
+                                                CachedCommit.timestamp <= end_date,
+                                            )
+                                            .all()
+                                        )
+
+                                        # Convert to dict format for enrichment
+                                        commits_for_enrichment = []
+                                        for cached_commit in cached_commits:
+                                            commit_dict = {
+                                                "hash": cached_commit.commit_hash,
+                                                "author_name": cached_commit.author_name,
+                                                "author_email": cached_commit.author_email,
+                                                "date": cached_commit.timestamp,
+                                                "message": cached_commit.message,
+                                            }
+                                            commits_for_enrichment.append(commit_dict)
+
+                                    # Enrich with GitHub PR data
+                                    enrichment = orchestrator.enrich_repository_data(
+                                        repo_config, commits_for_enrichment, start_date
+                                    )
+
+                                    if enrichment["prs"]:
+                                        pr_count = len(enrichment["prs"])
+                                        if display:
+                                            display.print_status(
+                                                f"   ✅ Found {pr_count} pull requests",
+                                                "success",
+                                            )
+                                        else:
+                                            click.echo(f"   ✅ Found {pr_count} pull requests")
+
+                                except Exception as e:
+                                    logger.warning(
+                                        f"Failed to fetch PRs for {repo_config.github_repo}: {e}"
+                                    )
+                                    if display:
+                                        display.print_status(
+                                            f"   ⚠️  Could not fetch PRs: {e}",
+                                            "warning",
+                                        )
+                                    else:
+                                        click.echo(f"   ⚠️  Could not fetch PRs: {e}")
+
                             # Collect unique developers if available
                             if "developers" in result["stats"]:
                                 total_developers.update(result["stats"]["developers"])

gitflow_analytics/core/git_auth.py

@@ -112,6 +112,80 @@ def setup_git_credentials(token: str, username: str = "git") -> bool:
         return False
 
 
+def ensure_remote_url_has_token(repo_path: Path, token: str) -> bool:
+    """Embed GitHub token in remote URL for HTTPS authentication.
+
+    This is needed because subprocess git operations may not have access
+    to the credential helper store due to environment variable restrictions
+    (GIT_CREDENTIAL_HELPER="" and GIT_ASKPASS="/bin/echo" in git_timeout_wrapper).
+
+    Args:
+        repo_path: Path to the git repository
+        token: GitHub personal access token
+
+    Returns:
+        True if URL was updated with token, False if already has token,
+        not applicable (SSH URL), or operation failed
+    """
+    if not token:
+        logger.debug("No token provided, skipping remote URL update")
+        return False
+
+    try:
+        # Get current origin remote URL
+        result = subprocess.run(
+            ["git", "remote", "get-url", "origin"],
+            cwd=repo_path,
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        current_url = result.stdout.strip()
+
+        if not current_url:
+            logger.debug(f"No origin remote found for {repo_path}")
+            return False
+
+        # Check if it's an HTTPS GitHub URL without embedded token
+        if current_url.startswith("https://github.com/"):
+            # URL format: https://github.com/org/repo.git
+            # New format: https://git:TOKEN@github.com/org/repo.git
+            new_url = current_url.replace("https://github.com/", f"https://git:{token}@github.com/")
+
+            # Update the remote URL
+            subprocess.run(
+                ["git", "remote", "set-url", "origin", new_url],
+                cwd=repo_path,
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+            logger.debug(f"Updated remote URL with embedded token for {repo_path.name}")
+            return True
+
+        elif "@github.com" in current_url:
+            # Already has authentication embedded (either token or SSH)
+            logger.debug(f"Remote URL already has authentication for {repo_path.name}")
+            return False
+
+        elif current_url.startswith("git@github.com:"):
+            # SSH URL, no need to modify
+            logger.debug(f"Using SSH authentication for {repo_path.name}")
+            return False
+
+        else:
+            # Unknown URL format
+            logger.debug(f"Unknown URL format for {repo_path.name}: {current_url}")
+            return False
+
+    except subprocess.CalledProcessError as e:
+        logger.warning(f"Could not update remote URL for {repo_path.name}: {e.stderr}")
+        return False
+    except Exception as e:
+        logger.warning(f"Unexpected error updating remote URL for {repo_path.name}: {e}")
+        return False
+
+
 def preflight_git_authentication(config: dict) -> bool:
     """Run pre-flight checks for git authentication and setup credentials.
 

gitflow_analytics/core/git_timeout_wrapper.py

@@ -14,6 +14,7 @@ from pathlib import Path
 from typing import Callable, Optional, TypeVar
 
 from ..constants import Timeouts
+from .git_auth import ensure_remote_url_has_token
 
 logger = logging.getLogger(__name__)
 
@@ -208,6 +209,13 @@ class GitTimeoutWrapper:
             True if fetch succeeded, False otherwise
         """
         try:
+            # Embed GitHub token in remote URL if available
+            # This is necessary because git operations run with GIT_CREDENTIAL_HELPER=""
+            # and GIT_ASKPASS="/bin/echo", which disable credential helpers
+            token = os.environ.get("GITHUB_TOKEN")
+            if token:
+                ensure_remote_url_has_token(repo_path, token)
+
             self.run_git_command(
                 ["git", "fetch", "--all"], cwd=repo_path, timeout=timeout, check=True
             )

{gitflow_analytics-3.13.5.dist-info → gitflow_analytics-3.13.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitflow-analytics
-Version: 3.13.5
+Version: 3.13.6
 Summary: Analyze Git repositories for developer productivity insights
 Author-email: Bob Matyas <bobmatnyc@gmail.com>
 License: MIT

{gitflow_analytics-3.13.5.dist-info → gitflow_analytics-3.13.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 gitflow_analytics/__init__.py,sha256=W3Jaey5wuT1nBPehVLTIRkVIyBa5jgYOlBKc_UFfh-4,773
-gitflow_analytics/_version.py,sha256=-dJJFHKImkdT2L9Kw0gRXFj8dh26CFKPTsdrAlg1aTg,138
-gitflow_analytics/cli.py,sha256=KdnuqiUodiqmImsDfMv15MuOlLrI_2zTv3x4s1BV0U8,302532
+gitflow_analytics/_version.py,sha256=LYLmUGZ3H7nuZiBCfCqGEKil8Qex-qsdWM7XiJjo6d8,138
+gitflow_analytics/cli.py,sha256=EEmj-1Q8ifFgV3U7ImIoRzUezZFDaO80M_VIegRbgec,309932
 gitflow_analytics/config.py,sha256=XRuxvzLWyn_ML7mDCcuZ9-YFNAEsnt33vIuWxQQ_jxg,1033
 gitflow_analytics/constants.py,sha256=GXEncUJS9ijOI5KWtQCTANwdqxPfXpw-4lNjhaWTKC4,2488
 gitflow_analytics/verify_activity.py,sha256=q82VnU8FhHEPlnupYMvh1XtyaDJfIPPg-AI8cSM0PIk,27054
@@ -27,8 +27,8 @@ gitflow_analytics/core/analyzer.py,sha256=apLbRFAOGDPCNnBTNOG_eXaVXh_QglO07t6p5s
 gitflow_analytics/core/branch_mapper.py,sha256=1L1ctrhTEqMZ61eS1nZRkcyaarLipeQgotw4HdXcSmM,7407
 gitflow_analytics/core/cache.py,sha256=2SBzry3FoLCJyhu-I-AgNTSzN_MkA-DunzOAxq_lyTw,69152
 gitflow_analytics/core/data_fetcher.py,sha256=KI0lGxrKvjOHf2UjnGytmcy9GSnSsA28c5mysOH7q1o,106944
-gitflow_analytics/core/git_auth.py,sha256=QP7U5_Mi9J-hEtoEhdjoMBl61nCukOGlL8PYXYSyN3g,6369
-gitflow_analytics/core/git_timeout_wrapper.py,sha256=14K8PHKSOonW4hJpLigB5XQNSWxmFbMFbrpu8cT1h-M,12534
+gitflow_analytics/core/git_auth.py,sha256=KPUT6qmUUjKfXRDPEIXBzYu6g4jO2RH94xcA_H28vXY,9128
+gitflow_analytics/core/git_timeout_wrapper.py,sha256=EPMOFnGYe_vrpmODraO8MHA8tUChS1pDPlQfYsyCUEQ,12945
 gitflow_analytics/core/identity.py,sha256=CTjxpM5BeeMyGQ8QbtSCsUmuzMmU7vhBwrdQctjI7Z0,31397
 gitflow_analytics/core/metrics_storage.py,sha256=2u4dxVHsCTEaVIO5udWCaHzuefRL7JVS8aN7wIwyMlc,21769
 gitflow_analytics/core/progress.py,sha256=KMXwZpJGlmUU8OehNRA7_PONpXUgSIxWl5ZN7INc108,20732
@@ -127,9 +127,9 @@ gitflow_analytics/ui/__init__.py,sha256=UBhYhZMvwlSrCuGWjkIdoP2zNbiQxOHOli-I8mqI
 gitflow_analytics/ui/progress_display.py,sha256=omCS86mCQR0QeMoM0YnsV3Gf2oALsDLu8u7XseQU6lk,59306
 gitflow_analytics/utils/__init__.py,sha256=YE3E5Mx-LmVRqLIgUUwDmbstm6gkpeavYHrQmVjwR3o,197
 gitflow_analytics/utils/commit_utils.py,sha256=TBgrWW73EODGOegGCF79ch0L0e5R6gpydNWutiQOa14,1356
-gitflow_analytics-3.13.5.dist-info/licenses/LICENSE,sha256=xwvSwY1GYXpRpmbnFvvnbmMwpobnrdN9T821sGvjOY0,1066
-gitflow_analytics-3.13.5.dist-info/METADATA,sha256=iB3vdWqPASbljtKC1rORHcIbiP1X21egIORMtIIGFws,40374
-gitflow_analytics-3.13.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gitflow_analytics-3.13.5.dist-info/entry_points.txt,sha256=ZOsX0GLsnMysp5FWPOfP_qyoS7WJ8IgcaDFDxWBYl1g,98
-gitflow_analytics-3.13.5.dist-info/top_level.txt,sha256=CQyxZXjKvpSB1kgqqtuE0PCRqfRsXZJL8JrYpJKtkrk,18
-gitflow_analytics-3.13.5.dist-info/RECORD,,
+gitflow_analytics-3.13.6.dist-info/licenses/LICENSE,sha256=xwvSwY1GYXpRpmbnFvvnbmMwpobnrdN9T821sGvjOY0,1066
+gitflow_analytics-3.13.6.dist-info/METADATA,sha256=iDW0016J8hTQPenAka3HPuGtsZrIJhFJZLw-XV2NlqU,40374
+gitflow_analytics-3.13.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gitflow_analytics-3.13.6.dist-info/entry_points.txt,sha256=ZOsX0GLsnMysp5FWPOfP_qyoS7WJ8IgcaDFDxWBYl1g,98
+gitflow_analytics-3.13.6.dist-info/top_level.txt,sha256=CQyxZXjKvpSB1kgqqtuE0PCRqfRsXZJL8JrYpJKtkrk,18
+gitflow_analytics-3.13.6.dist-info/RECORD,,