Ignore additional files added in tzdata 2014g.

tzinfo · Aug 31, 2014 · 22fabc5 · 22fabc5
1 parent b51be04
commit 22fabc5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/lib/tzinfo/data/tzdataparser.rb b/lib/tzinfo/data/tzdataparser.rb
@@ -144,9 +144,14 @@ def initialize(input_dir, output_dir)
       # Reads the tzdata source and generates the classes. Progress information
       # is written to standard out.
       def execute
+        # Note that the backzone file is ignored. backzone contains alternative
+        # definitions of certain zones, primarily for pre-1970 data. It is not
+        # recommended for ordinary use and the tzdata Makefile does not
+        # install its entries by default.
+
         files = Dir.entries(@input_dir).select do |file|
           file =~ /\A[^\.]+\z/ &&            
-            !%w(leapseconds leapseconds.awk leap-seconds.list Makefile README SOURCE).include?(file) &&
+            !%w(backzone checktab.awk leapseconds leapseconds.awk leap-seconds.list CONTRIBUTING Makefile NEWS README SOURCE Theory zoneinfo2tdf.pl).include?(file) &&
             File.file?(File.join(@input_dir, file))
         end
 

diff --git a/test/tc_definitions.rb b/test/tc_definitions.rb
@@ -9,7 +9,7 @@ class TCDefinitions < Minitest::Test
   def data_files
     files = Dir.entries(DATA_DIR).select do |name| 
       name =~ /\A[^\.]+\z/ &&            
-        !%w(leapseconds leapseconds.awk leap-seconds.list Makefile README SOURCE).include?(name) &&
+        !%w(backzone checktab.awk leapseconds leapseconds.awk leap-seconds.list CONTRIBUTING Makefile NEWS README SOURCE Theory zoneinfo2tdf.pl).include?(name) &&
         File.file?(File.join(DATA_DIR, name))
     end
 

diff --git a/test/tc_timezone_index.rb b/test/tc_timezone_index.rb
@@ -5,7 +5,7 @@ class TCTimezoneIndex < Minitest::Test
   DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..', 'data'))
 
   def data_files
-    files = Dir.entries(DATA_DIR).select {|name| name =~ /^[^\.]+$/ && name != 'leapseconds'}
+    files = Dir.entries(DATA_DIR).select {|name| name =~ /\A[^\.]+\z/ && !%w(backzone leapseconds).include?(name) }
     files.collect {|name| File.join(DATA_DIR, name)}
   end