et-orbi 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69e37c4c31852fc38185e883d9c1cb061080eb6d
-  data.tar.gz: 1862219b63d16c1e79b681bd5f930a419f1da254
+  metadata.gz: 16693871e0e1a8330e6ecade907b21302ad124ab
+  data.tar.gz: 00fee3dbf2143ee21043597a1d64f7d19c2c6dfa
 SHA512:
-  metadata.gz: 5dcab4f70ec22ef0a7c8303b14042344860df2d26ca93fc27923a52b2a87aa36c671422f73be18d432a15524d60b86945c467c1b6fdda125f8408a8bf6e64f72
-  data.tar.gz: '07203989eedf55dbfbeb40b0433060e03644760d07a8448b78f7c30af1694b173fc67e507360262a316978815cf04181c45c0264634af75f37dd492397e56d01'
+  metadata.gz: 6f151d68c6c1f070945f9cf9718e7d38004117832b53acac741de0e5e2c38ec8cd06c4bccca60a93072bc1b7dad2342a6e5bac7ed17f2a8829ec47554e36e0be
+  data.tar.gz: 66af905287bb713bc376adb0e67b7c1eac19a486fbc4a93c902615f33280dad69586f245726e3fb19a57ac6ab5649a7737391d3b1ead3d13b7aef6a945f96e65

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 # et-orbi CHANGELOG.md
 
 
+## et-orbi 1.0.6  released 2017-10-05
+
+- Introduce `make info`
+- Alias EoTime#to_utc_time to #utc
+- Alias EoTime#to_t to #to_local_time
+- Implement EoTime#to_local_time (since #to_time returns a UTC Time instance)
+
+
 ## et-orbi 1.0.5  released 2017-06-23
 
 - Rework EtOrbi.make_time

data/CREDITS.md

@@ -1,7 +1,9 @@
 
 # et-orbi credits
 
-* Jeremy Strouse https://github.com/jstrouse help alleviate issue with older versions of TZInfo
+* Chris Arcand https://github.com/chrisarcand shew various issues around America/Chicago on OSX, gh-4
+* Jeremy Strouse https://github.com/jstrouse helped alleviate issue with older versions of TZInfo
+
 
 ## since rufus-scheduler
 

data/Makefile

@@ -1,5 +1,5 @@
 
-## gem tasks ##
+## core floraison make ##
 
 NAME = \
   $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.name")
@@ -26,6 +26,20 @@ build: gemspec_validate
 push: build
 	gem push pkg/$(NAME)-$(VERSION).gem
 
+spec:
+	bundle exec rspec
+test: spec
 
-.PHONY: build push
+
+## specific to project ##
+
+info:
+	uname -a
+	bundle exec ruby -v
+	bundle exec ruby -Ilib -r et-orbi -e "EtOrbi._make_info"
+
+
+## done ##
+
+.PHONY: build info push spec
 

data/README.md

@@ -28,6 +28,16 @@ EtOrbi::EoTime.new(0, 'Europe/Moscow').to_s
   # => "1970-01-01 03:00:00 +0300"
 ```
 
+More about `EtOrbi::EoTime` instances:
+```
+eot = EtOrbi::EoTime.new(0, 'Europe/Moscow')
+
+eot.to_local_time.class  # => Time
+eot.to_local_time.to_s   # => "1970-01-01 09:00:00 +0900" (at least on my system)
+
+# For the rest, EtOrbi::EoTime mimicks ::Time
+```
+
 Helper methods:
 ```ruby
 require 'et-orbi'

data/et-orbi.gemspec

@@ -20,9 +20,11 @@ Time zones for fugit and rufus-scheduler. Urbi et Orbi.
 
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
+    'README.{md,txt}',
+    'CHANGELOG.{md,txt}', 'CREDITS.{md,txt}', 'LICENSE.{md,txt}',
     'Makefile',
     'lib/**/*.rb', #'spec/**/*.rb', 'test/**/*.rb',
-    '*.gemspec', '*.txt', '*.md'
+    "#{s.name}.gemspec",
   ]
 
   s.add_runtime_dependency 'tzinfo'

data/lib/et-orbi.rb

@@ -7,7 +7,7 @@ require 'tzinfo'
 
 module EtOrbi
 
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 
   #
   # module methods
@@ -36,12 +36,19 @@ module EtOrbi
         # is necessary since Time.parse('xxx') in Ruby < 1.9 yields `now`
 
       str_zone = get_tzone(list_iso8601_zones(str).last)
+#p [ :parse, str, str_zone ]
+#p ENV['TZ']
 
+#p [ :parse, :oz, opts[:zone] ]
+#p [ :parse, :sz, str_zone ]
+#p [ :parse, :foz, find_olson_zone(str) ]
+#p [ :parse, :ltz, local_tzone ]
       zone =
         opts[:zone] ||
         str_zone ||
         find_olson_zone(str) ||
         local_tzone
+#p [ :parse, :zone, zone ]
 
       str = str.sub(zone.name, '') unless zone.name.match(/\A[-+]/)
         #
@@ -49,6 +56,7 @@ module EtOrbi
         # although where does rufus-scheduler have it from?
 
       local = Time.parse(str)
+#p [ :parse, :local, local, local.zone ]
 
       secs =
         if str_zone
@@ -56,19 +64,20 @@ module EtOrbi
         else
           zone.period_for_local(local).to_utc(local).to_f
         end
+#p [ :parse, :secs, secs ]
 
       EoTime.new(secs, zone)
     end
 
     def make_time(*a)
 
-#p a
+#p [ :mt, a ]
       zone = a.length > 1 ? get_tzone(a.last) : nil
       a.pop if zone
 #p [ :mt, zone ]
 
       o = a.length > 1 ? a : a.first
-#p o
+#p [ :mt, :o, o ]
 
       case o
       when Time then make_from_time(o, zone)
@@ -87,11 +96,11 @@ module EtOrbi
       z =
         zone ||
         get_tzone(t.zone) ||
-        (
-          local_tzone.period_for_local(t).abbreviation.to_s == t.zone &&
-          local_tzone
-        ) ||
-        t.zone
+        get_local_tzone(t)
+
+      z ||= t.zone
+        # pass the abbreviation anyway,
+        # it will be used in resulting the error message
 
       EoTime.new(t.to_f, z)
     end
@@ -115,6 +124,7 @@ module EtOrbi
 
     def make_from_string(s, zone)
 
+#p [ :mfs, s, zone ]
       parse(s, zone: zone)
     end
 
@@ -160,6 +170,21 @@ module EtOrbi
         end
     end
 
+    def render_nozone_time(seconds)
+
+      t =
+        Time.utc(0) + seconds
+      ts =
+        t.strftime('%Y-%m-%d %H:%M:%S') +
+        ".#{(seconds % 1).to_s.split('.').last}"
+      z =
+        EtOrbi.local_tzone ?
+        EtOrbi.local_tzone.period_for_local(t).abbreviation.to_s :
+        nil
+
+      "(secs:#{seconds},utc~:#{ts.inspect},ltz~:#{z.inspect})"
+    end
+
     def platform_info
 
       etos = Proc.new { |k, v| "#{k}:#{v.inspect}" }
@@ -173,19 +198,52 @@ module EtOrbi
           'rp' => RUBY_PLATFORM,
           'eov' => EtOrbi::VERSION,
           'rorv' => (Rails::VERSION::STRING rescue nil),
-          'astz' => Time.respond_to?(:zone) ? Time.zone.name : nil,
-            # Active Support Time.zone
+          'astz' => ([ Time.zone.class, Time.zone.tzinfo.name ] rescue nil),
         }.collect(&etos).join(',') + ',' +
         gather_tzs.collect(&etos).join(',') +
       ')'
     end
 
     alias make make_time
+
+    # For `make info`
+    #
+    def _make_info
+
+      puts render_nozone_time(Time.now.to_f)
+      puts platform_info
+    end
+
+    protected
+
+    def get_local_tzone(t)
+
+#      lt = local_tzone
+#      lp = lt.period_for_local(t)
+#      ab = lp.abbreviation.to_s
+#
+#      return lt \
+#        if ab == t.zone
+#      return lt \
+#        if ab.match(/\A[-+]\d{2}(:?\d{2})?\z/) && lp.utc_offset == t.utc_offset
+#
+#      nil
+
+      l = Time.local(t.year, t.month, t.day, t.hour, t.min, t.sec, t.usec)
+
+      t.zone == l.zone ? local_tzone : nil
+    end
   end
 
+  # Our EoTime class (which quacks like a ::Time).
+  #
+  # An EoTime instance should respond to most of the methods ::Time instances
+  # respond to. If a method is missing, feel free to open an issue to
+  # ask (politely) for it. If it makes sense, it'll get added, else
+  # a workaround will get suggested.
+  # The immediate workaround is to call #to_t on the EoTime instance to get
+  # equivalent ::Time instance in the local, current, timezone.
   #
-  # our EoTime class (which quacks like a ::Time)
-
   class EoTime
 
     #
@@ -237,8 +295,8 @@ module EtOrbi
 
       fail ArgumentError.new(
         "cannot determine timezone from #{zone.inspect}" +
-        "\n#{render_nozone_time(s)}" +
-        "\n#{self.class.platform_info.sub(',debian:', ",\ndebian:")}" +
+        "\n#{EtOrbi.render_nozone_time(s)}" +
+        "\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)" +
         (defined?(TZInfo::Data) ? '' : "\nand adding gem 'tzinfo-data'")
@@ -259,22 +317,25 @@ module EtOrbi
       @zone = self.class.get_tzone(zone || :current)
     end
 
+    # Returns this ::EtOrbi::EoTime as a ::Time instance
+    # in the current UTC timezone.
+    #
     def utc
 
       Time.utc(1970, 1, 1) + @seconds
     end
 
+    # Returns true if this ::EtOrbi::EoTime instance timezone is UTC.
+    # Returns false else.
+    #
     def utc?
 
       %w[ zulu utc gmt ].include?(@zone.canonical_identifier.downcase)
-
-      #t = Time.now
-      #@zone.period_for_local(t).utc_offset == 0 &&
-      #@zone.period_for_local(t + 183 * 24 * 3600).utc_offset == 0
     end
 
     alias getutc utc
     alias getgm utc
+    alias to_utc_time utc
 
     def to_f
 
@@ -293,15 +354,18 @@ module EtOrbi
       to_time.strftime(format)
     end
 
-    # Returns a Ruby Time instance.
+    # Returns this ::EtOrbi::EoTime as a ::Time instance
+    # in the current timezone.
     #
-    # Warning: the timezone of that Time instance will be UTC.
+    # Has a #to_t alias.
     #
-    def to_time
+    def to_local_time
 
-      @time ||= begin; u = utc; @zone.period_for_utc(u).to_local(u); end
+      Time.at(@seconds)
     end
 
+    alias to_t to_local_time
+
     def is_dst?
 
       @zone.period_for_utc(utc).std_offset != 0
@@ -325,9 +389,6 @@ module EtOrbi
 
     def utc_offset
 
-      #@zone.period_for_utc(utc).utc_offset
-      #@zone.period_for_utc(utc).utc_total_offset
-      #@zone.period_for_utc(utc).std_offset
       @zone.period_for_utc(utc).utc_offset
     end
 
@@ -340,9 +401,11 @@ module EtOrbi
 
     def ==(o)
 
-      o.is_a?(EoTime) && o.seconds == @seconds && o.zone == @zone
+      o.is_a?(EoTime) &&
+      o.seconds == @seconds &&
+      (o.zone == @zone || o.zone.current_period == @zone.current_period)
     end
-    #alias eq? == # FIXME see Object#== (ri)
+    #alias eql? == # FIXME see Object#== (ri)
 
     def >(o); @seconds > _to_f(o); end
     def >=(o); @seconds >= _to_f(o); end
@@ -436,6 +499,15 @@ module EtOrbi
 
     protected
 
+    # Returns a Ruby Time instance.
+    #
+    # Warning: the timezone of that Time instance will be UTC.
+    #
+    def to_time
+
+      @time ||= begin; u = utc; @zone.period_for_utc(u).to_local(u); end
+    end
+
     def count_weeks(dir)
 
       c = 0
@@ -448,21 +520,6 @@ module EtOrbi
       c
     end
 
-    def render_nozone_time(seconds)
-
-      t =
-        Time.utc(0) + seconds
-      ts =
-        t.strftime('%Y-%m-%d %H:%M:%S') +
-        ".#{(seconds % 1).to_s.split('.').last}"
-      z =
-        EtOrbi.local_tzone ?
-        EtOrbi.local_tzone.period_for_local(t).abbreviation.to_s :
-        nil
-
-      "(secs:#{seconds},utc~:#{ts.inspect},ltz~:#{z.inspect})"
-    end
-
     def strfz(code)
 
       return @zone.name if code == '%/Z'
@@ -549,15 +606,23 @@ module EtOrbi
       tz = ::TZInfo::Timezone.get(etz) rescue nil
       return tz if tz
 
-      tz = Time.zone.tzinfo \
-        if Time.respond_to?(:zone) && Time.zone.respond_to?(:tzinfo)
+      if Time.respond_to?(:zone) && Time.zone.respond_to?(:tzinfo)
+        tz = Time.zone.tzinfo
+        return tz if tz
+      end
+
+      tz = ::TZInfo::Timezone.get(os_tz) rescue nil
       return tz if tz
 
       tzs = determine_local_tzones
-
       (etz && tzs.find { |z| z.name == etz }) || tzs.first
     end
 
+    def os_tz
+
+      debian_tz || centos_tz || osx_tz
+    end
+
     #
     # protected module methods
 
@@ -654,11 +719,6 @@ module EtOrbi
         nil
     rescue; nil; end
 
-#    def find_tz
-#
-#      debian_tz || centos_tz || osx_tz
-#    end
-
     def gather_tzs
 
       { :debian => debian_tz, :centos => centos_tz, :osx => osx_tz }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: time with zones