Merge pull request #28 from fikin/dev

merging progress from dev branch

.github/workflows/oncommit.yml

@@ -18,6 +18,8 @@ jobs:
     - name: Prepare modules
       run: make config
     - name: Run lua tests
-      run: make prepare-firmware mock_spiffs_dir test
+      run: make test
     - name: Run lua integration tests
-      run: make prepare-firmware mock_spiffs_dir integration-test
+      run: make integration-test
+    - name: Report test coverage
+      run: make coverage

.gitignore

@@ -1 +1,5 @@
 vendor
+luacov.stats.out
+luacov.report.out
+luacov.report.out.index
+luacov-html

.luacov_html

@@ -0,0 +1,3 @@
+reporter = "html"
+html = {}
+

.vscode/launch.json

@@ -14,7 +14,7 @@
       "luaVersion": "5.3",
       "env": {
         "NODEMCU_MOCKS_SPIFFS_DIR": "vendor/tests-spiffs",
-        "NODEMCU_LFS_FILES": "lua_modules/bootprotect/lua/bootprotect.lua lua_modules/device-settings/lua/device-settings.lua lua_modules/device-settings/lua/factory-settings.lua lua_modules/device-settings/lua/user-settings.lua lua_modules/ds18b20/lua/ds18b20.lua lua_modules/dummy-strings/lua/dummy-strings.lua lua_modules/http-srv/lua/http-authorize.lua lua_modules/http-srv/lua/http-conn-gc.lua lua_modules/http-srv/lua/http-conn.lua lua_modules/http-srv/lua/http-conn-req.lua lua_modules/http-srv/lua/http-conn-resp.lua lua_modules/http-srv/lua/http-h-ok.lua lua_modules/http-srv/lua/http-h-read-json.lua lua_modules/http-srv/lua/http-h-restart.lua lua_modules/http-srv/lua/http-h-return-file.lua lua_modules/http-srv/lua/http-h-save-file-bak.lua lua_modules/http-srv/lua/http-h-save-file.lua lua_modules/http-srv/lua/http-h-send-json.lua lua_modules/http-srv/lua/http-parse-headers.lua lua_modules/http-srv/lua/http-srv.lua lua_modules/lfs-init/lua/_init.lua lua_modules/lights-switch/lua/lights-switch-ha-data.lua lua_modules/lights-switch/lua/lights-switch-ha-set.lua lua_modules/lights-switch/lua/lights-switch-ha-spec.lua lua_modules/lights-switch/lua/lights-switch-start.lua lua_modules/log/lua/log.lua lua_modules/log/lua/log-start.lua lua_modules/mdns-adv/lua/mdns-adv.lua lua_modules/pid/lua/pid-control.lua lua_modules/pid/lua/pid-get-output.lua lua_modules/pid/lua/pid-set-input.lua lua_modules/pid/lua/pid-set-setpoint.lua lua_modules/pid/lua/pid-setup.lua lua_modules/pid/lua/pid-start.lua lua_modules/relay-switch/lua/relay-switch-ha-data.lua lua_modules/relay-switch/lua/relay-switch-ha-set.lua lua_modules/relay-switch/lua/relay-switch-ha-spec.lua lua_modules/relay-switch/lua/relay-switch-start.lua lua_modules/sct013-sensor/lua/sct013-sensor-ha-data.lua lua_modules/sct013-sensor/lua/sct013-sensor-ha-spec.lua lua_modules/sct013-sensor/lua/sct013-sensor-start.lua lua_modules/sntp-sync/lua/sntp-dns-code.lua lua_modules/sntp-sync/lua/sntp-sync.lua lua_modules/state/lua/state.lua lua_modules/system-hass/lua/system-hass-ha-data.lua lua_modules/system-hass/lua/system-hass-ha-spec.lua lua_modules/system-hass/lua/system-restart-button-ha-set.lua lua_modules/telnet/lua/telnet.lua lua_modules/temp-sensor/lua/temp-sensor-control.lua lua_modules/temp-sensor/lua/temp-sensor-get.lua lua_modules/temp-sensor/lua/temp-sensor-ha-data.lua lua_modules/temp-sensor/lua/temp-sensor-ha-spec.lua lua_modules/temp-sensor/lua/temp-sensor-start.lua lua_modules/thermostat/lua/thermostat-control.lua lua_modules/thermostat/lua/thermostat-ha-data.lua lua_modules/thermostat/lua/thermostat-ha-set.lua lua_modules/thermostat/lua/thermostat-ha-spec.lua lua_modules/thermostat/lua/thermostat-start.lua lua_modules/utils/lua/call-later.lua lua_modules/utils/lua/get-sw-version.lua lua_modules/utils/lua/gpio-set-pin.lua lua_modules/utils/lua/is-array.lua lua_modules/utils/lua/read-json-file.lua lua_modules/utils/lua/str-split.lua lua_modules/utils/lua/str-to-json.lua lua_modules/utils/lua/table-clone.lua lua_modules/utils/lua/table-merge.lua lua_modules/utils/lua/table-substract.lua lua_modules/utils/lua/time-it.lua lua_modules/vetinari-clock/lua/vetinari-clock.lua lua_modules/web-ha/lua/web-ha.lua lua_modules/web-ota/lua/web-ota.lua lua_modules/web-portal/lua/web-portal.lua lua_modules/wifimgr/lua/wifi-apply-config.lua lua_modules/wifimgr/lua/wifi-authmode.lua lua_modules/wifimgr/lua/wifi-event-type.lua lua_modules/wifimgr/lua/wifi-mgr.lua lua_modules/wifimgr/lua/wifi-reasons.lua lua_modules/wifimgr/lua/wifi-stastatus.lua lua_modules/wifimgr/lua/wifi-wifimode.lua"
+        "NODEMCU_LFS_FILES": "lua_modules/bootprotect/lua/bootprotect.lua lua_modules/device-settings/lua/device-settings.lua lua_modules/device-settings/lua/factory-settings.lua lua_modules/device-settings/lua/user-settings.lua lua_modules/ds18b20/lua/ds18b20.lua lua_modules/dummy-strings/lua/dummy-strings.lua lua_modules/http-srv/lua/http-authorize.lua lua_modules/http-srv/lua/http-conn-gc.lua lua_modules/http-srv/lua/http-conn.lua lua_modules/http-srv/lua/http-conn-req.lua lua_modules/http-srv/lua/http-conn-resp.lua lua_modules/http-srv/lua/http-h-ok.lua lua_modules/http-srv/lua/http-h-read-json.lua lua_modules/http-srv/lua/http-h-restart.lua lua_modules/http-srv/lua/http-h-return-file.lua lua_modules/http-srv/lua/http-h-save-file-bak.lua lua_modules/http-srv/lua/http-h-save-file.lua lua_modules/http-srv/lua/http-h-send-json.lua lua_modules/http-srv/lua/http-parse-headers.lua lua_modules/http-srv/lua/http-srv.lua lua_modules/lfs-init/lua/_init.lua lua_modules/lights-switch/lua/lights-switch-ha-data.lua lua_modules/lights-switch/lua/lights-switch-ha-set.lua lua_modules/lights-switch/lua/lights-switch-ha-spec.lua lua_modules/lights-switch/lua/lights-switch-start.lua lua_modules/log/lua/log.lua lua_modules/mdns-adv/lua/mdns-adv.lua lua_modules/pid/lua/pid-control.lua lua_modules/pid/lua/pid-get-output.lua lua_modules/pid/lua/pid-set-input.lua lua_modules/pid/lua/pid-set-setpoint.lua lua_modules/pid/lua/pid-setup.lua lua_modules/pid/lua/pid-start.lua lua_modules/relay-switch/lua/relay-switch-ha-data.lua lua_modules/relay-switch/lua/relay-switch-ha-set.lua lua_modules/relay-switch/lua/relay-switch-ha-spec.lua lua_modules/relay-switch/lua/relay-switch-start.lua lua_modules/sct013-sensor/lua/sct013-sensor-ha-data.lua lua_modules/sct013-sensor/lua/sct013-sensor-ha-spec.lua lua_modules/sct013-sensor/lua/sct013-sensor-start.lua lua_modules/sntp-sync/lua/sntp-dns-code.lua lua_modules/sntp-sync/lua/sntp-sync.lua lua_modules/state/lua/state.lua lua_modules/system-hass/lua/system-hass-ha-data.lua lua_modules/system-hass/lua/system-hass-ha-spec.lua lua_modules/system-hass/lua/system-restart-button-ha-set.lua lua_modules/telnet/lua/telnet.lua lua_modules/temp-sensor/lua/temp-sensor-control.lua lua_modules/temp-sensor/lua/temp-sensor-get.lua lua_modules/temp-sensor/lua/temp-sensor-ha-data.lua lua_modules/temp-sensor/lua/temp-sensor-ha-spec.lua lua_modules/temp-sensor/lua/temp-sensor-start.lua lua_modules/thermostat/lua/thermostat-control.lua lua_modules/thermostat/lua/thermostat-ha-data.lua lua_modules/thermostat/lua/thermostat-ha-set.lua lua_modules/thermostat/lua/thermostat-ha-spec.lua lua_modules/thermostat/lua/thermostat-start.lua lua_modules/utils/lua/call-later.lua lua_modules/utils/lua/get-sw-version.lua lua_modules/utils/lua/gpio-set-pin.lua lua_modules/utils/lua/is-array.lua lua_modules/utils/lua/read-json-file.lua lua_modules/utils/lua/str-split.lua lua_modules/utils/lua/str-to-json.lua lua_modules/utils/lua/table-clone.lua lua_modules/utils/lua/table-merge.lua lua_modules/utils/lua/table-substract.lua lua_modules/utils/lua/time-it.lua lua_modules/vetinari-clock/lua/vetinari-clock.lua lua_modules/web-ha/lua/web-ha.lua lua_modules/web-ota/lua/web-ota.lua lua_modules/web-portal/lua/web-portal.lua lua_modules/wifimgr/lua/wifi-apply-config.lua lua_modules/wifimgr/lua/wifi-authmode.lua lua_modules/wifimgr/lua/wifi-event-type.lua lua_modules/wifimgr/lua/wifi-mgr.lua lua_modules/wifimgr/lua/wifi-reasons.lua lua_modules/wifimgr/lua/wifi-stastatus.lua lua_modules/wifimgr/lua/wifi-wifimode.lua"
       },
       "path": [
         "${workspaceFolder}/lua_modules/bootprotect/lua/?.lua",
@@ -56,7 +56,7 @@
       "luaVersion": "5.3",
       "env": {
         "NODEMCU_MOCKS_SPIFFS_DIR": "vendor/tests-spiffs",
-        "NODEMCU_LFS_FILES": "lua_modules/bootprotect/lua/bootprotect.lua lua_modules/device-settings/lua/device-settings.lua lua_modules/device-settings/lua/factory-settings.lua lua_modules/device-settings/lua/user-settings.lua lua_modules/ds18b20/lua/ds18b20.lua lua_modules/dummy-strings/lua/dummy-strings.lua lua_modules/http-srv/lua/http-authorize.lua lua_modules/http-srv/lua/http-conn-gc.lua lua_modules/http-srv/lua/http-conn.lua lua_modules/http-srv/lua/http-conn-req.lua lua_modules/http-srv/lua/http-conn-resp.lua lua_modules/http-srv/lua/http-h-ok.lua lua_modules/http-srv/lua/http-h-read-json.lua lua_modules/http-srv/lua/http-h-restart.lua lua_modules/http-srv/lua/http-h-return-file.lua lua_modules/http-srv/lua/http-h-save-file-bak.lua lua_modules/http-srv/lua/http-h-save-file.lua lua_modules/http-srv/lua/http-h-send-json.lua lua_modules/http-srv/lua/http-parse-headers.lua lua_modules/http-srv/lua/http-srv.lua lua_modules/lfs-init/lua/_init.lua lua_modules/lights-switch/lua/lights-switch-ha-data.lua lua_modules/lights-switch/lua/lights-switch-ha-set.lua lua_modules/lights-switch/lua/lights-switch-ha-spec.lua lua_modules/lights-switch/lua/lights-switch-start.lua lua_modules/log/lua/log.lua lua_modules/log/lua/log-start.lua lua_modules/mdns-adv/lua/mdns-adv.lua lua_modules/pid/lua/pid-control.lua lua_modules/pid/lua/pid-get-output.lua lua_modules/pid/lua/pid-set-input.lua lua_modules/pid/lua/pid-set-setpoint.lua lua_modules/pid/lua/pid-setup.lua lua_modules/pid/lua/pid-start.lua lua_modules/relay-switch/lua/relay-switch-ha-data.lua lua_modules/relay-switch/lua/relay-switch-ha-set.lua lua_modules/relay-switch/lua/relay-switch-ha-spec.lua lua_modules/relay-switch/lua/relay-switch-start.lua lua_modules/sct013-sensor/lua/sct013-sensor-ha-data.lua lua_modules/sct013-sensor/lua/sct013-sensor-ha-spec.lua lua_modules/sct013-sensor/lua/sct013-sensor-start.lua lua_modules/sntp-sync/lua/sntp-dns-code.lua lua_modules/sntp-sync/lua/sntp-sync.lua lua_modules/state/lua/state.lua lua_modules/system-hass/lua/system-hass-ha-data.lua lua_modules/system-hass/lua/system-hass-ha-spec.lua lua_modules/system-hass/lua/system-restart-button-ha-set.lua lua_modules/telnet/lua/telnet.lua lua_modules/temp-sensor/lua/temp-sensor-control.lua lua_modules/temp-sensor/lua/temp-sensor-get.lua lua_modules/temp-sensor/lua/temp-sensor-ha-data.lua lua_modules/temp-sensor/lua/temp-sensor-ha-spec.lua lua_modules/temp-sensor/lua/temp-sensor-start.lua lua_modules/thermostat/lua/thermostat-control.lua lua_modules/thermostat/lua/thermostat-ha-data.lua lua_modules/thermostat/lua/thermostat-ha-set.lua lua_modules/thermostat/lua/thermostat-ha-spec.lua lua_modules/thermostat/lua/thermostat-start.lua lua_modules/utils/lua/call-later.lua lua_modules/utils/lua/get-sw-version.lua lua_modules/utils/lua/gpio-set-pin.lua lua_modules/utils/lua/is-array.lua lua_modules/utils/lua/read-json-file.lua lua_modules/utils/lua/str-split.lua lua_modules/utils/lua/str-to-json.lua lua_modules/utils/lua/table-clone.lua lua_modules/utils/lua/table-merge.lua lua_modules/utils/lua/table-substract.lua lua_modules/utils/lua/time-it.lua lua_modules/vetinari-clock/lua/vetinari-clock.lua lua_modules/web-ha/lua/web-ha.lua lua_modules/web-ota/lua/web-ota.lua lua_modules/web-portal/lua/web-portal.lua lua_modules/wifimgr/lua/wifi-apply-config.lua lua_modules/wifimgr/lua/wifi-authmode.lua lua_modules/wifimgr/lua/wifi-event-type.lua lua_modules/wifimgr/lua/wifi-mgr.lua lua_modules/wifimgr/lua/wifi-reasons.lua lua_modules/wifimgr/lua/wifi-stastatus.lua lua_modules/wifimgr/lua/wifi-wifimode.lua"
+        "NODEMCU_LFS_FILES": "lua_modules/bootprotect/lua/bootprotect.lua lua_modules/device-settings/lua/device-settings.lua lua_modules/device-settings/lua/factory-settings.lua lua_modules/device-settings/lua/user-settings.lua lua_modules/ds18b20/lua/ds18b20.lua lua_modules/dummy-strings/lua/dummy-strings.lua lua_modules/http-srv/lua/http-authorize.lua lua_modules/http-srv/lua/http-conn-gc.lua lua_modules/http-srv/lua/http-conn.lua lua_modules/http-srv/lua/http-conn-req.lua lua_modules/http-srv/lua/http-conn-resp.lua lua_modules/http-srv/lua/http-h-ok.lua lua_modules/http-srv/lua/http-h-read-json.lua lua_modules/http-srv/lua/http-h-restart.lua lua_modules/http-srv/lua/http-h-return-file.lua lua_modules/http-srv/lua/http-h-save-file-bak.lua lua_modules/http-srv/lua/http-h-save-file.lua lua_modules/http-srv/lua/http-h-send-json.lua lua_modules/http-srv/lua/http-parse-headers.lua lua_modules/http-srv/lua/http-srv.lua lua_modules/lfs-init/lua/_init.lua lua_modules/lights-switch/lua/lights-switch-ha-data.lua lua_modules/lights-switch/lua/lights-switch-ha-set.lua lua_modules/lights-switch/lua/lights-switch-ha-spec.lua lua_modules/lights-switch/lua/lights-switch-start.lua lua_modules/log/lua/log.lua lua_modules/mdns-adv/lua/mdns-adv.lua lua_modules/pid/lua/pid-control.lua lua_modules/pid/lua/pid-get-output.lua lua_modules/pid/lua/pid-set-input.lua lua_modules/pid/lua/pid-set-setpoint.lua lua_modules/pid/lua/pid-setup.lua lua_modules/pid/lua/pid-start.lua lua_modules/relay-switch/lua/relay-switch-ha-data.lua lua_modules/relay-switch/lua/relay-switch-ha-set.lua lua_modules/relay-switch/lua/relay-switch-ha-spec.lua lua_modules/relay-switch/lua/relay-switch-start.lua lua_modules/sct013-sensor/lua/sct013-sensor-ha-data.lua lua_modules/sct013-sensor/lua/sct013-sensor-ha-spec.lua lua_modules/sct013-sensor/lua/sct013-sensor-start.lua lua_modules/sntp-sync/lua/sntp-dns-code.lua lua_modules/sntp-sync/lua/sntp-sync.lua lua_modules/state/lua/state.lua lua_modules/system-hass/lua/system-hass-ha-data.lua lua_modules/system-hass/lua/system-hass-ha-spec.lua lua_modules/system-hass/lua/system-restart-button-ha-set.lua lua_modules/telnet/lua/telnet.lua lua_modules/temp-sensor/lua/temp-sensor-control.lua lua_modules/temp-sensor/lua/temp-sensor-get.lua lua_modules/temp-sensor/lua/temp-sensor-ha-data.lua lua_modules/temp-sensor/lua/temp-sensor-ha-spec.lua lua_modules/temp-sensor/lua/temp-sensor-start.lua lua_modules/thermostat/lua/thermostat-control.lua lua_modules/thermostat/lua/thermostat-ha-data.lua lua_modules/thermostat/lua/thermostat-ha-set.lua lua_modules/thermostat/lua/thermostat-ha-spec.lua lua_modules/thermostat/lua/thermostat-start.lua lua_modules/utils/lua/call-later.lua lua_modules/utils/lua/get-sw-version.lua lua_modules/utils/lua/gpio-set-pin.lua lua_modules/utils/lua/is-array.lua lua_modules/utils/lua/read-json-file.lua lua_modules/utils/lua/str-split.lua lua_modules/utils/lua/str-to-json.lua lua_modules/utils/lua/table-clone.lua lua_modules/utils/lua/table-merge.lua lua_modules/utils/lua/table-substract.lua lua_modules/utils/lua/time-it.lua lua_modules/vetinari-clock/lua/vetinari-clock.lua lua_modules/web-ha/lua/web-ha.lua lua_modules/web-ota/lua/web-ota.lua lua_modules/web-portal/lua/web-portal.lua lua_modules/wifimgr/lua/wifi-apply-config.lua lua_modules/wifimgr/lua/wifi-authmode.lua lua_modules/wifimgr/lua/wifi-event-type.lua lua_modules/wifimgr/lua/wifi-mgr.lua lua_modules/wifimgr/lua/wifi-reasons.lua lua_modules/wifimgr/lua/wifi-stastatus.lua lua_modules/wifimgr/lua/wifi-wifimode.lua"
       },
       "path": [
         "${workspaceFolder}/lua_modules/init/fs/?.lua",

.vscode/settings.json

@@ -1,11 +1,8 @@
 {
   "Lua.workspace.library": [
-    "${workspace}/vendor/nodemcu-lua-mocks/lua/?.lua",
+    "../nodemcu-lua-mocks/lua",
     "${3rd}/lfs/library"
   ],
-  "Lua.runtime.version": "Lua 5.4",
-  "Lua.workspace.useGitIgnore": false,
-  "Lua.diagnostics.globals": [
-    "lfs"
-  ]
+  "Lua.runtime.version": "Lua 5.3",
+  "Lua.workspace.useGitIgnore": true,
 }