tzinfo 0.3.60 → 0.3.61

data/lib/tzinfo/definitions/Pacific/Fiji.rb

@@ -40,8 +40,6 @@ module TZInfo
           tz.transition 2020, 1, :o1, 1578751200
           tz.transition 2020, 12, :o2, 1608386400
           tz.transition 2021, 1, :o1, 1610805600
-          tz.transition 2021, 11, :o2, 1636812000
-          tz.transition 2022, 1, :o1, 1642255200
           tz.transition 2022, 11, :o2, 1668261600
           tz.transition 2023, 1, :o1, 1673704800
           tz.transition 2023, 11, :o2, 1699711200

data/lib/tzinfo/definitions/Pacific/Kanton.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Kanton
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Kanton' do |tz|
+          tz.offset :o0, 0, 0, :'-00'
+          tz.offset :o1, -43200, 0, :'-12'
+          tz.offset :o2, -39600, 0, :'-11'
+          tz.offset :o3, 46800, 0, :'+13'
+          
+          tz.transition 1937, 8, :o1, 4857553, 2
+          tz.transition 1979, 10, :o2, 307627200
+          tz.transition 1994, 12, :o3, 788871600
+        end
+      end
+    end
+  end
+end

data/lib/tzinfo/definitions/Pacific/Niue.rb

@@ -9,12 +9,10 @@ module TZInfo
         timezone 'Pacific/Niue' do |tz|
           tz.offset :o0, -40780, 0, :LMT
           tz.offset :o1, -40800, 0, :'-1120'
-          tz.offset :o2, -41400, 0, :'-1130'
-          tz.offset :o3, -39600, 0, :'-11'
+          tz.offset :o2, -39600, 0, :'-11'
           
-          tz.transition 1901, 1, :o1, 10434467399, 4320
-          tz.transition 1951, 1, :o2, 87611327, 36
-          tz.transition 1978, 10, :o3, 276089400
+          tz.transition 1952, 10, :o1, 10516184519, 4320
+          tz.transition 1964, 7, :o2, 87788807, 36
         end
       end
     end

data/lib/tzinfo/definitions/Pacific/Rarotonga.rb

@@ -7,38 +7,40 @@ module TZInfo
         include TimezoneDefinition
         
         timezone 'Pacific/Rarotonga' do |tz|
-          tz.offset :o0, -38344, 0, :LMT
-          tz.offset :o1, -37800, 0, :'-1030'
-          tz.offset :o2, -36000, 1800, :'-0930'
-          tz.offset :o3, -36000, 0, :'-10'
+          tz.offset :o0, 48056, 0, :LMT
+          tz.offset :o1, -38344, 0, :LMT
+          tz.offset :o2, -37800, 0, :'-1030'
+          tz.offset :o3, -36000, 1800, :'-0930'
+          tz.offset :o4, -36000, 0, :'-10'
           
-          tz.transition 1901, 1, :o1, 26086168193, 10800
-          tz.transition 1978, 11, :o2, 279714600
-          tz.transition 1979, 3, :o3, 289387800
-          tz.transition 1979, 10, :o2, 309952800
-          tz.transition 1980, 3, :o3, 320837400
-          tz.transition 1980, 10, :o2, 341402400
-          tz.transition 1981, 3, :o3, 352287000
-          tz.transition 1981, 10, :o2, 372852000
-          tz.transition 1982, 3, :o3, 384341400
-          tz.transition 1982, 10, :o2, 404906400
-          tz.transition 1983, 3, :o3, 415791000
-          tz.transition 1983, 10, :o2, 436356000
-          tz.transition 1984, 3, :o3, 447240600
-          tz.transition 1984, 10, :o2, 467805600
-          tz.transition 1985, 3, :o3, 478690200
-          tz.transition 1985, 10, :o2, 499255200
-          tz.transition 1986, 3, :o3, 510139800
-          tz.transition 1986, 10, :o2, 530704800
-          tz.transition 1987, 3, :o3, 541589400
-          tz.transition 1987, 10, :o2, 562154400
-          tz.transition 1988, 3, :o3, 573643800
-          tz.transition 1988, 10, :o2, 594208800
-          tz.transition 1989, 3, :o3, 605093400
-          tz.transition 1989, 10, :o2, 625658400
-          tz.transition 1990, 3, :o3, 636543000
-          tz.transition 1990, 10, :o2, 657108000
-          tz.transition 1991, 3, :o3, 667992600
+          tz.transition 1899, 12, :o1, 26082150593, 10800
+          tz.transition 1952, 10, :o2, 26290460993, 10800
+          tz.transition 1978, 11, :o3, 279714600
+          tz.transition 1979, 3, :o4, 289387800
+          tz.transition 1979, 10, :o3, 309952800
+          tz.transition 1980, 3, :o4, 320837400
+          tz.transition 1980, 10, :o3, 341402400
+          tz.transition 1981, 3, :o4, 352287000
+          tz.transition 1981, 10, :o3, 372852000
+          tz.transition 1982, 3, :o4, 384341400
+          tz.transition 1982, 10, :o3, 404906400
+          tz.transition 1983, 3, :o4, 415791000
+          tz.transition 1983, 10, :o3, 436356000
+          tz.transition 1984, 3, :o4, 447240600
+          tz.transition 1984, 10, :o3, 467805600
+          tz.transition 1985, 3, :o4, 478690200
+          tz.transition 1985, 10, :o3, 499255200
+          tz.transition 1986, 3, :o4, 510139800
+          tz.transition 1986, 10, :o3, 530704800
+          tz.transition 1987, 3, :o4, 541589400
+          tz.transition 1987, 10, :o3, 562154400
+          tz.transition 1988, 3, :o4, 573643800
+          tz.transition 1988, 10, :o3, 594208800
+          tz.transition 1989, 3, :o4, 605093400
+          tz.transition 1989, 10, :o3, 625658400
+          tz.transition 1990, 3, :o4, 636543000
+          tz.transition 1990, 10, :o3, 657108000
+          tz.transition 1991, 3, :o4, 667992600
         end
       end
     end

data/lib/tzinfo/definitions/Pacific/Tongatapu.rb

@@ -7,13 +7,13 @@ module TZInfo
         include TimezoneDefinition
         
         timezone 'Pacific/Tongatapu' do |tz|
-          tz.offset :o0, 44360, 0, :LMT
+          tz.offset :o0, 44352, 0, :LMT
           tz.offset :o1, 44400, 0, :'+1220'
           tz.offset :o2, 46800, 0, :'+13'
           tz.offset :o3, 46800, 3600, :'+14'
           
-          tz.transition 1900, 12, :o1, 5217231571, 2160
-          tz.transition 1940, 12, :o2, 174959639, 72
+          tz.transition 1945, 9, :o1, 182378099, 75
+          tz.transition 1960, 12, :o2, 175485599, 72
           tz.transition 1999, 10, :o3, 939214800
           tz.transition 2000, 3, :o2, 953384400
           tz.transition 2000, 11, :o3, 973342800

data/lib/tzinfo/indexes/countries.rb

@@ -444,7 +444,7 @@ module TZInfo
       end
       country 'KI', 'Kiribati' do |c|
         c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilbert Islands'
-        c.timezone 'Pacific/Enderbury', -47, 15, -2053, 12, 'Phoenix Islands'
+        c.timezone 'Pacific/Kanton', -167, 60, -10303, 60, 'Phoenix Islands'
         c.timezone 'Pacific/Kiritimati', 28, 15, -472, 3, 'Line Islands'
       end
       country 'KM', 'Comoros' do |c|
@@ -815,7 +815,7 @@ module TZInfo
         c.timezone 'Africa/Tunis', 184, 5, 611, 60
       end
       country 'TO', 'Tonga' do |c|
-        c.timezone 'Pacific/Tongatapu', -127, 6, -1051, 6
+        c.timezone 'Pacific/Tongatapu', -317, 15, -876, 5
       end
       country 'TR', 'Turkey' do |c|
         c.timezone 'Europe/Istanbul', 2461, 60, 869, 30

data/lib/tzinfo/indexes/timezones.rb

@@ -6,7 +6,7 @@ module TZInfo
       include TimezoneIndexDefinition
 
       timezone 'Africa/Abidjan'
-      timezone 'Africa/Accra'
+      linked_timezone 'Africa/Accra'
       linked_timezone 'Africa/Addis_Ababa'
       timezone 'Africa/Algiers'
       linked_timezone 'Africa/Asmara'
@@ -79,14 +79,14 @@ module TZInfo
       timezone 'America/Argentina/Ushuaia'
       linked_timezone 'America/Aruba'
       timezone 'America/Asuncion'
-      timezone 'America/Atikokan'
+      linked_timezone 'America/Atikokan'
       linked_timezone 'America/Atka'
       timezone 'America/Bahia'
       timezone 'America/Bahia_Banderas'
       timezone 'America/Barbados'
       timezone 'America/Belem'
       timezone 'America/Belize'
-      timezone 'America/Blanc-Sablon'
+      linked_timezone 'America/Blanc-Sablon'
       timezone 'America/Boa_Vista'
       timezone 'America/Bogota'
       timezone 'America/Boise'
@@ -103,9 +103,9 @@ module TZInfo
       linked_timezone 'America/Coral_Harbour'
       linked_timezone 'America/Cordoba'
       timezone 'America/Costa_Rica'
-      timezone 'America/Creston'
+      linked_timezone 'America/Creston'
       timezone 'America/Cuiaba'
-      timezone 'America/Curacao'
+      linked_timezone 'America/Curacao'
       timezone 'America/Danmarkshavn'
       timezone 'America/Dawson'
       timezone 'America/Dawson_Creek'
@@ -172,7 +172,7 @@ module TZInfo
       timezone 'America/Montevideo'
       linked_timezone 'America/Montreal'
       linked_timezone 'America/Montserrat'
-      timezone 'America/Nassau'
+      linked_timezone 'America/Nassau'
       timezone 'America/New_York'
       timezone 'America/Nipigon'
       timezone 'America/Nome'
@@ -187,7 +187,7 @@ module TZInfo
       timezone 'America/Paramaribo'
       timezone 'America/Phoenix'
       timezone 'America/Port-au-Prince'
-      timezone 'America/Port_of_Spain'
+      linked_timezone 'America/Port_of_Spain'
       linked_timezone 'America/Porto_Acre'
       timezone 'America/Porto_Velho'
       timezone 'America/Puerto_Rico'
@@ -228,14 +228,14 @@ module TZInfo
       timezone 'America/Yellowknife'
       timezone 'Antarctica/Casey'
       timezone 'Antarctica/Davis'
-      timezone 'Antarctica/DumontDUrville'
+      linked_timezone 'Antarctica/DumontDUrville'
       timezone 'Antarctica/Macquarie'
       timezone 'Antarctica/Mawson'
       linked_timezone 'Antarctica/McMurdo'
       timezone 'Antarctica/Palmer'
       timezone 'Antarctica/Rothera'
       linked_timezone 'Antarctica/South_Pole'
-      timezone 'Antarctica/Syowa'
+      linked_timezone 'Antarctica/Syowa'
       timezone 'Antarctica/Troll'
       timezone 'Antarctica/Vostok'
       linked_timezone 'Arctic/Longyearbyen'
@@ -539,7 +539,7 @@ module TZInfo
       timezone 'Pacific/Chuuk'
       timezone 'Pacific/Easter'
       timezone 'Pacific/Efate'
-      timezone 'Pacific/Enderbury'
+      linked_timezone 'Pacific/Enderbury'
       timezone 'Pacific/Fakaofo'
       timezone 'Pacific/Fiji'
       timezone 'Pacific/Funafuti'
@@ -549,6 +549,7 @@ module TZInfo
       timezone 'Pacific/Guam'
       timezone 'Pacific/Honolulu'
       linked_timezone 'Pacific/Johnston'
+      timezone 'Pacific/Kanton'
       timezone 'Pacific/Kiritimati'
       timezone 'Pacific/Kosrae'
       timezone 'Pacific/Kwajalein'

data/lib/tzinfo/time_or_datetime.rb

@@ -178,7 +178,15 @@ module TZInfo
     # receiver is less than, equal to, or greater than timeOrDateTime.
     #
     # Milliseconds and smaller units are ignored in the comparison.
+    #
+    # Returns nil if the passed in timeOrDateTime is not comparable with
+    # TimeOrDateTime instances.
     def <=>(timeOrDateTime)
+      return nil unless timeOrDateTime.is_a?(TimeOrDateTime) ||
+                        timeOrDateTime.is_a?(Time) ||
+                        timeOrDateTime.is_a?(DateTime) ||
+                        timeOrDateTime.respond_to?(:to_i)
+
       if timeOrDateTime.is_a?(TimeOrDateTime)            
         orig = timeOrDateTime.to_orig
         

data/lib/tzinfo/timezone.rb

@@ -101,7 +101,7 @@ module TZInfo
     def self.get(identifier)
       instance = @@loaded_zones[identifier]
       unless instance  
-        raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier !~ /^[A-Za-z0-9\+\-_]+(\/[A-Za-z0-9\+\-_]+)*$/
+        raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier !~ /\A[A-Za-z0-9+\-_]+(\/[A-Za-z0-9+\-_]+)*\z/
         identifier = identifier.gsub(/-/, '__m__').gsub(/\+/, '__p__')
         begin
           # Use a temporary variable to avoid an rdoc warning
@@ -498,10 +498,13 @@ module TZInfo
     
     # Compares two Timezones based on their identifier. Returns -1 if tz is less
     # than self, 0 if tz is equal to self and +1 if tz is greater than self.
+    #
+    # Returns nil if tz is not comparable with Timezone instances.
     def <=>(tz)
+      return nil unless tz.is_a?(Timezone)
       identifier <=> tz.identifier
     end
-    
+
     # Returns true if and only if the identifier of tz is equal to the 
     # identifier of this Timezone.
     def eql?(tz)

data/lib/tzinfo/tzdataparser.rb

@@ -107,7 +107,7 @@ module TZInfo
 
       files = Dir.entries(@input_dir).select do |file|
         file =~ /\A[^\.]+\z/ &&            
-          !%w(backzone calendars leapseconds version CONTRIBUTING LICENSE Makefile NEWS README SOURCE Theory version).include?(file) &&
+          !%w(backzone calendars leapseconds version CONTRIBUTING LICENSE Makefile NEWS README SECURITY SOURCE Theory version).include?(file) &&
           File.file?(File.join(@input_dir, file))
       end
     

data/test/in_load_path/payload.rb

@@ -0,0 +1 @@
+raise 'This should never be executed'

data/test/tc_country.rb

@@ -114,6 +114,10 @@ class TCCountry < Test::Unit::TestCase
     assert_equal(1, Country.get('US') <=> Country.get('FR'))
   end
   
+  def test_compare_non_comparable
+    assert_nil(Country.get('GB') <=> Object.new)
+  end
+  
   def test_equality
     assert_equal(true, Country.get('GB') == Country.get('GB'))
     assert_equal(false, Country.get('GB') == Country.get('US'))

data/test/tc_time_or_datetime.rb

@@ -276,6 +276,12 @@ class TCTimeOrDateTime < Test::Unit::TestCase
     assert_equal(1, TimeOrDateTime.new(1143214323) <=> '1111678323')
   end
   
+  def test_compare_non_comparable
+    assert_nil(TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Object.new)
+    assert_nil(TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Object.new)
+    assert_nil(TimeOrDateTime.new(1143214323) <=> Object.new)
+  end
+  
   def test_eql
     assert_equal(true, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3))))
     assert_equal(false, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3))))

data/test/tc_timezone.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "in_load_path")
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'test_utils')
 require 'tzinfo'
@@ -97,7 +98,11 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_get_invalid
-    assert_raises(InvalidTimezoneIdentifier) { Timezone.get('../Definitions/UTC') }
+    assert_raises(InvalidTimezoneIdentifier) { Timezone.get('../definitions/UTC') }
+  end
+
+  def test_get_directory_traversal
+    assert_raises(InvalidTimezoneIdentifier) { Timezone.get("foo\n/../../../payload") }
   end
   
   def test_get_nil
@@ -907,6 +912,10 @@ class TCTimezone < Test::Unit::TestCase
     assert_equal(1, TestTimezone.new('Europe/Paris') <=> TestTimezone.new('America/New_York'))    
   end
   
+  def test_compare_non_comparable
+    assert_nil(TestTimezone.new('Europe/London') <=> Object.new)
+  end
+  
   def test_equality
     assert_equal(true, TestTimezone.new('Europe/London') == TestTimezone.new('Europe/London'))
     assert_equal(false, TestTimezone.new('Europe/London') == TestTimezone.new('Europe/london'))

data/tzinfo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'tzinfo'
-  s.version = '0.3.60'
+  s.version = '0.3.61'
   s.author = 'Philip Ross'
   s.email = 'phil.ross@gmail.com'
   s.homepage = 'http://tzinfo.github.io'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tzinfo
 version: !ruby/object:Gem::Version 
-  hash: 107
+  hash: 105
   prerelease: 
   segments: 
   - 0
   - 3
-  - 60
-  version: 0.3.60
+  - 61
+  version: 0.3.61
 platform: ruby
 authors: 
 - Philip Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2021-02-05 16:00:00 -08:00
+date: 2022-07-18 16:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -206,6 +206,7 @@ files:
 - lib/tzinfo/definitions/Etc/GMT__p__9.rb
 - lib/tzinfo/definitions/Etc/GMT__m__13.rb
 - lib/tzinfo/definitions/Etc/GMT__m__3.rb
+- lib/tzinfo/definitions/Pacific/Kanton.rb
 - lib/tzinfo/definitions/Pacific/Fiji.rb
 - lib/tzinfo/definitions/Pacific/Tongatapu.rb
 - lib/tzinfo/definitions/Pacific/Guam.rb
@@ -678,6 +679,7 @@ files:
 - test/test_utils.rb
 - test/tc_ruby_core_support.rb
 - test/tc_timezone_info.rb
+- test/in_load_path/payload.rb
 - test/tc_country.rb
 has_rdoc: true
 homepage: http://tzinfo.github.io
@@ -742,4 +744,5 @@ test_files:
 - test/test_utils.rb
 - test/tc_ruby_core_support.rb
 - test/tc_timezone_info.rb
+- test/in_load_path/payload.rb
 - test/tc_country.rb