timezone 1.3.6 → 1.3.11

data/data/Australia/Victoria

@@ -1,13 +1,13 @@
 -2364111593:LMT:0:34792
-691544452:AEST:0:36000
-7174740:AEDT:1:39600
-781750800:AEST:0:36000
-7513200:AEDT:1:39600
-15728400:AEST:0:36000
-15721200:AEDT:1:39600
-16333200:AEST:0:36000
-15116400:AEDT:1:39600
-870915600:AEST:0:36000
+691551592:AEST:0:36000
+7171200:AEDT:1:39600
+781747200:AEST:0:36000
+7516800:AEDT:1:39600
+15724800:AEST:0:36000
+15724800:AEDT:1:39600
+16329600:AEST:0:36000
+15120000:AEDT:1:39600
+870912000:AEST:0:36000
 10281600:AEDT:1:39600
 21168000:AEST:0:36000
 10886400:AEDT:1:39600

data/data/Australia/West

@@ -1,11 +1,11 @@
 -2337925405:LMT:0:27804
-665365464:AWST:0:28800
-7174740:AWDT:1:32400
-781750800:AWST:0:28800
-7513200:AWDT:1:32400
-15728400:AWST:0:28800
-15721200:AWDT:1:32400
-996714000:AWST:0:28800
+665372604:AWST:0:28800
+7171200:AWDT:1:32400
+781747200:AWST:0:28800
+7516800:AWDT:1:32400
+15724800:AWST:0:28800
+15724800:AWDT:1:32400
+996710400:AWST:0:28800
 10886400:AWDT:1:32400
 273369600:AWST:0:28800
 10886400:AWDT:1:32400

data/data/Australia/Yancowinna

@@ -1,15 +1,15 @@
 -2364110749:LMT:0:33948
 49159548:AEST:0:36000
 84762000:ACST:0:32400
-557623860:ACST:0:34200
-7174740:ACDT:1:37800
-781750800:ACST:0:34200
-7513200:ACDT:1:37800
-15728400:ACST:0:34200
-15721200:ACDT:1:37800
-16333200:ACST:0:34200
-15116400:ACDT:1:37800
-870915600:ACST:0:34200
+557631000:ACST:0:34200
+7171200:ACDT:1:37800
+781747200:ACST:0:34200
+7516800:ACDT:1:37800
+15724800:ACST:0:34200
+15724800:ACDT:1:37800
+16329600:ACST:0:34200
+15120000:ACDT:1:37800
+870912000:ACST:0:34200
 10281600:ACDT:1:37800
 21168000:ACST:0:34200
 10886400:ACDT:1:37800

data/data/Canada/Yukon

@@ -90,41 +90,5 @@
 10890000:PST:0:-28800
 20559600:PDT:1:-25200
 10890000:PST:0:-28800
-20559600:PDT:1:-25200
-11494800:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-11494800:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-11494800:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-10890000:PST:0:-28800
-20559600:PDT:1:-25200
-11494800:PST:0:-28800
-20559600:PDT:1:-25200
-1:PST:0:-28800
+20552400:PDT:1:-25200
+1:MST:0:-25200

data/data/Europe/Budapest

@@ -1,47 +1,47 @@
--2500938981:LMT:0:4580
-807232580:CET:0:3600
+-2498260581:LMT:0:4580
+804554180:CET:0:3600
 13222800:CEST:1:7200
 17028000:CET:0:3600
 13305600:CEST:1:7200
-16938000:CET:0:3600
-14511600:CEST:1:7200
-18234000:CET:0:3600
-19263600:CEST:1:7200
-674431200:CET:0:3600
-49514400:CEST:1:7200
+18144000:CET:0:3600
+13305600:CEST:1:7200
+18230400:CET:0:3600
+13219200:CEST:1:7200
+17539200:CET:0:3600
+14515200:CEST:1:7200
+648421200:CET:0:3600
+49518000:CEST:1:7200
 12700800:CET:0:3600
 16329600:CEST:1:7200
 15724800:CET:0:3600
 15724800:CEST:1:7200
 18306000:CET:0:3600
-15811200:CEST:1:7200
-12970800:CET:0:3600
-16329600:CEST:1:7200
-15724800:CET:0:3600
+15814800:CEST:1:7200
+12967200:CET:0:3600
+16412400:CEST:1:7200
+15642000:CET:0:3600
 15724800:CEST:1:7200
 15724800:CET:0:3600
 15724800:CEST:1:7200
 16329600:CET:0:3600
 15120000:CEST:1:7200
-17020800:CET:0:3600
-16329600:CEST:1:7200
-113004000:CET:0:3600
+146354400:CET:0:3600
 11487600:CEST:1:7200
-20048400:CET:0:3600
-11487600:CEST:1:7200
-21085200:CET:0:3600
-10278000:CEST:1:7200
-21175200:CET:0:3600
-10285200:CEST:1:7200
-710636400:CET:0:3600
-15123600:CEST:1:7200
+19969200:CET:0:3600
+11491200:CEST:1:7200
+21168000:CET:0:3600
+10281600:CEST:1:7200
+21168000:CET:0:3600
+10281600:CEST:1:7200
+710632800:CET:0:3600
+15120000:CEST:1:7200
 15724800:CET:0:3600
 15724800:CEST:1:7200
 15724800:CET:0:3600
 15724800:CEST:1:7200
 15724800:CET:0:3600
 15724800:CEST:1:7200
-15724800:CET:0:3600
+15732000:CET:0:3600
 16329600:CEST:1:7200
 15724800:CET:0:3600
 15724800:CEST:1:7200

data/data/Europe/Monaco

@@ -1,6 +1,6 @@
--2486680173:LMT:0:1772
-630721211:PMT:0:561
-166144161:WET:0:0
+-2448318573:LMT:0:1772
+593914811:PMT:0:561
+164588961:WET:0:0
 9417600:WEST:1:3600
 15033600:WET:0:0
 17020800:WEST:1:3600

data/data/Europe/Paris

@@ -1,6 +1,6 @@
--2486678902:LMT:0:561
-630720000:PMT:0:561
-166144101:WET:0:0
+-2486592562:LMT:0:561
+630633600:PMT:0:561
+166144161:WET:0:0
 9417600:WEST:1:3600
 15033600:WET:0:0
 17020800:WEST:1:3600

data/data/Europe/Volgograd

@@ -62,4 +62,5 @@
 12700800:+03:0:10800
 113094000:+04:0:14400
 126406800:+03:0:10800
-1:+04:0:14400
+68338800:+04:0:14400
+1:+03:0:10800

data/data/Indian/Antananarivo

@@ -1,5 +1,6 @@
--1309746437:LMT:0:8836
-47431636:EAT:0:10800
-315534600:+0230:0:9000
-631151100:+0245:0:9900
+-1946168837:LMT:0:8836
+636422236:+0230:0:9000
+47777400:EAT:0:10800
+220581000:+0230:0:9000
+176082300:+0245:0:9900
 1:EAT:0:10800

data/data/Indian/Comoro

@@ -1,5 +1,6 @@
--1309746437:LMT:0:8836
-47431636:EAT:0:10800
-315534600:+0230:0:9000
-631151100:+0245:0:9900
+-1946168837:LMT:0:8836
+636422236:+0230:0:9000
+47777400:EAT:0:10800
+220581000:+0230:0:9000
+176082300:+0245:0:9900
 1:EAT:0:10800

data/data/Indian/Mahe

@@ -1,2 +1,2 @@
--2006653309:LMT:0:13308
+-1988163709:LMT:0:13308
 1:+04:0:14400

data/data/Indian/Mayotte

@@ -1,5 +1,6 @@
--1309746437:LMT:0:8836
-47431636:EAT:0:10800
-315534600:+0230:0:9000
-631151100:+0245:0:9900
+-1946168837:LMT:0:8836
+636422236:+0230:0:9000
+47777400:EAT:0:10800
+220581000:+0230:0:9000
+176082300:+0245:0:9900
 1:EAT:0:10800

data/data/Israel

@@ -1,47 +1,49 @@
 -2840149255:LMT:0:8454
 1199145614:JMT:0:8440
-707358040:IST:0:7200
-76287600:IDT:1:10800
-13057200:IST:0:7200
-18478800:IDT:1:10800
-13136400:IST:0:7200
-18486000:IDT:1:10800
-14346000:IST:0:7200
-17197200:IDT:1:10800
-14346000:IST:0:7200
-17182800:IDT:1:10800
-49165200:IST:0:7200
-8719200:IDDT:1:14400
-5281200:IDT:1:10800
-15634800:IST:0:7200
-15901200:IDT:1:10800
-14338800:IST:0:7200
-13140000:IDT:1:10800
-17100000:IST:0:7200
-19360800:IDT:1:10800
+707365240:IST:0:7200
+10540800:IDT:1:10800
+4060800:IST:0:7200
+61689600:IDT:1:10800
+13046400:IST:0:7200
+18489600:IDT:1:10800
+13132800:IST:0:7200
+18489600:IDT:1:10800
+14342400:IST:0:7200
+17193600:IDT:1:10800
+14342400:IST:0:7200
+17193600:IDT:1:10800
+49161600:IST:0:7200
+8726400:IDDT:1:14400
+5270400:IDT:1:10800
+15638400:IST:0:7200
+15897600:IDT:1:10800
+14342400:IST:0:7200
+13132800:IDT:1:10800
+17107200:IST:0:7200
+19353600:IDT:1:10800
 13910400:IST:0:7200
 15724800:IDT:1:10800
 15120000:IST:0:7200
 13305600:IDT:1:10800
-23580000:IST:0:7200
-7858800:IDT:1:10800
-23511600:IST:0:7200
-7938000:IDT:1:10800
-22986000:IST:0:7200
-10288800:IDT:1:10800
-18230400:IST:0:7200
-12603600:IDT:1:10800
-529808400:IST:0:7200
+23587200:IST:0:7200
+7862400:IDT:1:10800
+23587200:IST:0:7200
+7862400:IDT:1:10800
+22982400:IST:0:7200
+10281600:IDT:1:10800
+18144000:IST:0:7200
+12700800:IDT:1:10800
+529797600:IST:0:7200
 8463600:IDT:1:10800
 16333200:IST:0:7200
 11487600:IDT:1:10800
-155350800:IST:0:7200
+155437200:IST:0:7200
 3628800:IDT:1:10800
 114912000:IST:0:7200
 9676800:IDT:1:10800
-20044800:IST:0:7200
-13302000:IDT:1:10800
-21171600:IST:0:7200
+19958400:IST:0:7200
+12092400:IDT:1:10800
+22381200:IST:0:7200
 9673200:IDT:1:10800
 19011600:IST:0:7200
 13042800:IDT:1:10800

data/data/PRC

@@ -1,5 +1,7 @@
 -2177481944:LMT:0:29143
-1243814743:CST:0:28800
+576806743:CST:0:28800
+14770800:CDT:1:32400
+652237200:CST:0:28800
 11574000:CDT:1:32400
 13222800:CST:0:28800
 20041200:CDT:1:32400

data/data/Pacific/Efate

@@ -1,8 +1,10 @@
 -1829387597:LMT:0:40396
-2262643996:+11:0:39600
+1954797196:+11:0:39600
+8467200:+12:1:43200
+299379600:+11:0:39600
+15721200:+12:1:43200
+15728400:+11:0:39600
 15721200:+12:1:43200
-18320400:+11:0:39600
-13129200:+12:1:43200
 16333200:+11:0:39600
 15116400:+12:1:43200
 16333200:+11:0:39600

data/data/Pacific/Fiji

@@ -25,8 +25,8 @@
 6048000:+13:1:46800
 26006400:+12:0:43200
 5443200:+13:1:46800
-26006400:+12:0:43200
-6048000:+13:1:46800
+29635200:+12:0:43200
+2419200:+13:1:46800
 26006400:+12:0:43200
 5443200:+13:1:46800
 26006400:+12:0:43200

data/lib/timezone/parser.rb

@@ -11,28 +11,42 @@ module Timezone
 
     LINE = /\s*(.+)\s*=\s*(.+)\s*isdst=(\d+)\s*gmtoff=([\+\-]*\d+)/
 
-    ZONEINFO_DIR = '/usr/share/zoneinfo'.freeze
+    # Bookkeeping files that we do not want to parse.
+    IGNORE = ['leapseconds', 'posixrules', 'tzdata.zi'].freeze
 
-    attr_reader :zoneinfo
-
-    def initialize(zoneinfo = ZONEINFO_DIR)
-      @zoneinfo = zoneinfo
+    def initialize(root)
+      @config = Config.new(root)
     end
 
     def perform
       FileUtils.rm_rf('data')
 
-      Dir["#{zoneinfo}/posix/**/*"].each do |file|
+      Dir["#{@config.zoneinfo}/**/*"].each do |file|
         next if File.directory?(file)
+        next if file.end_with?('.tab')
+        next if IGNORE.include?(File.basename(file))
         parse(file)
       end
     end
 
+    # Represents a timezone database config.
+    class Config
+      def initialize(root)
+        @root = root
+        @zoneinfo = File.join(@root, 'usr/share/zoneinfo')
+        @zdump = File.join(@root, 'usr/bin/zdump')
+      end
+
+      attr_reader :root, :zoneinfo, :zdump
+    end
+
+    private_constant :Config
+
     # Represents a single timezone data file line for a reference timezone.
     class RefLine
-      def initialize(zone)
+      def initialize(config, file)
         first =
-          `zdump -i posix/#{zone}`
+          `#{config.zdump} -i #{file}`
             .split("\n")
             .reject(&:empty?)
             .reject { |line| line.start_with?('TZ=') }
@@ -85,15 +99,15 @@ module Timezone
     private
 
     def parse(file)
-      zone = file.gsub("#{zoneinfo}/posix/", '')
+      zone = file.gsub("#{@config.zoneinfo}/", '')
       print "Parsing #{zone}... "
-      data = zdump(zone)
+      data = zdump(file)
 
       last = 0
       result = []
 
       data.split("\n").each do |line|
-        match = line.gsub('posix/' + zone + ' ', '').match(LINE)
+        match = line.gsub(/^#{file}\s+/, '').match(LINE)
         next if match.nil?
 
         line = Line.new(match)
@@ -112,14 +126,14 @@ module Timezone
         result << line
       end
 
-      result << RefLine.new(zone) if result.empty?
+      result << RefLine.new(@config, file) if result.empty?
 
       write(zone, result)
       puts 'DONE'
     end
 
-    def zdump(zone)
-      `zdump -v -c #{MIN_YEAR},#{MAX_YEAR} posix/#{zone}`
+    def zdump(file)
+      `#{@config.zdump} -v -c #{MIN_YEAR},#{MAX_YEAR} #{file}`
     end
 
     def write(zone, data)