Add helper function for writable attributes

tmc/reflect.py

@@ -77,6 +77,9 @@ def list_attributes(self, filter_builtin=False):
             return [x for x in dir(self.__obj) if not x.startswith("__")]
         return dir(self.__obj)
 
+    def list_writable_attributes(self):
+        return self.__obj.__dict__
+
     def has_attribute(self, attribute: str):
         if attribute in dir(self.__obj):
             return True

tmc_module.sh

@@ -8,10 +8,10 @@ osa1/02_ei_hymio
 osa3/01_input_file
 osa3/18_last_exercise
 Where:
-    -t  		Runs tests for exercises
-    -u  		Updates TMC Module from tmc-python-tester repository
-	-p='part1' 	Applies only to given folder"
-	
+    -t          Runs tests for exercises
+    -u          Updates TMC Module from tmc-python-tester repository
+    -p='part1'  Applies only to given folder"
+
 
 # Manually ignored folders if needed
 ignored_dirs=("tmc-python-tester" ".vscode" "osax")
@@ -22,99 +22,128 @@ UPDATE=false
 PART=""
 
 for i in "$@"; do
-	case $i in
-		-t|--test)
-			TEST=true
-			shift
-			;;
-		-u|--update)
-			UPDATE=true
-			shift
-			;;
-		-p=*|--part=*)
-			PART="${i#*=}"
-			shift
-			;;
-		*)
-			echo "$usage" >&2
-			exit 1
-			;;
-	esac
+    case $i in
+        -t|--test)
+            TEST=true
+            shift
+            ;;
+        -u|--update)
+            UPDATE=true
+            shift
+            ;;
+        -p=*|--part=*)
+            PART="${i#*=}"
+            shift
+            ;;
+        *)
+            echo "$usage" >&2
+            exit 1
+            ;;
+    esac
 done
 
 if [[ "$UPDATE" = true ]]; then
-	git clone https://github.com/testmycode/tmc-python-tester.git
+    git clone https://github.com/testmycode/tmc-python-tester.git
 fi
 
 for dir in *; do
+    # Only process directories
+    if [ ! -d "${dir}" ]; then
+        continue
+    fi
+
+    # Skip ignored directories
+    skip_dir=false
+    for ignored_dir in "${ignored_dirs[@]}"
+    do
+        if [[ $ignored_dir =~ $dir ]]; then
+            skip_dir=true
+            break
+        fi
+    done
+    if $skip_dir; then
+        continue
+    fi
+
+    # Filter by part argument, if given
+    if [[ "$PART" != "" && "$PART" != "$dir" ]]; then
+        continue
+    fi
 
-    if [[ -d "${dir}" ]] && [[ ! "${ignored_dirs[@]}" =~ "${dir}" ]]; then
-
-		if [[ "$PART" = "" || "$PART" = "$dir" ]]; then
-			cd ${dir} # Go to part/osa folder
-		else
-			continue 
-		fi
-
-        for subdir in *; do
-
-            if [[ -d "${subdir}" ]]; then
-				if [[ ! "${ignored_subdirs[@]}" =~ "${subdir}" ]]; then
-
-					cd ${subdir} # Go to exercise folder under part
-
-					if [[ $(ls -la | grep ".tmcignore") ]]; then
-						echo "Skipped update for ${dir}/${subdir} due to .tmcignore file."
-						cd .. # Leave exercise folder
-						continue
-					fi
-
-					if [[ "$UPDATE" = true ]]; then
-						echo "Updating TMC Module for ${dir}/${subdir}."
-						rm -rf tmc/
-						cp -r ../../tmc-python-tester/tmc/ tmc/
-					fi
-
-					if [[ "$TEST" = true ]]; then
-
-						output=$((python -m tmc) 2>&1)
-
-						skipped=false
-						while [[ "$output" =~ "FAIL" || "$output" =~ "ERROR" ]]; do
-
-								python -m tmc
-								echo ""
-								echo "Some test failed after update for ${dir}/${subdir}, please fix failed tests."
-								read -n 1 -r -p "Press (s) to skip or any key to continue... " key
-								if [[ "$key" == "s" || "$key" == "S" ]]; then
-									skipped=true
-									git restore "tmc/."
-									echo ""
-									break
-								fi
-								output=$((python -m tmc) 2>&1)
-
-						done
-
-						if [[ "$skipped" = false ]]; then
-							echo "All tests passed for ${dir}/${subdir}."
-						fi
-					fi
-					cd .. # Go away from exercise folder
-
-				else
-					echo "Skipped update for ${dir}/${subdir}."
-				fi
+    # Go to part/osa folder
+    cd "${dir}" || exit
+
+    for subdir in *; do
+        # Only process directories
+        if [ ! -d "${subdir}" ]; then
+            continue
+        fi
+
+        # Skip ignored subdirectories
+        skip_subdir=false
+        for ignored_subdir in "${ignored_subdirs[@]}"
+        do
+            if [[ $ignored_subdir =~ $subdir ]]; then
+                skip_subdir=true
             fi
-
         done
-
-        cd .. # Away from part/osa folder
-
-    fi
+        if $skip_subdir; then
+            continue
+        fi
+
+        # Go to exercise folder under part
+        cd "${subdir}" || exit
+
+        if find . | grep -q ".tmcignore"; then
+            echo "Skipped update for ${dir}/${subdir} due to .tmcignore file."
+            # Leave exercise folder
+            cd ..
+            continue
+        fi
+
+        if [[ "$UPDATE" = true ]]; then
+            echo "Updating TMC Module for ${dir}/${subdir}."
+            rm -rf tmc/
+            cp -r ../../tmc-python-tester/tmc/ tmc/
+        fi
+
+        if [[ "$TEST" = true ]]; then
+
+            output=$( (python -m tmc) 2>&1 )
+
+            skipped=false
+            while [[ "$output" =~ "FAIL" || "$output" =~ "ERROR" ]]; do
+
+                    python -m tmc
+                    echo ""
+                    echo "Some test failed after update for ${dir}/${subdir}, please fix failed tests."
+                    read -n 1 -r -p "Press (s) to skip or any key to continue... " key
+                    if [[ "$key" == "s" || "$key" == "S" ]]; then
+                        skipped=true
+                        git restore "tmc/."
+                        echo ""
+                        break
+                    fi
+                    output=$( (python -m tmc) 2>&1 )
+
+            done
+
+            if [[ "$skipped" = false ]]; then
+                echo "All tests passed for ${dir}/${subdir}."
+            fi
+        fi
+
+        # Go away from exercise folder
+        cd ..
+    done
+
+    # Away from part/osa folder
+    cd ..
 done
+
 if [[ "$UPDATE" = true ]]; then
-	echo "Removing cloned tmc-python-tester repo."
-	rm -rf tmc-python-tester
+    echo "Removing cloned tmc-python-tester repo."
+    rm -rf tmc-python-tester
 fi
-echo "Make sure to use 'git add -u (--patch)' after update, so you don't add model solution generated files into repository."
+
+echo "Make sure to run \`git add **/tmc/**\` to add the updated \`tmc\` module files without any files generated by the exercise tests."