git-commit-msg-ai 1.4.0__tar.gz → 1.4.1__tar.gz

{git_commit_msg_ai-1.4.0 → git_commit_msg_ai-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-msg-ai
-Version: 1.4.0
+Version: 1.4.1
 Summary: AI-powered git commit message generator following Conventional Commits
 License-Expression: MIT
 Requires-Python: >=3.10
@@ -53,9 +53,9 @@ The tool will:
 [a]ccept / [e]dit / [r]eject:
 ```
 
-- **a** — commits immediately with the generated message
-- **e** — opens the message in your `$EDITOR` (defaults to `notepad` on Windows, `vi` on Linux/macOS), lets you modify it, then commits
-- **r** — exits without committing
+- **a** - commits immediately with the generated message
+- **e** - opens the message in your `$EDITOR` (defaults to `notepad` on Windows, `vi` on Linux/macOS), lets you modify it, then commits
+- **r** - exits without committing
 
 ## Commit message format
 

{git_commit_msg_ai-1.4.0 → git_commit_msg_ai-1.4.1}/README.md

@@ -39,9 +39,9 @@ The tool will:
 [a]ccept / [e]dit / [r]eject:
 ```
 
-- **a** — commits immediately with the generated message
-- **e** — opens the message in your `$EDITOR` (defaults to `notepad` on Windows, `vi` on Linux/macOS), lets you modify it, then commits
-- **r** — exits without committing
+- **a** - commits immediately with the generated message
+- **e** - opens the message in your `$EDITOR` (defaults to `notepad` on Windows, `vi` on Linux/macOS), lets you modify it, then commits
+- **r** - exits without committing
 
 ## Commit message format
 

{git_commit_msg_ai-1.4.0 → git_commit_msg_ai-1.4.1}/git_commit_msg_ai/git_ops.py

@@ -1,11 +1,19 @@
 import subprocess
+from typing import Final
 
 from git_commit_msg_ai.exceptions import GitError
 
+GIT_COMMAND: Final[str] = 'git'
+DIFF_SUBCOMMAND: Final[str] = 'diff'
+CACHED_FLAG: Final[str] = '--cached'
+COMMIT_SUBCOMMAND: Final[str] = 'commit'
+MESSAGE_FLAG: Final[str] = '-m'
+UTF8_ENCODING: Final[str] = 'utf-8'
+
 
 def get_staged_diff() -> str:
     try:
-        staged_diff = subprocess.check_output(['git', 'diff', '--cached']).decode('utf-8')
+        staged_diff = subprocess.check_output([GIT_COMMAND, DIFF_SUBCOMMAND, CACHED_FLAG]).decode(UTF8_ENCODING)
     except FileNotFoundError:
         raise GitError('git is not installed or not on PATH.')
     except subprocess.CalledProcessError:
@@ -21,7 +29,7 @@ def get_staged_diff() -> str:
 
 def commit(message: str) -> None:
     try:
-        subprocess.run(['git', 'commit', '-m', message], check=True)
+        subprocess.run([GIT_COMMAND, COMMIT_SUBCOMMAND, MESSAGE_FLAG, message], check=True)
     except FileNotFoundError:
         raise GitError('git is not installed or not on PATH.')
     except subprocess.CalledProcessError:

{git_commit_msg_ai-1.4.0 → git_commit_msg_ai-1.4.1}/git_commit_msg_ai.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-msg-ai
-Version: 1.4.0
+Version: 1.4.1
 Summary: AI-powered git commit message generator following Conventional Commits
 License-Expression: MIT
 Requires-Python: >=3.10
@@ -53,9 +53,9 @@ The tool will:
 [a]ccept / [e]dit / [r]eject:
 ```
 
-- **a** — commits immediately with the generated message
-- **e** — opens the message in your `$EDITOR` (defaults to `notepad` on Windows, `vi` on Linux/macOS), lets you modify it, then commits
-- **r** — exits without committing
+- **a** - commits immediately with the generated message
+- **e** - opens the message in your `$EDITOR` (defaults to `notepad` on Windows, `vi` on Linux/macOS), lets you modify it, then commits
+- **r** - exits without committing
 
 ## Commit message format
 

{git_commit_msg_ai-1.4.0 → git_commit_msg_ai-1.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "git-commit-msg-ai"
-version = "1.4.0"
+version = "1.4.1"
 description = "AI-powered git commit message generator following Conventional Commits"
 readme = "README.md"
 license = "MIT"

{git_commit_msg_ai-1.4.0 → git_commit_msg_ai-1.4.1}/tests/test_ai_client.py

@@ -1,3 +1,4 @@
+from contextlib import ExitStack
 from unittest.mock import MagicMock, patch
 
 import anthropic
@@ -26,7 +27,8 @@ def _make_status_error(exception_class: type[anthropic.APIStatusError], status_c
 
 class TestGenerateCommitMessage:
     def test_returns_stripped_commit_message(self) -> None:
-        with patch('git_commit_msg_ai.ai_client.anthropic.Anthropic') as mock_anthropic_class:
+        with ExitStack() as stack:
+            mock_anthropic_class = stack.enter_context(patch('git_commit_msg_ai.ai_client.anthropic.Anthropic'))
             mock_client = MagicMock()
             mock_client.messages.create.return_value = _make_api_response('  feat: add feature  ')
             mock_anthropic_class.return_value = mock_client
@@ -36,7 +38,8 @@ class TestGenerateCommitMessage:
         assert result == 'feat: add feature'
 
     def test_raises_ai_error_on_authentication_error(self) -> None:
-        with patch('git_commit_msg_ai.ai_client.anthropic.Anthropic') as mock_anthropic_class:
+        with ExitStack() as stack:
+            mock_anthropic_class = stack.enter_context(patch('git_commit_msg_ai.ai_client.anthropic.Anthropic'))
             mock_client = MagicMock()
             mock_client.messages.create.side_effect = _make_status_error(anthropic.AuthenticationError, 401)
             mock_anthropic_class.return_value = mock_client
@@ -45,7 +48,8 @@ class TestGenerateCommitMessage:
                 generate_commit_message('diff content')
 
     def test_raises_ai_error_on_rate_limit_error(self) -> None:
-        with patch('git_commit_msg_ai.ai_client.anthropic.Anthropic') as mock_anthropic_class:
+        with ExitStack() as stack:
+            mock_anthropic_class = stack.enter_context(patch('git_commit_msg_ai.ai_client.anthropic.Anthropic'))
             mock_client = MagicMock()
             mock_client.messages.create.side_effect = _make_status_error(anthropic.RateLimitError, 429)
             mock_anthropic_class.return_value = mock_client
@@ -56,7 +60,8 @@ class TestGenerateCommitMessage:
     def test_raises_ai_error_on_api_connection_error(self) -> None:
         mock_request = MagicMock()
 
-        with patch('git_commit_msg_ai.ai_client.anthropic.Anthropic') as mock_anthropic_class:
+        with ExitStack() as stack:
+            mock_anthropic_class = stack.enter_context(patch('git_commit_msg_ai.ai_client.anthropic.Anthropic'))
             mock_client = MagicMock()
             mock_client.messages.create.side_effect = anthropic.APIConnectionError(request=mock_request)
             mock_anthropic_class.return_value = mock_client
@@ -65,7 +70,8 @@ class TestGenerateCommitMessage:
                 generate_commit_message('diff content')
 
     def test_raises_ai_error_on_api_status_error_with_status_code(self) -> None:
-        with patch('git_commit_msg_ai.ai_client.anthropic.Anthropic') as mock_anthropic_class:
+        with ExitStack() as stack:
+            mock_anthropic_class = stack.enter_context(patch('git_commit_msg_ai.ai_client.anthropic.Anthropic'))
             mock_client = MagicMock()
             mock_client.messages.create.side_effect = _make_status_error(anthropic.APIStatusError, 500)
             mock_anthropic_class.return_value = mock_client

git_commit_msg_ai-1.4.1/tests/test_cli.py

@@ -0,0 +1,149 @@
+from contextlib import ExitStack
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from git_commit_msg_ai.cli import main
+from git_commit_msg_ai.exceptions import AIError, GitError
+
+COMMIT_MESSAGE = 'feat: add feature'
+EDITED_COMMIT_MESSAGE = 'edited commit message'
+STAGED_DIFF = 'diff content'
+GENERIC_COMMIT_MESSAGE = 'generic commit message'
+
+
+class TestMain:
+    def _run_with_input(self, user_input: str, commit_message: str = COMMIT_MESSAGE) -> tuple[MagicMock, MagicMock, MagicMock]:
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
+
+        mock_ai_client = MagicMock()
+        mock_ai_client.generate_commit_message.return_value = commit_message
+
+        mock_editor = MagicMock()
+        mock_editor.open_in_editor.return_value = EDITED_COMMIT_MESSAGE
+
+        with ExitStack() as stack:
+            stack.enter_context(patch('git_commit_msg_ai.cli.git_ops', mock_git_ops))
+            stack.enter_context(patch('git_commit_msg_ai.cli.ai_client', mock_ai_client))
+            stack.enter_context(patch('git_commit_msg_ai.cli.editor', mock_editor))
+            stack.enter_context(patch('builtins.input', return_value=user_input))
+            main()
+
+        return mock_git_ops, mock_ai_client, mock_editor
+
+    def test_accept_calls_commit_with_generated_message(self) -> None:
+        mock_git_ops, _, _ = self._run_with_input('a', COMMIT_MESSAGE)
+
+        mock_git_ops.commit.assert_called_once_with(COMMIT_MESSAGE)
+
+    def test_edit_opens_editor_then_commits_edited_message(self) -> None:
+        mock_git_ops, _, mock_editor = self._run_with_input('e', COMMIT_MESSAGE)
+
+        mock_editor.open_in_editor.assert_called_once_with(COMMIT_MESSAGE)
+        mock_git_ops.commit.assert_called_once_with(EDITED_COMMIT_MESSAGE)
+
+    def test_reject_does_not_commit(self) -> None:
+        mock_git_ops, _, _ = self._run_with_input('r')
+
+        mock_git_ops.commit.assert_not_called()
+
+    def test_invalid_input_exits_with_code_1(self) -> None:
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
+
+        mock_ai_client = MagicMock()
+        mock_ai_client.generate_commit_message.return_value = GENERIC_COMMIT_MESSAGE
+
+        with ExitStack() as stack:
+            stack.enter_context(patch('git_commit_msg_ai.cli.git_ops', mock_git_ops))
+            stack.enter_context(patch('git_commit_msg_ai.cli.ai_client', mock_ai_client))
+            stack.enter_context(patch('git_commit_msg_ai.cli.editor'))
+            stack.enter_context(patch('builtins.input', return_value='x'))
+            with pytest.raises(SystemExit) as exc_info:
+                main()
+
+        assert exc_info.value.code == 1
+
+    def test_git_error_from_get_staged_diff_exits_with_message(self, capsys: pytest.CaptureFixture[str]) -> None:
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.side_effect = GitError('staged error')
+
+        with ExitStack() as stack:
+            stack.enter_context(patch('git_commit_msg_ai.cli.git_ops', mock_git_ops))
+            with pytest.raises(SystemExit) as exc_info:
+                main()
+
+        assert exc_info.value.code == 1
+        assert 'staged error' in capsys.readouterr().out
+
+    def test_ai_error_from_generate_commit_message_exits_with_message(self, capsys: pytest.CaptureFixture[str]) -> None:
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
+
+        mock_ai_client = MagicMock()
+        mock_ai_client.generate_commit_message.side_effect = AIError('ai error')
+
+        with ExitStack() as stack:
+            stack.enter_context(patch('git_commit_msg_ai.cli.git_ops', mock_git_ops))
+            stack.enter_context(patch('git_commit_msg_ai.cli.ai_client', mock_ai_client))
+            with pytest.raises(SystemExit) as exc_info:
+                main()
+
+        assert exc_info.value.code == 1
+        assert 'ai error' in capsys.readouterr().out
+
+    def test_git_error_from_commit_exits_with_message(self, capsys: pytest.CaptureFixture[str]) -> None:
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
+        mock_git_ops.commit.side_effect = GitError('commit error')
+
+        mock_ai_client = MagicMock()
+        mock_ai_client.generate_commit_message.return_value = GENERIC_COMMIT_MESSAGE
+
+        with ExitStack() as stack:
+            stack.enter_context(patch('git_commit_msg_ai.cli.git_ops', mock_git_ops))
+            stack.enter_context(patch('git_commit_msg_ai.cli.ai_client', mock_ai_client))
+            stack.enter_context(patch('git_commit_msg_ai.cli.editor'))
+            stack.enter_context(patch('builtins.input', return_value='a'))
+            with pytest.raises(SystemExit) as exc_info:
+                main()
+
+        assert exc_info.value.code == 1
+        assert 'commit error' in capsys.readouterr().out
+
+    def test_keyboard_interrupt_exits_with_aborted_message(self, capsys: pytest.CaptureFixture[str]) -> None:
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
+
+        mock_ai_client = MagicMock()
+        mock_ai_client.generate_commit_message.return_value = GENERIC_COMMIT_MESSAGE
+
+        with ExitStack() as stack:
+            stack.enter_context(patch('git_commit_msg_ai.cli.git_ops', mock_git_ops))
+            stack.enter_context(patch('git_commit_msg_ai.cli.ai_client', mock_ai_client))
+            stack.enter_context(patch('git_commit_msg_ai.cli.editor'))
+            stack.enter_context(patch('builtins.input', side_effect=KeyboardInterrupt))
+            with pytest.raises(SystemExit) as exc_info:
+                main()
+
+        assert exc_info.value.code == 1
+        assert 'Aborted.' in capsys.readouterr().out
+
+    def test_eof_error_exits_with_aborted_message(self, capsys: pytest.CaptureFixture[str]) -> None:
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
+
+        mock_ai_client = MagicMock()
+        mock_ai_client.generate_commit_message.return_value = GENERIC_COMMIT_MESSAGE
+
+        with ExitStack() as stack:
+            stack.enter_context(patch('git_commit_msg_ai.cli.git_ops', mock_git_ops))
+            stack.enter_context(patch('git_commit_msg_ai.cli.ai_client', mock_ai_client))
+            stack.enter_context(patch('git_commit_msg_ai.cli.editor'))
+            stack.enter_context(patch('builtins.input', side_effect=EOFError))
+            with pytest.raises(SystemExit) as exc_info:
+                main()
+
+        assert exc_info.value.code == 1
+        assert 'Aborted.' in capsys.readouterr().out

{git_commit_msg_ai-1.4.0 → git_commit_msg_ai-1.4.1}/tests/test_editor.py

@@ -10,6 +10,11 @@ from git_commit_msg_ai.editor import get_default_editor, open_in_editor
 from git_commit_msg_ai.exceptions import EditorError
 
 TEMP_FILE_PATH = os.path.join(tempfile.gettempdir(), 'tmpfile.txt')
+INITIAL_TEXT = 'initial text'
+EDITED_TEXT_WITH_WHITESPACE = '  edited text  '
+EDITED_TEXT = 'edited text'
+GENERIC_TEXT = 'text'
+VIM_EDITOR = 'vim'
 
 
 def _make_named_temporary_file_mock() -> MagicMock:
@@ -35,24 +40,24 @@ class TestOpenInEditor:
         with ExitStack() as stack:
             stack.enter_context(patch('git_commit_msg_ai.editor.tempfile.NamedTemporaryFile', return_value=_make_named_temporary_file_mock()))
             stack.enter_context(patch('git_commit_msg_ai.editor.subprocess.run'))
-            stack.enter_context(patch('git_commit_msg_ai.editor.open', return_value=_make_open_mock('  edited text  ')))
+            stack.enter_context(patch('git_commit_msg_ai.editor.open', return_value=_make_open_mock(EDITED_TEXT_WITH_WHITESPACE)))
             stack.enter_context(patch('git_commit_msg_ai.editor.os.unlink'))
 
-            result = open_in_editor('initial text')
+            result = open_in_editor(INITIAL_TEXT)
 
-        assert result == 'edited text'
+        assert result == EDITED_TEXT
 
     def test_uses_editor_env_var(self) -> None:
         with ExitStack() as stack:
             stack.enter_context(patch('git_commit_msg_ai.editor.tempfile.NamedTemporaryFile', return_value=_make_named_temporary_file_mock()))
             mock_run = stack.enter_context(patch('git_commit_msg_ai.editor.subprocess.run'))
-            stack.enter_context(patch('git_commit_msg_ai.editor.open', return_value=_make_open_mock('text')))
+            stack.enter_context(patch('git_commit_msg_ai.editor.open', return_value=_make_open_mock(GENERIC_TEXT)))
             stack.enter_context(patch('git_commit_msg_ai.editor.os.unlink'))
-            stack.enter_context(patch('git_commit_msg_ai.editor.os.environ.get', return_value='vim'))
+            stack.enter_context(patch('git_commit_msg_ai.editor.os.environ.get', return_value=VIM_EDITOR))
 
-            open_in_editor('initial text')
+            open_in_editor(INITIAL_TEXT)
 
-        mock_run.assert_called_once_with(['vim', TEMP_FILE_PATH], check=True)
+        mock_run.assert_called_once_with([VIM_EDITOR, TEMP_FILE_PATH], check=True)
 
     def test_falls_back_to_platform_default_when_editor_not_set(self) -> None:
         sentinel_editor = 'test-sentinel-editor'
@@ -60,12 +65,12 @@ class TestOpenInEditor:
         with ExitStack() as stack:
             stack.enter_context(patch('git_commit_msg_ai.editor.tempfile.NamedTemporaryFile', return_value=_make_named_temporary_file_mock()))
             mock_run = stack.enter_context(patch('git_commit_msg_ai.editor.subprocess.run'))
-            stack.enter_context(patch('git_commit_msg_ai.editor.open', return_value=_make_open_mock('text')))
+            stack.enter_context(patch('git_commit_msg_ai.editor.open', return_value=_make_open_mock(GENERIC_TEXT)))
             stack.enter_context(patch('git_commit_msg_ai.editor.os.unlink'))
             stack.enter_context(patch('git_commit_msg_ai.editor.get_default_editor', return_value=sentinel_editor))
             stack.enter_context(patch.dict('os.environ', {}, clear=True))
 
-            open_in_editor('initial text')
+            open_in_editor(INITIAL_TEXT)
 
         mock_run.assert_called_once_with([sentinel_editor, TEMP_FILE_PATH], check=True)
 
@@ -75,7 +80,7 @@ class TestOpenInEditor:
             mock_unlink = stack.enter_context(patch('git_commit_msg_ai.editor.os.unlink'))
 
             with pytest.raises(EditorError, match='temporary file'):
-                open_in_editor('initial text')
+                open_in_editor(INITIAL_TEXT)
 
         mock_unlink.assert_not_called()
 
@@ -84,22 +89,22 @@ class TestOpenInEditor:
             stack.enter_context(patch('git_commit_msg_ai.editor.tempfile.NamedTemporaryFile', return_value=_make_named_temporary_file_mock()))
             stack.enter_context(patch('git_commit_msg_ai.editor.subprocess.run', side_effect=FileNotFoundError))
             mock_unlink = stack.enter_context(patch('git_commit_msg_ai.editor.os.unlink'))
-            stack.enter_context(patch('git_commit_msg_ai.editor.os.environ.get', return_value='vim'))
+            stack.enter_context(patch('git_commit_msg_ai.editor.os.environ.get', return_value=VIM_EDITOR))
 
             with pytest.raises(EditorError, match='was not found'):
-                open_in_editor('initial text')
+                open_in_editor(INITIAL_TEXT)
 
         mock_unlink.assert_called_once_with(TEMP_FILE_PATH)
 
     def test_raises_editor_error_when_editor_exits_with_error(self) -> None:
         with ExitStack() as stack:
             stack.enter_context(patch('git_commit_msg_ai.editor.tempfile.NamedTemporaryFile', return_value=_make_named_temporary_file_mock()))
-            stack.enter_context(patch('git_commit_msg_ai.editor.subprocess.run', side_effect=subprocess.CalledProcessError(1, 'vim')))
+            stack.enter_context(patch('git_commit_msg_ai.editor.subprocess.run', side_effect=subprocess.CalledProcessError(1, VIM_EDITOR)))
             mock_unlink = stack.enter_context(patch('git_commit_msg_ai.editor.os.unlink'))
-            stack.enter_context(patch('git_commit_msg_ai.editor.os.environ.get', return_value='vim'))
+            stack.enter_context(patch('git_commit_msg_ai.editor.os.environ.get', return_value=VIM_EDITOR))
 
             with pytest.raises(EditorError, match='exited with an error'):
-                open_in_editor('initial text')
+                open_in_editor(INITIAL_TEXT)
 
         mock_unlink.assert_called_once_with(TEMP_FILE_PATH)
 
@@ -111,20 +116,22 @@ class TestOpenInEditor:
             mock_unlink = stack.enter_context(patch('git_commit_msg_ai.editor.os.unlink'))
 
             with pytest.raises(EditorError, match='Could not read'):
-                open_in_editor('initial text')
+                open_in_editor(INITIAL_TEXT)
 
         mock_unlink.assert_called_once_with(TEMP_FILE_PATH)
 
 
 class TestGetDefaultEditor:
     def test_returns_notepad_on_windows(self) -> None:
-        with patch('git_commit_msg_ai.editor.platform.system', return_value='Windows'):
+        with ExitStack() as stack:
+            stack.enter_context(patch('git_commit_msg_ai.editor.platform.system', return_value='Windows'))
             result = get_default_editor()
 
         assert result == 'notepad'
 
     def test_returns_vi_on_non_windows(self) -> None:
-        with patch('git_commit_msg_ai.editor.platform.system', return_value='Linux'):
+        with ExitStack() as stack:
+            stack.enter_context(patch('git_commit_msg_ai.editor.platform.system', return_value='Linux'))
             result = get_default_editor()
 
         assert result == 'vi'

{git_commit_msg_ai-1.4.0 → git_commit_msg_ai-1.4.1}/tests/test_git_ops.py

@@ -1,15 +1,19 @@
 import subprocess
+from contextlib import ExitStack
 from unittest.mock import MagicMock, patch
 
 import pytest
 
 from git_commit_msg_ai.exceptions import GitError
-from git_commit_msg_ai.git_ops import commit, get_staged_diff
+from git_commit_msg_ai.git_ops import COMMIT_SUBCOMMAND, GIT_COMMAND, MESSAGE_FLAG, commit, get_staged_diff
+
+COMMIT_MESSAGE = 'my message'
 
 
 class TestGetStagedDiff:
     def test_returns_decoded_diff(self) -> None:
-        with patch('git_commit_msg_ai.git_ops.subprocess.check_output') as mock_check_output:
+        with ExitStack() as stack:
+            mock_check_output = stack.enter_context(patch('git_commit_msg_ai.git_ops.subprocess.check_output'))
             mock_check_output.return_value = b'diff content'
 
             result = get_staged_diff()
@@ -17,14 +21,16 @@ class TestGetStagedDiff:
         assert result == 'diff content'
 
     def test_raises_git_error_when_git_not_found(self) -> None:
-        with patch('git_commit_msg_ai.git_ops.subprocess.check_output') as mock_check_output:
+        with ExitStack() as stack:
+            mock_check_output = stack.enter_context(patch('git_commit_msg_ai.git_ops.subprocess.check_output'))
             mock_check_output.side_effect = FileNotFoundError
 
             with pytest.raises(GitError, match='not installed'):
                 get_staged_diff()
 
     def test_raises_git_error_on_called_process_error(self) -> None:
-        with patch('git_commit_msg_ai.git_ops.subprocess.check_output') as mock_check_output:
+        with ExitStack() as stack:
+            mock_check_output = stack.enter_context(patch('git_commit_msg_ai.git_ops.subprocess.check_output'))
             mock_check_output.side_effect = subprocess.CalledProcessError(1, 'git')
 
             with pytest.raises(GitError, match='git repository'):
@@ -34,14 +40,16 @@ class TestGetStagedDiff:
         mock_bytes = MagicMock()
         mock_bytes.decode.side_effect = UnicodeDecodeError('utf-8', b'', 0, 1, 'reason')
 
-        with patch('git_commit_msg_ai.git_ops.subprocess.check_output') as mock_check_output:
+        with ExitStack() as stack:
+            mock_check_output = stack.enter_context(patch('git_commit_msg_ai.git_ops.subprocess.check_output'))
             mock_check_output.return_value = mock_bytes
 
             with pytest.raises(GitError, match='UTF-8'):
                 get_staged_diff()
 
     def test_raises_git_error_when_diff_is_empty(self) -> None:
-        with patch('git_commit_msg_ai.git_ops.subprocess.check_output') as mock_check_output:
+        with ExitStack() as stack:
+            mock_check_output = stack.enter_context(patch('git_commit_msg_ai.git_ops.subprocess.check_output'))
             mock_check_output.return_value = b''
 
             with pytest.raises(GitError, match='No staged changes'):
@@ -50,21 +58,24 @@ class TestGetStagedDiff:
 
 class TestCommit:
     def test_calls_subprocess_run_with_correct_args(self) -> None:
-        with patch('git_commit_msg_ai.git_ops.subprocess.run') as mock_run:
-            commit('my message')
+        with ExitStack() as stack:
+            mock_run = stack.enter_context(patch('git_commit_msg_ai.git_ops.subprocess.run'))
+            commit(COMMIT_MESSAGE)
 
-        mock_run.assert_called_once_with(['git', 'commit', '-m', 'my message'], check=True)
+        mock_run.assert_called_once_with([GIT_COMMAND, COMMIT_SUBCOMMAND, MESSAGE_FLAG, COMMIT_MESSAGE], check=True)
 
     def test_raises_git_error_when_git_not_found(self) -> None:
-        with patch('git_commit_msg_ai.git_ops.subprocess.run') as mock_run:
+        with ExitStack() as stack:
+            mock_run = stack.enter_context(patch('git_commit_msg_ai.git_ops.subprocess.run'))
             mock_run.side_effect = FileNotFoundError
 
             with pytest.raises(GitError, match='not installed'):
-                commit('my message')
+                commit(COMMIT_MESSAGE)
 
     def test_raises_git_error_on_called_process_error(self) -> None:
-        with patch('git_commit_msg_ai.git_ops.subprocess.run') as mock_run:
-            mock_run.side_effect = subprocess.CalledProcessError(1, 'git')
+        with ExitStack() as stack:
+            mock_run = stack.enter_context(patch('git_commit_msg_ai.git_ops.subprocess.run'))
+            mock_run.side_effect = subprocess.CalledProcessError(1, GIT_COMMAND)
 
             with pytest.raises(GitError, match='git commit failed'):
-                commit('my message')
+                commit(COMMIT_MESSAGE)

git_commit_msg_ai-1.4.0/tests/test_cli.py

@@ -1,139 +0,0 @@
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from git_commit_msg_ai.cli import main
-from git_commit_msg_ai.exceptions import AIError, GitError
-
-COMMIT_MESSAGE = 'feat: add feature'
-EDITED_COMMIT_MESSAGE = 'edited commit message'
-
-
-class TestMain:
-    def _run_with_input(self, user_input: str, commit_message: str = COMMIT_MESSAGE) -> tuple[MagicMock, MagicMock, MagicMock]:
-        mock_git_ops = MagicMock()
-        mock_git_ops.get_staged_diff.return_value = 'diff content'
-
-        mock_ai_client = MagicMock()
-        mock_ai_client.generate_commit_message.return_value = commit_message
-
-        mock_editor = MagicMock()
-        mock_editor.open_in_editor.return_value = EDITED_COMMIT_MESSAGE
-
-        with patch('git_commit_msg_ai.cli.git_ops', mock_git_ops):
-            with patch('git_commit_msg_ai.cli.ai_client', mock_ai_client):
-                with patch('git_commit_msg_ai.cli.editor', mock_editor):
-                    with patch('builtins.input', return_value=user_input):
-                        main()
-
-        return mock_git_ops, mock_ai_client, mock_editor
-
-    def test_accept_calls_commit_with_generated_message(self) -> None:
-        mock_git_ops, _, _ = self._run_with_input('a', COMMIT_MESSAGE)
-
-        mock_git_ops.commit.assert_called_once_with(COMMIT_MESSAGE)
-
-    def test_edit_opens_editor_then_commits_edited_message(self) -> None:
-        mock_git_ops, _, mock_editor = self._run_with_input('e', COMMIT_MESSAGE)
-
-        mock_editor.open_in_editor.assert_called_once_with(COMMIT_MESSAGE)
-        mock_git_ops.commit.assert_called_once_with(EDITED_COMMIT_MESSAGE)
-
-    def test_reject_does_not_commit(self) -> None:
-        mock_git_ops, _, _ = self._run_with_input('r')
-
-        mock_git_ops.commit.assert_not_called()
-
-    def test_invalid_input_exits_with_code_1(self) -> None:
-        mock_git_ops = MagicMock()
-        mock_git_ops.get_staged_diff.return_value = 'diff content'
-
-        mock_ai_client = MagicMock()
-        mock_ai_client.generate_commit_message.return_value = 'msg'
-
-        with patch('git_commit_msg_ai.cli.git_ops', mock_git_ops):
-            with patch('git_commit_msg_ai.cli.ai_client', mock_ai_client):
-                with patch('git_commit_msg_ai.cli.editor'):
-                    with patch('builtins.input', return_value='x'):
-                        with pytest.raises(SystemExit) as exc_info:
-                            main()
-
-        assert exc_info.value.code == 1
-
-    def test_git_error_from_get_staged_diff_exits_with_message(self, capsys: pytest.CaptureFixture[str]) -> None:
-        mock_git_ops = MagicMock()
-        mock_git_ops.get_staged_diff.side_effect = GitError('staged error')
-
-        with patch('git_commit_msg_ai.cli.git_ops', mock_git_ops):
-            with pytest.raises(SystemExit) as exc_info:
-                main()
-
-        assert exc_info.value.code == 1
-        assert 'staged error' in capsys.readouterr().out
-
-    def test_ai_error_from_generate_commit_message_exits_with_message(self, capsys: pytest.CaptureFixture[str]) -> None:
-        mock_git_ops = MagicMock()
-        mock_git_ops.get_staged_diff.return_value = 'diff content'
-
-        mock_ai_client = MagicMock()
-        mock_ai_client.generate_commit_message.side_effect = AIError('ai error')
-
-        with patch('git_commit_msg_ai.cli.git_ops', mock_git_ops):
-            with patch('git_commit_msg_ai.cli.ai_client', mock_ai_client):
-                with pytest.raises(SystemExit) as exc_info:
-                    main()
-
-        assert exc_info.value.code == 1
-        assert 'ai error' in capsys.readouterr().out
-
-    def test_git_error_from_commit_exits_with_message(self, capsys: pytest.CaptureFixture[str]) -> None:
-        mock_git_ops = MagicMock()
-        mock_git_ops.get_staged_diff.return_value = 'diff content'
-        mock_git_ops.commit.side_effect = GitError('commit error')
-
-        mock_ai_client = MagicMock()
-        mock_ai_client.generate_commit_message.return_value = 'msg'
-
-        with patch('git_commit_msg_ai.cli.git_ops', mock_git_ops):
-            with patch('git_commit_msg_ai.cli.ai_client', mock_ai_client):
-                with patch('git_commit_msg_ai.cli.editor'):
-                    with patch('builtins.input', return_value='a'):
-                        with pytest.raises(SystemExit) as exc_info:
-                            main()
-
-        assert exc_info.value.code == 1
-        assert 'commit error' in capsys.readouterr().out
-
-    def test_keyboard_interrupt_exits_with_aborted_message(self, capsys: pytest.CaptureFixture[str]) -> None:
-        mock_git_ops = MagicMock()
-        mock_git_ops.get_staged_diff.return_value = 'diff content'
-
-        mock_ai_client = MagicMock()
-        mock_ai_client.generate_commit_message.return_value = 'msg'
-
-        with patch('git_commit_msg_ai.cli.git_ops', mock_git_ops):
-            with patch('git_commit_msg_ai.cli.ai_client', mock_ai_client):
-                with patch('git_commit_msg_ai.cli.editor'):
-                    with patch('builtins.input', side_effect=KeyboardInterrupt):
-                        with pytest.raises(SystemExit) as exc_info:
-                            main()
-
-        assert exc_info.value.code == 1
-        assert 'Aborted.' in capsys.readouterr().out
-
-    def test_eof_error_exits_with_aborted_message(self, capsys: pytest.CaptureFixture[str]) -> None:
-        mock_git_ops = MagicMock()
-        mock_git_ops.get_staged_diff.return_value = 'diff content'
-
-        mock_ai_client = MagicMock()
-        mock_ai_client.generate_commit_message.return_value = 'msg'
-
-        with patch('git_commit_msg_ai.cli.git_ops', mock_git_ops):
-            with patch('git_commit_msg_ai.cli.ai_client', mock_ai_client):
-                with patch('git_commit_msg_ai.cli.editor'):
-                    with patch('builtins.input', side_effect=EOFError):
-                        with pytest.raises(SystemExit) as exc_info:
-                            main()
-
-        assert exc_info.value.code == 1
-        assert 'Aborted.' in capsys.readouterr().out