fancygit 1.0.19__tar.gz → 1.0.20__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fancygit
-Version: 1.0.19
+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.19 → fancygit-1.0.20}/fancygit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fancygit
-Version: 1.0.19
+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.19 → 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.19 → 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.19 → 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.19 → 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.19 → 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.19/VERSION

@@ -1 +0,0 @@
-1.0.19