Fix module loading to support 'require'

hs/application.lua

@@ -1,5 +1,6 @@
 -- Provide the ability to encapsulate the extensions into a different table.
-local module = ... or require('hs.application')
+local _,_,module = ...
+module = module  or require('hs.application')
 assert(type(module) == 'table', 'must provide a table to extend')
 
 require('hs.applescript')

hs/canvas.lua

@@ -1,5 +1,6 @@
 -- Provide the ability to encapsulate the extensions into a different table.
-local module = ... or require('hs.canvas')
+local _,_,module = ...
+module = module or require('hs.canvas')
 assert(type(module) == 'table', 'must provide a table to extend')
 
 require('hs.timer')

hs/chooser.lua

@@ -1,5 +1,6 @@
 -- Provide the ability to encapsulate the extensions into a different table.
-local module = ... or require('hs.chooser')
+local _,_,module = ...
+module = module or require('hs.chooser')
 assert(type(module) == 'table', 'must provide a table to extend')
 
 -- Takes a list of strings and creates a choice table formatted such that

hs/fs.lua

@@ -1,8 +1,9 @@
 -- Provide the ability to encapsulate the extensions into a different table.
-local module = ... or require('hs.fs')
+local _,_,module = ...
+module = module or require('hs.fs')
 assert(type(module) == 'table', 'must provide a table to extend')
 
-require '../string'
+require('lua-utils/string')
 
 -- Returns a list of directories in the given path.
 function module.dirs(path)

hs/location.lua

@@ -1,5 +1,6 @@
 -- Provide the ability to encapsulate the extensions into a different table.
-local module = ... or require('hs.location')
+local _,_,module = ...
+module = module or require('hs.location')
 assert(type(module) == 'table', 'must provide a table to extend')
 if not module.geocoder then module.geocoder = {} end
 

hs/spotify.lua

@@ -1,4 +1,5 @@
-local module = ... or {}
+local _,_,module = ...
+module = module or {}
 assert(type(module) == 'table', 'must provide a table to extend')
 
 local tell = require('./application').tell

math.lua

@@ -1,5 +1,6 @@
 -- Provide the ability to encapsulate the extensions into a different table.
-local module = ... or math
+local _,_,module = ...
+module = module or math
 assert(type(module) == 'table', 'must provide a table to extend')
 
 -- Round the given number to the given number of decimal places.

string.lua

@@ -1,5 +1,6 @@
 -- Provide the ability to encapsulate the extensions into a different table.
-local module = ... or string
+local _,_,module = ...
+module = module or string
 assert(type(module) == 'table', 'must provide a table to extend')
 
 --- Recipes for common string manipulations in Lua ---

table.lua

@@ -1,5 +1,6 @@
 -- Provide the ability to encapsulate the extensions into a different table.
-local module = ... or table
+local _,_,module = ...
+module = module or table
 assert(type(module) == 'table', 'must provide a table to extend')
 
 -- Handy table formatting function. Supports arbitrary depth.