chronic_cron 0.2.30 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3021f9c41bdc280f708a200198ded01bd2fbeec0
-  data.tar.gz: f958ca9e1e244edb44eba8740414ce93ab5742d0
+  metadata.gz: e42e18d5ebcdb9de79765b2d45dc153ac8fb5952
+  data.tar.gz: 0e1210be360e47fcc7a4663288efa6fb640280dc
 SHA512:
-  metadata.gz: 3426c1d69d7508d85d76013d6416674275a4e29acd4d0c6e9f37b844102bb9949dbfac012a3975507abe8a875083a060e24502a5ce957084b616f318af473c93
-  data.tar.gz: f6ba01d88b5b042f624afadd449621f44c78c7bd544cddfdfb38009214e18ad5d28d846b2f0b356906374282e09dc051b632a9fa64dc5820560d514846ea49b0
+  metadata.gz: e880f3bfe6c25ec58989543a196f0e5aa05985b1ff9a6a14f7f0d4ad4b899bb36787a8278b11b332b9a8a26b84de690819292056610cf8ff50841d2d49c2e28e
+  data.tar.gz: debd5511c05ef066d9b4d5379315f8874e2ef600f286980235a93a3ca50c708d8f0d23a1fed90a5da2041ace7252030388684a66141ef2a3854710b728805492

data/lib/chronic_cron.rb

@@ -150,6 +150,30 @@ class ChronicCron
       "0 %s * * %s" % [hrs , wday]
     end
 
+    # e.g. first thursday of each month at 7:30pm
+    nday = '(\w+(?:st|rd|nd))\s+' + weekday + '\s+'
+    get /#{nday}(?:of\s+)?(?:the|each|every)\s+month(?:\s+at\s+([^\s]+))?/i do
+                                              |nth_week, day_of_week, raw_time|
+
+      month = @now.month
+
+      h = {
+            /first|1st/i       => '1-7', 
+            /second|2nd/i      => '8-14', 
+            /third|3rd/i       => '15-21', 
+            /fourth|4th|last/i => '22-28'
+      }
+
+      _, day_range = h.find{|k,_| nth_week[k]}
+      a = %w(sunday monday tuesday wednesday thursday friday saturday)
+      wday = a.index(a.grep(/#{day_of_week}/i).first)
+
+      raw_time ||= '6:00am'
+      minute, hour = Chronic.parse(raw_time).to_a[1,2]
+      "%s %s %s * %s" % [minute, hour, day_range, wday]
+
+    end 
+
     # e.g. every tuesday at 4:40pm
     get /every\s+#{weekday}\s+at\s+(\d{1,2}):(\d{1,2})([ap]m)/i do
                                             |wday, raw_hrs, mins, meridiem, |
@@ -232,30 +256,6 @@ class ChronicCron
       "%s %s %s %s %s %s" % [mins, hrs, day, month, t.wday, year]
     end            
     
-    # e.g. first thursday of each month at 7:30pm
-    nday = '(\w+(?:st|rd|nd))\s+' + weekday + '\s+'
-    get /#{nday}(?:of\s+)?(?:the|each|every)\s+month(?:\s+at\s+([^\s]+))?/i do
-                                              |nth_week, day_of_week, raw_time|
-
-      month = @now.month
-
-      h = {
-            /first|1st/i       => '1-7', 
-            /second|2nd/i      => '8-14', 
-            /third|3rd/i       => '15-21', 
-            /fourth|4th|last/i => '22-28'
-      }
-
-      _, day_range = h.find{|k,_| nth_week[k]}
-      a = %w(sunday monday tuesday wednesday thursday friday saturday)
-      wday = a.index(a.grep(/#{day_of_week}/).first)
-
-      raw_time ||= '6:00am'
-      minute, hour = Chronic.parse(raw_time).to_a[1,2]
-
-      "%s %s %s * %s" % [minute, hour, day_range, wday]
-    end 
-
     # e.g. 04-Aug@12:34
     get '*' do
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.2.31
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   aYYwh4InyS/QZr4LG0nh0TuYVP5vwm1cCSlLlo4dlv7bl7Q4y815j70z8O4oUrT8
   5oSIzmlVDEDmwAibYqdf+aHqmum1mkYW
   -----END CERTIFICATE-----
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes