fancygit 1.0.0__py3-none-any.whl

fancygit-1.0.0.dist-info/METADATA

@@ -0,0 +1,169 @@
+Metadata-Version: 2.4
+Name: fancygit
+Version: 1.0.0
+Summary: A smart CLI tool that provides intelligent recommendations and helps solve merge conflicts
+Home-page: https://github.com/Youssif-Ashmawy/Fancy_Git
+Author: Youssif Ashmawy
+Author-email: ashmawyyoussif@gmail.com
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Topic :: Software Development :: Version Control :: Git
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+Requires-Dist: requests>=2.25.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+# Fancy Git
+
+![FancyGit Overview](images/overview.png)
+
+A smart CLI tool that provides intelligent recommendations and helps solve merge conflicts by analyzing git command outputs.
+
+## Email Notifications Test
+*Testing email notification system - this change should trigger an email to the commit author.*
+
+## Overview
+
+FancyGit is a CLI wrapper around git commands that:
+- Runs git commands and captures their output
+- Detects warnings and errors in real-time
+- Provides user confirmation for clean operations
+- Prepares for AI-powered recommendations (future phase)
+
+## Current Implementation (Phase 1)
+
+### ✅ Features Implemented
+- **CLI Interface**: `fancygit` command works system-wide
+- **Git Commands**: Full support for `add`, `commit`, `push`, and `pull` with argument passing
+- **Warning/Error Detection**: Regex-based pattern matching for common git issues
+- **User Confirmation**: Prompts for confirmation when no issues detected
+- **Cross-platform**: Works on macOS, Linux, and Windows
+
+### 🔍 Detection Patterns
+
+**Error Patterns:**
+- `error:`, `fatal:`, `failed`, `rejected`
+- `conflict`, `merge conflict`, `unable to`
+
+**Warning Patterns:**
+- `warning:`, `WARNING:`, `behind`, `ahead`, `diverged`
+
+## Installation
+
+### Quick Setup
+
+Run the automated cross-platform launcher script:
+```bash
+python3 launcher.py
+```
+
+This script will:
+- Automatically detect your operating system (Linux, macOS, or Windows)
+- Run the appropriate installation script for your system
+- Check Python 3.6+ and Git installation
+- Make fancygit.py executable
+- Create system-wide symlink (Unix-like systems) or add to PATH (Windows)
+- Test the installation
+
+## Usage
+
+### Basic Commands
+```bash
+# Add files
+fancygit add .
+fancygit add filename.txt
+
+# Commit changes
+fancygit commit -m "Your commit message"
+fancygit commit --amend
+
+# Push to remote
+fancygit push origin main
+
+# Pull from remote  
+fancygit pull origin main
+
+# With additional arguments
+fancygit push origin main --force-with-lease
+fancygit pull origin main --rebase
+```
+
+### How It Works
+
+1. **Command Execution**: Runs the actual git command
+2. **Output Analysis**: Scans stdout/stderr for warning/error patterns
+3. **User Feedback**: 
+   - If issues detected: Shows detailed error/warning messages
+   - If no issues: Prompts for confirmation with "enter 'y' to run the command"
+4. **Action**: Executes or cancels based on user input
+
+### Example Output
+
+**No Issues:**
+```
+Running: git push origin main
+✅ No warnings or errors detected
+No warning messages - enter 'y' to run the command: y
+Command executed successfully!
+```
+
+**Issues Detected:**
+```
+Running: git pull origin main
+❌ Errors detected:
+    error: couldn't find remote ref refs/heads/main
+```
+
+## Architecture
+
+```
+FancyGit CLI → Git Commands → Collect Output → Pattern Matching → User Interface (CLI)
+```
+
+## Future Roadmap
+
+### Phase 2: AI Pipeline
+- Implement AI model for parsing warnings/errors
+- Generate intelligent recommendations
+- Add confidence scoring (backend only)
+
+### Phase 3: Smart Resolution
+- Automatic conflict resolution suggestions
+- Context-aware recommendations
+- Integration with popular Git workflows
+
+## File Structure
+
+```
+Fancy_Git/
+├── fancygit.py          # Main CLI application
+├── launcher.py          # Cross-platform launcher script
+├── README.md            # This file
+├── images/              # Images and documentation
+│   └── overview.png     # Project overview image
+└── .git/                # Git repository
+```
+
+*Note: Platform-specific installation scripts (`start.sh`, `start.bat`) are included but automatically managed by `launcher.py`.*
+THIS SHOULD BE UPDATED ASAP
+## Requirements
+
+- Python 3.6+
+- Git installed and configured
+- System permissions for symlink creation
+- Note: No external dependecies for now so no environment setup required 
+
+## License
+
+MIT License (For now as it is still a private project)

fancygit-1.0.0.dist-info/RECORD

@@ -0,0 +1,29 @@
+src/__init__.py,sha256=9kebFj2X3VcOAcKAMsbUy_BY0odMs6JDpR6XZd-UBMo,53
+src/colors.py,sha256=v5GogeZzJJdchim5kbenlQno350kld_4HkTojLvGbog,7810
+src/git_error.py,sha256=tb-RbWWQZYqEcqP2PxI3snjwlfuEp96baZiONFulDm0,1852
+src/git_error_parser.py,sha256=aWhVpb0eXx0tF8y8npWovvuKMYQTv-vgHnNh7o5rzh4,1499
+src/git_insights.py,sha256=2R4Qb6iZ3HRdMNFUV03FWxZtbaYMCMIQ_lTXePhbC7w,13196
+src/git_runner.py,sha256=ogQntBlV55uPH1dHlyQtEJI3OOL9WnvdzyxK-7qUaVE,544
+src/loading_animation.py,sha256=Ei5oXCmNxLCbLPsLuST8ipxQN0vjzYBaHWfkbCASttw,5365
+src/merge_conflict.py,sha256=OZ5_WkbEIycAtg0fazEB_LulhibfT8A4vpUwuD_NN1s,559
+src/mermaid_export.py,sha256=HdFWpDSsiKIYehZ24mEQa62mMEiPOecD6LdDHZoc7w0,17157
+src/ollama_client.py,sha256=2aB0dwrJNX1LagKpMJAgNyX7gL9bhdCbeDjXCklFU6I,5229
+src/output_colorizer.py,sha256=yBDF0-ddoGH5A-44Ht9qNKFdamAfenJeTgyxMwOFuS0,14161
+src/repo_state.py,sha256=QaDKEBYk3J6L6aZVeJdJlKz6aci3K3VK5eEHF43TuzU,665
+src/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/README.md,sha256=x_5bZLmVpTvobP8YQc_qVDwKlRk6CjbVqD-cN0WNfpI,4377
+tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/conftest.py,sha256=z80AuePwW-ZczGfa9YQpuAKKG2iaJ8qzx3DU-qXTVV0,2095
+tests/test_conflict_parser_integration.py,sha256=vWCHNBcxlHDxjk5c7kk8dlktcbUcF0sGUF47Iwvru_w,2721
+tests/test_fancygit_advanced.py,sha256=SWEZJBrEbqFg-hzvEkqV150DFIdpkSigovH9cM-D1Dc,22920
+tests/test_fancygit_commands.py,sha256=FNNAd4kLyd_tXlNXQBG0cCt5yOH3_v3Xy8B0M4M9LKM,22414
+tests/test_fancygit_integration.py,sha256=EQxjw-wlUoWBRhtCVvSERM-ikx-P73M7-R_bJqtP8oM,7506
+tests/test_fancygit_workflows.py,sha256=CPGpmRIgFlwf95fAx-I_sb2ZpelOZPIfhqTTj4use8Q,21309
+tests/test_git_error.py,sha256=lJcFlVwa1beP74fnTbn7pD8XKFLGgAL59XMYW3CF8W0,2618
+tests/test_git_error_parser.py,sha256=UuRwVN5awD5F9G7fg9dJLowRFMt-tYfXwOyedukO1-U,6008
+tests/test_git_runner.py,sha256=pVIaz2P2qbpIrcYBW-jCYA6HUD6uq6Ye7RDviDvoyyU,4365
+fancygit-1.0.0.dist-info/METADATA,sha256=wHhxrZOmQ0VFpzQHDuQmrYpolhUF_9KkuqS8BdvLlmg,4802
+fancygit-1.0.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+fancygit-1.0.0.dist-info/entry_points.txt,sha256=kUhjnub9IlB7qbE3w9KKKhKb8-QMdgLfAsTrD4Jhe_w,43
+fancygit-1.0.0.dist-info/top_level.txt,sha256=KW3xgkz9NLMTcmmzgKvW8RFpCFkRIQ085qzq2diFf68,10
+fancygit-1.0.0.dist-info/RECORD,,

fancygit-1.0.0.dist-info/WHEEL

@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (82.0.1)
+Root-Is-Purelib: true
+Tag: py3-none-any
+

fancygit-1.0.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+fancygit = fancygit:main

fancygit-1.0.0.dist-info/top_level.txt

@@ -0,0 +1,2 @@
+src
+tests

src/__init__.py

@@ -0,0 +1 @@
+# This file makes the src directory a Python package

src/colors.py

@@ -0,0 +1,260 @@
+#!/usr/bin/env python3
+"""
+FancyGit Color System
+Provides vibrant colors and styling for the CLI interface
+"""
+
+class Colors:
+    """ANSI color codes for vibrant terminal output"""
+    
+    # Reset
+    RESET = '\033[0m'
+    
+    # Check if terminal supports colors
+    SUPPORTS_COLOR = True
+    
+    @classmethod
+    def check_color_support(cls):
+        """Check if terminal supports colors"""
+        import os
+        # Check if NO_COLOR environment variable is set
+        if os.environ.get('NO_COLOR'):
+            cls.SUPPORTS_COLOR = False
+            return False
+        
+        # Check if TERM environment variable suggests no color support
+        term = os.environ.get('TERM', '').lower()
+        no_color_terms = ['dumb', 'unknown', 'unknown']
+        if any(no_color_term in term for no_color_term in no_color_terms):
+            cls.SUPPORTS_COLOR = False
+            return False
+        
+        # Check if we're not in a TTY
+        import sys
+        if not sys.stdout.isatty():
+            cls.SUPPORTS_COLOR = False
+            return False
+            
+        cls.SUPPORTS_COLOR = True
+        return True
+    
+    # Regular colors
+    BLACK = '\033[30m'
+    RED = '\033[31m'
+    GREEN = '\033[32m'
+    YELLOW = '\033[33m'
+    BLUE = '\033[34m'
+    MAGENTA = '\033[35m'
+    CYAN = '\033[36m'
+    WHITE = '\033[37m'
+    
+    # Bright colors
+    BRIGHT_BLACK = '\033[90m'
+    BRIGHT_RED = '\033[91m'
+    BRIGHT_GREEN = '\033[92m'
+    BRIGHT_YELLOW = '\033[93m'
+    BRIGHT_BLUE = '\033[94m'
+    BRIGHT_MAGENTA = '\033[95m'
+    BRIGHT_CYAN = '\033[96m'
+    BRIGHT_WHITE = '\033[97m'
+    
+    # Background colors
+    BG_BLACK = '\033[40m'
+    BG_RED = '\033[41m'
+    BG_GREEN = '\033[42m'
+    BG_YELLOW = '\033[43m'
+    BG_BLUE = '\033[44m'
+    BG_MAGENTA = '\033[45m'
+    BG_CYAN = '\033[46m'
+    BG_WHITE = '\033[47m'
+    
+    # Bright background colors
+    BG_BRIGHT_BLACK = '\033[100m'
+    BG_BRIGHT_RED = '\033[101m'
+    BG_BRIGHT_GREEN = '\033[102m'
+    BG_BRIGHT_YELLOW = '\033[103m'
+    BG_BRIGHT_BLUE = '\033[104m'
+    BG_BRIGHT_MAGENTA = '\033[105m'
+    BG_BRIGHT_CYAN = '\033[106m'
+    BG_BRIGHT_WHITE = '\033[107m'
+    
+    # Text styles
+    BOLD = '\033[1m'
+    DIM = '\033[2m'
+    ITALIC = '\033[3m'
+    UNDERLINE = '\033[4m'
+    BLINK = '\033[5m'
+    REVERSE = '\033[7m'
+    STRIKETHROUGH = '\033[9m'
+    
+    # FancyGit theme colors
+    PRIMARY = BRIGHT_BLUE
+    SECONDARY = BRIGHT_CYAN
+    ACCENT = BRIGHT_YELLOW
+    SUCCESS = BRIGHT_GREEN
+    WARNING = BRIGHT_YELLOW
+    ERROR = BRIGHT_RED
+    INFO = BRIGHT_MAGENTA
+    MUTED = BRIGHT_BLACK
+    
+    # Git-specific colors
+    GIT_ADD = SUCCESS
+    GIT_MODIFY = WARNING
+    GIT_DELETE = ERROR
+    GIT_RENAME = INFO
+    GIT_COPY = SECONDARY
+    GIT_CONFLICT = BG_BRIGHT_RED + WHITE + BOLD
+    
+    # Status indicators
+    STATUS_SUCCESS = '✅'
+    STATUS_ERROR = '❌'
+    STATUS_WARNING = '⚠️'
+    STATUS_INFO = 'ℹ️'
+    STATUS_LOADING = '🔄'
+    STATUS_AI = '🤖'
+    STATUS_BRAIN = '🧠'
+    
+    @classmethod
+    def colorize(cls, text: str, color: str, style: str = '') -> str:
+        """Apply color and style to text"""
+        if not cls.SUPPORTS_COLOR:
+            return text
+        return f"{style}{color}{text}{cls.RESET}"
+    
+    @classmethod
+    def command(cls, text: str) -> str:
+        """Color for command names"""
+        return cls.colorize(text, cls.PRIMARY, cls.BOLD)
+    
+    @classmethod
+    def success(cls, text: str) -> str:
+        """Color for success messages"""
+        return cls.colorize(text, cls.SUCCESS)
+    
+    @classmethod
+    def error(cls, text: str) -> str:
+        """Color for error messages"""
+        return cls.colorize(text, cls.ERROR, cls.BOLD)
+    
+    @classmethod
+    def warning(cls, text: str) -> str:
+        """Color for warning messages"""
+        return cls.colorize(text, cls.WARNING)
+    
+    @classmethod
+    def info(cls, text: str) -> str:
+        """Color for info messages"""
+        return cls.colorize(text, cls.INFO)
+    
+    @classmethod
+    def ai_response(cls, text: str) -> str:
+        """Color for AI responses"""
+        return cls.colorize(text, cls.SECONDARY, cls.ITALIC)
+    
+    @classmethod
+    def highlight(cls, text: str) -> str:
+        """Color for highlighted text"""
+        return cls.colorize(text, cls.ACCENT, cls.BOLD)
+    
+    @classmethod
+    def muted(cls, text: str) -> str:
+        """Color for muted text"""
+        return cls.colorize(text, cls.MUTED)
+    
+    @classmethod
+    def git_status(cls, status: str) -> str:
+        """Color for git status indicators"""
+        status_colors = {
+            'A': cls.GIT_ADD,      # Added
+            'M': cls.GIT_MODIFY,   # Modified
+            'D': cls.GIT_DELETE,   # Deleted
+            'R': cls.GIT_RENAME,   # Renamed
+            'C': cls.GIT_COPY,     # Copied
+            '??': cls.MUTED,       # Untracked
+            'UU': cls.GIT_CONFLICT # Conflict
+        }
+        color = status_colors.get(status, cls.WHITE)
+        return cls.colorize(status, color, cls.BOLD)
+    
+    @classmethod
+    def branch_name(cls, branch: str, is_current: bool = False) -> str:
+        """Color for branch names"""
+        if is_current:
+            return cls.colorize(branch, cls.BRIGHT_GREEN, cls.BOLD)
+        return cls.colorize(branch, cls.PRIMARY)
+    
+    @classmethod
+    def file_path(cls, path: str) -> str:
+        """Color for file paths"""
+        return cls.colorize(path, cls.BRIGHT_CYAN)
+    
+    @classmethod
+    def header(cls, text: str) -> str:
+        """Color for headers"""
+        return cls.colorize(text, cls.PRIMARY, cls.BOLD)
+    
+    @classmethod
+    def subheader(cls, text: str) -> str:
+        """Color for subheaders"""
+        return cls.colorize(text, cls.SECONDARY)
+    
+    @classmethod
+    def divider(cls, char: str = '=', length: int = 60) -> str:
+        """Create a colored divider"""
+        return cls.colorize(char * length, cls.MUTED)
+    
+    @classmethod
+    def progress_bar(cls, current: int, total: int, width: int = 20) -> str:
+        """Create a colored progress bar"""
+        filled = int(width * current / total)
+        bar = '█' * filled + '░' * (width - filled)
+        return cls.colorize(f'[{bar}] {current}/{total}', cls.SUCCESS)
+    
+    @classmethod
+    def rainbow_text(cls, text: str) -> str:
+        """Create rainbow-colored text"""
+        colors = [cls.RED, cls.BRIGHT_YELLOW, cls.GREEN, cls.CYAN, cls.BLUE, cls.MAGENTA]
+        result = []
+        for i, char in enumerate(text):
+            color = colors[i % len(colors)]
+            result.append(f"{color}{char}")
+        return ''.join(result) + cls.RESET
+    
+    @classmethod
+    def gradient_text(cls, text: str, start_color: str, end_color: str) -> str:
+        """Create gradient-colored text (simplified version)"""
+        # This is a simplified gradient - in a full implementation,
+        # you'd interpolate between RGB values
+        mid_point = len(text) // 2
+        first_half = text[:mid_point]
+        second_half = text[mid_point:]
+        
+        return f"{start_color}{first_half}{end_color}{second_half}{cls.RESET}"
+
+# Convenience functions for common color operations
+def color_command(text: str) -> str:
+    return Colors.command(text)
+
+def color_success(text: str) -> str:
+    return Colors.success(text)
+
+def color_error(text: str) -> str:
+    return Colors.error(text)
+
+def color_warning(text: str) -> str:
+    return Colors.warning(text)
+
+def color_info(text: str) -> str:
+    return Colors.info(text)
+
+def color_ai(text: str) -> str:
+    return Colors.ai_response(text)
+
+def color_header(text: str) -> str:
+    return Colors.header(text)
+
+def color_file(text: str) -> str:
+    return Colors.file_path(text)
+
+def color_branch(text: str, current: bool = False) -> str:
+    return Colors.branch_name(text, current)

src/git_error.py

@@ -0,0 +1,55 @@
+# this class will be an immutable dataclass
+# it will represent like the format of the data so we can then
+# pass it to the ai models so they can be fed a consistent and organized
+# json format that is both readable and can be easily extracted and 
+# worked on
+
+# dataclasses are suitable here because we will primarily use it to store the 
+# data and represent it
+# moreover to make it look cleaner without having to write an init method
+
+
+# the format will be like the following
+# {
+#   "type": "MERGE_CONFLICT",
+#   "source" : stdout || stderr
+#   "message": "error: Merge conflict in README.md",
+#   "severity": "error" || "warning",
+#   "file": "README.md",
+#   "line": null
+# }
+from dataclasses import dataclass
+from src.colors import Colors, color_error, color_warning, color_info, color_file
+
+@dataclass(frozen = True)   # we freeze it to make it immutable
+class GitError:
+    source: str 
+    message: str
+    severity: str = "unknown"
+    
+    type: str | None = None
+    file: str | None = None
+    line: int | None = None
+
+    def __str__(self) -> str:
+        severity_color = {
+            'error': color_error,
+            'warning': color_warning,
+            'info': color_info,
+            'unknown': lambda x: x
+        }.get(self.severity, lambda x: x)
+        
+        type_str = str(self.type) if self.type is not None else 'None'
+        file_str = str(self.file) if self.file is not None else 'N/A'
+        line_str = str(self.line) if self.line is not None else 'N/A'
+        
+        return (
+            f"{Colors.divider('=', 60)}\n"
+            f"type: {type_str}\n"
+            f"source: {str(self.source)}\n"
+            f"message: {str(self.message)}\n"
+            f"severity: {str(self.severity)}\n"
+            f"file: {file_str}\n"
+            f"line: {line_str}\n"
+            f"{Colors.divider('=', 60)}"
+        )

src/git_error_parser.py

@@ -0,0 +1,43 @@
+import re
+from src.git_error import GitError
+class GitErrorParser:
+    def __init__(self) -> None:
+        pass
+
+    def detect_warnings_errors(self, stdout, stderr):
+        """Detect warnings and errors in git output"""
+        messages = []
+
+        def scan_patterns(patterns, text, type, source):
+            for pattern in patterns:
+                for match in re.findall(f'{pattern}.*', text, re.IGNORECASE | re.MULTILINE):
+                    messages.append(GitError(severity = type, source=source, message=match.strip()))
+        
+        # Common git error patterns (more specific to avoid false positives)
+        error_patterns = [
+            r'fatal:',
+            r'error:',
+            r'\bfailed\b',
+            r'\brejected\b',
+            r'merge conflict',
+            r'\bconflict\b',
+            r'unable to',
+            r'\.git.*error:',
+            r'^(?!.*error:).*pathspec.*did not match'
+        ]
+        
+        # Common git warning patterns (more specific to avoid false positives)
+        warning_patterns = [
+            r'warning:',
+            r'WARNING:',
+            r'.*behind.*by\s+\d+.*',
+            r'.*ahead.*by\s+\d+.*',
+            r'\bdiverged\b'
+        ]
+
+        scan_patterns(error_patterns, stdout, "error", "stdout")
+        scan_patterns(warning_patterns, stdout, "warning", "stdout")
+        scan_patterns(error_patterns, stderr, "error", "stderr")
+        scan_patterns(warning_patterns, stderr, "warning", "stderr")
+
+        return messages