chronic_cron 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71cb9fbaff016e7cf04a40aa56dedba54844753254825889c6e1525aa680be7b
-  data.tar.gz: e5b614c4fdd6c3935eb7276387206c6b1e5ed90cf84c18c1a16ef8819fd6c318
+  metadata.gz: 74e6c6b5e6aafa964b67958982e125192dff761eb9368ed437918ba129f579d3
+  data.tar.gz: c261b87089908765d850751596efc61d41fff9a963096a46a592db5b58d374a4
 SHA512:
-  metadata.gz: 2ca9ba056ab67289a9a63bfc865ab45f3d7cdf70caeb28db11c912f80e0161f6cf9aa7cf74a812c7cd5ee0372c14ca9b875c50d9321880bf29909fc1079fad5a
-  data.tar.gz: 067d8f29da520258af4fa0054e446084bb49cedb04260821a94f5ce0800b82ed4f9f7772f392d7d46ef7c87708dc2d3d4b1a891fe5ee9d5dbf8230351d2c34e5
+  metadata.gz: 6aeca1b4badf614977581b0dfbfc246746b483f2c4b69fe212e3e066b529019d56a2ad45e215868e7e346d91f70e5fc599cdcb2f1f2064e6f543a2d265825fa4
+  data.tar.gz: 4e62f03e153be58292d68512abd4a338f2337b9443b9fe5dbda504daf39f6b7b45646cf2410b19c3ca0536a1e9575bc716a130f330419341f45fd29bbe9ed836

data/lib/chronic_cron.rb

@@ -8,6 +8,8 @@ require 'cron_format'
 require 'timetoday'
 
 
+MONTHS =  (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1]).join('|')
+
 class ChronicCron
   include AppRoutes
   using ColouredText
@@ -43,7 +45,7 @@ class ChronicCron
                                  .sub(/^(?:on|at|from|starting)\s+/,''))
       puts 'expression: ' + expression.inspect if @debug
       return unless expression
-
+      puts 'now: ' + now.inspect if @debug
       @cf = CronFormat.new(expression, now)
 
     end
@@ -284,7 +286,7 @@ class ChronicCron
     # e.g. last sunday of March at 1am
 
     get /last (#{Date::DAYNAMES.join('|')}) (?:of|in) \
-(#{Date::MONTHNAMES[1..-1].join('|')})\s+at\s+(\d{1,2})(?::(\d{1,2}))?\
+(#{MONTHS})\s+at\s+(\d{1,2})(?::(\d{1,2}))?\
 ([ap]m)/i do |day, month,  raw_hrs, mins, meridiem|
 
       now = Chronic.parse(month, now: @now)
@@ -303,7 +305,7 @@ class ChronicCron
     # e.g. last sunday of October
 
     get /last (#{Date::DAYNAMES.join('|')}) (?:of|in) \
-(#{Date::MONTHNAMES[1..-1].join('|')})/i do |day, month|
+(#{MONTHS})/i do |day, month|
 
       now = Chronic.parse(month, now: @now)
 
@@ -316,14 +318,27 @@ class ChronicCron
 
 
     # 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: r225' if log
+    #
+    get /every\s+2nd\s+#{weekday}\s+at\s+(\d{1,2})(?::(\d{1,2}))?([ap]m)(.*)/i do
+                                    |wday, raw_hrs, mins, meridiem, remaining|
 
+      log.info 'ChronicCron/expressions/get: r225' if log
       puts 'ChronicCron#expressions 225' if @debug
 
-      "%s %s * * %s/2" % [mins.to_i, hrs , wday]
+      hrs = in24hrs(raw_hrs, meridiem)
+      puts 'remaining: ' + remaining.inspect if @debug
+
+      if remaining =~ /#{MONTHS}/i then
+
+        t = Chronic.parse(remaining.gsub(/[\(\)]/,''), :now => @now)
+        "%s %s * * %s/2" % [mins.to_i, hrs, t.wday]
+
+      else
+
+        "%s %s * * %s/2" % [mins.to_i, hrs , wday]
+
+      end
+
     end
 
     # e.g. every tuesday at 4:40pm
@@ -341,7 +356,7 @@ class ChronicCron
     get /every 2nd week\s+at\s+([^\s]+)/ do |raw_time|
 
       t = Chronic.parse(raw_time, :now => @now)
-      log.info 'ChronicCron/expressions/get: r250' if log
+      log.info 'ChronicCron/expressions/get: r240' if log
       puts 'ChronicCron#expressions 240' if @debug
 
       "%s %s * * %s/2" % [t.min,t.hour,t.wday]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - James Robertson