Move to consistent whitespace style

[etc/awesome.git] / luatz / init.lua

diff --git a/luatz/init.lua b/luatz/init.lua
index b3ca99e43ffc450b13dee2f8a969a820bcfd451b..4423189304874c46efb00e07f3f52077561549f5 100644 (file)
--- a/luatz/init.lua
+++ b/luatz/init.lua
@@ -1,17 +1,40 @@
 local _M = {
-       parse = require "luatz.parse" ;
-       timetable = require "luatz.timetable" ;
+       gettime = require "luatz.gettime";
+       parse = require "luatz.parse";
+       strftime = require "luatz.strftime";
+       timetable = require "luatz.timetable";
+       tzcache = require "luatz.tzcache";
 }
 
 --- Top-level aliases for common functions
 
-_M.time = require "luatz.gettime".gettime
-_M.get_tz = require "luatz.tzcache".get_tz
+_M.time = _M.gettime.gettime
+_M.get_tz = _M.tzcache.get_tz
 
 --- Handy functions
 
-_M.time_in = function ( tz , now )
-       return _M.get_tz ( tz ):localize ( now )
+_M.time_in = function(tz, now)
+       return _M.get_tz(tz):localize(now)
+end
+
+_M.now = function()
+       local ts = _M.gettime.gettime()
+       return _M.timetable.new_from_timestamp(ts)
+end
+
+--- C-like functions
+
+_M.gmtime = function(ts)
+       return _M.timetable.new_from_timestamp(ts)
+end
+
+_M.localtime = function(ts)
+       ts = _M.time_in(nil, ts)
+       return _M.gmtime(ts)
+end
+
+_M.ctime = function(ts)
+       return _M.strftime.asctime(_M.localtime(ts))
 end
 
 return _M