Fix a couple things

Author: dem4ron

.gitignore

@@ -9,3 +9,4 @@ bin/exercise
 bin/exercise.exe
 exercises/*/*/Cargo.lock
 exercises/*/*/clippy.log
+canonical_data.json

bin/generator-utils/generate_tests

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # shellcheck source=/dev/null
-source ./bin/generator-utils/utils
+source ./bin/generator-utils/utils.sh
 
 function digest_template() {
   template=$(cat bin/generator-utils/test_template)
@@ -12,15 +12,18 @@ function digest_template() {
 
 canonical_json=$(cat canonical_data.json)
 SLUG=$(echo "$canonical_json" | jq '.exercise')
-EXERCISE_DIR="exercises/practice/${SLUG}"
-EXERCISE_DIR="exercises/practice/${SLUG}"
-TEST_FILE="${EXERCISE_DIR}/tests/${SLUG}.rs"
-    cat <<EOT >"$TEST_FILE"
+# shellcheck disable=SC2001
+# Remove double quotes
+SLUG=$(echo "$SLUG" | sed 's/"//g')
+EXERCISE_DIR="exercises/practice/$SLUG"
+TEST_FILE="$EXERCISE_DIR/tests/$SLUG.rs"
+rm "$TEST_FILE"
+
+cat <<EOT >"$TEST_FILE"
 use $(dash_to_underscore "$SLUG")::*;
 // Add tests here
 
 EOT
-rm "$TEST_FILE"
 cases=$(echo "$canonical_json" | jq '[ .. | objects | with_entries(select(.key | IN("uuid", "description", "input", "expected", "property"))) | select(. != {}) | select(has("uuid")) ]')
 
 # shellcheck disable=SC2034
@@ -33,6 +36,10 @@ jq -c '.[]' <<<"$cases" | while read -r case; do
   # Turn function name unto snake_case
   formatted_template=$(echo "$eval_template" | sed -e ':loop' -e 's/\(fn[^(]*\)[ -]/\1_/g' -e 't loop' | sed 's/fn_/fn /')
   # Push to file
-  echo "$formatted_template" >>tests.rs
+
+  echo "$formatted_template" >>"$TEST_FILE"
+  printf "\\n" >> "$TEST_FILE"
 
 done
+
+rustfmt "$TEST_FILE"

bin/generator-utils/templates.sh

@@ -24,7 +24,7 @@ EOT
     )
     # fetch canonical_data
     canonical_json=$(curl "${curlopts[@]}" "https://raw.githubusercontent.com/exercism/problem-specifications/main/exercises/${slug}/canonical-data.json")
-    $canonical_json >>canonical_data.json
+    echo "$canonical_json" >>canonical_data.json
 
     if [ "${canonical_json}" == "404: Not Found" ]; then
         canonical_json=$(jq --null-input '{cases: []}')