Update rockspec and lua scripts

.github/workflows/lua.yml

@@ -13,15 +13,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: leafo/gh-actions-lua@v8.0.0
-    - uses: leafo/gh-actions-luarocks@v4.0.0
+    - uses: leafo/gh-actions-lua@v10.0.0
+    - uses: leafo/gh-actions-luarocks@v4.3.0
     - name: Set up lua
       run: |
-        luarocks install busted
-        luarocks install luacheck
-    - name: Lint with luacheck
+        cd filters; luarocks init; luarocks test --prepare
+    - name: Run tests and linters
       run: |
-        cd filters; luacheck src/*.lua --std max+busted
-    - name: Test with busted
-      run: |
-        cd filters; busted src -p '.*.test.lua'
+        cd filters; luarocks test

Makefile

@@ -24,7 +24,7 @@ init-js:
 
 .PHONY:	init-lua
 init-lua:
-	cd filters; lua scripts/init.lua
+	cd filters; luarocks init; luarocks test --prepare
 
 .PHONY:	init-python
 init-python:
@@ -41,7 +41,7 @@ check-js:
 
 .PHONY:	check-lua
 check-lua:
-	cd filters; lua scripts/check.lua
+	cd filters; luarocks test
 
 .PHONY:	check-python
 check-python:	lint test

filters/scripts/bundle.lua

@@ -1,8 +1,8 @@
 -- Bundle filters into a single-file.
 
-local utils = require "scripts.utils"
-local run = utils.run
+require "scripts.path"
 
+local exec = require("scripts.utils").exec
 local lfs = require "lfs"
 
 local function bundle()
@@ -20,7 +20,7 @@ local function bundle()
    local command = "%s %s -s src/zk.lua -o build/filter.lua"
    local prog = "lua_modules/bin/amalg.lua"
    local args = table.concat(sources, " ")
-   run(command:format(prog, args))
+   exec(command:format(prog, args))
 end
 
 lfs.mkdir "build"

filters/scripts/path.lua

@@ -0,0 +1,8 @@
+-- Update package path to load from lua_modules.
+
+local version = _VERSION:match "%d+%.%d+"
+
+package.path = "lua_modules/share/lua/" .. version .. "/?/init.lua;" .. package.path
+package.path = "lua_modules/share/lua/" .. version .. "/?.lua;" .. package.path
+package.cpath = "lua_modules/lib/lua/" .. version .. "/?.so;" .. package.cpath
+package.cpath = "lua_modules/lib64/lua/" .. version .. "/?.so;" .. package.cpath

filters/scripts/test.lua

@@ -0,0 +1,6 @@
+-- Run tests and linters.
+
+local exec = require("scripts.utils").exec
+
+exec "lua_modules/bin/busted"
+exec "lua_modules/bin/luacheck src spec scripts"

filters/scripts/utils.lua

@@ -1,28 +1,11 @@
 -- Useful functions used in other scripts.
 
-local function run(command)
-   -- Execute command and exit on error.
-   local ok, _, code = os.execute(command)
-   if not ok then
-      os.exit(code)
-   end
+-- Executes command.
+-- Raises an error on failure.
+local function exec(command)
+  if not os.execute(command) then
+    error "command failed"
+  end
 end
 
-local updated = false
-
-local function update_paths()
-   -- Include lua_modules/ in require path.
-   assert(not updated)
-   if not updated then
-      package.path = "lua_modules/share/lua/5.4/?.lua;" .. package.path
-      package.cpath = "lua_modules/lib/lua/5.4/?.so;" .. package.cpath
-      package.cpath = "lua_modules/lib64/lua/5.4/?.so;" .. package.cpath
-      updated = true
-   end
-end
-
-update_paths()
-
-return {
-   run = run,
-}
+return {exec = exec}

filters/slipbox-filters-0.1-1.rockspec → filters/slipbox-filters-dev-1.rockspec

@@ -1,24 +1,38 @@
+rockspec_format = "3.0"
 package = "slipbox-filters"
-version = "0.1-1"
+version = "dev-1"
 source = {
    url = "git+ssh://[email protected]/lggruspe/slipbox.git"
 }
 description = {
+   summary = "Lua filters used by slipbox",
    homepage = "https://github.com/lggruspe/slipbox",
    license = "MIT"
 }
 dependencies = {
-   "lua ~> 5.3"
+   "lua >= 5.1, < 5.5",
+   "dkjson"
+}
+test_dependencies = {
+   "amalg",
+   "busted",
+   "luacheck",
+   "luafilesystem"
 }
 build = {
    type = "builtin",
    modules = {
       csv = "src/csv.lua",
+      errors = "src/errors.lua",
       filters = "src/filters.lua",
-      log = "src/log.lua",
+      links = "src/links.lua",
+      metadata = "src/metadata.lua",
       slipbox = "src/slipbox.lua",
       utils = "src/utils.lua",
-      ["utils.test"] = "src/utils.test.lua",
       zk = "src/zk.lua"
    }
 }
+test = {
+   type = "command",
+   script = "scripts/test.lua",
+}

filters/src/csv.test.lua → filters/spec/csv_spec.lua

@@ -1,8 +1,5 @@
-require "busted.runner" ()
-
 local csv = require "src.csv"
 
-
 describe("Writer", function()
   describe("write", function()
     describe("with wrong number of fields", function()

filters/src/errors.test.lua → filters/spec/errors_spec.lua

@@ -1,5 +1,3 @@
-require "busted.runner" ()
-
 local errors = require "src.errors"
 
 describe("duplicate_note_id", function()

filters/src/links.test.lua → filters/spec/links_spec.lua

@@ -1,5 +1,3 @@
-require "busted.runner" ()
-
 local links = require "src.links"
 
 local function join(table, sep)

filters/src/metadata.test.lua → filters/spec/metadata_spec.lua

@@ -1,5 +1,3 @@
-require "busted.runner" ()
-
 local metadata = require "src.metadata"
 
 describe("parse", function()

filters/src/utils.test.lua → filters/spec/utils_spec.lua

@@ -1,5 +1,3 @@
-require "busted.runner" ()
-
 local utils = require "src.utils"
 
 it("hashtag_prefix", function()