git-project 0.0.32__tar.gz → 0.0.34__tar.gz

{git_project-0.0.32 → git_project-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-project
-Version: 0.0.32
+Version: 0.0.34
 Summary: The extensible stupid project manager
 Author-email: "David A. Greene" <dag@obbligato.org>
 License-Expression: AGPL-3.0-or-later

{git_project-0.0.32 → git_project-0.0.34}/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.32'
-__version_tuple__ = version_tuple = (0, 0, 32)
+__version__ = version = '0.0.34'
+__version_tuple__ = version_tuple = (0, 0, 34)

{git_project-0.0.32 → git_project-0.0.34}/src/git_project/git.py

@@ -404,8 +404,12 @@ class Git(object):
 
         def credentials(self, url, username_from_url, allowed_types):
             if allowed_types & pygit2.enums.CredentialType.SSH_KEY:
-                return pygit2.Keypair(username_from_url, str(Path.home() / '.ssh' / 'id_rsa.pub'),
-                                      str(Path.home() / '.ssh' / 'id_rsa'), '')
+                return pygit2.Keypair(
+                    username_from_url,
+                    str(Path.home() / '.ssh' / f'{self.ssh_id}.pub'),
+                    str(Path.home() / '.ssh' / self.ssh_id),
+                    ''
+                )
             elif allowed_types & pygit2.enums.CredentialType.USERNAME:
                 return pygit2.Username(username_from_url)
             return None
@@ -600,7 +604,7 @@ class Git(object):
 
     def fetch_remote(self, remote):
         """Fetch all refspecs from the given remote."""
-        callbacks = Git.RemoteCallbacks()
+        callbacks = Git.RemoteCallbacks(self.get_ssh_id())
         self._repo.remotes[remote].fetch(callbacks=callbacks)
 
     # Info on refs.
@@ -766,14 +770,14 @@ class Git(object):
             result = branch.upstream.branch_name
         return result
 
-    def clone(self, url, path=None, bare=False):
+    def clone(self, url, ssh_id, path=None, bare=False):
         """Clone a respository at the given url, making a bare clone if specified."""
         parsed_url = urllib.parse.urlparse(url)
         url_path = Path(parsed_url.path).resolve()
         url_name = url_path.name
         target_path = path if path else str(Path.cwd() / url_name)
 
-        callbacks = Git.RemoteCallbacks()
+        callbacks = Git.RemoteCallbacks(ssh_id)
         self._repo = pygit2.clone_repository(url, target_path, bare, callbacks=callbacks)
         self._config = self.Config(self, self._repo.config)
 

{git_project-0.0.32 → git_project-0.0.34}/src/git_project/substitutable.py

@@ -95,7 +95,6 @@ class SubstitutableConfigObject(ConfigObject):
                     current_branch = git.refname_to_branch_name(head_name.read_text().strip())
                     break
 
-        print(f'current_branch: {current_branch}')
         if current_branch is not None:
             formats['branch'] = current_branch
 

{git_project-0.0.32 → git_project-0.0.34}/tests/test_git.py

@@ -439,7 +439,7 @@ def test_git_clone(reset_directory, remote_repository, tmp_path_factory):
 
     remote_url = 'file://' + remote_repository.path
 
-    clone_path = git.clone(remote_url)
+    clone_path = git.clone(remote_url, 'id_rsa')
     assert os.path.exists(clone_path)
 
     os.chdir(clone_path)
@@ -454,7 +454,7 @@ def test_git_clone(reset_directory, remote_repository, tmp_path_factory):
 
     git = git_project.Git()
 
-    clone_path = git.clone(remote_url, bare=True)
+    clone_path = git.clone(remote_url, 'id_rsa', bare=True)
 
     assert os.path.exists(clone_path)
 
@@ -480,7 +480,7 @@ def test_git_clone_with_path(reset_directory,
 
     path = path / 'test-clone'
 
-    clone_path = git.clone(remote_url, path)
+    clone_path = git.clone(remote_url, 'id_rsa', path)
 
     assert os.path.exists(clone_path)
     assert clone_path == str(path)
@@ -878,7 +878,7 @@ def test_git_get_git_common_dir_renamed(reset_directory, local_repository):
 
 
 def test_git_remote_credentials(reset_directory):
-    callback = git_project.Git.RemoteCallbacks();
+    callback = git_project.Git.RemoteCallbacks(ssh_id='id_rsa');
 
     key_result = callback.credentials(
         'ssh:me@my.org/test.git', 'me', pygit2.enums.CredentialType.SSH_KEY
@@ -892,7 +892,7 @@ def test_git_remote_credentials(reset_directory):
 
 
 def test_git_remote_branch_delete_credentials(reset_directory):
-    callback = git_project.Git.RemoteBranchDeleteCallback();
+    callback = git_project.Git.RemoteBranchDeleteCallback(ssh_id='id_rsa');
 
     key_result = callback.credentials(
         'ssh:me@my.org/test.git', 'me', pygit2.enums.CredentialType.SSH_KEY
@@ -906,7 +906,7 @@ def test_git_remote_branch_delete_credentials(reset_directory):
 
 
 def test_git_ls_remotes_credentials(reset_directory):
-    callback = git_project.Git.LsRemotesCallbacks();
+    callback = git_project.Git.LsRemotesCallbacks(ssh_id='id_rsa');
 
     key_result = callback.credentials(
         'ssh:me@my.org/test.git', 'me', pygit2.enums.CredentialType.SSH_KEY

{git_project-0.0.32 → git_project-0.0.34}/tests/test_project.py

@@ -142,7 +142,7 @@ def test_project_prune_branch(reset_directory,
     git = git_project.Git()
     project = git_project.Project.get(git, 'project')
 
-    path = git.clone(remote_path)
+    path = git.clone(remote_path, 'id_rsa')
 
     os.chdir(path)