ygrader 2.6.13__tar.gz → 2.6.14__tar.gz

{ygrader-2.6.13/ygrader.egg-info → ygrader-2.6.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ygrader
-Version: 2.6.13
+Version: 2.6.14
 Summary: Grading scripts used in BYU's Electrical and Computer Engineering Department
 Home-page: https://github.com/byu-cpe/ygrader
 Author: Jeff Goeders

{ygrader-2.6.13 → ygrader-2.6.14}/setup.py

@@ -4,7 +4,7 @@ setup(
     name="ygrader",
     packages=["ygrader"],
     package_data={"ygrader": ["*.ahk"]},
-    version="2.6.13",
+    version="2.6.14",
     description="Grading scripts used in BYU's Electrical and Computer Engineering Department",
     author="Jeff Goeders",
     author_email="jeff.goeders@gmail.com",

{ygrader-2.6.13 → ygrader-2.6.14}/ygrader/grader.py

@@ -537,8 +537,8 @@ class Grader:
                     continue
 
                 # Print name(s) of who we are grading
-                student_work_path = self.work_path / utils.names_to_dir(
-                    first_names, last_names, net_ids
+                student_work_path = self._get_student_work_path(
+                    row, first_names, last_names, net_ids
                 )
                 print_color(
                     TermColors.PURPLE,
@@ -567,7 +567,9 @@ class Grader:
                 callback_args["first_names"] = first_names
                 callback_args["last_names"] = last_names
                 callback_args["net_ids"] = net_ids
-                callback_args["output"] = sys.stdout  # Default to stdout in sequential mode
+                callback_args["output"] = (
+                    sys.stdout
+                )  # Default to stdout in sequential mode
                 if self.code_source == CodeSource.GITHUB:
                     callback_args["repo_url"] = row["github_url"]
                     callback_args["tag"] = self.github_tag
@@ -663,8 +665,8 @@ class Grader:
         )
         log_path = log_file.name
 
-        student_work_path = self.work_path / utils.names_to_dir(
-            first_names, last_names, net_ids
+        student_work_path = self._get_student_work_path(
+            row, first_names, last_names, net_ids
         )
 
         # Build student info dict to pass to helper
@@ -868,6 +870,19 @@ class Grader:
         df["submitted_zip_path"] = df["submitted_zip_path"].fillna(value="")
         return df
 
+    def _get_student_work_path(self, row, first_names, last_names, net_ids):
+        """Get the work path for a student/group.
+
+        For GitHub submissions, the folder is named after the repository name.
+        For Learning Suite submissions, it uses the first student's name.
+        """
+        if self.code_source == CodeSource.GITHUB:
+            # Use the repository name from the GitHub URL
+            repo_name = utils.github_url_to_repo_name(row["github_url"])
+            return self.work_path / repo_name
+        # Learning Suite: use first student's name
+        return self.work_path / utils.names_to_dir(first_names, last_names, net_ids)
+
     def _group_students(self, df):
         if self.code_source == CodeSource.GITHUB:
             # For Github source, group name is simply github URL

{ygrader-2.6.13 → ygrader-2.6.14}/ygrader/utils.py

@@ -86,6 +86,31 @@ def names_to_dir(first_names, last_names, net_ids):
     )
 
 
+def github_url_to_repo_name(url):
+    """Extract the repository name from a GitHub URL.
+
+    Works with both SSH and HTTPS formats:
+    >>> github_url_to_repo_name("git@github.com:byu-ecen123-classroom/123-labs-team01.git")
+    '123-labs-team01'
+    >>> github_url_to_repo_name("https://github.com/byu-ecen123-classroom/123-labs-team01")
+    '123-labs-team01'
+    >>> github_url_to_repo_name("https://github.com/byu-ecen123-classroom/123-labs-team01.git")
+    '123-labs-team01'
+    """
+    # Try SSH format: git@github.com:org/repo.git
+    match = re.search(r"git@github\.com:.*?/(.*?)(?:\.git)?$", url)
+    if match:
+        return match.group(1)
+
+    # Try HTTPS format: https://github.com/org/repo or https://github.com/org/repo.git
+    match = re.search(r"github\.com/.*?/(.*?)(?:\.git)?$", url)
+    if match:
+        return match.group(1)
+
+    # Fallback: return the URL as-is (shouldn't happen with valid GitHub URLs)
+    return url
+
+
 def hash_file(file_path):
     """Returns a hash of a file"""
 

{ygrader-2.6.13 → ygrader-2.6.14/ygrader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ygrader
-Version: 2.6.13
+Version: 2.6.14
 Summary: Grading scripts used in BYU's Electrical and Computer Engineering Department
 Home-page: https://github.com/byu-cpe/ygrader
 Author: Jeff Goeders