dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-20 12:24:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: handle directory creation errors in setup_git_home

Browse source
This commit is contained in:
Paul Gauthier (aider) 2024-08-28 11:21:28 -07:00
parent 2192a5efb2
commit a57d9e55d6
2 changed files with 42 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
aider/main.py
View file

@ -58,15 +58,23 @@ def setup_git_home(io):
# Assume it's a new project name # Assume it's a new project name
project_name = choice project_name = choice
new_dir = home / project_name new_dir = home / project_name
new_dir.mkdir(parents=True, exist_ok=True) try:
os.chdir(new_dir) new_dir.mkdir(parents=True, exist_ok=True)
return str(new_dir) os.chdir(new_dir)
return str(new_dir)
except OSError as e:
io.tool_error(f"Error creating directory: {e}")
return None
project_name = io.user_input("Enter a name for your new project directory:") project_name = io.user_input("Enter a name for your new project directory:")
new_dir = home / project_name new_dir = home / project_name
new_dir.mkdir(parents=True, exist_ok=True) try:
os.chdir(new_dir) new_dir.mkdir(parents=True, exist_ok=True)
return str(new_dir) os.chdir(new_dir)
return str(new_dir)
except OSError as e:
io.tool_error(f"Error creating directory: {e}")
return None
def get_git_root(): def get_git_root():

30
tests/basic/test_main.py
View file

@ -99,7 +99,8 @@ class TestMain(TestCase):
@patch("aider.main.Path.glob") @patch("aider.main.Path.glob")
@patch("aider.main.os.chdir") @patch("aider.main.os.chdir")
@patch("aider.main.InputOutput") @patch("aider.main.InputOutput")
def test_setup_git_home_new_project(self, mock_io, mock_chdir, mock_glob, mock_home): @patch("pathlib.Path.mkdir")
def test_setup_git_home_new_project(self, mock_mkdir, mock_io, mock_chdir, mock_glob, mock_home):
mock_home.return_value = Path("/home/user") mock_home.return_value = Path("/home/user")
mock_glob.return_value = [Path("/home/user/repo1/.git"), Path("/home/user/repo2/.git")] mock_glob.return_value = [Path("/home/user/repo1/.git"), Path("/home/user/repo2/.git")]
mock_io.return_value.prompt_ask.return_value = "new_project" mock_io.return_value.prompt_ask.return_value = "new_project"
@ -110,6 +111,7 @@ class TestMain(TestCase):
"Found git repositories in your home directory:" "Found git repositories in your home directory:"
) )
mock_io.return_value.prompt_ask.assert_called_once() mock_io.return_value.prompt_ask.assert_called_once()
mock_mkdir.assert_called_once_with(parents=True, exist_ok=True)
mock_chdir.assert_called_once_with(Path("/home/user/new_project")) mock_chdir.assert_called_once_with(Path("/home/user/new_project"))
self.assertEqual(result, str(Path("/home/user/new_project"))) self.assertEqual(result, str(Path("/home/user/new_project")))
@ -117,7 +119,8 @@ class TestMain(TestCase):
@patch("aider.main.Path.glob") @patch("aider.main.Path.glob")
@patch("aider.main.os.chdir") @patch("aider.main.os.chdir")
@patch("aider.main.InputOutput") @patch("aider.main.InputOutput")
def test_setup_git_home_no_existing_repos(self, mock_io, mock_chdir, mock_glob, mock_home): @patch("pathlib.Path.mkdir")
def test_setup_git_home_no_existing_repos(self, mock_mkdir, mock_io, mock_chdir, mock_glob, mock_home):
mock_home.return_value = Path("/home/user") mock_home.return_value = Path("/home/user")
mock_glob.return_value = [] mock_glob.return_value = []
mock_io.return_value.user_input.return_value = "new_project" mock_io.return_value.user_input.return_value = "new_project"
@ -128,9 +131,32 @@ class TestMain(TestCase):
mock_io.return_value.user_input.assert_called_once_with( mock_io.return_value.user_input.assert_called_once_with(
"Enter a name for your new project directory:" "Enter a name for your new project directory:"
) )
mock_mkdir.assert_called_once_with(parents=True, exist_ok=True)
mock_chdir.assert_called_once_with(Path("/home/user/new_project")) mock_chdir.assert_called_once_with(Path("/home/user/new_project"))
self.assertEqual(result, str(Path("/home/user/new_project"))) self.assertEqual(result, str(Path("/home/user/new_project")))
@patch("aider.main.Path.home")
@patch("aider.main.Path.glob")
@patch("aider.main.os.chdir")
@patch("aider.main.InputOutput")
@patch("pathlib.Path.mkdir")
def test_setup_git_home_directory_creation_error(self, mock_mkdir, mock_io, mock_chdir, mock_glob, mock_home):
mock_home.return_value = Path("/home/user")
mock_glob.return_value = []
mock_io.return_value.user_input.return_value = "new_project"
mock_mkdir.side_effect = OSError("Permission denied")
result = setup_git_home(mock_io.return_value)
mock_io.return_value.tool_output.assert_not_called()
mock_io.return_value.user_input.assert_called_once_with(
"Enter a name for your new project directory:"
)
mock_mkdir.assert_called_once_with(parents=True, exist_ok=True)
mock_chdir.assert_not_called()
mock_io.return_value.tool_error.assert_called_once_with("Error creating directory: Permission denied")
self.assertIsNone(result)
def test_main_with_git_config_yml(self): def test_main_with_git_config_yml(self):
make_repo() make_repo()