chronic_cron 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b5058b12c2cb781f5788a5aef3de5f34b405d26
-  data.tar.gz: 6e71c3ca5e7dd59b04ab7644706c3769b7c95911
+  metadata.gz: 5b2ee2e57788dd1ce049bc000c191b52e1f3ec10
+  data.tar.gz: 53956301fc4972129722a3224af01b703d98bd21
 SHA512:
-  metadata.gz: 0ee877393bb0fdb6937ceeed1eae95cd1d1c320c25987ef0bea48a5fd05767b6737f77c47835970fda8e069b41b6165ab5b2bb5645cde8a66230785c2e90a90a
-  data.tar.gz: 787220c0fa7e8634dc7b5230ad2a2f57a1da83b10938b23a458b0d1cb77cf73af98a760920202cb5d140a28e2e5a5e82cc2d535820dff2dca9cfb5cba1f9a9f2
+  metadata.gz: 035ff581044f8cf789307764454c229a5cb60d5a1c6f867665b623abd31166d1fc3675cafc32be7804c71e6379711f3df79a6e5362f6ac6dec9ea598b1c24bd9
+  data.tar.gz: 207f6cf8aafd205b36f6de811b67b06b9700fe3527898d090a7591c87b4ade46e75e69ee69774db8afdbb336029346cdd04454e789a22162a2e2cccfb6fa174b

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-�]��E9*�u�Z����[&��-���1ɡ��BV3�.�ّ�^�׶6ܾK�Id� �p���_���������ӛ����TU�6����1ԗ�ZpJL�*#t��ǾX�b���"h����֣
�V3��xŪ��{∸L�v���x�����iq�|�������Uٛ�'��x�Y#P��RYy�����1_@�������cy����;���mױm�C{�;Xp}>AM�2�f!��Lӡ������?�C�
+��x��9N�f�zIO2$mL��2�|⇣�t�t�"f�wa��?DV:�N[���j�ZL�Fs)�'�M��q�47G�����*ܤ:�/)�>-	$��$����mfK�J�2��5��y��y�9�n�;���l*�
+��q>��D
��uގ���[q5�0���4]܋�U�n�V"�b1�0�В�b�:��$]$����S��:A\j��Ta��v�_K�AL�ҟ, ���p�F���X��1�#��Y�j��� 

data/lib/chronic_cron.rb

@@ -2,167 +2,51 @@
 
 # file: chronic_cron.rb
 
-require 'date'
-require 'time'
-
-MINUTE = 60
-HOUR = MINUTE * 60
-DAY = HOUR * 24
-
-class Array
-
-  def inflate()
-    Array.new(self.max_by {|x| x.length}.length).map do |x|
-      self.map{|x| x.length <= 1 ? x.first : x.shift}
-    end
-  end
-end
+require 'app-routes'
+require 'cron_format'
 
 
 class ChronicCron
+  include AppRoutes
+  
+  attr_reader :to_expression
   
-  def self.day_valid?(date)
-    year, month, day = date
-    last_day = DateTime.parse("%s-%s-%s" % [year, month.succ, 1]) - 1
-    day.to_i <= last_day.day
-  end  
+  def self.parse(s, now=Time.now)    
+    CronFormat.new(s, now).to_time
+  end
   
-  def self.parse(object, now=Time.now)
+  def initialize(s, now=Time.now)
+    @now = now
+    super()
+    @params = {}
+    expressions(@params)
+    @to_expression = find_expression s
+    @cf = CronFormat.new(@to_expression, now)    
+  end
+  
+  def next()    @cf.next    end
+  def to_time() @cf.to_time end
     
-    raw_a = object.is_a?(String) ? object.split : object
-    raw_a << '*' if raw_a.length <= 5 # add the year?
-
-    units = now.to_a.values_at(1..4) + [nil, now.year]
-      
-    procs = {
-      min: lambda{|x, interval| x += (interval * MINUTE).to_i},
-      hour: lambda{|x, interval| x += (interval * HOUR).to_i},
-      day: lambda{|x, interval| x += (interval * DAY).to_i}, 
-      month: lambda{|x, interval| 
-         date = x.to_a.values_at(1..5)
-         interval.times { date[3].succ! }
-         Time.parse("%s-%s-%s %s:%s" % date.reverse)},
-      year: lambda{|x, interval| 
-         date = x.to_a.values_at(1..5)
-         interval.times { date[4].succ! }
-         Time.parse("%s-%s-%s %s:%s" % date.reverse)}
-    }
+  protected
 
-    dt = units.map do |start|
-      # convert * to time unit
-      lambda do |x| v2 = x.sub('*', start.to_s)
-        # split any times
-        multiples = v2.split(/,/)
-        range = multiples.map do |time|
-          s1, s2 = time.split(/-/)
-          s2 ? (s1..s2).to_a : s1
-        end
-        range.flatten
-      end
+  def expressions(params) 
 
+    get /10:15am every day/ do 
+      '0 15 10 * *'
     end
-    
-    # take any repeater out of the unit value
-    raw_units, repeaters = [], []
 
-    raw_a.each do |x| 
-      v1, v2 = x.split('/')
-      raw_units << v1
-      repeaters << v2
+    # e.g. 10:15am every day
+    get /(\d{1,2}):(\d{1,2})am every day/ do |hrs, mins|
+      "0 %s %s * *" % [mins, hrs]
     end
 
-    raw_date = raw_units.map.with_index {|x,i| dt[i].call(x) }
-    
-    # expand the repeater
-
-    ceil = {min: MINUTE, hour: 23, day: 31, month: 12}.values
-
-    if repeaters.any? then
-      repeaters.each_with_index do |x,i|
-        if x and not raw_a[i][/^\*/] then
-          raw_date[i] = raw_date[i].map {|y|            
-            (y.to_i...ceil[i]).step(x.to_i).to_a.map(&:to_s)
-          }.flatten
-        else  
-          raw_date[i]
-        end 
-      end
-    end  
-   
-    dates = raw_date.inflate
-    
-    a = dates.map do |date|
-      d = date.map{|x| x ? x.clone : nil}
-      wday, year = d.pop(2)
-      d << year
-
-      next unless day_valid? d.reverse.take 3
-      t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
-        
-      if t < now and wday and wday != t.wday then
-        d[2], d[3] = now.to_a.values_at(3,4).map(&:to_s)
-        t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
-        t += DAY until t.wday == wday.to_i
-      end
-
-      i = 3
-      while t < now and i >= 0 and raw_a[i][/\*/]
-        d[i] = now.to_a[i+1].to_s
-        t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
-        i -= 1
-      end
-
-      if t < now then
-
-        if t.month < now.month and raw_a[4] == '*' then
-          # increment the year
-          d[4].succ!
-          t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
-
-          if repeaters[4] then
-            d[4].succ!
-            t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
-          end
-        elsif t.day < now.day and raw_a[3] == '*' then
-          # increment the month
-          if d[3].to_i <= 11 then
-            d[3].succ!
-          else 
-            d[3] = '1'
-            d[4].succ!
-          end
-          t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
-        elsif  t.hour < now.hour and raw_a[2] == '*' then
-          # increment the day
-          t += DAY * ((now.day - d[2].to_i) + 1)
-        elsif t.min < now.min and raw_a[1] == '*' then
-          # increment the hour
-          t += HOUR * ((now.hour - d[1].to_i) + 1)
-        elsif raw_a[0] == '*' then
-          # increment the minute
-          t += MINUTE * ((now.min - d[0].to_i) + 1)
-          t = procs.values[i].call(t, repeaters[i].to_i) if repeaters[i]
-        end   
-
-      end
-
-      if wday then
-        t += DAY until t.wday == wday.to_i
-      end
-      
-      if t <= now and repeaters.any? then
-
-        repeaters.each_with_index do |x,i|
-          if x then
-            t = procs.values[i].call(t, x.to_i)
-          end
-        end
-      end
-
-      t     
+    # e.g. at 11:00 and 16:00 on every day
+    get /(\d{1,2}):(\d{1,2}) and (\d{1,2}):(\d{1,2}) on every day/ do
+      "00 %s,%s * * *" % params.captures
     end
 
-    a.compact.min
   end
   
-end
+  alias find_expression run_route
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   aYYwh4InyS/QZr4LG0nh0TuYVP5vwm1cCSlLlo4dlv7bl7Q4y815j70z8O4oUrT8
   5oSIzmlVDEDmwAibYqdf+aHqmum1mkYW
   -----END CERTIFICATE-----
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: