fugit 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d147427cf9a05edc023aff03f2a66327630136
-  data.tar.gz: 4ec39bf97a9ead1ada6b7ae28ce1584bb481d76a
+  metadata.gz: 35836e95c82a113fe2e5222a02522ab2bf36f1b0
+  data.tar.gz: 0fb6db1cb77893af937354da715b2eb8b14403f5
 SHA512:
-  metadata.gz: 7ebf332f1ef63e6d4ab8a7d948a896ed0d901a53cffb870206fb7a8109c29fd0510e0809e332c0202429896e5c0f74ef486bcab0436100548ebc53d0299a0487
-  data.tar.gz: e390316cf035e0a4228d9e8078c7e417dcb093a98b85cffe0d4f379d08709af8faae00d017e4b9a00a38a9d5eafae33e1206a47ea3e17dafd482ff3aa517d290
+  metadata.gz: 7de61477e96c9612542641787346fb154394d8388eccccaeb1be257cb57410abe4e23d1377148539d92852674df3c58d0a44c9cc4816c50cd157515f185d59da
+  data.tar.gz: c1f23c4a8395ddc29a85415300608fbc45d5900cbb42c502fd51f02f7f8c5f6fe945fe9b010349e9bde6fc1df6f3ec105a977c8705722820be41c65b47656ff7

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 # CHANGELOG.md
 
 
+## fugit 1.1.9  released 2019-03-26
+
+* Fix cron `"0 9 29 feb *"` endless loop, gh-18
+* Fix cron endless loop when #previous_time(t) and t matches, gh-15
+* Simplify Cron #next_time / #previous_time breaker system, gh-15
+  Thanks @godfat and @conet
+
+
 ## fugit 1.1.8  released 2019-01-17
 
 * Ensure Cron#next_time happens in cron's time zone, gh-12

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* Cristian Oneț https://githbu.com/conet #previous_time vs 1/-1 endless loop #15
 * Wenhui Wang https://github.com/w11th #next_time vs Chronic+ActiveSupport #11
 * Lin-Jen Shin https://github.com/godfat #next_time untamed loop, #13
 * Nils Mueller https://github.com/Tolsto missing Olson timezone names, #9
@@ -17,5 +18,5 @@
 As fugit originates in rufus-scheduler, many thanks to all the
 rufus-scheduler contributors and people who gave feedback.
 
-https://github.com/jmettraux/rufus-scheduler/blob/master/CREDITS.txt
+https://github.com/jmettraux/rufus-scheduler/blob/master/CREDITS.md
 

data/README.md

@@ -3,6 +3,7 @@
 
 [![Build Status](https://secure.travis-ci.org/floraison/fugit.svg)](http://travis-ci.org/floraison/fugit)
 [![Gem Version](https://badge.fury.io/rb/fugit.svg)](http://badge.fury.io/rb/fugit)
+[![Join the chat at https://gitter.im/floraison/fugit](https://badges.gitter.im/floraison/fugit.svg)](https://gitter.im/floraison/fugit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Time tools for [flor](https://github.com/floraison/flor) and the floraison group.
 
@@ -34,9 +35,9 @@ The intersection of those two projects is where fugit is born:
 * [sideqik-cron](https://github.com/ondrejbartas/sidekiq-cron) - recent versions of Sideqik-Cron use fugit to parse cron strings
 * [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) -
 * [flor](https://github.com/floraison/flor) - used in the [cron](https://github.com/floraison/flor/blob/master/doc/procedures/cron.md) procedure
+* [que-scheduler](https://github.com/hlascelles/que-scheduler) - a reliable job scheduler for [que](https://github.com/chanks/que)
 * ...
 
-
 ## `Fugit.parse(s)`
 
 The simplest way to use fugit is via `Fugit.parse(s)`.

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.1.8'
+  VERSION = '1.1.9'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -64,7 +64,8 @@ module Fugit
 
     class TimeCursor
 
-      def initialize(t)
+      def initialize(cron, t)
+        @cron = cron
         @t = t.is_a?(TimeCursor) ? t.time : t
         @t.seconds = @t.seconds.to_i
       end
@@ -88,28 +89,49 @@ module Fugit
         @t = ::EtOrbi.make(y, m, @t.zone)
         self
       end
-      def inc_day; inc((24 - @t.hour) * 3600 - @t.min * 60 - @t.sec); end
-      def inc_hour; inc((60 - @t.min) * 60 - @t.sec); end
-      def inc_min; inc(60 - @t.sec); end
 
-      def inc_sec(seconds)
-        if sec = seconds.find { |s| s > @t.sec }
+      def inc_day
+        inc((24 - @t.hour) * 3600 - @t.min * 60 - @t.sec)
+      end
+      def inc_hour
+        inc((60 - @t.min) * 60 - @t.sec)
+      end
+      def inc_min
+        inc(60 - @t.sec)
+      end
+
+      def inc_sec
+        if sec = @cron.seconds.find { |s| s > @t.sec }
           inc(sec - @t.sec)
         else
-          inc(60 - @t.sec + seconds.first)
+          inc(60 - @t.sec + @cron.seconds.first)
         end
       end
 
       def dec_month
-        dec(@t.day * 24 * 3600 + @t.hour * 3600 + @t.min * 60 + @t.sec + 1)
+
+        #dec(@t.day * 24 * 3600 + @t.hour * 3600 + @t.min * 60 + @t.sec + 1)
+          #
+          # gh-18, so that '0 9 29 feb *' doesn't get skipped (over and over)
+          #
+        dec(@t.day * 24 * 3600 + 1)
+      end
+
+      def dec_day
+        dec(@t.hour * 3600 + @t.min * 60 + @t.sec + 1)
+      end
+      def dec_hour
+        dec(@t.min * 60 + @t.sec + 1)
+      end
+      def dec_min
+        dec(@t.sec + 1)
       end
-      def dec_day; dec(@t.hour * 3600 + @t.min * 60 + @t.sec + 1); end
-      def dec_hour; dec(@t.min * 60 + @t.sec + 1); end
-      def dec_min; dec(@t.sec + 1); end
 
-      def dec_sec(seconds)
-        target = seconds.reverse.find { |s| s < @t.sec } || seconds.last
-        inc(target - @t.sec)
+      def dec_sec
+        target =
+          @cron.seconds.reverse.find { |s| s < @t.sec } ||
+          @cron.seconds.last
+        inc(target - @t.sec - (@t.sec > target ? 0 : 60))
       end
     end
 
@@ -140,7 +162,7 @@ module Fugit
 
       return true if @monthdays.nil?
 
-      last = (TimeCursor.new(nt).inc_month.time - 24 * 3600).day + 1
+      last = (TimeCursor.new(self, nt).inc_month.time - 24 * 3600).day + 1
 
       @monthdays
         .collect { |d| d < 1 ? last + d : d }
@@ -166,47 +188,43 @@ module Fugit
       hour_match?(t) && min_match?(t) && sec_match?(t)
     end
 
-    BREAKER_S = 41 * (365 + 1) * 24 * 3600
-      # 41 years and a few days... there wont'be a next or a previous time
+    MAX_ITERATION_COUNT = 2048
+      #
+      # See gh-15 and tst/iteration_count.rb
+      #
+      # Initially set to 1024 after seeing the worst case for #next_time
+      # at 167 iterations, I placed it at 2048 after experimenting with
+      # gh-18 and noticing some > 1024 for some experiments. 2048 should
+      # be ok.
 
     def next_time(from=::EtOrbi::EoTime.now)
 
       from = ::EtOrbi.make_time(from)
-      sfrom = from.strftime('%F/%T')
+      sfrom = from.strftime('%F|%T')
       ifrom = from.to_i
 
-      t = TimeCursor.new(from.translate(@timezone))
+      i = 0
+      t = TimeCursor.new(self, from.translate(@timezone))
         #
         # the translation occurs in the timezone of
         # this Fugit::Cron instance
 
-      ti = 0
-      stalling = false
-
       loop do
 
-        ti1 = t.to_i
-
-        fail RuntimeError.new(
-          "loop stalled for #{@original.inspect} #next_time, breaking"
-        ) if stalling && ti == ti1
-
-        stalling = (ti == ti1)
-        ti = ti1
-
         fail RuntimeError.new(
-          "too many loops for #{@original.inspect} #next_time, breaking"
-        ) if (ti - ifrom).abs > BREAKER_S
+          "too many loops for #{@original.inspect} #next_time, breaking, " +
+          "please fill an issue at https://git.io/fjJC9"
+        ) if (i += 1) > MAX_ITERATION_COUNT
 
-        (ifrom == ti) && (t.inc(1); next)
+        (ifrom == t.to_i) && (t.inc(1); next)
         month_match?(t) || (t.inc_month; next)
         day_match?(t) || (t.inc_day; next)
         hour_match?(t) || (t.inc_hour; next)
         min_match?(t) || (t.inc_min; next)
-        sec_match?(t) || (t.inc_sec(@seconds); next)
+        sec_match?(t) || (t.inc_sec; next)
 
-        st = t.time.strftime('%F/%T')
-        (from, sfrom, ifrom = t.time, st, t.time.to_i; next) if st == sfrom
+        st = t.time.strftime('%F|%T')
+        (from, sfrom, ifrom = t.time, st, t.to_i; next) if st == sfrom
           #
           # when transitioning out of DST, this prevents #next_time from
           # yielding the same literal time twice in a row, see gh-6
@@ -223,33 +241,22 @@ module Fugit
     def previous_time(from=::EtOrbi::EoTime.now)
 
       from = ::EtOrbi.make_time(from)
-      ti = 0
-      ifrom = from.to_i
 
-      t = TimeCursor.new(from.translate(@timezone))
-      stalling = false
+      i = 0
+      t = TimeCursor.new(self, (from - 1).translate(@timezone))
 
       loop do
 
-        ti1 = t.to_i
-
-        fail RuntimeError.new(
-          "loop stalled for #{@original.inspect} #previous_time, breaking"
-        ) if stalling && ti == ti1
-
-        stalling = (ti == ti1)
-        ti = ti1
-
         fail RuntimeError.new(
-          "too many loops for #{@original.inspect} #previous_time, breaking"
-        ) if (ifrom - ti).abs > BREAKER_S
+          "too many loops for #{@original.inspect} #previous_time, breaking, " +
+          "please fill an issue at https://git.io/fjJCQ"
+        ) if (i += 1) > MAX_ITERATION_COUNT
 
-        (ifrom == ti) && (t.inc(-1); next)
         month_match?(t) || (t.dec_month; next)
         day_match?(t) || (t.dec_day; next)
         hour_match?(t) || (t.dec_hour; next)
         min_match?(t) || (t.dec_min; next)
-        sec_match?(t) || (t.dec_sec(@seconds); next)
+        sec_match?(t) || (t.dec_sec; next)
         break
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro