Merge pull request #112 from sommersoft/expand_simpletest_check

Expand Example File Checks To Include Subfolders

Author: kattni

adabot/lib/circuitpython_library_validators.py

@@ -523,15 +523,23 @@ def validate_contents(self, repo):
 
 
         #Check for an examples folder.
-        dirs = [x["name"] for x in content_list if x["type"] == "dir"]
-        if "examples" in dirs:
-            # check for at least on .py file
-            examples_list = github.get("/repos/"
-                                       + repo["full_name"]
-                                       + "/contents/examples")
-            if not examples_list.ok:
-                errors.append(ERROR_UNABLE_PULL_REPO_EXAMPLES)
-            examples_list = examples_list.json()
+        dirs = [
+            x["url"] for x in content_list
+            if (x["type"] == "dir" and x["name"] == "examples")
+        ]
+        examples_list = []
+        if dirs:
+            while dirs:
+                # loop through the results to ensure we capture files
+                # in subfolders, and add any files in the current directory
+                result = github.get(dirs.pop(0))
+                if not result.ok:
+                    errors.append(ERROR_UNABLE_PULL_REPO_EXAMPLES)
+                    break
+                result_json = result.json()
+                dirs.extend([x["url"] for x in result_json if x["type"] == "dir"])
+                examples_list.extend([x for x in result_json if x["type"] == "file"])
+
             if len(examples_list) < 1:
                 errors.append(ERROR_MISSING_EXAMPLE_FILES)
             else:

adabot/lib/common_funcs.py

@@ -169,11 +169,13 @@ def list_repos():
                                 "order": "asc"}
                         )
     while result.ok:
-        links = result.headers["Link"]
         #repos.extend(result.json()["items"]) # uncomment and comment below, to include all forks
         repos.extend(repo for repo in result.json()["items"] if (repo["owner"]["login"] == "adafruit" and
                      (repo["name"].startswith("Adafruit_CircuitPython") or repo["name"] == "circuitpython")))
-
+        try:
+            links = result.headers["Link"]
+        except KeyError:
+            break
         next_url = None
         for link in links.split(","):
             link, rel = link.split(";")