chronic_cron 0.2.26 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66daab1a72dc3f45d8d1df42be0c6b78d874b662
-  data.tar.gz: e2a927a2a7a829653c26681d1b5521d3c2076be0
+  metadata.gz: 690f3ee1c70a006717b4a76bd21812930979de24
+  data.tar.gz: ece3e04aa6302da8f134b56e1ed11934803bf08d
 SHA512:
-  metadata.gz: 6ff659dd0c467a203da283097413e54c55ba595e71e768b52b24af92fccfab6edca0a20f03444095c77f39cae3ac923171dc5e7ecd0d3b40f6d1d290962e41dc
-  data.tar.gz: 64c9cf0cbbc65948522004745f32b54ba465f818c65284e8845f09291e8b669a0acca4153c8200adcd4f05a4b85c133f0f9b92cdd070de41d7752b5c1d149dd6
+  metadata.gz: 0c373e11011f6e15de9608da63384870e4a4bdbf81749ceb003b9b9a963cc86c3d42eba6c7067d1127eab76cddeeb8d748453f3d8f35ecc6250edceac079beec
+  data.tar.gz: b6d63f2c70be57268aa6bca911ed1a2e116b674a518840610f7947be6be68dce758a5c5292381199f011b13e50ce584f37de2b8c298885bc925f9936d508d108

data.tar.gz.sig

@@ -1 +1 @@
-M'�i��4n���G-c�)�-�YsS+
���Y \�)0ؑ!M7V�F=�‹>�hl�]�Ү��j�)=E���O�M�Kb����P>�U�4���k33XA8�������Oc��텉�(p
+'E7��f�ܐ��Eh��h��Фs�'�����ܐۭ���]�L~�/�j�Ո����c8�o,�^��f%��ӫّXP<��@bltMf�S�h��ҭQ]f��y�>�=Si��'��l�I�В3�j�kA�F��Nu�IK�L���Ŭ6�+ٴ�u$��xW���fs��t�="������/{	[��I8U��AJ����z6Ϫ��w����� ����w��Z*�R�ܾ����(;��ZǢ |5U%�60�V

data/lib/chronic_cron.rb

@@ -160,13 +160,64 @@ class ChronicCron
       "%s %s * * %s" % [mins, hrs , wday]
     end    
     
+    
+
+    # e.g. every 2nd week at 6am starting from 7th Jan
+    get /every (\w+) week\s+(?:at\s+(\w+)\s+starting\s+)?(?:from\s+)?(.*)/ do
+                                               |nth_week, raw_time, raw_date|
+
+#   |nth_week, day_of_week, time|
+
+
+
+      h = {
+            /first|1st/       => 0, 
+            /second|2nd/      => 1, 
+            /third|3rd/       => 2, 
+            /fourth|4th|last/ => 3
+      }
+
+      _, nweek = h.find{|k,_| nth_week[k]}
+
+      month = @now.month
+      date = Time.local(@now.year, month, 1)
+      t = Chronic.parse(raw_date + ' ' + raw_time, :now => date)
+
+      def make_date(day_of_week, month, time, nweek)
+
+        Chronic.parse([day_of_week,month,time].join(' '), :now => @now) \
+          + WEEK * nweek
+      end
+
+      if t < @now
+        day_of_week = Date::DAYNAMES[t.wday]
+        months = Date::MONTHNAMES
+        t = make_date(day_of_week, months.rotate[month], raw_time, nweek)
+      end
+
+      "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
+
+    end        
+
+    # e.g.  every 2 weeks at 6am starting from 7th Jan
+     get /every (\w+) weeks\s+(?:at\s+(\w+)\s+starting\s+)?(?:from\s+)?(.*)/ do
+                                               |interval, raw_time, raw_date|
+
+      t = Chronic.parse(raw_date + ' ' + raw_time, :now => @now)
+      t += WEEK * interval.to_i until t > @now
+      mins, hrs, day, month, year = t.to_a.values_at(1,2,3,4,5)
+
+      "%s %s %s %s %s/%s %s" % [mins, hrs, day, month, t.wday, interval, year]
+    end    
+
+
     # e.g. starting 05-Aug@15:03 every 2 weeks
     get /(.*) every (\d) weeks/ do |raw_date, interval|
 
       t = Chronic.parse(raw_date, :now => @now)
       mins, hrs, day, month, year = t.to_a.values_at(1,2,3,4,5)
       "%s %s %s %s %s/%s %s" % [mins, hrs, day, month, t.wday, interval, year]
-    end        
+    end    
     
     # e.g. from 05-Aug@12:34 fortnightly
     get /(.*)\s+(?:biweekly|fortnightly)/ do |raw_date|
@@ -205,12 +256,12 @@ class ChronicCron
         Chronic.parse([day_of_week,month,time].join(' '), :now => @now) \
           + WEEK * nweek
       end
+      
+      months = Date::MONTHNAMES
+      t = make_date day_of_week, months[month], time, nweek
 
-      months = %w(jan feb mar apr may jun jul aug sep oct nov dec)
-      t = make_date day_of_week, months[month-1], time, nweek
-
-      if t < Time.now
-        t = make_date(day_of_week, months.rotate[month-1], time, nweek)
+      if t < @now
+        t = make_date(day_of_week, months.rotate[month], time, nweek)
       end
 
       "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)

metadata

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