Merge pull request #16 from git-mastery/woojiahao/embed-publish-into-bump

Support repo-smith v2 syntax

Author: woojiahao

app/commands/download.py

@@ -5,6 +5,7 @@
 
 import click
 import pytz
+from repo_smith.repo_smith import create_repo_smith
 
 from app.commands.check.git import git
 from app.commands.check.github import github
@@ -177,10 +178,12 @@ def _download_hands_on(hands_on: str, formatted_hands_on: str) -> None:
                     warn("Setup Github and Github CLI before downloading this hands-on")
                     exit(1)
 
-        hands_on_namespace.execute_function(
-            "download",
-            {"verbose": get_verbose()},
-        )
+        verbose = get_verbose()
+        with create_repo_smith(verbose, null_repo=True) as repo_smith:
+            hands_on_namespace.execute_function(
+                "download",
+                {"rs": repo_smith, "verbose": verbose},
+            )
         success(f"Completed setting up {click.style(hands_on, bold=True, italic=True)}")
 
 
@@ -251,10 +254,12 @@ def setup_exercise_folder(
             empty_commit(initial_commit_message)
 
     info("Executing download setup")
-    namespace.execute_function(
-        "setup",
-        {"verbose": get_verbose()},
-    )
+    verbose = get_verbose()
+    with create_repo_smith(verbose, existing_path=".") as repo_smith:
+        namespace.execute_function(
+            "setup",
+            {"rs": repo_smith, "verbose": verbose},
+        )
 
     success(f"Completed setting up {click.style(exercise, bold=True, italic=True)}")
     info("Start working on it:")

app/utils/gitmastery.py

@@ -1,3 +1,4 @@
+import inspect
 import os
 import sys
 import tempfile
@@ -21,10 +22,15 @@
 T = TypeVar("T")
 
 
-# We hardcode this list because to fetch it dynamically requires a Github API call
-# which we only have 60/hour so it's unwise to do it
-# TODO(woojiahao): Find a better way around this
-EXERCISE_UTILS_FILES = ["__init__", "cli", "git", "file", "gitmastery", "github_cli"]
+EXERCISE_UTILS_FILES = [
+    "__init__",
+    "cli",
+    "git",
+    "file",
+    "gitmastery",
+    "github_cli",
+    "test",
+]
 
 
 class ExercisesRepo:
@@ -147,7 +153,10 @@ def execute_function(
             sys.dont_write_bytecode = False
             return None
 
-        result = self.namespace[function_name](**params)
+        func = self.namespace[function_name]
+        sig = inspect.signature(func)
+        valid_params = {k: v for k, v in params.items() if k in sig.parameters}
+        result = self.namespace[function_name](**valid_params)
         sys.dont_write_bytecode = False
         return result
 

requirements.txt

@@ -8,3 +8,4 @@ git-autograder==6.*
 pytz
 PyYAML
 GitPython
+repo-smith