.busted: Make sure we run tests on the code in the current directory

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

diff --git a/luatz/init.lua b/luatz/init.lua
index 02b07bac84a65b898f8d90ba6eb4b24e7f73a8f4..1a6c83533c99a7c1c6274aca03d29352e69ef8db 100644 (file)
--- a/luatz/init.lua
+++ b/luatz/init.lua
@@ -17,10 +17,15 @@ _M.time_in = function ( tz , now )
        return _M.get_tz ( tz ):localize ( now )
 end
 
        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 )
 --- C-like functions
 
 _M.gmtime = function ( ts )

-       return _M.timetable.new_from_timestamp ( ts ):normalise ( )
+       return _M.timetable.new_from_timestamp ( ts )

 end
 
 _M.localtime = function ( ts )
 end
 
 _M.localtime = function ( ts )


@@ -29,7 +34,7 @@ _M.localtime = function ( ts )
 end
 
 _M.ctime = function ( ts )
 end
 
 _M.ctime = function ( ts )

-       return _M.localtime ( ts ):asctime ( )
+       return _M.strftime.asctime ( _M.localtime ( ts ) )

 end
 
 return _M
 end
 
 return _M