[conflict-mediator] Add download

Author: woojiahao

conflict_mediator/.gitmastery-exercise.json

@@ -0,0 +1,17 @@
+{
+  "exercise_name": "conflict-mediator",
+  "tags": [
+    "git-merge",
+    "merge-conflicts"
+  ],
+  "requires_git": true,
+  "requires_github": false,
+  "base_files": {},
+  "exercise_repo": {
+    "repo_type": "local",
+    "repo_name": "conflict",
+    "repo_title": null,
+    "create_fork": null,
+    "init": true
+  }
+}

conflict_mediator/README.md

@@ -0,0 +1,18 @@
+# conflict-mediator
+
+<!--- Insert exercise description -->
+
+## Task
+
+<!--- Insert exercise task, simplify what needs to be done -->
+
+## Hints
+
+<!--- Insert hints here -->
+<!---
+    Use Github Markdown's collapsible content:
+    <details>
+    <summary>...</summary>
+    ...
+    </details>
+-->

conflict_mediator/__init__.py

@@ -0,0 +1,64 @@
+import os
+import pathlib
+import subprocess
+import textwrap
+from sys import exit
+from typing import List, Optional
+
+
+def run_command(command: List[str], verbose: bool) -> Optional[str]:
+    try:
+        result = subprocess.run(
+            command,
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        if verbose:
+            print(result.stdout)
+        return result.stdout
+    except subprocess.CalledProcessError as e:
+        if verbose:
+            print(e.stderr)
+        exit(1)
+
+
+def create_or_update_file(
+    filepath: str | pathlib.Path, contents: Optional[str] = None
+) -> None:
+    if os.path.dirname(filepath) != "":
+        os.makedirs(os.path.dirname(filepath), exist_ok=True)
+    if contents is None:
+        open(filepath, "a").close()
+    else:
+        with open(filepath, "w") as file:
+            file.write(textwrap.dedent(contents).lstrip())
+
+
+def setup(verbose: bool = False):
+    commits_str = run_command(
+        ["git", "log", "--reverse", "--pretty=format:%h"], verbose
+    )
+    assert commits_str is not None
+    first_commit = commits_str.split("\n")[-1]
+    tag_name = f"git-mastery-start-{first_commit}"
+    run_command(["git", "tag", tag_name], verbose)
+
+    create_or_update_file("script.py", "print('Hello ...')")
+    run_command(["git", "add", "script.py"], verbose)
+    run_command(["git", "commit", "-m", "Add base script.py"], verbose)
+
+    run_command(["git", "checkout", "-b", "A"], verbose)
+    create_or_update_file("script.py", "print('Hello World!')")
+    run_command(["git", "add", "script.py"], verbose)
+    run_command(["git", "commit", "-m", "Hello world"], verbose)
+
+    run_command(["git", "checkout", "main"], verbose)
+    run_command(["git", "checkout", "-b", "B"], verbose)
+    create_or_update_file("script.py", "print('Hello Everyone!')")
+    run_command(["git", "add", "script.py"], verbose)
+    run_command(["git", "commit", "-m", "Hello everyone"], verbose)
+
+    run_command(["git", "checkout", "main"], verbose)
+    run_command(["git", "merge", "A", "--no-edit"], verbose)
+    run_command(["git", "merge", "B", "--no-edit"], verbose)

conflict_mediator/download.py

@@ -0,0 +1,6 @@
+initialization:
+  steps:
+    - type: commit
+      empty: true
+      message: Empty commit
+      id: start

conflict_mediator/tests/__init__.py

@@ -0,0 +1,12 @@
+from git_autograder import GitAutograderTestLoader
+
+from ..verify import verify
+
+REPOSITORY_NAME = "conflict-mediator"
+
+loader = GitAutograderTestLoader(__file__, REPOSITORY_NAME, verify)
+
+
+def test():
+    with loader.load("specs/base.yml", "start"):
+        pass

conflict_mediator/tests/specs/base.yml

@@ -0,0 +1,11 @@
+from git_autograder import (
+    GitAutograderOutput,
+    GitAutograderExercise,
+    GitAutograderStatus,
+)
+
+
+def verify(exercise: GitAutograderExercise) -> GitAutograderOutput:
+    # INSERT YOUR GRADING CODE HERE
+
+    return exercise.to_output([], GitAutograderStatus.SUCCESSFUL)