Система тестов для модульных файлов (раунд 2)

.github/workflows/ci_suite.yml

@@ -86,13 +86,15 @@ jobs:
         run: ':'
       - name: Run Grep Checks
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
-        run: bash tools/ci/check_grep.sh
+        run: |
+          bash tools/ci/check_grep.sh
+          bash massmeta/tools/massmeta_check_grep.sh # MASSMETA EDIT ADDITION - checking modular_meta code
       - name: Ticked File Enforcement
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: |
-          bash tools/massmeta_check_grep.sh # MASSMETA EDIT ADDITION - checking modular_meta code
           tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/tgstation_dme.json
           tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/unit_tests.json
+          tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/modular_meta.json # MASSMETA EDIT ADDITION - modular tick enforcement
       - name: Check Define Sanity
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: tools/bootstrap/python -m define_sanity.check

massmeta/features/hardsuits/includes.dm

@@ -0,0 +1,5 @@
+#include "code\_jetpack.dm"
+#include "code\armor.dm"
+#include "code\hardsuit.dm"
+#include "code\helmet.dm"
+#include "code\space_suit_beacon.dm"

massmeta/features/smites/includes.dm

@@ -0,0 +1 @@
+#include "code\testicular_torsion.dm"

massmeta/modular_meta.dm

@@ -1,15 +1,17 @@
-/*
-*
-* Это основной файл куда будут складываться все наши модульные добавления.
-* Добавлять только:
-*	Модули (.dm файлами)
-* Сам этот файл добавлен в tgstation.dme
-*
-*Все Defines файлы лежат в папке "~meta_defines\", однако там идет переопределение пути для того чтобы не ругались тесты.
-*
-*/
+// Это основной файл куда будут складываться все наши модульные добавления.
+// Добавлять только:
+// Модули (includes.dm файлами)
+// Сам этот файл добавлен в tgstation.dme
 
-//modular files
+// Все Defines файлы лежат в папке "~meta_defines\", однако там идет переопределение пути для того чтобы не ругались тесты.
+
+
+// Modular files (covered with tests)
+// BEGIN_INCLUDE
+#include "features\additional_circuit\includes.dm"
+#include "features\hardsuits\includes.dm"
+#include "features\smites\includes.dm"
+// END_INCLUDE
 
 
 //master files (unsorted, TODO: need modularization)
@@ -83,14 +85,6 @@
 #include "code\game\objects\structures\crates_lockers\crates\large.dm"
 #include "code\modules\cargo\packs\imports.dm"
 
-//features
-#include "features\additional_circuit\includes.dm"
-#include "features\hardsuits\code\_jetpack.dm"
-#include "features\hardsuits\code\armor.dm"
-#include "features\hardsuits\code\hardsuit.dm"
-#include "features\hardsuits\code\helmet.dm"
-#include "features\hardsuits\code\space_suit_beacon.dm"
-
 //buts
 #include "code\modules\surgery\organs\internal\butts\butts.dm"
 #include "code\modules\surgery\organs\internal\butts\butts_init.dm"
@@ -109,6 +103,3 @@
 #include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\sodas.dm"
 #include "code\modules\reagents\reagent_containers\cups\soda.dm"
 #include "code\modules\reagents\reagent_dispenser.dm"
-
-//smites
-#include "features\smites\testicular_torsion.dm"

tools/ticked_file_enforcement/schemas/modular_meta.json

@@ -0,0 +1,7 @@
+{
+	"file": "massmeta/modular_meta.dm",
+	"scannable_directory": "massmeta/features/",
+	"subdirectories": true,
+	"excluded_files": [],
+	"forbidden_includes": []
+}

tools/ticked_file_enforcement/ticked_file_enforcement.py

@@ -56,8 +56,45 @@ def post_error(string):
         elif not reading:
             continue
 
+        # MASSMETA EDIT ADDITION START (check modular code folder)
+        # need to make full path
+        if scannable_directory == "massmeta/features/":
+            line =  line[:10] + "massmeta\\" + line[10:]
+        # MASSMETA EDIT ADDITION END
         lines.append(line)
 
+        # MASSMETA EDIT ADDITION START (check modular code folder)
+        if scannable_directory == "massmeta/features/":
+            fail_no_include_modular = False
+            print(blue(f"Scanning Modular Code... Checking files in [{scannable_directory}]"))
+
+            module_file_path = line.replace('\\', '/')
+            module_file_path_clean = module_file_path[10:-1]
+            print(f"    [{module_file_path_clean}] with in it:")
+            if module_file_path_clean[-11:] != "includes.dm":
+                red(f"      File [{module_file_path_clean}] must be named \"includes.dm\", skipping the file.")
+                fail_no_include_modular = True
+                continue
+
+            with open(module_file_path_clean, 'r') as extra_file:
+                for extra_line in extra_file:
+                    total += 1
+                    extra_line = extra_line.strip()
+                    if (extra_line[10:14] != "code"):
+                        red(f"       File [{extra_line}] must be in \"code/\" folder")
+                        fail_no_include_modular = True
+
+                    # make full path
+                    extra_line = line[:-12] + extra_line[10:]
+                    lines.append(extra_line)
+                    extra_line.replace('\\', '/')
+                    print(f"        [{extra_line[10:-1]}]")
+
+            if fail_no_include_modular:
+                post_error(f"Modular Ticked File Enforcement has failed!")
+                sys.exit(1)
+        # MASSMETA EDIT ADDITION END
+
 offset = total - len(lines)
 print(blue(f"Ticked File Enforcement: {offset} lines were ignored in output for [{file_reference}]."))
 fail_no_include = False