Correct exercise configuration and verify logic

Author: MousseDm

tags_add/.gitmastery-exercise.json

@@ -1,16 +1,14 @@
 {
-  "exercise_name": "tags-add",
-  "tags": [
-    "tags"
-  ],
+  "exercise_name": "tags_add",
+  "tags": ["git-tag"],
   "requires_git": true,
-  "requires_github": false,
+  "requires_github": true,
   "base_files": {},
   "exercise_repo": {
-    "repo_type": "local",
-    "repo_name": "project",
-    "repo_title": null,
+    "repo_type": "remote",
+    "repo_name": "duty-roster",
     "create_fork": false,
-    "init": true
+    "repo_title": "gm-duty-roster",
+    "init": false
   }
-}
+}

tags_add/README.md

@@ -1,18 +1,23 @@
 # tags-add
 
-<!--- Insert exercise description -->
+1. Add a **lightweight** tag `first-pilot` to the **first commit**.
+2. Add an **annotated** tag `v1.0` to the commit that updates March duty roster, with message `first full duty roster`.
 
 ## Task
 
-<!--- Insert exercise task, simplify what needs to be done -->
+This exercise clones `git-mastery/gm-duty-roster` into the `duty-roster/` folder.
 
 ## Hints
 
-<!--- Insert hints here -->
-<!---
-    Use Github Markdown's collapsible content:
-    <details>
-    <summary>...</summary>
-    ...
-    </details>
--->
+```bash
+# first commit
+git rev-list --max-parents=0 HEAD
+
+# add lightweight tag
+git tag first-pilot <FIRST_COMMIT_SHA>
+
+# find the commit for "Update roster for March"
+git log --oneline | grep -i "Update roster for March"
+
+# add annotated tag with message
+git tag -a v1.0 -m "first full duty roster" <MARCH_COMMIT_SHA>

tags_add/download.py

@@ -1,16 +1,4 @@
-from exercise_utils.file import create_or_update_file
-from exercise_utils.git import add, commit
-from exercise_utils.gitmastery import create_start_tag
-
 __resources__ = []
 
 def setup(verbose: bool = False):
-    create_or_update_file("README.md", "# T4L2: Add a tag\n")
-    add(["README.md"], verbose)
-    commit("chore: init README", verbose)
-
-    create_or_update_file("main.txt", "v1 content\n")
-    add(["main.txt"], verbose)
-    commit("feat: initial content", verbose)
-
-    create_start_tag(verbose)
+    pass

tags_add/verify.py

@@ -1,26 +1,54 @@
-from typing import List
+from git import TagObject
 from git_autograder.core import GitAutograderExercise, GitAutograderStatus
 
-MSG_NO_TAG = "Tag 'v1.0.0' was not found."
-MSG_NOT_AT_HEAD = "Tag 'v1.0.0' does not point to HEAD."
+FIRST_TAG = "first-pilot"
+SECOND_TAG = "v1.0"
+SECOND_TAG_MSG = "first full duty roster"
+MARCH_MSG_FRAGMENT = "Update roster for March"
 
 def verify(exercise: GitAutograderExercise):
-    """
-    Pass condition：
-    1) exist 1.0.0 tag
-    2) the tag is pointing to current head
-    """
     repo = exercise.repo.repo
-    target = next((t for t in repo.tags if t.name == "v1.0.0"), None)
 
-    messages: List[str] = []
-    status = GitAutograderStatus.SUCCESSFUL
+    root_sha = next(repo.iter_commits(rev="HEAD", reverse=True)).hexsha
 
-    if target is None:
-        messages.append(MSG_NO_TAG)
-        status = GitAutograderStatus.FAILED
-    elif target.commit.hexsha != repo.head.commit.hexsha:
-        messages.append(MSG_NOT_AT_HEAD)
-        status = GitAutograderStatus.FAILED
+    march_commit = None
+    for c in repo.iter_commits("HEAD"):
+        if MARCH_MSG_FRAGMENT in c.message:
+            march_commit = c
+            break
 
-    return exercise.to_output(messages, status)
+    comments = []
+
+    t_first = next((t for t in repo.tags if t.name == FIRST_TAG), None)
+    if not t_first:
+        comments.append(f"Missing lightweight tag `{FIRST_TAG}`.")
+    else:
+        if t_first.commit.hexsha != root_sha:
+            comments.append(
+                f"`{FIRST_TAG}` should point to first commit {root_sha[:7]}, "
+                f"but points to {t_first.commit.hexsha[:7]} instead."
+            )
+        if isinstance(getattr(t_first, "tag", None), TagObject):
+            comments.append(f"`{FIRST_TAG}` must be a lightweight tag (not annotated).")
+
+    t_v1 = next((t for t in repo.tags if t.name == SECOND_TAG), None)
+    if not t_v1:
+        comments.append(f"Missing annotated tag `{SECOND_TAG}`.")
+    else:
+        if not isinstance(getattr(t_v1, "tag", None), TagObject):
+            comments.append(f"`{SECOND_TAG}` must be an annotated tag.")
+        else:
+            msg = (t_v1.tag.message or "").strip()
+            if msg != SECOND_TAG_MSG:
+                comments.append(f"`{SECOND_TAG}` message must be exactly `{SECOND_TAG_MSG}`.")
+        if not march_commit:
+            comments.append(f"Could not find the commit containing '{MARCH_MSG_FRAGMENT}'.")
+        else:
+            if t_v1.commit.hexsha != march_commit.hexsha:
+                comments.append(
+                    f"`{SECOND_TAG}` should point to March commit {march_commit.hexsha[:7]}, "
+                    f"but points to {t_v1.commit.hexsha[:7]} instead."
+                )
+
+    status = GitAutograderStatus.SUCCESSFUL if not comments else GitAutograderStatus.FAILED
+    return exercise.to_output(comments, status)