tzinfo 0.3.37 → 0.3.38

data/.yardopts

@@ -0,0 +1,8 @@
+--no-private
+--exclude ^lib/tzinfo/definitions/
+--exclude ^lib/tzinfo/indexes/
+lib/**/*.rb
+-
+CHANGES
+LICENSE
+README

data/CHANGES

@@ -1,3 +1,9 @@
+== Version 0.3.38 (tzdata v2013g) - 8-Oct-2013
+
+* Updated to tzdata version 2013g
+  (http://mm.icann.org/pipermail/tz-announce/2013-October/000015.html).
+
+
 == Version 0.3.37 (tzdata v2013b) - 11-Mar-2013
 
 * Updated to tzdata version 2013b

data/README

@@ -1,12 +1,12 @@
 = TZInfo -- Daylight-savings aware timezone support for Ruby
 
-TZInfo[http://tzinfo.rubyforge.org] uses the tz database 
-(http://www.twinsun.com/tz/tz-link.htm) to provide
+TZInfo[http://tzinfo.github.io] uses the IANA Time Zone Database 
+(http://www.iana.org/time-zones) to provide
 daylight-savings aware transformations between times in different timezones.
 This is the same database as used for zoneinfo on Unix machines.
 
-The tz database has been imported (using TZDataParser) and turned into a set of
-Ruby modules (which are packaged with this release).
+The Time Zone database has been imported (using TZDataParser) and turned into a 
+set of Ruby modules (which are packaged with this release).
 
 
 == Example usage
@@ -66,15 +66,9 @@ The above covers the most common uses of Timezone and Country. For more detail,
 see the API documentation for the individual classes.
 
 
-== Download
+== Documentation
 
-The latest version of TZInfo can be found at
-
-* http://rubyforge.org/frs/?group_id=894
-
-API documentation can be found at 
-
-* http://tzinfo.rubyforge.org/doc/
+API documentation for TZInfo is available on RubyDoc.info[http://rubydoc.info/gems/tzinfo/frames].
 
 
 == Installation
@@ -93,9 +87,12 @@ or to automatically download and install:
 TZInfo is released under the MIT[http://opensource.org/licenses/mit-license.html] license.
 
 
-== Support
+== Source Code
+
+Source code for TZInfo is available on GitHub[https://github.com/tzinfo/tzinfo].
+
 
-Please post to the TZInfo Users mailing list (http://rubyforge.org/mailman/listinfo/tzinfo-users)
-if you require assistance or have any suggestions.
+== Issue Tracker
 
-Alternatively, you can contact the author Philip Ross directly at phil.ross@gmail.com.
+Please post any bugs, issues, feature requests or questions to the 
+{GitHub issue tracker}[https://github.com/tzinfo/tzinfo/issues].

data/Rakefile

@@ -40,12 +40,13 @@ def sh(*cmd, &block)
 end
 
 
-PKG_VERSION = "0.3.37"
+PKG_VERSION = "0.3.38"
 PKG_FILES = FileList[
   'CHANGES',
   'LICENSE',
   'Rakefile',
   'README',
+  '.yardopts',
   'lib',
   'lib/**/*'
 ].delete_if {|f| f.include?('.svn')}
@@ -61,7 +62,7 @@ SPEC = Gem::Specification.new do |s|
   s.version = PKG_VERSION
   s.author = "Philip Ross"
   s.email = "phil.ross@gmail.com"
-  s.homepage = "http://tzinfo.rubyforge.org/"
+  s.homepage = "http://tzinfo.github.io"
   s.platform = Gem::Platform::RUBY
   s.summary = "Daylight-savings aware timezone library"  
   s.description = "TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones."
@@ -148,81 +149,152 @@ task :build_tz_modules do
     p = TZInfo::TZDataParser.new('../data', BUILD_TZ_CLASSES_DIR)
     p.execute
     
-    ['indexes', 'definitions'].each {|dir|
-      sync_svn("#{BUILD_TZ_CLASSES_DIR}/#{dir}", "lib/tzinfo/#{dir}")
-    }        
+    scm = Scm.create(File.join(File.dirname(__FILE__), '..'))
+    
+    ['indexes', 'definitions'].each do |dir|
+      scm.sync("#{BUILD_TZ_CLASSES_DIR}/#{dir}", "lib/tzinfo/#{dir}")
+    end
   ensure
     FileUtils.rm_rf(BUILD_TZ_CLASSES_DIR)
   end
 end
 
-def sync_svn(source_dir, target_dir)
-  puts "SVN Sync from #{source_dir} to #{target_dir}"
+class Scm
+  def self.create(dir)
+    if File.directory?(File.join(dir, '.git'))
+      GitScm.new(dir)
+    elsif File.directory?(File.join(dir, '.svn'))
+      SvnScm.new(dir)
+    else
+      NullScm.new(dir)
+    end
+  end
 
-  # Assumes a directory will never turn into a file and vice-versa
-  # (files will all end in .rb, directories won't).
-  # SVN wouldn't allow the change in a single commit anyway.
+  def initialize(dir)
+  end
+
+  def sync(source_dir, target_dir)
+    puts "Sync from #{source_dir} to #{target_dir}#{command ? " using #{command}" : ''}"
+    sync_dirs(source_dir, target_dir)
+  end
+
+  protected
+
+  def exec_scm(params)
+    puts "#{command} #{params}"
+    `#{command} #{params}`
+    raise "#{command} exited with status #$?" if $? != 0  
+  end
 
-  source_entries, target_entries = [source_dir, target_dir].collect {|dir|
-    Dir.entries(dir).delete_if {|entry| entry =~ /^\.(\.?|svn)$/}.sort
-  }
+  private
   
-  until source_entries.empty? || target_entries.empty?          
-    if source_entries.last == target_entries.last      
-      source_file = "#{source_dir}/#{source_entries.last}"
-      target_file = "#{target_dir}/#{target_entries.last}"
+  def sync_dirs(source_dir, target_dir)
+    # Assumes a directory will never turn into a file and vice-versa
+    # (files will all end in .rb, directories won't).
+
+    source_entries, target_entries = [source_dir, target_dir].collect do |dir|
+      Dir.entries(dir).delete_if {|entry| entry =~ /\A\./}.sort
+    end
+    
+    until source_entries.empty? || target_entries.empty?          
+      last_source = source_entries.last
+      last_target = target_entries.last
+    
+      if last_source == last_target
+        source_file = File.join(source_dir, last_source)
+        target_file = File.join(target_dir, last_target)
+      
+        if File.directory?(source_file)
+          sync_dirs(source_file, target_file)
+        else
+          FileUtils.cp(source_file, target_file)
+        end     
+      
+        source_entries.pop
+        target_entries.pop
+      elsif source_entries.last < target_entries.last
+        sync_only_in_target(target_dir, target_entries)
+      else      
+        sync_only_in_source(source_dir, target_dir, source_entries)
+      end    
+    end
     
-      if File.directory?(source_file)
-        sync_svn(source_file, target_file)
-      else
-        FileUtils.cp(source_file, target_file)
-      end     
+    until target_entries.empty?
+      sync_only_in_target(target_dir, target_entries)
+    end
     
-      source_entries.pop
-      target_entries.pop
-    elsif source_entries.last < target_entries.last
-      sync_svn_only_in_target(target_dir, target_entries)
-    else      
-      sync_svn_only_in_source(source_dir, target_dir, source_entries)
-    end    
+    until source_entries.empty?
+      sync_only_in_source(source_dir, target_dir, source_entries)
+    end
+  end
+
+  def sync_only_in_target(target_dir, target_entries)
+    target_file = File.join(target_dir, target_entries.last)
+    delete(target_file)
+    target_entries.pop
+  end
+
+  def sync_only_in_source(source_dir, target_dir, source_entries)
+    source_file = File.join(source_dir, source_entries.last)
+    target_file = File.join(target_dir, source_entries.last)
+        
+    if File.directory?(source_file)
+      Dir.mkdir(target_file)
+      add(target_file)
+      sync_dirs(source_file, target_file)
+    else
+      FileUtils.cp(source_file, target_file)
+      add(target_file)
+    end
+    
+    source_entries.pop
+  end
+end
+
+class NullScm < Scm
+  def command
+    nil
   end
   
-  until target_entries.empty?
-    sync_svn_only_in_target(target_dir, target_entries)
+  def add(file)
   end
   
-  until source_entries.empty?
-    sync_svn_only_in_source(source_dir, target_dir, source_entries)
+  def delete(file)
+    puts "rm -rf \"#{file}\""
+    FileUtils.rm_rf(file)
   end
 end
 
-def sync_svn_only_in_target(target_dir, target_entries)
-  target_file = "#{target_dir}/#{target_entries.last}"  
-  exec_svn "delete \"#{target_file}\""
-  target_entries.pop
+class GitScm < Scm
+  def command
+    'git'
+  end
+  
+  def add(file)
+    unless File.directory?(file)
+      exec_scm "add \"#{file}\""
+    end
+  end
+  
+  def delete(file)
+    exec_scm "rm -rf \"#{file}\""
+  end
 end
 
-def sync_svn_only_in_source(source_dir, target_dir, source_entries)
-  source_file = "#{source_dir}/#{source_entries.last}"
-  target_file = "#{target_dir}/#{source_entries.last}"
-      
-  if File.directory?(source_file)
-    Dir.mkdir(target_file)
-    exec_svn "add \"#{target_file}\""    
-    sync_svn(source_file, target_file)
-  else
-    FileUtils.cp(source_file, target_file)
-    exec_svn "add \"#{target_file}\""
+class SvnScm < Scm
+  def command
+    'svn'
+  end
+  
+  def add(file)
+    exec_scm "add \"#{file}\""
   end
   
-  source_entries.pop
+  def delete(file)
+    exec_scm "delete --force \"#{file}\""
+  end
 end
 
-def exec_svn(params)
-  puts "svn #{params}"
-  `svn #{params}`
-  raise "SVN exited with status #$?" if $? != 0  
-end
 
 task :build_tz_module do
   require 'lib/tzinfo/tzdataparser'

data/lib/tzinfo/country.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2010 Philip Ross
+# Copyright (c) 2005-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -36,9 +36,13 @@ module TZInfo
     include Comparable
     
     # Defined countries.
+    #
+    # @!visibility private
     @@countries = {}
     
     # Whether the countries index has been loaded yet.
+    #
+    # @!visibility private
     @@index_loaded = false
     
     # Gets a Country by its ISO 3166 code. Raises an InvalidCountryCode 

data/lib/tzinfo/country_index_definition.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,8 @@
 module TZInfo
   # The country index file includes CountryIndexDefinition which provides
   # a country method used to define each country in the index.
+  #
+  # @private
   module CountryIndexDefinition #:nodoc:
     def self.append_features(base)
       super
@@ -30,6 +32,9 @@ module TZInfo
       base.instance_eval { @countries = {} }
     end
     
+    # Class methods for inclusion.
+    #
+    # @private
     module ClassMethods #:nodoc:
       # Defines a country with an ISO 3166 country code, name and block. The
       # block will be evaluated to obtain all the timezones for the country.

data/lib/tzinfo/country_info.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,8 @@
 module TZInfo  
   # Class to store the data loaded from the country index. Instances of this
   # class are passed to the blocks in the index that define timezones.
+  #
+  # @private
   class CountryInfo #:nodoc:
     attr_reader :code
     attr_reader :name

data/lib/tzinfo/country_timezone.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2012 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/tzinfo/data_timezone.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,8 @@
 module TZInfo
 
   # A Timezone based on a DataTimezoneInfo.
+  #
+  # @private
   class DataTimezone < InfoTimezone #:nodoc:
     
     # Returns the TimezonePeriod for the given UTC time. utc can either be

data/lib/tzinfo/data_timezone_info.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010 Philip Ross
+# Copyright (c) 2006-2013 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,8 @@ module TZInfo
   end
     
   # Represents a (non-linked) timezone defined in a data module.
+  #
+  # @private
   class DataTimezoneInfo < TimezoneInfo #:nodoc:
             
     # Constructs a new TimezoneInfo with its identifier.

data/lib/tzinfo/definitions/Africa/Casablanca.rb

@@ -42,95 +42,76 @@ module TZInfo
           tz.transition 2012, 8, :o2, 1345428000
           tz.transition 2012, 9, :o1, 1348970400
           tz.transition 2013, 4, :o2, 1367114400
-          tz.transition 2013, 7, :o1, 1373335200
-          tz.transition 2013, 8, :o2, 1375927200
-          tz.transition 2013, 9, :o1, 1380420000
-          tz.transition 2014, 4, :o2, 1398564000
+          tz.transition 2013, 7, :o1, 1373162400
+          tz.transition 2013, 8, :o2, 1376100000
+          tz.transition 2013, 10, :o1, 1382839200
+          tz.transition 2014, 3, :o2, 1396144800
           tz.transition 2014, 6, :o1, 1404007200
           tz.transition 2014, 7, :o2, 1406599200
-          tz.transition 2014, 9, :o1, 1411869600
-          tz.transition 2015, 4, :o2, 1430013600
+          tz.transition 2014, 10, :o1, 1414288800
+          tz.transition 2015, 3, :o2, 1427594400
           tz.transition 2015, 6, :o1, 1434592800
           tz.transition 2015, 7, :o2, 1437184800
-          tz.transition 2015, 9, :o1, 1443319200
-          tz.transition 2016, 4, :o2, 1461463200
+          tz.transition 2015, 10, :o1, 1445738400
+          tz.transition 2016, 3, :o2, 1459044000
           tz.transition 2016, 6, :o1, 1465264800
           tz.transition 2016, 7, :o2, 1467856800
-          tz.transition 2016, 9, :o1, 1474768800
-          tz.transition 2017, 4, :o2, 1493517600
+          tz.transition 2016, 10, :o1, 1477792800
+          tz.transition 2017, 3, :o2, 1490493600
           tz.transition 2017, 5, :o1, 1495850400
           tz.transition 2017, 6, :o2, 1498442400
-          tz.transition 2017, 9, :o1, 1506218400
-          tz.transition 2018, 4, :o2, 1524967200
+          tz.transition 2017, 10, :o1, 1509242400
+          tz.transition 2018, 3, :o2, 1521943200
           tz.transition 2018, 5, :o1, 1526436000
           tz.transition 2018, 6, :o2, 1529028000
-          tz.transition 2018, 9, :o1, 1538272800
-          tz.transition 2019, 4, :o2, 1556416800
+          tz.transition 2018, 10, :o1, 1540692000
+          tz.transition 2019, 3, :o2, 1553997600
           tz.transition 2019, 5, :o1, 1557108000
           tz.transition 2019, 6, :o2, 1559700000
-          tz.transition 2019, 9, :o1, 1569722400
+          tz.transition 2019, 10, :o1, 1572141600
+          tz.transition 2020, 3, :o2, 1585447200
+          tz.transition 2020, 4, :o1, 1587693600
           tz.transition 2020, 5, :o2, 1590285600
-          tz.transition 2020, 9, :o1, 1601172000
+          tz.transition 2020, 10, :o1, 1603591200
+          tz.transition 2021, 3, :o2, 1616896800
+          tz.transition 2021, 4, :o1, 1618279200
           tz.transition 2021, 5, :o2, 1620871200
-          tz.transition 2021, 9, :o1, 1632621600
+          tz.transition 2021, 10, :o1, 1635645600
+          tz.transition 2022, 3, :o2, 1648346400
+          tz.transition 2022, 4, :o1, 1648951200
           tz.transition 2022, 5, :o2, 1651543200
-          tz.transition 2022, 9, :o1, 1664071200
-          tz.transition 2023, 4, :o2, 1682820000
-          tz.transition 2023, 9, :o1, 1695520800
-          tz.transition 2024, 4, :o2, 1714269600
-          tz.transition 2024, 9, :o1, 1727575200
-          tz.transition 2025, 4, :o2, 1745719200
-          tz.transition 2025, 9, :o1, 1759024800
-          tz.transition 2026, 4, :o2, 1777168800
-          tz.transition 2026, 9, :o1, 1790474400
-          tz.transition 2027, 4, :o2, 1808618400
-          tz.transition 2027, 9, :o1, 1821924000
-          tz.transition 2028, 4, :o2, 1840672800
-          tz.transition 2028, 9, :o1, 1853373600
-          tz.transition 2029, 4, :o2, 1872122400
-          tz.transition 2029, 9, :o1, 1885428000
-          tz.transition 2030, 4, :o2, 1903572000
-          tz.transition 2030, 9, :o1, 1916877600
-          tz.transition 2031, 4, :o2, 1935021600
-          tz.transition 2031, 9, :o1, 1948327200
-          tz.transition 2032, 4, :o2, 1966471200
-          tz.transition 2032, 9, :o1, 1979776800
-          tz.transition 2033, 4, :o2, 1997920800
-          tz.transition 2033, 9, :o1, 2011226400
-          tz.transition 2034, 4, :o2, 2029975200
-          tz.transition 2034, 9, :o1, 2042676000
-          tz.transition 2035, 4, :o2, 2061424800
-          tz.transition 2035, 9, :o1, 2074730400
-          tz.transition 2036, 4, :o2, 2092874400
-          tz.transition 2036, 9, :o1, 2106180000
-          tz.transition 2037, 4, :o2, 2124324000
-          tz.transition 2037, 9, :o1, 2137629600
-          tz.transition 2038, 4, :o2, 29586463, 12
-          tz.transition 2038, 9, :o1, 29588311, 12
-          tz.transition 2039, 4, :o2, 29590831, 12
-          tz.transition 2039, 9, :o1, 29592679, 12
-          tz.transition 2040, 4, :o2, 29595283, 12
-          tz.transition 2040, 9, :o1, 29597131, 12
-          tz.transition 2041, 4, :o2, 29599651, 12
-          tz.transition 2041, 9, :o1, 29601499, 12
-          tz.transition 2042, 4, :o2, 29604019, 12
-          tz.transition 2042, 9, :o1, 29605867, 12
-          tz.transition 2043, 4, :o2, 29608387, 12
-          tz.transition 2043, 9, :o1, 29610235, 12
-          tz.transition 2044, 4, :o2, 29612755, 12
-          tz.transition 2044, 9, :o1, 29614603, 12
-          tz.transition 2045, 4, :o2, 29617207, 12
-          tz.transition 2045, 9, :o1, 29618971, 12
-          tz.transition 2046, 4, :o2, 29621575, 12
-          tz.transition 2046, 9, :o1, 29623423, 12
-          tz.transition 2047, 4, :o2, 29625943, 12
-          tz.transition 2047, 9, :o1, 29627791, 12
-          tz.transition 2048, 4, :o2, 29630311, 12
-          tz.transition 2048, 9, :o1, 29632159, 12
-          tz.transition 2049, 4, :o2, 29634679, 12
-          tz.transition 2049, 9, :o1, 29636527, 12
-          tz.transition 2050, 4, :o2, 29639047, 12
-          tz.transition 2050, 9, :o1, 29640895, 12
+          tz.transition 2022, 10, :o1, 1667095200
+          tz.transition 2023, 4, :o2, 1682128800
+          tz.transition 2023, 10, :o1, 1698544800
+          tz.transition 2024, 4, :o2, 1712714400
+          tz.transition 2024, 10, :o1, 1729994400
+          tz.transition 2025, 3, :o2, 1743386400
+          tz.transition 2025, 10, :o1, 1761444000
+          tz.transition 2026, 3, :o2, 1774749600
+          tz.transition 2026, 10, :o1, 1792893600
+          tz.transition 2027, 3, :o2, 1806199200
+          tz.transition 2027, 10, :o1, 1824948000
+          tz.transition 2028, 3, :o2, 1837648800
+          tz.transition 2028, 10, :o1, 1856397600
+          tz.transition 2029, 3, :o2, 1869098400
+          tz.transition 2029, 10, :o1, 1887847200
+          tz.transition 2030, 3, :o2, 1901152800
+          tz.transition 2030, 10, :o1, 1919296800
+          tz.transition 2031, 3, :o2, 1932602400
+          tz.transition 2031, 10, :o1, 1950746400
+          tz.transition 2032, 3, :o2, 1964052000
+          tz.transition 2032, 10, :o1, 1982800800
+          tz.transition 2033, 3, :o2, 1995501600
+          tz.transition 2033, 10, :o1, 2014250400
+          tz.transition 2034, 3, :o2, 2026951200
+          tz.transition 2034, 10, :o1, 2045700000
+          tz.transition 2035, 3, :o2, 2058400800
+          tz.transition 2035, 10, :o1, 2077149600
+          tz.transition 2036, 3, :o2, 2090455200
+          tz.transition 2036, 10, :o1, 2108167200
+          tz.transition 2037, 3, :o2, 2121904800
+          tz.transition 2037, 10, :o1, 2138839200
+          tz.transition 2038, 3, :o2, 29586127, 12
         end
       end
     end