Create git trees (and blobs) and commit.

Author: jessemyers-lettuce

src/bot/cli/commit.py

@@ -1,11 +1,14 @@
+from logging import INFO
+from logging import basicConfig as basic_config
 from pathlib import Path
 
 from click import Path as PathType
 from click import command, option, secho
+from github import GithubIntegration
 from github.Auth import AppAuth
 
 from ..dtos import Tree
-from ..local import read_commit
+from ..local import read_commit, read_repo
 from ..remote import write_commit
 
 
@@ -45,7 +48,8 @@ def read(
     repo_path: Path,
     ref: str,
 ) -> None:
-    commit = read_commit(repo_path, ref)
+    repo = read_repo(repo_path)
+    commit = read_commit(repo, ref)
 
     secho(f"Commit: {commit.message}", fg="green")
     print_tree(commit.tree, Path())
@@ -57,6 +61,7 @@ def read(
     "--app-id",
     envvar="GITHUB_APP_ID",
     required=True,
+    type=int,
 )
 @option(
     "--private-key",
@@ -86,7 +91,18 @@ def write(
     repo_path: Path,
     ref: str,
 ) -> None:
+    basic_config(level=INFO)
+
+    repo = read_repo(repo_path)
+
+    # TODO: parse repo.remote().url to get GitHub information
+    # print(repo.remote().url)
     auth = AppAuth(application_id, private_key)
+    integration = GithubIntegration(auth=auth)
+    installation = integration.get_installations()[0]
+    github = installation.get_github_for_installation()
+    repository = github.get_repo("lettuce-financial/github-bot-signed-commit")
 
-    commit = read_commit(repo_path, ref)
-    write_commit(auth, commit)
+    commit = read_commit(repo, ref)
+    git_commit = write_commit(repository, commit)
+    secho(f"Created git commit: {git_commit.sha}", fg="green")

src/bot/local.py

@@ -116,9 +116,12 @@ def extract_message(commit: Commit) -> str:
         return commit.message.decode("utf-8")
 
 
-def read_commit(repo_path: Path, ref: str) -> CommitDTO:
+def read_repo(repo_path: Path) -> Repo:
+    return Repo(repo_path)
+
+
+def read_commit(repo: Repo, ref: str) -> CommitDTO:
     # Find the commit at the given ref in the local repo.
-    repo = Repo(repo_path)
     commit = repo.commit(ref)
 
     # Compute the diff between the parent and this commit

src/bot/remote.py

@@ -1,24 +1,72 @@
-from github.Auth import Auth
+from logging import getLogger as get_logger
+
+from github.GitCommit import GitCommit
+from github.GitTree import GitTree
+from github.InputGitTreeElement import InputGitTreeElement
+from github.Repository import Repository
 
 from .dtos import Blob, Commit, Tree
+from .enums import Mode, Type
+
+
+def make_tree_blob_element(blob: Blob) -> InputGitTreeElement:
+    if blob.sha:
+        with blob.path.open() as infile:
+            return InputGitTreeElement(
+                path=str(blob.path),
+                mode=Mode.FILE.value,
+                type=Type.BLOB.value,
+                content=infile.read(),
+            )
+    else:
+        return InputGitTreeElement(
+            path=str(blob.path),
+            mode=Mode.FILE.value,
+            type=Type.BLOB.value,
+            sha=None,
+        )
+
+
+def make_tree_tree_element(tree: Tree, git_tree: GitTree) -> InputGitTreeElement:
+    return InputGitTreeElement(
+        path=str(tree.path),
+        mode=Mode.SUBDIRECTORY.value,
+        type=Type.TREE.value,
+        sha=git_tree.sha,
+    )
 
 
-def write_blob(auth: Auth, blob: Blob) -> None:
-    # TODO: write blob
-    pass
+def write_tree(repo: Repository, tree: Tree, base_tree: GitTree) -> GitTree:
+    logger = get_logger("GitTree")
 
+    child_git_trees = [write_tree(repo, child, base_tree) for child in tree.trees]
 
-def write_tree(auth: Auth, tree: Tree) -> None:
-    for tree in tree.trees:
-        write_tree(auth, tree)
+    tree_items = [make_tree_blob_element(blob) for blob in tree.blobs] + [
+        make_tree_tree_element(child, child_git_tree)
+        for child, child_git_tree in zip(tree.trees, child_git_trees)
+    ]
 
-    for blob in tree.blobs:
-        write_blob(auth, blob)
+    logger.info(f"Creating git tree with {len(tree_items)} items from: {base_tree}")
+    git_tree = repo.create_git_tree(
+        tree=tree_items,
+        base_tree=base_tree,
+    )
+    logger.info(f"Created git tree: {git_tree.sha}")
+    return git_tree
 
-    # TODO: write tree
 
+def write_commit(repo: Repository, commit: Commit) -> GitCommit:
+    logger = get_logger("GitCommit")
 
-def write_commit(auth: Auth, commit: Commit) -> None:
-    write_tree(auth, commit.tree)
+    parent_git_commit = repo.get_git_commit(commit.parents[0])
+    parent_git_tree = parent_git_commit.tree
+    git_tree = write_tree(repo, commit.tree, parent_git_tree)
 
-    # TODO: write commit
+    logger.info(f"Creating git commit from tree: {git_tree.sha}")
+    git_commit = repo.create_git_commit(
+        message=commit.message,
+        tree=git_tree,
+        parents=[parent_git_commit],
+    )
+    logger.info(f"Created git commit: {git_commit.sha}")
+    return git_commit