Adjust require() calls so they work in a Spoon

application.lua

@@ -1,6 +1,7 @@
 local application = {}
 
-local utils = require((...):gsub("[^.]+$", "utils"))
+local knu = hs.loadSpoon("Knu")
+local utils = knu.utils
 
 local registry = {}
 

chord.lua

@@ -3,8 +3,9 @@ local chord = {}
 local keyDown = hs.eventtap.event.types.keyDown
 local keyUp = hs.eventtap.event.types.keyUp
 
-local utils = require((...):gsub("[^.]+$", "utils"))
-local runtime = require((...):gsub("[^.]+$", "runtime"))
+local knu = hs.loadSpoon("Knu")
+local utils = knu.utils
+local runtime = knu.runtime
 
 local activeChords = {}
 

http.lua

@@ -1,7 +1,8 @@
 local http = {}
 
 local fnutils = hs.fnutils
-local utils = require((...):gsub("[^.]+$", "utils"))
+local knu = hs.loadSpoon("Knu")
+local utils = knu.utils
 
 -- This is a wrapperr of hs.http.urlParts() that adds a "params" table
 -- and lowercases the "scheme" and "host" fields.

init.lua

@@ -1,6 +1,4 @@
-local __namespace__, __file__ = ...
-__namespace__ = __namespace__:gsub("%.init$", "")  -- just in case
-local __dir__ = __file__:match("^(.*)/[^/]+$")
+local __dir__ = hs.spoons.scriptPath()
 
 local knu = {
   name = "Knu",
@@ -11,7 +9,7 @@ local knu = {
 }
 
 local function loadModule(name)
-  knu[name] = require(__namespace__ .. "." .. name)
+  knu[name] = dofile(hs.spoons.resourcePath(name .. ".lua"))
   return knu[name]
 end
 

keyboard.lua

@@ -1,6 +1,7 @@
 local keyboard = {}
 
-local utils = require((...):gsub("[^.]+$", "utils"))
+local knu = hs.loadSpoon("Knu")
+local utils = knu.utils
 
 -- Some of the known Japanese input source IDs:
 --   com.apple.inputmethod.Kotoeri.Japanese

mouse.lua

@@ -1,6 +1,7 @@
 local mouse = {}
 
-local runtime = require((...):gsub("[^.]+$", "runtime"))
+local knu = hs.loadSpoon("Knu")
+local runtime = knu.runtime
 
 -- Creates a hold-to-scroll button mode
 --

photkey.lua

@@ -2,9 +2,10 @@ local photkey = {}
 
 local keyDown = hs.eventtap.event.types.keyDown
 
-local runtime = require((...):gsub("[^.]+$", "runtime"))
-local utils = require((...):gsub("[^.]+$", "utils"))
-local keyboard = require((...):gsub("[^.]+$", "keyboard"))
+local knu = hs.loadSpoon("Knu")
+local runtime = knu.runtime
+local utils = knu.utils
+local keyboard = knu.keyboard
 
 photkey.methods = {
   -- Provide hotkey compatible API for convenience