fancygit 1.0.18__tar.gz → 1.0.20__tar.gz

{fancygit-1.0.18 → fancygit-1.0.20}/MANIFEST.in

@@ -7,5 +7,6 @@ include welcome.py
 include fancygit.py
 recursive-include src *.py
 recursive-include tests *.py
+recursive-include images *.png *.jpg *.jpeg *.gif
 global-exclude *.pyc
 global-exclude __pycache__

{fancygit-1.0.18 → fancygit-1.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fancygit
-Version: 1.0.18
+Version: 1.0.20
 Summary: A smart CLI tool that provides intelligent recommendations and helps solve merge conflicts
 Author: Youssif Ashmawy
 Author-email: ashmawyyoussif@gmail.com

fancygit-1.0.20/VERSION

@@ -0,0 +1 @@
+1.0.20

{fancygit-1.0.18 → fancygit-1.0.20}/fancygit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fancygit
-Version: 1.0.18
+Version: 1.0.20
 Summary: A smart CLI tool that provides intelligent recommendations and helps solve merge conflicts
 Author: Youssif Ashmawy
 Author-email: ashmawyyoussif@gmail.com

{fancygit-1.0.18 → fancygit-1.0.20}/fancygit.egg-info/SOURCES.txt

@@ -18,6 +18,11 @@ fancygit.egg-info/dependency_links.txt
 fancygit.egg-info/entry_points.txt
 fancygit.egg-info/requires.txt
 fancygit.egg-info/top_level.txt
+images/Logo.png
+images/Logo_with_name.png
+images/dark_background_logo.png
+images/light_background_logo.png
+images/overview.png
 src/__init__.py
 src/ai_engine.py
 src/colors.py

{fancygit-1.0.18 → fancygit-1.0.20}/fancygit.py

@@ -136,69 +136,6 @@ class FancyGit:
         print(color_warning(f"Warning: {commands_file} not found. No commands available."))
         return []
     
-    ## Keep these functions for now
-    def _load_confirmation_state(self):
-        """Load confirmation state from config file"""
-        config_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), '.fancygit_config')
-        try:
-            with open(config_file, 'r') as f:
-                for line in f:
-                    if line.startswith('confirmation_enabled='):
-                        return line.strip().split('=')[1].lower() == 'true'
-        except FileNotFoundError:
-            pass
-        return True  # Default to enabled
-    
-    def _load_ai_analysis_state(self):
-        """Load AI analysis state from config file"""
-        config_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), '.fancygit_config')
-        try:
-            with open(config_file, 'r') as f:
-                for line in f:
-                    if line.startswith('ai_analysis_enabled='):
-                        return line.strip().split('=')[1].lower() == 'true'
-        except FileNotFoundError:
-            pass
-        return True  # Default to enabled
-    
-    def _load_animation_type(self):
-        """Load loading animation type from config file"""
-        config_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), '.fancygit_config')
-        try:
-            with open(config_file, 'r') as f:
-                for line in f:
-                    if line.startswith('loading_animation='):
-                        anim_type = line.strip().split('=')[1].strip()
-                        valid_types = ['run', 'dots', 'progress', 'matrix', 'brain']
-                        if anim_type in valid_types:
-                            return anim_type
-        except FileNotFoundError:
-            pass
-        return 'dots'  # Default to dots animation
-    
-    def _load_output_coloring_state(self):
-        """Load output coloring state from config file"""
-        config_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), '.fancygit_config')
-        try:
-            with open(config_file, 'r') as f:
-                for line in f:
-                    if line.startswith('output_coloring_enabled='):
-                        return line.strip().split('=')[1].lower() == 'true'
-        except FileNotFoundError:
-            pass
-        return True  # Default to enabled
-    
-    def _save_confirmation_state(self):
-        """Save confirmation state to config file"""
-        try:
-            with open(self.config_file, 'w') as f:
-                f.write(f'confirmation_enabled={self.confirmation_enabled}\n')
-                f.write(f'ai_analysis_enabled={self.ai_analysis_enabled}\n')
-                f.write(f'output_coloring_enabled={self.output_coloring_enabled}\n')
-                f.write(f'loading_animation={self.loading_animation_type}\n')
-        except Exception as e:
-            print(color_warning(f"Warning: Could not save confirmation state: {e}"))
-    
     def toggle_confirmation(self, enable=None):
         """Toggle confirmation messages before executing commands
         

{fancygit-1.0.18 → fancygit-1.0.20}/setup.py

@@ -15,7 +15,10 @@ class CustomBuildPy(_build_py):
             shutil.copy('.fancygit_config', os.path.join(build_lib, '.fancygit_config'))
             # Copy images folder for logo files
             if os.path.exists('images'):
-                shutil.copytree('images', os.path.join(build_lib, 'images'))
+                images_build_dir = os.path.join(build_lib, 'images')
+                if os.path.exists(images_build_dir):
+                    shutil.rmtree(images_build_dir)
+                shutil.copytree('images', images_build_dir)
 
 import os
 
@@ -67,6 +70,18 @@ setup(
     packages=find_packages(),
     py_modules=["fancygit", "welcome"],
     include_package_data=True,
+    package_data={
+        '': ['images/*.png', 'images/*.jpg', 'images/*.jpeg', 'images/*.gif'],
+    },
+    data_files=[
+        ('share/fancygit/images', [
+            'images/Logo.png',
+            'images/Logo_with_name.png', 
+            'images/dark_background_logo.png',
+            'images/light_background_logo.png',
+            'images/overview.png'
+        ]),
+    ],
     cmdclass={'build_py': CustomBuildPy},
     classifiers=[
         "Development Status :: 4 - Beta",

{fancygit-1.0.18 → fancygit-1.0.20}/src/mermaid_export.py

@@ -3,11 +3,90 @@ import os
 import re
 import textwrap
 from datetime import datetime
+try:
+    import importlib.resources as resources
+except ImportError:
+    import importlib_resources as resources
 
 
 class MermaidExporter:
     def __init__(self, runner):
         self.runner = runner
+        self._image_base_path = self._get_image_base_path()
+
+    def _get_image_base_path(self) -> str:
+        """Get the base path for images, handling both development and installed environments"""
+        # Try to get the path from installed package data first
+        try:
+            # When installed, try to find images in the package
+            if resources.is_resource('fancygit', 'images'):
+                return resources.files('fancygit').joinpath('images')
+        except Exception:
+            pass
+        
+        # Fallback to development environment - look relative to this file
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        project_root = os.path.dirname(current_dir)
+        images_path = os.path.join(project_root, 'images')
+        
+        if os.path.exists(images_path):
+            return images_path
+        
+        # Final fallback - assume images are in the same directory as the HTML
+        return '.'
+
+    def _get_image_url(self, image_name: str) -> str:
+        """Get proper URL for image files"""
+        # First try to get the file as a resource (installed package)
+        try:
+            if resources.is_resource('fancygit', f'images/{image_name}'):
+                # For installed packages, we'll embed the image as base64
+                image_path = resources.files('fancygit').joinpath('images', image_name)
+                if hasattr(image_path, 'read_bytes'):
+                    # Python 3.9+ Path object
+                    return self._bytes_to_base64(image_path.read_bytes(), image_name)
+                elif os.path.exists(str(image_path)):
+                    return self._image_to_base64(str(image_path))
+        except Exception:
+            pass
+        
+        # In development, use absolute path
+        abs_path = os.path.join(self._image_base_path, image_name)
+        if os.path.exists(abs_path):
+            return self._image_to_base64(abs_path)
+        
+        # If not found, return empty string to avoid broken images
+        return ''
+
+    def _bytes_to_base64(self, image_bytes: bytes, image_name: str) -> str:
+        """Convert image bytes to base64 data URL"""
+        try:
+            import base64
+            encoded = base64.b64encode(image_bytes).decode('utf-8')
+            
+            # Determine MIME type
+            if image_name.lower().endswith('.png'):
+                mime_type = 'image/png'
+            elif image_name.lower().endswith(('.jpg', '.jpeg')):
+                mime_type = 'image/jpeg'
+            elif image_name.lower().endswith('.gif'):
+                mime_type = 'image/gif'
+            else:
+                mime_type = 'image/png'  # default
+            
+            return f'data:{mime_type};base64,{encoded}'
+        except Exception:
+            return ''
+
+    def _image_to_base64(self, image_path: str) -> str:
+        """Convert image file to base64 data URL"""
+        try:
+            with open(image_path, 'rb') as img_file:
+                image_bytes = img_file.read()
+                image_name = os.path.basename(image_path)
+                return self._bytes_to_base64(image_bytes, image_name)
+        except Exception:
+            return ''
 
     def _git(self, args):
         return self.runner.run_git_command(args)
@@ -456,6 +535,10 @@ class MermaidExporter:
     def build_html(self, diagrams: dict, title: str = 'FancyGit Repository Visualization') -> str:
         payload = json.dumps(diagrams)
         now = datetime.now().isoformat(timespec='seconds')
+        
+        # Get proper image URLs
+        light_logo_url = self._get_image_url('light_background_logo.png')
+        dark_logo_url = self._get_image_url('dark_background_logo.png')
 
         return textwrap.dedent(
             f"""\
@@ -551,7 +634,7 @@ class MermaidExporter:
                   .logo {{
                     width: 80px;
                     height: 80px;
-                    background-image: url('../images/light_background_logo.png');
+                    background-image: url('{light_logo_url}');
                     background-size: contain;
                     background-repeat: no-repeat;
                     background-position: center;
@@ -563,7 +646,7 @@ class MermaidExporter:
                   }}
                   
                   [data-theme="dark"] .logo {{
-                    background-image: url('../images/dark_background_logo.png');
+                    background-image: url('{dark_logo_url}');
                   }}
 
                   .meta {{

{fancygit-1.0.18 → fancygit-1.0.20}/tests/test_conflict_parser_integration.py

@@ -20,10 +20,12 @@ class TestConflictParserIntegration:
         """Setup method called before each test"""
         # Initialize FancyGit with mocked config
         with patch.object(FancyGit, '_load_commands', return_value=['add', 'commit', 'push', 'pull']):
-            with patch.object(FancyGit, '_load_confirmation_state', return_value=True):
-                with patch.object(FancyGit, '_load_ai_analysis_state', return_value=False):
-                    with patch.object(FancyGit, '_load_animation_type', return_value='simple'):
-                        self.fancy_git = FancyGit()
+            with patch('src.config_manager.ConfigManager'):
+                self.fancy_git = FancyGit()
+                # Configure test settings
+                self.fancy_git.config_manager.config.confirmation_enabled = True
+                self.fancy_git.config_manager.config.ai_analysis_enabled = False
+                self.fancy_git.config_manager.config.loading_animation = 'simple'
     
     def test_conflict_parser_no_conflicts(self, temp_git_repo):
         """Test conflict parser when no conflicts exist"""

{fancygit-1.0.18 → fancygit-1.0.20}/tests/test_fancygit_advanced.py

@@ -20,13 +20,14 @@ class TestFancyGitAdvancedCommands:
             'notes', 'range-diff', 'restore', 'revert', 'shortlog', 'show',
             'sparse-checkout', 'submodule', 'switch', 'tag', 'worktree', 'log', 'status'
         ]):
-            with patch.object(FancyGit, '_load_ai_analysis_state', return_value=False):
-                with patch.object(FancyGit, '_load_output_coloring_state', return_value=False):
-                    with patch.object(FancyGit, '_load_animation_type', return_value='dots'):
-                        with patch('builtins.input', return_value='y'):
-                            self.fancy_git = FancyGit()
-                            # Disable confirmation directly on config
-                            self.fancy_git.config_manager.config.confirmation_enabled = False
+            with patch('src.config_manager.ConfigManager'):
+                with patch('builtins.input', return_value='y'):
+                    self.fancy_git = FancyGit()
+                    # Configure test settings
+                    self.fancy_git.config_manager.config.ai_analysis_enabled = False
+                    self.fancy_git.config_manager.config.output_coloring_enabled = False
+                    self.fancy_git.config_manager.config.loading_animation = 'dots'
+                    self.fancy_git.config_manager.config.confirmation_enabled = False
     
     @patch('src.git_runner.GitRunner.run_git_command')
     def test_archive_command(self, mock_run_git):

{fancygit-1.0.18 → fancygit-1.0.20}/tests/test_fancygit_commands.py

@@ -20,13 +20,14 @@ class TestFancyGitCommands:
             'merge', 'rebase', 'reset', 'log', 'diff', 'stash', 'rm', 'mv',
             'welcome', 'confirmation', 'ai', 'colors', 'insights', 'visualize'
         ]):
-            with patch.object(FancyGit, '_load_ai_analysis_state', return_value=False):
-                with patch.object(FancyGit, '_load_output_coloring_state', return_value=False):
-                    with patch.object(FancyGit, '_load_animation_type', return_value='dots'):
-                        with patch('builtins.input', return_value='y'):
-                            self.fancy_git = FancyGit()
-                            # Disable confirmation directly on config
-                            self.fancy_git.config_manager.config.confirmation_enabled = False
+            with patch('src.config_manager.ConfigManager'):
+                with patch('builtins.input', return_value='y'):
+                    self.fancy_git = FancyGit()
+                    # Configure test settings
+                    self.fancy_git.config_manager.config.ai_analysis_enabled = False
+                    self.fancy_git.config_manager.config.output_coloring_enabled = False
+                    self.fancy_git.config_manager.config.loading_animation = 'dots'
+                    self.fancy_git.config_manager.config.confirmation_enabled = False
     
     @patch('src.git_runner.GitRunner.run_git_command')
     def test_add_command_success(self, mock_run_git):

{fancygit-1.0.18 → fancygit-1.0.20}/tests/test_fancygit_workflows.py

@@ -19,11 +19,13 @@ class TestFancyGitCommandWorkflows:
             'merge', 'rebase', 'reset', 'log', 'diff', 'stash', 'rm', 'mv', 'revert',
             'welcome', 'confirmation', 'ai', 'colors', 'insights', 'visualize'
         ]):
-            with patch.object(FancyGit, '_load_confirmation_state', return_value=False):
-                with patch.object(FancyGit, '_load_ai_analysis_state', return_value=False):
-                    with patch.object(FancyGit, '_load_output_coloring_state', return_value=False):
-                        with patch.object(FancyGit, '_load_animation_type', return_value='dots'):
-                            self.fancy_git = FancyGit()
+            with patch('src.config_manager.ConfigManager'):
+                self.fancy_git = FancyGit()
+                # Configure test settings
+                self.fancy_git.config_manager.config.confirmation_enabled = False
+                self.fancy_git.config_manager.config.ai_analysis_enabled = False
+                self.fancy_git.config_manager.config.output_coloring_enabled = False
+                self.fancy_git.config_manager.config.loading_animation = 'dots'
     
     @patch('src.git_runner.GitRunner.run_git_command')
     def test_complete_add_commit_workflow(self, mock_run_git):
@@ -211,11 +213,13 @@ class TestFancyGitSpecialCommandWorkflows:
             'merge', 'rebase', 'reset', 'log', 'diff', 'stash', 'rm', 'mv',
             'welcome', 'confirmation', 'ai', 'colors', 'insights', 'visualize'
         ]):
-            with patch.object(FancyGit, '_load_confirmation_state', return_value=False):
-                with patch.object(FancyGit, '_load_ai_analysis_state', return_value=False):
-                    with patch.object(FancyGit, '_load_output_coloring_state', return_value=False):
-                        with patch.object(FancyGit, '_load_animation_type', return_value='dots'):
-                            self.fancy_git = FancyGit()
+            with patch('src.config_manager.ConfigManager'):
+                self.fancy_git = FancyGit()
+                # Configure test settings
+                self.fancy_git.config_manager.config.confirmation_enabled = False
+                self.fancy_git.config_manager.config.ai_analysis_enabled = False
+                self.fancy_git.config_manager.config.output_coloring_enabled = False
+                self.fancy_git.config_manager.config.loading_animation = 'dots'
     
     @patch('src.git_runner.GitRunner.run_git_command')
     def test_ai_error_analysis_workflow(self, mock_run_git):
@@ -345,11 +349,13 @@ class TestFancyGitErrorRecoveryWorkflows:
     def setup_method(self):
         """Setup method called before each test"""
         with patch.object(FancyGit, '_load_commands', return_value=['add', 'commit', 'push', 'pull', 'status']):
-            with patch.object(FancyGit, '_load_confirmation_state', return_value=False):
-                with patch.object(FancyGit, '_load_ai_analysis_state', return_value=False):
-                    with patch.object(FancyGit, '_load_output_coloring_state', return_value=False):
-                        with patch.object(FancyGit, '_load_animation_type', return_value='dots'):
-                            self.fancy_git = FancyGit()
+            with patch('src.config_manager.ConfigManager'):
+                self.fancy_git = FancyGit()
+                # Configure test settings
+                self.fancy_git.config_manager.config.confirmation_enabled = False
+                self.fancy_git.config_manager.config.ai_analysis_enabled = False
+                self.fancy_git.config_manager.config.output_coloring_enabled = False
+                self.fancy_git.config_manager.config.loading_animation = 'dots'
     
     @patch('src.git_runner.GitRunner.run_git_command')
     def test_network_error_recovery(self, mock_run_git):

fancygit-1.0.18/VERSION

@@ -1 +0,0 @@
-1.0.18