chronic_cron 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a5a5a3764414f761efcfacd6c25115ed3d713900
-  data.tar.gz: db0ccc85847ec1c1ed014693dae7b110fa1f4623
+SHA256:
+  metadata.gz: bda37336df08c15781de2f92da0c38856fc99617a2a9981d678a02d6c7cab433
+  data.tar.gz: 90f135067b113779770df25b1ff01d58e3052027da8967d31e959a852e670eab
 SHA512:
-  metadata.gz: 6466d447e34682edd54ccaf8eb0991e29c2ec350a4143467817d803451839f3081117749e62cc0a693fdf55c8e8df92c61c8e4658afcf38a5ab913f677c2bf06
-  data.tar.gz: 4936d51bd6e7e0d03a920821e28d8bfbb09f4f451376412323300f2c208a05fd515d5eb65de6f2be14da245a5997396223a829a6b1656846a4ee8b75c1471c89
+  metadata.gz: 18323a22bcbd7acd242858d2791468bda38cf7f1ad90c5cb1383161795062b7317696607ecab37787cae76849cf20af70fb1c5b9500bea90ccf59791f4cd215d
+  data.tar.gz: 741f4e6cfc99e92130a66cea286e6186ba3090e601c8e1f5bcd5ba681e92abf4b3f4fda85a4574be3414fbb73ae96d45c99f4db814a011ebc407760f858987c0

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-0d%J0O��
��a���_�E�0M���X�5I$�^s��da
-�V
+J�na-9J��L�@[K�RR�جX�"$i�3^~k�ޏ�]"#ߖ�;%&

data.tar.gz.sig

@@ -1,3 +1,3 @@
-4�eK�1R
>�#7�������K7)��֟��}�C"k;��~��%
���r���g��(���"o��~6QWՆN�M�He��\ԉ�Rl������i�ma���\�݂c�5��a��Ա�6[���2�q�O���;5�^O;
c�6��'�J�ް��1lv�3>W*�0��TMFX�?!��d~�w�gX(�^*L��(�p�D������~�W]�
-
-��	0:�
+!������lr]' ظ�a��yǯ\n��
+6������o������M޼f$����	_V��Z�4dB+Q��5LR-�f��HɄp��U	`$O�&�afX�JPjE8
+X\�ğ�63jh�}��7���zI���/�@�Hb���x]6)�� �&�}b�IP��Q���.]���i)�^
A�7Μf�?�W�â���K̉+O|6q�
?vy��
]�7��~��di�T��ݮ�#r�

data/lib/chronic_cron.rb

@@ -13,9 +13,9 @@ class ChronicCron
   
   attr_reader :to_expression  
   
-  def initialize(s, now=Time.now, log: nil)
+  def initialize(s, now=Time.now, log: nil, debug: false)
     
-    @now, @log = now, log
+    @now, @log, @debug = now, log, debug
     
     super()
     @params = {input: s}
@@ -70,11 +70,17 @@ class ChronicCron
 
     # e.g. 00 5 15 * *
     get /(#{r}\s+#{r}\s+#{r}\s#{r}\s#{r})(\s#{r})?/ do
+      
+      puts 'ChronicCron#expressions 10' if @debug
+      
       "%s%s" % params[:captures]
     end
 
     # e.g. 9:00-18:00 every day
     get /(\d{1,2}):(\d{1,2})-(\d{1,2}):\d{1,2}\s+#{daily}/ do
+      
+      puts 'ChronicCron#expressions 20' if @debug
+      
       "%s %s-%s * * *" % params[:captures].values_at(1,0,2)
     end    
 
@@ -84,6 +90,9 @@ class ChronicCron
 
       hrs1 = meridiem1 == 'pm' ? r_hrs1.to_i + 12 : r_hrs1
       hrs2 = meridiem2 == 'pm' ? r_hrs2.to_i + 12 : r_hrs2
+      
+      puts 'ChronicCron#expressions 30' if @debug
+      
       "%s/%s %s-%s * * %s" % [mins1.to_i, interval_mins, hrs1, hrs2, wdays]
     end        
     
@@ -92,6 +101,9 @@ class ChronicCron
                   |interval_mins, r_hrs1, mins1, meridiem1, r_hrs2, meridiem2|
       hrs1 = meridiem1 == 'pm' ? r_hrs1.to_i + 12 : r_hrs1
       hrs2 = meridiem2 == 'pm' ? r_hrs2.to_i + 12 : r_hrs2
+      
+      puts 'ChronicCron#expressions 40' if @debug
+      
       "%s/%s %s-%s * * *" % [mins1.to_i, interval_mins, hrs1, hrs2]
     end        
     
@@ -100,12 +112,18 @@ class ChronicCron
                                   |r_hrs1, mins1, meridiem1, r_hrs2, meridiem2|
       hrs1 = meridiem1 == 'pm' ? r_hrs1.to_i + 12 : r_hrs1
       hrs2 = meridiem2 == 'pm' ? r_hrs2.to_i + 12 : r_hrs2
+      
+      puts 'ChronicCron#expressions 50' if @debug
+      
       "%s %s-%s * * *" % [mins1.to_i, hrs1, hrs2]
     end    
 
     # e.g. 10:15am every day
     get /(\d{1,2}):?(\d{1,2})([ap]m)?\s+#{daily}/ do |raw_hrs, mins, meridiem|
       hrs = in24hrs(raw_hrs, meridiem)
+      
+      puts 'ChronicCron#expressions 60' if @debug
+      
       "%s %s * * *" % [mins.to_i, hrs]
     end
 
@@ -113,11 +131,17 @@ class ChronicCron
     get /(\d{1,2}):?(\d{1,2})([ap]m)?\s+(\w+) to (\w+)/ do 
                                   |raw_hrs, mins, meridiem, wday1, wday2|
       hrs = in24hrs(raw_hrs, meridiem)
+      
+      puts 'ChronicCron#expressions 70' if @debug
+      
       "%s %s * * %s-%s" % [mins.to_i, hrs , wday1, wday2]
     end      
     
     # 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 )?#{daily}/ do
+      
+      puts 'ChronicCron#expressions 80' if @debug
+      
       "%s %s,%s * * *" % params[:captures].values_at(1,0,2)
     end
 
@@ -136,6 +160,9 @@ class ChronicCron
     get /(\d{1,2}):?(\d{1,2})([ap]m)?\s+(?:on )?every #{weekday}/i do 
                                               |raw_hrs, mins, meridiem, wday|                                              
       hrs = in24hrs(raw_hrs, meridiem)
+      
+      puts 'ChronicCron#expressions 90' if @debug
+      
       "%s %s * * %s" % [mins, hrs , wday]
     end
     
@@ -143,6 +170,9 @@ class ChronicCron
     get /(\d{1,2})([ap]m)?\s+(?:on )?every #{weekday}/i do 
                                               |raw_hrs, meridiem, wday|
       hrs = in24hrs(raw_hrs, meridiem)
+      
+      puts 'ChronicCron#expressions 100' if @debug
+      
       "0 %s * * %s" % [hrs , wday]
     end    
     
@@ -158,6 +188,8 @@ class ChronicCron
     get(/every (\d{1,2}) days?/) do |days|
       
       log.info 'ChronicCron/expressions/get: r130' if log
+      puts 'ChronicCron#expressions 150' if @debug
+      
       "* * */%s * *" % [days]
     end
     
@@ -171,6 +203,9 @@ class ChronicCron
         t
       end
       )
+      
+      puts 'ChronicCron#expressions 170' if @debug
+      
       "%s %s %s %s *" % TimeToday.between(s1,s2).to_a[1..4]
     end
     
@@ -182,6 +217,8 @@ class ChronicCron
         t
       end
       )
+      puts 'ChronicCron#expressions 180' if @debug
+      
       "%s %s %s %s *" % TimeToday.future.to_a[1..4]
     end
     
@@ -206,6 +243,9 @@ class ChronicCron
       raw_time ||= '6:00am'
 
       minute, hour = Chronic.parse(raw_time).to_a[1,2]
+      
+      puts 'ChronicCron#expressions 190' if @debug
+      
       "%s %s %s * %s" % [minute, hour, day_range, wday]
 
     end
@@ -216,6 +256,8 @@ class ChronicCron
 
       hrs = in24hrs(raw_hrs, meridiem)      
       
+      puts 'ChronicCron#expressions 200' if @debug
+      
       "0 %s * * %s" % [hrs , Date::DAYNAMES.index(wday.capitalize)]
     end
     
@@ -227,21 +269,39 @@ class ChronicCron
 ([ap]m)/i do |day, month,  raw_hrs, mins, meridiem|
 
       now = Chronic.parse(month, now: @now)
+      
+      d = last_wdayofmonth(day, now)
 
-      t = Chronic.parse(month, now: 
-                        Time.local(now > @now ? now.year : now.year.next))
-      t2 = Chronic.parse('last ' + day, now: 
-                         Time.local(t.year, t.month.next)).to_date
       hrs = in24hrs(raw_hrs, meridiem)
       
-      "%s %s %s %s *" % [mins.to_i, hrs, t2.day, t.month]
+      puts 'ChronicCron#expressions 210' if @debug
+      
+      "%s %s %s %s *" % [mins.to_i, hrs, d.day, d.month]
     end
+    
+    # e.g. last sunday of October
+    
+    get /last (#{Date::DAYNAMES.join('|')}) (?:of|in) \
+(#{Date::MONTHNAMES[1..-1].join('|')})/i do |day, month|
+
+      now = Chronic.parse(month, now: @now)
+
+      d = last_wdayofmonth(day, now)
+      
+      puts 'ChronicCron#expressions 220' if @debug
+      
+      "* * %s %s *" % [d.day, d.month]
+    end
+    
 
     # e.g. every 2nd tuesday at 4:40pm
     get /every\s+2nd\s+#{weekday}\s+at\s+(\d{1,2})(?::(\d{1,2}))?([ap]m)/i do
                                             |wday, raw_hrs, mins, meridiem, |
       hrs = in24hrs(raw_hrs, meridiem)
       log.info 'ChronicCron/expressions/get: r230' if log
+      
+      puts 'ChronicCron#expressions 220' if @debug
+      
       "%s %s * * %s/2" % [mins.to_i, hrs , wday]
     end       
     
@@ -249,6 +309,9 @@ class ChronicCron
     get /every\s+#{weekday}\s+at\s+(\d{1,2}):(\d{1,2})([ap]m)/i do
                                             |wday, raw_hrs, mins, meridiem, |
       hrs = in24hrs(raw_hrs, meridiem)
+      
+      puts 'ChronicCron#expressions 230' if @debug
+      
       "%s %s * * %s" % [mins, hrs , wday]
     end    
     
@@ -258,6 +321,7 @@ class ChronicCron
 
       t = Chronic.parse(raw_time, :now => @now)
       log.info 'ChronicCron/expressions/get: r250' if log
+      puts 'ChronicCron#expressions 240' if @debug
       
       "%s %s * * %s/2" % [t.min,t.hour,t.wday]
 
@@ -267,6 +331,7 @@ class ChronicCron
     # e.g. every 2nd monday
     get /every 2nd #{weekday}/ do |wday|
 
+      puts 'ChronicCron#expressions 250' if @debug
       "* * * * %s/2" % [wday]
 
     end       
@@ -279,6 +344,7 @@ class ChronicCron
       mins, hrs = t.to_a.values_at(1,2)
       
       log.info 'ChronicCron/expressions/get: r270' if log      
+      puts 'ChronicCron#expressions 270' if @debug
 
       "%s %s * * %s/%s" % [mins, hrs, t.wday, interval]
     end    
@@ -289,6 +355,8 @@ class ChronicCron
 
       t = Chronic.parse(raw_date, :now => @now)
       mins, hrs = t.to_a.values_at(1,2)
+      puts 'ChronicCron#expressions 280' if @debug
+      
       "%s %s * * %s/%s" % [mins, hrs, t.wday, interval]
     end    
     
@@ -297,6 +365,8 @@ class ChronicCron
 
       t = Chronic.parse(raw_date, :now => @now)
       mins, hrs, day, month, year = t.to_a.values_at(1,2,3,4,5)
+      puts 'ChronicCron#expressions 290' if @debug
+      
       "%s %s %s %s %s/2 %s" % [mins, hrs, day, month, t.wday, year]
     end            
 
@@ -305,11 +375,16 @@ class ChronicCron
 
       t = Chronic.parse(raw_date, :now => @now)
       mins, hrs, day, month, year = t.to_a.values_at(1,2,3,4,5)
+      puts 'ChronicCron#expressions 300' if @debug
+      
       "%s %s %s %s %s %s" % [mins, hrs, day, month, t.wday, year]
     end            
         
     # e.g. every sunday
     get /every\s+#{weekday}/ do |wday|
+      
+      puts 'ChronicCron#expressions 310' if @debug
+      
       "0 12 * * %s" % wday
     end    
     
@@ -317,6 +392,8 @@ class ChronicCron
     get '*' do
 
       t = Chronic.parse(params[:input], :now => @now)
+      puts 'ChronicCron#expressions 330' if @debug
+      
       "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
     end
 
@@ -330,6 +407,21 @@ class ChronicCron
     end    
   end
   
+  
   alias find_expression run_route
   
+  private
+  
+  def last_wdayofmonth(day, now)
+    
+    wday = Date::DAYNAMES.map(&:downcase).index(day)
+
+    d2 = Date.today
+    date = Date.civil(now.year, now.month, -1)
+    date -= 1 until date.wday == wday       
+      
+    return date
+    
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   q95F5t9M4vy0Q8baeY7AJ7+f6Z5LLLCK4MyPO2y4aYy209dwdEY2zHZOA+CLkPEU
   p0BvK7yY4ZqPZw==
   -----END CERTIFICATE-----
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
@@ -59,20 +59,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -140,9 +140,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Converts a human-readable time (e.g. 10:15 daily)  into a cron format (e,g,
+summary: Converts a human-readable time (e.g. 10:15 daily) into a cron format (e,g,
   15 10 * * *)
 test_files: []