et-orbi 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db2e44b25fa9806ddea412a4c4ab67f404f8abf7
-  data.tar.gz: 28bff7ef341b1458b17a604638878f17c131ad76
+  metadata.gz: 9087de4253106aad0142d0e3a7985b2fd4cef1f4
+  data.tar.gz: e5b7dc43e253987e3f60b42ce55c4c8b521438d4
 SHA512:
-  metadata.gz: '0411908916cd638a834b73d73685c3615154c26b39d1ef264bb0e924808bbb845dab0ee7d89c12a2d0fc20757e748a0dc2b1785c12396a754123a65393cb7b5c'
-  data.tar.gz: bde96903887538a4f15885e74996882c68d662d6692e76f217fe471782ef9b8951df0aee97b0c6150ab0ffd5e6985579f9786f00b6e5c4b059b341eb4235b904
+  metadata.gz: 72c25c33cca74a4e487f215ad9b2b6c1fda170d06387e1bd9242a8b04bc51f2885a0773f11658076d1f3c99b4ddb8e93269028500d991fed82ab5a2f144e6c91
+  data.tar.gz: 220954e56982a997ccee2d2f036f74a10384ab63033055171130cbd984b38c9b1d8148134a57e6db9acb527a35854697e7063a869cb73794d2f529e89a0df7f9

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # et-orbi CHANGELOG.md
 
 
+## et-orbi 1.1.2  released 2018-05-24
+
+- Let EtOrbi.get_tzone understand "CST+0800"
+- Introduce EtOrbi.to_windows_tz (Asia/Kolkata to IST-5:30)
+
+
 ## et-orbi 1.1.1  released 2018-05-04
 
 - Stop caching the local tzone, cache the tools used for determining it

data/README.md

@@ -2,6 +2,7 @@
 # et-orbi
 
 [![Build Status](https://secure.travis-ci.org/floraison/et-orbi.svg)](http://travis-ci.org/floraison/et-orbi)
+[![Build status](https://ci.appveyor.com/api/projects/status/6tbo9lk9qdor8ipl?svg=true)](https://ci.appveyor.com/project/jmettraux/et-orbi)
 [![Gem Version](https://badge.fury.io/rb/et-orbi.svg)](http://badge.fury.io/rb/et-orbi)
 
 Time zones for [fugit](https://github.com/floraison/fugit) and for [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler). Urbi et Orbi.

data/lib/et-orbi.rb

@@ -4,10 +4,12 @@ require 'time'
 
 require 'tzinfo'
 
+require 'et-orbi/zone_aliases'
+
 
 module EtOrbi
 
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 
   #
   # module methods
@@ -103,7 +105,7 @@ module EtOrbi
         # pass the abbreviation anyway,
         # it will be used in resulting the error message
 
-      EoTime.new(t.to_f, z)
+      EoTime.new(t, z)
     end
 
     def make_from_date(d, zone)
@@ -151,15 +153,16 @@ module EtOrbi
 
       return nil unless o.is_a?(String)
 
-      (@custom_tz_cache ||= {})[o] ||
-      get_offset_tzone(o) ||
-      (::TZInfo::Timezone.get(o) rescue nil)
+      s = unalias(o)
+
+      get_offset_tzone(s) ||
+      (::TZInfo::Timezone.get(s) rescue nil)
     end
 
     def render_nozone_time(seconds)
 
       t =
-        Time.utc(0) + seconds
+        Time.utc(1970) + seconds
       ts =
         t.strftime('%Y-%m-%d %H:%M:%S') +
         ".#{(seconds % 1).to_s.split('.').last}"
@@ -175,22 +178,26 @@ module EtOrbi
 
       etos = Proc.new { |k, v| "#{k}:#{v.inspect}" }
 
-      '(' +
-        {
-          'etz' => ENV['TZ'],
-          'tnz' => Time.now.zone,
-          'tzid' => defined?(TZInfo::Data),
-          'rv' => RUBY_VERSION,
-          'rp' => RUBY_PLATFORM,
-          'rorv' => (Rails::VERSION::STRING rescue nil),
-          'astz' => ([ Time.zone.class, Time.zone.tzinfo.name ] rescue nil),
-          'eov' => EtOrbi::VERSION,
-          'eotnz' => EtOrbi::EoTime.now.zone,
-          'eotnfz' => EtOrbi::EoTime.now.strftime('%z'),
-          'eotlzn' => EtOrbi::EoTime.local_tzone.name,
-        }.collect(&etos).join(',') + ',' +
-        gather_tzs.collect(&etos).join(',') +
-      ')'
+      h = {
+        'etz' => ENV['TZ'],
+        'tnz' => Time.now.zone,
+        'tzid' => defined?(TZInfo::Data),
+        'rv' => RUBY_VERSION,
+        'rp' => RUBY_PLATFORM,
+        'win' => Gem.win_platform?,
+        'rorv' => (Rails::VERSION::STRING rescue nil),
+        'astz' => ([ Time.zone.class, Time.zone.tzinfo.name ] rescue nil),
+        'eov' => EtOrbi::VERSION,
+        'eotnz' => '???',
+        'eotnfz' => '???',
+        'eotlzn' => '???' }
+      if ltz = EtOrbi::EoTime.local_tzone
+        h['eotnz'] = EtOrbi::EoTime.now.zone
+        h['eotnfz'] = EtOrbi::EoTime.now.strftime('%z')
+        h['eotlzn'] = ltz.name
+      end
+
+      "(#{h.map(&etos).join(',')},#{gather_tzs.map(&etos).join(',')})"
     end
 
     alias make make_time
@@ -301,7 +308,7 @@ module EtOrbi
 
       fail ArgumentError.new(
         "Cannot determine timezone from #{zone.inspect}" +
-        "\n#{EtOrbi.render_nozone_time(s)}" +
+        "\n#{EtOrbi.render_nozone_time(@seconds)}" +
         "\n#{EtOrbi.platform_info.sub(',debian:', ",\ndebian:")}" +
         "\nTry setting `ENV['TZ'] = 'Continent/City'` in your script " +
         "(see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)" +
@@ -328,7 +335,7 @@ module EtOrbi
     #
     def utc
 
-      Time.utc(1970, 1, 1) + @seconds
+      Time.utc(1970) + @seconds
     end
 
     # Returns true if this ::EtOrbi::EoTime instance timezone is UTC.
@@ -336,7 +343,8 @@ module EtOrbi
     #
     def utc?
 
-      %w[ zulu utc gmt ].include?(@zone.canonical_identifier.downcase)
+      %w[ gmt utc zulu etc/gmt etc/utc ].include?(
+        @zone.canonical_identifier.downcase)
     end
 
     alias getutc utc
@@ -616,7 +624,7 @@ module EtOrbi
 
       etz = ENV['TZ']
 
-      tz = ::TZInfo::Timezone.get(etz) rescue nil
+      tz = etz && (::TZInfo::Timezone.get(etz) rescue nil)
       return tz if tz
 
       if Time.respond_to?(:zone) && Time.zone.respond_to?(:tzinfo)
@@ -628,14 +636,44 @@ module EtOrbi
       return tz if tz
 
       tzs = determine_local_tzones
-      (etz && tzs.find { |z| z.name == etz }) || tzs.first
+      tz = (etz && tzs.find { |z| z.name == etz }) || tzs.first
+      return tz if tz
+
+      n = Time.now
+
+      get_tzone(n.zone) ||
+      get_tzone(n.strftime('%Z%z'))
     end
 
+    attr_accessor :_os_zone # test tool
+
     def os_tz
 
+      return (@_os_zone == '' ? nil : @_os_zone) if @_os_zone
+
       @os_tz ||= (debian_tz || centos_tz || osx_tz)
     end
 
+    def to_windows_tz(zone_name, time=Time.now)
+
+      twin = Time.utc(time.year, 1, 1) # winter
+      tsum = Time.utc(time.year, 7, 1) # summer
+
+      tz = ::TZInfo::Timezone.get(zone_name)
+      tzo = tz.period_for_local(time).utc_total_offset
+      tzop = tzo < 0 ? nil : '-'; tzo = tzo.abs
+      tzoh = tzo / 3600
+      tzos = tzo % 3600
+      tzos = tzos == 0 ? nil : ':%02d' % (tzos / 60)
+
+      abbs = [
+        tz.period_for_utc(twin).abbreviation.to_s,
+        tz.period_for_utc(tsum).abbreviation.to_s ]
+          .uniq
+
+      [ abbs[0], tzop, tzoh, tzos, abbs[1] ].compact.join
+    end
+
     #
     # protected module methods
 
@@ -664,7 +702,8 @@ module EtOrbi
       mn = -mn if hr && hr < 0
 
       return (
-        @custom_tz_cache[str] = create_offset_tzone(hr * 3600 + mn * 60, str)
+        (@custom_tz_cache ||= {})[str] =
+          create_offset_tzone(hr * 3600 + mn * 60, str)
       ) if hr
 
       nil
@@ -694,7 +733,9 @@ module EtOrbi
     def determine_local_tzones
 
       tabbs = (-6..5)
-        .collect { |i| (Time.now + i * 30 * 24 * 3600).zone }
+        .collect { |i|
+          t = Time.now + i * 30 * 24 * 3600
+          "#{t.zone}_#{t.utc_offset}" }
         .uniq
         .sort
         .join('|')
@@ -702,19 +743,22 @@ module EtOrbi
       t = Time.now
       #tu = t.dup.utc # /!\ dup is necessary, #utc modifies its target
 
-      twin = Time.utc(t.year, 1, 1) # winter
-      tsum = Time.utc(t.year, 7, 1) # summer
+      twin = Time.local(t.year, 1, 1) # winter
+      tsum = Time.local(t.year, 7, 1) # summer
 
       @tz_all ||= ::TZInfo::Timezone.all
       @tz_winter_summer ||= {}
 
       @tz_winter_summer[tabbs] ||= @tz_all
         .select { |tz|
+          pw = tz.period_for_local(twin)
+          ps = tz.period_for_local(tsum)
           tabbs ==
-            [
-              tz.period_for_utc(twin).abbreviation.to_s,
-              tz.period_for_utc(tsum).abbreviation.to_s
-            ].uniq.sort.join('|') }
+            [ "#{pw.abbreviation}_#{pw.utc_total_offset}",
+              "#{ps.abbreviation}_#{ps.utc_total_offset}" ]
+              .uniq.sort.join('|') }
+
+      @tz_winter_summer[tabbs]
     end
 
     #

data/lib/et-orbi/zone_aliases.rb

@@ -0,0 +1,115 @@
+
+module EtOrbi
+
+  def self.unalias(name)
+
+    ZONE_ALIASES[name.sub(/ Daylight /, ' Standard ')] ||
+    unzz(name) ||
+    name
+  end
+
+  def self.unzz(name)
+
+    m = name.match(/\A([A-Z]{3,4})([+-])(\d{1,2}):?(\d{2})?\z/)
+    return nil unless m
+
+    abbs = [ m[1] ]; a = m[1]
+    abbs << "#{a}T" if a.size < 4
+
+    off = (m[2] == '+' ? 1 : -1) * (m[3].to_i * 3600 + (m[4] || '0').to_i * 60)
+
+    t = Time.now
+    twin = Time.utc(t.year, 1, 1) # winter
+    tsum = Time.utc(t.year, 7, 1) # summer
+
+    (@tz_all ||= ::TZInfo::Timezone.all)
+      .each { |tz|
+        abbs.each { |abb|
+          per = tz.period_for_utc(twin)
+          return tz.name \
+            if per.abbreviation.to_s == abb && per.utc_total_offset == off
+          per = tz.period_for_utc(tsum)
+          return tz.name \
+            if per.abbreviation.to_s == abb && per.utc_total_offset == off } }
+
+    nil
+  end
+
+  ZONE_ALIASES = {
+    'Coordinated Universal Time' => 'UTC',
+    'Afghanistan Standard Time' => 'Asia/Kabul',
+    'FLE Standard Time' => 'Europe/Helsinki',
+    'Central Europe Standard Time' => 'Europe/Prague',
+    'UTC-11' => 'Etc/GMT+11',
+    'W. Europe Standard Time' => 'Europe/Rome',
+    'W. Central Africa Standard Time' => 'Africa/Lagos',
+    'SA Western Standard Time' => 'America/La_Paz',
+    'Pacific SA Standard Time' => 'America/Santiago',
+    'Argentina Standard Time' => 'America/Argentina/Buenos_Aires',
+    'Caucasus Standard Time' => 'Asia/Yerevan',
+    'AUS Eastern Standard Time' => 'Australia/Sydney',
+    'Azerbaijan Standard Time' => 'Asia/Baku',
+    'Eastern Standard Time' => 'America/New_York',
+    'Arab Standard Time' => 'Asia/Riyadh',
+    'Bangladesh Standard Time' => 'Asia/Dhaka',
+    'Belarus Standard Time' => 'Europe/Minsk',
+    'Romance Standard Time' => 'Europe/Paris',
+    'Central America Standard Time' => 'America/Belize',
+    'Atlantic Standard Time' => 'Atlantic/Bermuda',
+    'Venezuela Standard Time' => 'America/Caracas',
+    'Central European Standard Time' => 'Europe/Warsaw',
+    'South Africa Standard Time' => 'Africa/Johannesburg',
+    #'UTC' => 'Etc/UTC', # 'UTC' is good as is
+    'E. South America Standard Time' => 'America/Sao_Paulo',
+    'Central Asia Standard Time' => 'Asia/Almaty',
+    'Singapore Standard Time' => 'Asia/Singapore',
+    'Greenwich Standard Time' => 'Africa/Monrovia',
+    'Cape Verde Standard Time' => 'Atlantic/Cape_Verde',
+    'SE Asia Standard Time' => 'Asia/Bangkok',
+    'SA Pacific Standard Time' => 'America/Bogota',
+    'China Standard Time' => 'Asia/Shanghai',
+    'Myanmar Standard Time' => 'Asia/Yangon',
+    'E. Africa Standard Time' => 'Africa/Nairobi',
+    'Hawaiian Standard Time' => 'Pacific/Honololu',
+    'E. Europe Standard Time' => 'Europe/Nicosia',
+    'Tokyo Standard Time' => 'Asia/Tokyo',
+    'Egypt Standard Time' => 'Africa/Cairo',
+    'SA Eastern Standard Time' => 'America/Cayenne',
+    'GMT Standard Time' => 'Europe/London',
+    'Fiji Standard Time' => 'Pacific/Fiji',
+    'West Asia Standard Time' => 'Asia/Tashkent',
+    'Georgian Standard Time' => 'Asia/Tbilisi',
+    'GTB Standard Time' => 'Europe/Athens',
+    'Greenland Standard Time' => 'America/Godthab',
+    'West Pacific Standard Time' => 'Pacific/Guam',
+    'Mauritius Standard Time' => 'Indian/Mauritius',
+    'India Standard Time' => 'Asia/Kolkata',
+    'Iran Standard Time' => 'Asia/Tehran',
+    'Arabic Standard Time' => 'Asia/Baghdad',
+    'Israel Standard Time' => 'Asia/Jerusalem',
+    'Jordan Standard Time' => 'Asia/Amman',
+    'UTC+12' => 'Etc/GMT-12',
+    'Korea Standard Time' => 'Asia/Seoul',
+    'Middle East Standard Time' => 'Asia/Beirut',
+    'Central Standard Time (Mexico)' => 'America/Mexico_City',
+    'Ulaanbaatar Standard Time' => 'Asia/Ulaanbaatar',
+    'Morocco Standard Time' => 'Africa/Casablanca',
+    'Namibia Standard Time' => 'Africa/Windhoek',
+    'Nepal Standard Time' => 'Asia/Kathmandu',
+    'Central Pacific Standard Time' => 'Etc/GMT-11',
+    'New Zealand Standard Time' => 'Pacific/Auckland',
+    'Arabian Standard Time' => 'Asia/Dubai',
+    'Pakistan Standard Time' => 'Asia/Karachi',
+    'Paraguay Standard Time' => 'America/Asuncion',
+    'Pacific Standard Time' => 'America/Los_Angeles',
+    'Russian Standard Time' => 'Europe/Moscow',
+    'Samoa Standard Time' => 'Pacific/Pago_Pago',
+    'UTC-02' => 'Etc/GMT+2',
+    'Sri Lanka Standard Time' => 'Asia/Kolkata',
+    'Syria Standard Time' => 'Asia/Damascus',
+    'Taipei Standard Time' => 'Asia/Taipei',
+    'Tonga Standard Time' => 'Pacific/Tongatapu',
+    'Turkey Standard Time' => 'Asia/Istanbul',
+    'Montevideo Standard Time' => 'America/Montevideo' }
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -52,6 +52,7 @@ files:
 - README.md
 - et-orbi.gemspec
 - lib/et-orbi.rb
+- lib/et-orbi/zone_aliases.rb
 - lib/et_orbi.rb
 - lib/etorbi.rb
 homepage: http://github.com/floraison/et-orbi