et-orbi 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6330469df07c1668e684b3b17a7413f58b206791
-  data.tar.gz: a8b053546f08ca127a8cf99d71e7b2ff9119687c
+  metadata.gz: d8ef8fc834961c17b876b47c41d4d68c7901aa84
+  data.tar.gz: 6f2be70aa989f8a1245556b59bfefba5bd21e9cd
 SHA512:
-  metadata.gz: 343aa588d3a9fb2cb36ca7ac303797c23d27e5a2dca4d5db640898481d5fe275f63f363ef3b97aa492fe28aa1d2e0e58ed4f134bfb949f8c76d9b2e2e6d6c479
-  data.tar.gz: 4b852a4a9ba6aaa55687220511d0df6a37898560cb218dda54ec5f2f3e35ec4fcd4e4a9512624c1c80a574927c9b19d37ea0f71709727ed35a117f36c644e528
+  metadata.gz: 92da61eef8752d71237a83a14d8295c818f4236ecc725616bb7264ba6c0ff019fafabc813912e3bcb9e24b408da37d5222658b8671223a91cba9aa48867cdf52
+  data.tar.gz: c79094b2d43fa66d2907552603c8e973a0936e8a1b5d73d0b55c6d505eef6e280c8c868cbaa011119a9669abe1bc3314fe476de377806d780187fe277fba0b79

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # et-orbi CHANGELOG.md
 
 
+## et-orbi 1.1.4  released 2018-07-25
+
+- Silence 3 Ruby warnings (thanks Jamie Stackhouse, gh-13)
+- Introduce EtOrbi::Eotime.reach(points)
+
+
 ## et-orbi 1.1.3  released 2018-07-14
 
 - Introduce EtOrbi::EoTime#ambiguous?

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # et-orbi credits
 
+* Jamie Stackhouse https://github.com/itsjamie reported warnings, gh-13
 * mlotfi2005 https://github.com/mlotfi2005 reported infinite loop, gh-12
 * Mayur Dave https://github.com/mdave16 reported trailing warning, gh-10
 * Phil Ross https://github.com/philr added support for upcoming TZInfo 2.x, gh-9

data/lib/et-orbi.rb

@@ -9,7 +9,7 @@ require 'et-orbi/zone_aliases'
 
 module EtOrbi
 
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 
   #
   # module methods
@@ -343,7 +343,7 @@ module EtOrbi
 
       false
 
-    rescue TZInfo::AmbiguousTime => e
+    rescue TZInfo::AmbiguousTime
 
       true
     end
@@ -541,6 +541,38 @@ module EtOrbi
       [ count_weeks(-1), - count_weeks(1) ]
     end
 
+    def reach(points)
+
+      t = EoTime.new(self.to_f, @zone)
+      step = 1
+
+      s = points[:second] || points[:sec] || points[:s]
+      m = points[:minute] || points[:min] || points[:m]
+      h = points[:hour] || points[:hou] || points[:h]
+
+      fail ArgumentError.new("missing :second, :minute, and :hour") \
+        unless s || m || h
+
+      if !s && !m
+        step = 60 * 60
+        t -= t.sec
+        t -= t.min * 60
+      elsif !s
+        step = 60
+        t -= t.sec
+      end
+
+      loop do
+        t += step
+        next if s && t.sec != s
+        next if m && t.min != m
+        next if h && t.hour != h
+        break
+      end
+
+      t
+    end
+
     protected
 
     # Returns a Ruby Time instance.
@@ -672,7 +704,8 @@ module EtOrbi
 
     def os_tz
 
-      return (@_os_zone == '' ? nil : @_os_zone) if @_os_zone
+      return (@_os_zone == '' ? nil : @_os_zone) \
+        if defined?(@_os_zone) && @_os_zone
 
       @os_tz ||= (debian_tz || centos_tz || osx_tz)
     end
@@ -707,7 +740,10 @@ module EtOrbi
       i = n.to_i
       sn = i < 0 ? '-' : '+'; i = i.abs
       hr = i / 3600; mn = i % 3600; sc = i % 60
-      (sc > 0 ? "%s%02d:%02d:%02d" : "%s%02d:%02d") % [ sn, hr, mn, sc ]
+
+      sc > 0 ?
+        '%s%02d:%02d:%02d' % [ sn, hr, mn, sc ] :
+        '%s%02d:%02d' % [ sn, hr, mn ]
     end
 
     def get_offset_tzone(str)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: time with zones