refactor: 🗑️ removed submodules

repos requireing this repo via submodules will need to be updated

Author: ChristophLHR

.github/workflows/test.yml

@@ -7,15 +7,9 @@ on: [push, pull_request]
 jobs:
   test:
     runs-on: ubuntu-latest
-
     steps:
-    - name: checkout
-      uses: actions/checkout@v2
-      with:
-        submodules: true
-
     - name: get lua
-      uses: leafo/gh-actions-lua@v10
+      uses: leafo/gh-actions-lua@v11
       with: 
         luaVersion: "5.1"
 
@@ -30,11 +24,11 @@ jobs:
         luarocks install luasocket
         luarocks install luasec
 
-    - name: Git Submodule Update
+    - name: fetch dependencies
       run: |
-        git pull --recurse-submodules
-        git submodule update --remote --recursive
+        chmod +x ./fetch-deps.sh
+        ./fetch-deps.sh
 
     - name: test
       run: |
-        busted .
+        busted vector

.gitignore

@@ -1,4 +1,4 @@
 /config
 /.vscode
 /computer
-/suits
+/libs

.gitmodules

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# ---- Whats happening ---- #
+
+# This fetches the dependencies listed in the "libs" variable and saves them in the targetFolder
+
+
+
+set -e
+
+libs=(
+    "helperFunctions-lib"
+    "eventCallStack-lib"
+    "ccClass-lib"
+    "testSuite-lib"
+)
+
+# Basic setup variables
+repo="mc-cc-scripts"
+branch="master"
+targetFolderName=libs
+
+
+# fetch files.txt and save each file into the targetFolder
+fetch() {
+
+    files_txt=$(curl -fsSL "https://raw.githubusercontent.com/$repo/$1/$branch/files.txt")
+    if [ -z "$files_txt" ]; then
+        echo "Could not load files.txt for $1"
+        exit 1
+    fi
+    while IFS= read -r FILE; do
+        rm -f $targetFolderName/$1.lua # rm existing file
+        curl -s "https://raw.githubusercontent.com/$repo/$1/$branch/$FILE" -o "$targetFolderName/$FILE"
+    done < <(echo  "$files_txt")
+}
+
+mkdir -p $targetFolderName
+
+for i in "${libs[@]}"; do
+    fetch "$i"
+done

fetch-deps.sh

@@ -1,2 +1,8 @@
 turtleEmulator.lua
-turtleMock.lua
+turtleMock.lua
+peripheral.lua
+defaultInteraction.lua
+defaultcheckActionValid.lua
+inventory/chestInventory.lua
+inventory/inventory.lua
+inventory/turtleInventory.lua

files.txt

@@ -1,5 +1,5 @@
-local class = require("./TestSuite-lib/ccClass/ccClass")
-local inventory = require("../inventory/inventory")
+local class = require("ccClass")
+local inventory = require("inventory")
 ---@class ChestInventory : Inventory
 local chestInventory = class(inventory)
 

inventory/chestInventory.lua

@@ -18,8 +18,8 @@
 --#endregion
 
 
-local deepCopy = require("./TestSuite-lib/helperFunctions/helperFunctions").deepCopy
-local class = require("./TestSuite-lib/ccClass/ccClass")
+local deepCopy = require("helperFunctions").deepCopy
+local class = require("ccClass")
 
 ---# inventory
 ---Inventory system emulated

inventory/inventory.lua

@@ -1,6 +1,6 @@
-local class = require("./TestSuite-lib/ccClass/ccClass")
-local inventory = require("../inventory/inventory")
-local deepCopy = require("../TestSuite-lib/helperFunctions/helperFunctions").deepCopy
+local class = require("ccClass")
+local inventory = require("inventory")
+local deepCopy = require("helperFunctions").deepCopy
 ---@class TurtleInventory : Inventory
 ---@field protected _base Inventory the base inventory class
 local turtleInventory = class(inventory, function (selfRef)

inventory/turtleInventory.lua

@@ -29,12 +29,10 @@
 ---@field equal function
 assert = assert
 
-local spath =
-    debug.getinfo(1,'S').source:sub(2):gsub("/+", "/"):gsub("[^/]*$",""):gsub("/tests", ""):gsub("tests", "")
-    if spath == "" then
-        spath = "./"
-    end
-require(spath .. "package")
+package.path = package.path
+    ..";inventory/?.lua;"
+    .."libs/?.lua;"
+    .."libs/?/?.lua;"
 
 -- load the other suits
 local vector = require("vector")