update template_status.py for v3

cmccandless · BethanyG · commit 2582460602e6 · 2021-02-01T19:08:02.000-08:00
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -69,4 +69,4 @@ jobs:
 
     - name: Check exercises
       run: |
-        ./bin/test-exercises.py
+        ./bin/test_exercises.py
diff --git a/bin/data.py b/bin/data.py
@@ -65,12 +65,11 @@ def meta_dir(self):
     def exemplar_file(self):
         if self.type == 'concept':
             return self.meta_dir / 'exemplar.py'
-        # return self.meta_dir / 'example.py'
-        return self.path / 'example.py'
+        return self.meta_dir / 'example.py'
 
     @property
     def template_path(self):
-        return self.meta_dir / '.template.j2'
+        return self.meta_dir / 'template.j2'
 
 
 @dataclass
diff --git a/bin/template_status.py b/bin/template_status.py
@@ -4,12 +4,15 @@
 from fnmatch import fnmatch
 import json
 import logging
-import os
+from pathlib import Path
 import shlex
 from subprocess import check_call, DEVNULL, CalledProcessError
 import sys
 
-DEFAULT_SPEC_LOCATION = os.path.join("..", "problem-specifications")
+from data import Config, ExerciseInfo
+from test_exercises import check_assignment
+
+DEFAULT_SPEC_LOCATION = Path('spec')
 
 logging.basicConfig(format="%(levelname)s:%(message)s")
 logger = logging.getLogger("generator")
@@ -26,16 +29,6 @@ def __lt__(self, other):
         return self.value < other.value
 
 
-with open("config.json") as f:
-    config = json.load(f)
-
-exercises_dir = os.path.abspath("exercises")
-
-
-def get_template_path(exercise):
-    return os.path.join(exercises_dir, exercise, ".meta", "template.j2")
-
-
 def exec_cmd(cmd):
     try:
         args = shlex.split(cmd)
@@ -49,22 +42,20 @@ def exec_cmd(cmd):
         return False
 
 
-def generate_template(exercise, spec_path):
-    script = os.path.abspath("bin/generate_tests.py")
-    return exec_cmd(f'{script} --verbose --spec-path "{spec_path}" {exercise}')
+def generate_template(exercise: ExerciseInfo, spec_path: Path) -> bool:
+    script = Path('bin/generate_tests.py')
+    return exec_cmd(f'{script} --verbose --spec-path "{spec_path}" {exercise.slug}')
 
 
-def run_tests(exercise):
-    script = os.path.abspath("test/check-exercises.py")
-    return exec_cmd(f"{script} {exercise}")
+def run_tests(exercise: ExerciseInfo) -> bool:
+    return check_assignment(exercise, quiet=True) == 0
 
 
-def get_status(exercise, spec_path):
-    template_path = get_template_path(exercise)
-    if os.path.isfile(template_path):
+def get_status(exercise: ExerciseInfo, spec_path: Path):
+    if exercise.template_path.is_file():
         if generate_template(exercise, spec_path):
             if run_tests(exercise):
-                logging.info(f"{exercise}: OK")
+                logging.info(f"{exercise.slug}: OK")
                 return TemplateStatus.OK
             else:
                 return TemplateStatus.TEST_FAILURE
@@ -84,6 +75,7 @@ def get_status(exercise, spec_path):
         "-p",
         "--spec-path",
         default=DEFAULT_SPEC_LOCATION,
+        type=Path,
         help=(
             "path to clone of exercism/problem-specifications " "(default: %(default)s)"
         ),
@@ -96,10 +88,10 @@ def get_status(exercise, spec_path):
     elif opts.verbose >= 1:
         logger.setLevel(logging.INFO)
 
-    if not os.path.isdir(opts.spec_path):
+    if not opts.spec_path.is_dir():
         logger.error(f"{opts.spec_path} is not a directory")
         sys.exit(1)
-    opts.spec_path = os.path.abspath(opts.spec_path)
+    opts.spec_path = opts.spec_path.absolute()
     logger.debug(f"problem-specifications path is {opts.spec_path}")
 
     result = True
@@ -108,20 +100,24 @@ def get_status(exercise, spec_path):
         TemplateStatus.INVALID: [],
         TemplateStatus.TEST_FAILURE: [],
     }
+    config = Config.load()
     for exercise in filter(
-        lambda e: fnmatch(e["slug"], opts.exercise_pattern), config["exercises"]
+        lambda e: fnmatch(e.slug, opts.exercise_pattern),
+        config.exercises.all()
     ):
-        if exercise.get('deprecated', False):
+        if exercise.deprecated:
+            continue
+        if exercise.type == 'concept':
+            # Concept exercises are not generated
             continue
-        slug = exercise["slug"]
-        status = get_status(slug, opts.spec_path)
+        status = get_status(exercise, opts.spec_path)
         if status == TemplateStatus.OK:
-            logger.info(f"{slug}: {status.name}")
+            logger.info(f"{exercise.slug}: {status.name}")
         else:
-            buckets[status].append(slug)
+            buckets[status].append(exercise.slug)
             result = False
             if opts.stop_on_failure:
-                logger.error(f"{slug}: {status.name}")
+                logger.error(f"{exercise.slug}: {status.name}")
                 break
 
     if not opts.quiet and not opts.stop_on_failure:
diff --git a/bin/test_exercises.py b/bin/test_exercises.py
@@ -12,7 +12,7 @@
 ALLOW_SKIP = ['alphametics', 'largest-series-product']
 
 
-def check_assignment(exercise: ExerciseInfo) -> int:
+def check_assignment(exercise: ExerciseInfo, quiet=False) -> int:
     # Returns the exit code of the tests
     workdir = Path(tempfile.mkdtemp(exercise.slug))
     solution_file = exercise.solution_stub.name
@@ -27,7 +27,11 @@ def check_assignment(exercise: ExerciseInfo) -> int:
             with test_file_out.open('w') as dst_file:
                 dst_file.writelines(lines)
         shutil.copyfile(exercise.exemplar_file, workdir / solution_file)
-        return subprocess.call([sys.executable, test_file_out])
+        kwargs = {}
+        if quiet:
+            kwargs['stdout'] = subprocess.DEVNULL
+            kwargs['stderr'] = subprocess.DEVNULL
+        return subprocess.run([sys.executable, test_file_out], **kwargs).returncode
     finally:
         shutil.rmtree(workdir)
 
