pre-commit manual fixes

We update bin/verify-exercises from generic-track

Author: keiravillekode

bin/create-exercise

@@ -27,7 +27,7 @@ if [[ -z $author ]]; then
     read -rp "What's your github username? " author
 fi
 
-read -p "What's the difficulty for ${slug}? " difficulty
+read -rp "What's the difficulty for ${slug}? " difficulty
 
 bin/fetch-configlet
 bin/configlet create --practice-exercise "${slug}" --author "${author}" --difficulty "${difficulty}"

bin/verify-exercises

@@ -1,53 +1,71 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-set -e
+# Synopsis:
+# Verify that each exercise's example/exemplar solution passes the tests.
+# You can either verify all exercises or a single exercise.
 
-run_tests() {
-    cd "$1"
+# Example: verify all exercises
+# bin/verify-exercises
 
-    exercise_name=$(basename $1)
-    local file="${exercise_name//-/_}"
+# Example: verify single exercise
+# bin/verify-exercises two-fer
 
-    sed -i.bak 's#TEST_IGNORE();#// &#' "${file}"_test.c
+set -eo pipefail
 
-    # concept exercises have "exemplar" solutions (ideal, to be strived to)
-    if [ -f .meta/exemplar.asm ]; then
-      mv .meta/exemplar.asm "${file}".asm
-    fi
+die() { echo "$*" >&2; exit 1; }
 
-    # practice exercises have "example" solutions (one of many possible solutions with no single ideal approach)
-    if [ -f .meta/example.asm ]; then
-      mv .meta/example.asm "${file}".asm
-    fi
+required_tool() {
+    command -v "${1}" >/dev/null 2>&1 ||
+        die "${1} is required but not installed. Please install it and make sure it's in your PATH."
+}
 
-    make clean
-    make
+required_tool jq
 
-    cd ../..
+copy_example_or_examplar_to_solution() {
+    jq -c '[.files.solution, .files.exemplar // .files.example] | transpose | map({src: .[1], dst: .[0]}) | .[]' .meta/config.json \
+    | while read -r src_and_dst; do
+        cp "$(jq -r '.src' <<< "${src_and_dst}")" "$(jq -r '.dst' <<< "${src_and_dst}")"
+    done
 }
 
-main() {
-    cd "$(dirname "$0")"/..
+verify_exercise() {
+    local dir
+    local slug
+    local tmp_dir
+
+    dir=$(realpath "${1}")
+    slug=$(basename "${dir}")
+    tmp_dir=$(mktemp -d -t "exercism-verify-${slug}-XXXXX")
 
-    rm -rf build
-    cp -r exercises build
+    echo "Verifying ${slug} exercise..."
 
-    cd build
+    (
+        trap 'rm -rf "$tmp_dir"' EXIT    # remove tempdir when subshell ends
+        cp -r "${dir}/." "${tmp_dir}"
+        cd "${tmp_dir}"
 
-    exercises=`echo */*`
+        copy_example_or_examplar_to_solution
+        sed -i.bak 's#TEST_IGNORE();#// &#' "${slug//-/_}"_test.c
+        make clean
+        make
+    )
+}
 
-    if [[ ! -z "$@" ]]; then
-      pattern=$(echo "$@" | sed 's/ /|/g')
-      exercises=$(find $exercises -maxdepth 0 | grep -E "$pattern")
-    fi
+verify_exercises() {
+    local exercise_slug
 
-    # test each exercise
-    for exercise in $exercises; do
-      if [ -d ${exercise} ]; then
-        run_tests "${exercise}"
-      fi
-    done
+    exercise_slug="${1}"
 
+    shopt -s nullglob
+    count=0
+    for exercise_dir in ./exercises/{concept,practice}/${exercise_slug}/; do
+        if [[ -d "${exercise_dir}" ]]; then
+            verify_exercise "${exercise_dir}"
+            ((++count))
+        fi
+    done
+    ((count > 0)) || die 'no matching exercises found!'
 }
 
-main "$@"
+exercise_slug="${1:-*}"
+verify_exercises "${exercise_slug}"

generators/exercises/affine_cipher.py

@@ -10,7 +10,7 @@
 
 def gen_func_body(prop, inp, expected):
     str_list = []
-    if expected.__class__ == dict:
+    if isinstance(expected, dict):
         expected = ""
     phrase = inp["phrase"]
     a = inp["key"]["a"]

generators/exercises/phone_number.py

@@ -13,7 +13,7 @@ def gen_func_body(prop, inp, expected):
     str_list.append("char buffer[BUFFER_SIZE];\n\n")
     str_list.append(f'{prop}(buffer, "{phrase}");\n')
 
-    if expected.__class__ == dict:
+    if isinstance(expected, dict):
         expected = ""
 
     str_list.append(f'TEST_ASSERT_EQUAL_STRING("{expected}", buffer);\n')