git-project 0.0.28__tar.gz → 0.0.30__tar.gz

{git_project-0.0.28 → git_project-0.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-project
-Version: 0.0.28
+Version: 0.0.30
 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.28 → git_project-0.0.30}/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.28'
-__version_tuple__ = version_tuple = (0, 0, 28)
+__version__ = version = '0.0.30'
+__version_tuple__ = version_tuple = (0, 0, 30)

{git_project-0.0.28 → git_project-0.0.30}/src/git_project/git.py

@@ -58,10 +58,12 @@ class Git(object):
             self.null_oid = pygit2.Oid(hex='0000000000000000000000000000000000000000')
 
         def credentials(self, url, username_from_url, allowed_types):
-            if allowed_types & pygit2.credentials.GIT_CREDENTIAL_SSH_KEY:
-                return pygit2.Keypair(username_from_url, str(Path.home() / '.ssh' / 'id_rsa.pub'),
-                                      str(Path.home() / '.ssh' / 'id_rsa'), '')
-            elif allowed_types & pygit2.credentials.GIT_CREDENTIAL_USERNAME:
+            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'), ''
+                )
+            elif allowed_types & pygit2.enums.CredentialType.USERNAME:
                 return pygit2.Username(username_from_url)
             return None
 
@@ -373,10 +375,10 @@ class Git(object):
     class RemoteBranchDeleteCallback(pygit2.RemoteCallbacks):
         """Check the result of remove branch prune operations."""
         def credentials(self, url, username_from_url, allowed_types):
-            if allowed_types & pygit2.credentials.GIT_CREDENTIAL_SSH_KEY:
+            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'), '')
-            elif allowed_types & pygit2.credentials.GIT_CREDENTIAL_USERNAME:
+            elif allowed_types & pygit2.enums.CredentialType.USERNAME:
                 return pygit2.Username(username_from_url)
             return None
 
@@ -387,10 +389,10 @@ class Git(object):
 
     class LsRemotesCallbacks(pygit2.RemoteCallbacks):
         def credentials(self, url, username_from_url, allowed_types):
-            if allowed_types & pygit2.credentials.GIT_CREDENTIAL_SSH_KEY:
+            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'), '')
-            elif allowed_types & pygit2.credentials.GIT_CREDENTIAL_USERNAME:
+            elif allowed_types & pygit2.enums.CredentialType.USERNAME:
                 return pygit2.Username(username_from_url)
             return None
 

{git_project-0.0.28 → git_project-0.0.30}/tests/test_git.py

@@ -21,6 +21,7 @@ import os
 import git_project
 
 from pathlib import Path
+import pygit2
 import shutil
 
 def test_git_init(reset_directory,
@@ -874,3 +875,45 @@ def test_git_get_git_common_dir_renamed(reset_directory, local_repository):
 
     assert git.has_repo()
     assert Path(git.get_git_common_dir()).name == new_hidden_dir
+
+
+def test_git_remote_credentials(reset_directory):
+    callback = git_project.Git.RemoteCallbacks();
+
+    key_result = callback.credentials(
+        'ssh:me@my.org/test.git', 'me', pygit2.enums.CredentialType.SSH_KEY
+    )
+    name_result = callback.credentials(
+        'ssh:me@my.org/test.git', 'me', pygit2.enums.CredentialType.USERNAME
+    )
+
+    assert isinstance(key_result, pygit2.Keypair)
+    assert isinstance(name_result, pygit2.Username)
+
+
+def test_git_remote_branch_delete_credentials(reset_directory):
+    callback = git_project.Git.RemoteBranchDeleteCallback();
+
+    key_result = callback.credentials(
+        'ssh:me@my.org/test.git', 'me', pygit2.enums.CredentialType.SSH_KEY
+    )
+    name_result = callback.credentials(
+        'ssh:me@my.org/test.git', 'me', pygit2.enums.CredentialType.USERNAME
+    )
+
+    assert isinstance(key_result, pygit2.Keypair)
+    assert isinstance(name_result, pygit2.Username)
+
+
+def test_git_ls_remotes_credentials(reset_directory):
+    callback = git_project.Git.LsRemotesCallbacks();
+
+    key_result = callback.credentials(
+        'ssh:me@my.org/test.git', 'me', pygit2.enums.CredentialType.SSH_KEY
+    )
+    name_result = callback.credentials(
+        'ssh:me@my.org/test.git', 'me', pygit2.enums.CredentialType.USERNAME
+    )
+
+    assert isinstance(key_result, pygit2.Keypair)
+    assert isinstance(name_result, pygit2.Username)

git_project-0.0.28/.#pyproject.toml

@@ -1 +0,0 @@
-dag@basie.2617:1746908671