fugit 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57336fd846b610ad0c361564a8025f3ccb752025
-  data.tar.gz: 4effff19a32313a7eefad03b6ba1eebe1d056e62
+  metadata.gz: b6c020a2dc2dea8ee73eae196c502e1353839f84
+  data.tar.gz: d4d43e932e0e4de4d07d402db975bf2a642df687
 SHA512:
-  metadata.gz: 429bc3055890b87c7a1cb78da8d713844f73de3bc162295ce7e0688179800caec9c5bb96b792276b1bf71ee40de1cee50070553ccbeb98e6150abe7b168b3f9c
-  data.tar.gz: 95fa1fc74e5ebdef176edd772d7978f8c845ecd9d9e465450ae3d61d6d7cebca89bca8cb43cc1e1e4986ff22a392fb08c58525d4ed5c5a9cd31ee8539efd4738
+  metadata.gz: 7c7f5319195ca991c848826b336023f429fc21ad033b26d67b7011872b91d1e9f8fb639b2618eda9dd1e199d7e473599e356924f302bb5cbaba20817aa6ab050
+  data.tar.gz: 4358df79feebbdb50509b78735fad8210d5c3d001d6a0b3d5a85aa375be08605816ea87510abc8188b5e42d091cd4d47af91a18061d956dc10a115fd9397c7eb

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 # CHANGELOG.md
 
 
+## fugit 1.3.1 released 2019-07-27
+
+* Fix nat parsing for 'every day at 18:00 and 18:15', gh-29
+*   and for 'every day at 18:00, 18:15, 20:00, and 20:15', gh-29
+* Ensure multi: :fail doesn't force into multi, gh-28
+* Fix nat parsing for 'every Fri-Sun at 18:00', gh-27
+
+
 ## fugit 1.3.0 released 2019-07-21
 
 * Introduce Fugit.parse_nat('every day at 18:00 and 19:15', multi: true)

data/CREDITS.md

@@ -1,7 +1,7 @@
 
 # fugit credits
 
-* Shai Coleman https://github.com/shaicoleman parse_nat enhancements, gh-24 and gh-25
+* Shai Coleman https://github.com/shaicoleman parse_nat enhancements, gh-24, gh-25, and gh-28
 * Jan Stevens https://github.com/JanStevens Fugit.parse('every 15 minutes') gh-22
 * Fabio Pitino https://github.com/hspazio nil on February 30 gh-21
 * Cristian Oneț https://github.com/conet #previous_time vs 1/-1 endless loop gh-15

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -475,9 +475,45 @@ module Fugit
       sla = 1 if sla == nil
       sta = min if sta == nil
       edn = max if edn == nil
-      sta, edn = edn, sta if sta > edn
 
-      (sta..edn).step(sla).to_a
+      range(min, max, sta, edn, sla)
+    end
+
+    def range(min, max, sta, edn, sla)
+
+      fail ArgumentError.new(
+        'both start and end must be negative in ' +
+        { min: min, max: max, sta: sta, edn: edn, sla: sla }.inspect
+      ) if (sta < 0 && edn > 0) || (edn < 0 && sta > 0)
+
+#p({ min: min, max: max, sta: sta, edn: edn, sla: sla })
+      a = []
+
+      omin, omax = min, max
+      min, max = -max, -1 if sta < 0
+#p({ min: min, max: max })
+
+      cur = sta
+
+      loop do
+
+#p({ cur: cur })
+        a << cur
+        break if cur == edn
+
+        cur += 1
+        cur = min if cur > max
+#p cur
+
+        fail RuntimeError.new(
+          "too many loops for " +
+          { min: omin, max: omax, sta: sta, edn: edn, sla: sla }.inspect +
+          " #range, breaking, " +
+          "please fill an issue at https://git.io/fjJC9"
+        ) if a.length > omax
+      end
+
+      a.each_with_index.select { |e, i| i % sla == 0 }.collect(&:first)
     end
 
     def compact(key)
@@ -529,7 +565,8 @@ module Fugit
           ((a || 0)..(z || (a ? a : 6))).step(sl < 1 ? 1 : sl)
             .each { |i| @weekdays << [ i ] }
         elsif z
-          (a..z).each { |i| @weekdays << [ i ] }
+          z = z + 7 if a > z
+          (a..z).each { |i| @weekdays << [ (i > 6) ? i - 7 : i ] }
         elsif a
           @weekdays << [ a ]
         #else
@@ -538,6 +575,7 @@ module Fugit
 
       @weekdays.each { |wd| wd[0] = 0 if wd[0] == 7 } # turn sun7 into sun0
       @weekdays.uniq!
+      @weekdays.sort!
       @weekdays = nil if @weekdays.empty?
     end
 
@@ -685,7 +723,9 @@ module Fugit
 
         a = at ? rewrite_bound(k, at) : nil
         z = zt ? rewrite_bound(k, zt) : nil
-        a, z = z, a if a && z && a > z
+
+        #a, z = z, a if a && z && a > z
+          # handled downstream since gh-27
 
         [ a, z, sl, ha, mo ]
       end

data/lib/fugit/nat.rb

@@ -37,13 +37,16 @@ module Fugit
 
       def parse_crons(s, a, opts)
 
-        dhs, aa =
-          a.partition { |e| e[0] == :digital_hour }
-        dms =
-          dhs.collect { |dh| dh[1][1] }.uniq
+        dhs, aa = a
+          .partition { |e| e[0] == :digital_hour }
+        ms = dhs
+          .inject({}) { |h, dh| (h[dh[1][0]] ||= []) << dh[1][1]; h }
+          .values
+          .uniq
 
         crons =
-          if dhs.empty? || dms.size == 1
+          #if ms.size <= 1 || hs.size <= 1
+          if ms.size <= 1
             [ parse_cron(a, opts) ]
           else
             dhs.collect { |dh| parse_cron([ dh ] + aa, opts) }
@@ -54,7 +57,7 @@ module Fugit
           "(#{crons.collect(&:original).join(' | ')})"
         ) if opts[:multi] == :fail && crons.size > 1
 
-        if opts[:multi]
+        if opts[:multi] == true || (opts[:multi] && opts[:multi] != :fail)
           crons
         else
           crons.first
@@ -84,9 +87,13 @@ module Fugit
             process_duration(h, *val[0].to_h.first)
           end
         end
+
         h[:min] ||= [ 0 ]
         h[:min].uniq!
-        h[:hou].sort! if h[:hou]
+
+        h[:hou].uniq!;
+        h[:hou].sort!
+
         h[:dow].sort! if h[:dow]
 
         a = hkeys
@@ -95,9 +102,9 @@ module Fugit
             (v && v.any?) ? v.collect(&:to_s).join(',') : '*' }
         a.insert(0, h[:sec]) if h[:sec]
         a << h[:tz].first if h[:tz]
+
         s = a.join(' ')
 
-#p s
         Fugit::Cron.parse(s)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-21 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro