@@ -2,7 +2,7 @@ Here's the pseudo-BNF for timespecs. If you think a shortcut is missing, let me know! -timespec = time [date] | [now] + count units +timespec = time [zulu] [date] | [now] + count units units = seconds | minutes | hours | days | weeks | months | years time = ( [H]H[MM[.SS]] | [H]H[:MM[.SS]] ) [am|pm] | midnight | noon | teatime README.timespec @@ -20,7 +20,7 @@ module AtTime end seconds = $8 or '00' - Time.mktime(year,$3,$4,$5,$6,seconds,0) + Time.mktime(year,$3,$4,$5,$6,seconds) end # timespec = time [date] | [now] + count units @@ -62,20 +62,26 @@ module AtTime Time.local(*ary) end else - # time [date] + # time [zulu] [date] h,mi,s,str = parse_time(str) now = Time.now + z = false + if str.strip =~ /^(z(u(l(u)?)?)?)(.*)/ + z = true + str = $5.strip + end if str.strip == "" y,mo,d = [now.year, now.month, now.day] - t = Time.mktime(y,mo,d,h,mi,s,0) - if t - Time.now < 0 + t = Time.mktime(y,mo,d,h,mi,s) + while t - Time.now < 0 t += 60*60*24 end - t else y,mo,d = parse_date(str) - t = Time.mktime(y,mo,d,h,mi,s,0) + t = Time.mktime(y,mo,d,h,mi,s) end + t += t.utc_offset if z + t end end @@ -83,14 +89,14 @@ module AtTime def self.parse_time(str) h = m = s = nil str.strip! - if str =~ /^(\d?\d)(\:?(\d\d)(\.(\d+))?)?\s*(am?|pm?)?(\s|$)(.*)/i + if str =~ /^(\d?\d)(\:?(\d\d)(\.(\d+))?)?\s*(am?|pm?)?(([\sz]|$).*)/i h = $1.to_i m = s = 0 if $2 m = $3.to_i s = ($5 ? $5.to_i : 0) end - str = $8 or "" + str = $7 or "" h += 12 if $6 =~ /^p/i and h <= 12 elsif 'midnight' =~ /^#{str}/i h,m,s = [0,0,0] @@ -102,7 +108,7 @@ module AtTime h,m,s = [16,0,0] str = str[$&.size..-1] else - raise ParseError, "Invalid time." + raise ParseError, "Invalid time '#{str}'." end return [h,m,s,str] end lib/at_time.rb @@ -1,8 +1,8 @@ require 'test/unit' require 'at_time' +# See README.timespec class TestAtTime < Test::Unit::TestCase - # hms is [hours, minutes, seconds] def assert_time(t1, t2) assert_equal t1.hour, t2.hour assert_equal t1.min, t2.min @@ -19,7 +19,6 @@ class TestAtTime < Test::Unit::TestCase $now = Time.now end - # time = [H]HMM[.SS] [am|pm] | [H]H:MM[.SS] [am|pm] | midnight | noon | teatime def test_parse_time assert_equal [0,0,0,''], AtTime.parse_time('midnight') assert_equal [12,0,0,''], AtTime.parse_time('noon') @@ -32,7 +31,6 @@ class TestAtTime < Test::Unit::TestCase assert_equal [23,0,0,''], AtTime.parse_time('11pm') end - # date = month-name day | DD.MM.YY[YY] | MM/DD/YY[YY] | MMDDYY[YY] | today | tomorrow def test_parse_date assert_equal [$now.year,2,21], AtTime.parse_date('February 21') assert_equal [$now.year,2,21], AtTime.parse_date('feb 21') @@ -47,7 +45,6 @@ class TestAtTime < Test::Unit::TestCase assert_equal [w.year, w.month, w.day], AtTime.parse_date(wday_name) end - # timespec = time [date] | [now] + count units def test_parse_timespec assert_time $now, AtTime.parse_timespec($now.strftime("%H%M.%S")) assert_datetime $now, AtTime.parse_timespec($now.strftime("%H%M.%S %d.%m.%Y")) @@ -55,6 +52,9 @@ class TestAtTime < Test::Unit::TestCase assert_equal (Time.now + 5*60).min, AtTime.parse_timespec('now + 5 min').min assert_equal (Time.now + 5*60).min, AtTime.parse_timespec('+5').min assert_equal 3, AtTime.parse_timespec('255pm wed').wday + offset = Time.zone_offset($now.zone) + u = $now - offset + assert_equal $now.hour, AtTime.parse_timespec(u.strftime("%H%Mz")).hour end # POSIX = [[CC]YY]MMDDhhmm[.SS] test/test_at_time.rb ffebe24f19e98b21e9f225a549af27e32c866ae3 Hans Fugal hans@fugal.net http://github.com/fugalh/creme/commit/14163769f1a04a8ad28830bd5e52e24760fca86b 14163769f1a04a8ad28830bd5e52e24760fca86b 2008-02-26T08:42:59-08:00 2008-02-26T08:42:59-08:00 zulu 379dd066498d31f4de476834ccf6a2761adfcad3 Hans Fugal hans@fugal.net