fugit 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beb66d9d6eedbe579f1c5ee04d70cd10af36b2be
-  data.tar.gz: cc83ab367d09e4af91cc1fc82d43077eab81285b
+  metadata.gz: 29d3106a9c17929e0c4a556c304acea5ab9e29f1
+  data.tar.gz: 8890359912e32ca52e1022a5b6aa25b9fcce04d9
 SHA512:
-  metadata.gz: 5abf2492c6a49f7ce5ae70cd49b769f597d363aefee055d806676b5b0d45078cd6e03291f06bbf1e04eed2f4052692413b0450bce7d5fc85a851592ee7bdd7d8
-  data.tar.gz: fac490d0d5deea7d429001b7ee9e9420b5855679d2bc2bb8b1db2d5a919cf045065b7751d41673e5db1276526ec4206a651a8bb22df16be16e40be6ff2edf52e
+  metadata.gz: fd3550d81071658ef4cba1ef2699e9949fbb7455ee1cb0bcd2a80412339993bcfad20cbd93358e1b5328df506c401ca114624d6c48288feff643acf65cc44592
+  data.tar.gz: 3f8864b05feb8f7383ac4a149f34c0de604137b05b284c6ce1871f57f3e165d290943cf42229de8ef1944cc9808583533a441abb5c4fc94630a7c535a9c3d8ad

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## fugit 1.2.1 released 2019-05-04
+
+* Return nil when parsing a cron with February 30 and friend, gh-21
+
+
 ## fugit 1.2.0 released 2019-04-22
 
 * Accept "/15 * * * *" et al, gh-19 and resque/resque-scheduler#649

data/CREDITS.md

@@ -1,12 +1,13 @@
 
 # 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
-* jakemack https://github.com/jakemack issue when going out of DST, #6
-* Cristian Bica https://github.com/cristianbica Nat improvements, #7
+* 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
+* Wenhui Wang https://github.com/w11th #next_time vs Chronic+ActiveSupport gh-11
+* Lin-Jen Shin https://github.com/godfat #next_time untamed loop gh-13
+* Nils Mueller https://github.com/Tolsto missing Olson timezone names gh-9
+* jakemack https://github.com/jakemack issue when going out of DST gh-6
+* Cristian Bica https://github.com/cristianbica Nat improvements gh-7
 * Utilum https://github.com/utilum silenced Ruby warnings
 * Tero Marttila https://github.com/SpComb added missing Cron#seconds
 * Harry Lascelles https://github.com/hlascelles timezone reminder and more

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -12,9 +12,13 @@ module Fugit
       '@daily' => '0 0 * * *',
       '@midnight' => '0 0 * * *',
       '@hourly' => '0 * * * *' }
+    MAXDAYS = [
+      nil, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ]
 
-    attr_reader :original, :zone
-    attr_reader :seconds, :minutes, :hours, :monthdays, :months, :weekdays, :timezone
+    attr_reader(
+      :original, :zone)
+    attr_reader(
+      :seconds, :minutes, :hours, :monthdays, :months, :weekdays, :timezone)
 
     class << self
 
@@ -224,6 +228,7 @@ module Fugit
 
         fail RuntimeError.new(
           "too many loops for #{@original.inspect} #next_time, breaking, " +
+          "cron expression most likely invalid (Feb 30th like?), " +
           "please fill an issue at https://git.io/fjJC9"
         ) if (i += 1) > MAX_ITERATION_COUNT
 
@@ -260,6 +265,7 @@ module Fugit
 
         fail RuntimeError.new(
           "too many loops for #{@original.inspect} #previous_time, breaking, " +
+          "cron expression most likely invalid (Feb 30th like?), " +
           "please fill an issue at https://git.io/fjJCQ"
         ) if (i += 1) > MAX_ITERATION_COUNT
 
@@ -396,6 +402,22 @@ module Fugit
 
     protected
 
+    def compact_month_days
+
+      return true if @months == nil || @monthdays == nil
+
+      ms, ds =
+        @months.inject([ [], [] ]) { |a, m|
+          @monthdays.each { |d|
+            next if d > MAXDAYS[m]
+            a[0] << m; a[1] << d }
+          a }
+      @months = ms.uniq
+      @monthdays = ds.uniq
+
+      @months.any? && @monthdays.any?
+    end
+
     def rough_days
 
       return nil if @weekdays == nil && @monthdays == nil
@@ -436,6 +458,8 @@ module Fugit
       determine_weekdays(h[:dow])
       determine_timezone(h[:tz])
 
+      return nil unless compact_month_days
+
       self
     end
 

data/lib/fugit/nat.rb

@@ -32,20 +32,21 @@ module Fugit
 
       def parse_cron(a)
 
-        h = { min: nil, hou: [], dom: [ nil ], mon: [ nil ], dow: [ nil ] }
+        h = { min: nil, hou: [], dom: nil, mon: nil, dow: nil }
+        hkeys = h.keys
 
         a.each do |key, val|
           if key == :biz_day
-            h[:dow] = [ [ 1, 5 ] ]
+            (h[:dow] ||= []) << '1-5'
           elsif key == :simple_hour || key == :numeral_hour
-            (h[:hou] ||= []) << [ val ]
+            h[:hou] << val
           elsif key == :digital_hour
-            h[:hou] = [ val[0, 1] ]
-            h[:min] = [ val[1, 1] ]
+            h[:hou] = [ val[0] ]
+            h[:min] = [ val[1] ]
           elsif key == :name_day
-            (h[:dow] ||= []) << [ val ]
+            (h[:dow] ||= []) << val
           elsif key == :flag && val == 'pm' && h[:hou]
-            h[:hou][-1] =  [ h[:hou][-1].first + 12 ]
+            h[:hou][-1] = h[:hou][-1] + 12
           elsif key == :tz
             h[:tz] = val
           elsif key == :duration
@@ -53,9 +54,18 @@ module Fugit
           end
         end
         h[:min] ||= [ 0 ]
-        h[:dow].sort_by! { |d, _| d || 0 }
-
-        Fugit::Cron.allocate.send(:init, nil, h)
+        h[:hou].sort! if h[:hou]
+        h[:dow].sort! if h[:dow]
+
+        a = hkeys
+          .collect { |k|
+            v = h[k]
+            (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(' ')
+
+        Fugit::Cron.parse(s)
       end
 
       def process_duration(h, interval, value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: time tools for flor