chronic_cron 0.2.33 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7bcc699124b398877ec9336145f48360efd1367
-  data.tar.gz: 7d6100481983fa65e173c3daca2c328f508aa396
+  metadata.gz: 84b65bc4bc5c252fb22450e67c05a16f64024ae7
+  data.tar.gz: 130e04f60a902e99a43e7f9f16e1f751d4a0a65e
 SHA512:
-  metadata.gz: a7730d6a3f63e84a56cfb9e8e5568a7e28fb4aa0536f996ab081b93308880873da26e2f579907fb3043c846a487b279510be92541f6c564fe7cf6a8552fbc220
-  data.tar.gz: a5ff9e173653fa24d5930f8afcc2c009dd8754245b55e167b4c7caca193a12b081859183bf0abf017f296771f49e42ecaeab71587bf2eea7a5000a3c09bdc45a
+  metadata.gz: d2cfd9db55885dd93049687fc463d3c747d4fa527c51bb19b7c3c489f44ad35bdc0ba486bbc5d542432e6e0ede35a3aa7b41d8e657a787ccd178346d6dd4ef1c
+  data.tar.gz: ea3ef3afac95a724db0220d546084aff31166b4f1ea67f9409cdd62f9a3a370d891d72035e4d5f214b24251c43c169d7f6ec0b34c33befc93545328f3a1ddd25

data/lib/chronic_cron.rb

@@ -41,7 +41,7 @@ class ChronicCron
 
     r = '[0-9\*,\?\/\-]+'
     daily = '(?:every day|daily)'
-    
+
     # e.g. 00 5 15 * *
     get /(#{r}\s+#{r}\s+#{r}\s#{r}\s#{r})(\s#{r})?/ do
       "%s%s" % params[:captures]
@@ -103,7 +103,7 @@ class ChronicCron
     get('monthly')  {'0 0 1 * *'}
     get('yearly')   {'0 0 1 1 *'}
     get('annually') {'0 0 1 1 *'}
-    
+
     weekday = '((?:mon|tue|wed|thu|fri|sat|sun)\w*)'
     
     # e.g. at 10:30pm on every Monday
@@ -180,11 +180,20 @@ class ChronicCron
       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 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)
+      "%s %s * * %s/2" % [mins.to_i, hrs , 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, |
@@ -192,54 +201,24 @@ 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+([^\s]+)\s+starting\s+)?(?:from\s+)?(.*)/ do
-                                               |nth_week, raw_time, raw_date|
-
-#   |nth_week, day_of_week, time|
+    get /every 2nd week\s+at\s+([^\s]+)/ do |raw_time|
 
+      t = Chronic.parse(raw_time, :now => @now)
 
-
-      h = {
-            /first|1st/i       => 0, 
-            /second|2nd/i      => 1, 
-            /third|3rd/i       => 2, 
-            /fourth|4th|last/i => 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)
+      "%s %s * * %s/2" % [t.min,t.hour,t.wday]
 
     end        
 
     # e.g.  every 2 weeks at 6am starting from 7th Jan
-     get /every (\w+) weeks\s+(?:at\s+([^\s]+)\s+starting\s+)?(?:from\s+)?(.*)/ do
-                                               |interval, raw_time, raw_date|
+     get /every (\w+) weeks\s+(?:at\s+([^\s]+))?/ do |interval, raw_time|
 
-      t = Chronic.parse(raw_date + ' ' + raw_time, :now => @now)
+      t = Chronic.parse(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)
+      mins, hrs = t.to_a.values_at(1,2)
 
-      "%s %s %s %s %s/%s %s" % [mins, hrs, day, month, t.wday, interval, year]
+      "%s %s * * %s/%s" % [mins, hrs, t.wday, interval]
     end    
 
 
@@ -247,8 +226,8 @@ class ChronicCron
     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]
+      mins, hrs = t.to_a.values_at(1,2)
+      "%s %s * * %s/%s" % [mins, hrs, t.wday, interval]
     end    
     
     # e.g. from 05-Aug@12:34 fortnightly
@@ -269,7 +248,7 @@ class ChronicCron
     
     # e.g. 04-Aug@12:34
     get '*' do
-      
+
       t = Chronic.parse(params[:input], :now => @now)
       "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
     end
@@ -286,4 +265,4 @@ class ChronicCron
   
   alias find_expression run_route
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,64 +31,88 @@ cert_chain:
   nWO4x6WpqjcmB1Woj5XGJhRoWqPEdpB7dv+oitT+rBDJnsYAVXx50tBSE8iv+u11
   9OUH3bEVRYl7Cg==
   -----END CERTIFICATE-----
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.18
 - !ruby/object:Gem::Dependency
   name: cron_format
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: timetoday
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -108,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -116,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: chronic_cron