chronic_cron 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6880061d93fedcede28b7e651d068f16f7add182
-  data.tar.gz: c4c085e839bc2beb70cbe76a26bf62e58922b8e9
+  metadata.gz: 87c9ca865ed518099e452b2bdb060caec364df00
+  data.tar.gz: 4138b72f8a680693fbb989a0978bb940165a5f12
 SHA512:
-  metadata.gz: c73c6e91eeaca2e88c8d0079d1c593bf4379907c034ace3d0c104725dfa61ba2c144ce6616750226db106ff1b8fa0e451c8544ed12dbbeff65c4bf7ad35ed606
-  data.tar.gz: 3dcbe3cb2092b39a51c8758fa24eac419b2574a08c3803e1548ba237a44747fec72dc86ccebe7719dfdef36d755af6771e5ba8cfad43679977231313dd4c1964
+  metadata.gz: 971534edf8e75f73379dfa927c936eca189f21aa9b43fcd928c3c5070532624abaa7318a8a7f5245d66f05ea0a2fd199419b1443a89b50aba8b77ad440eb85f0
+  data.tar.gz: 2e56ad254692427c0856d7292314a253eda668a409f7e3c658b67c5349f4d7b38cd6776cee6b03944123f4637b23d61293aa31259293c8958cc134cdcbec7dbf

data.tar.gz.sig

@@ -1 +1,4 @@
-�e��#sc���%H�����+���}��
+�� *�Rb�@��i���"NY�@6�ڡƑ
0B�u5�n�F�խZf«�2߱��Kx2n2+�
+�l�C�v�#UM�'ի��/�'3��؝�;��'���1�_
+�i@�y)�q6��AR9�ϵ�-�^��µ��ɾJd�
+����F���&�J�+�hVC���gᾤ9r�*�

data/lib/chronic_cron.rb

@@ -13,9 +13,9 @@ class ChronicCron
   
   attr_reader :to_expression  
   
-  def initialize(s, now=Time.now)
+  def initialize(s, now=Time.now, log: nil)
     
-    @now = now
+    @now, @log = now, log
     
     super()
     @params = {input: s}
@@ -49,6 +49,8 @@ class ChronicCron
   protected
 
   def expressions(params) 
+    
+    log = @log
 
     r = '[0-9\*,\?\/\-]+'
     daily = '(?:every day|daily)'
@@ -64,7 +66,7 @@ class ChronicCron
     end    
 
     # e.g. every 30mins from 8:00am until 8:00pm mon-fri
-    get /every\s+(\d+)\s*mins\s+from\s+(\d{1,2}):(\d{1,2})([ap]m)(?:\s+until\s+|\s*-\s*)(\d{1,2}):\d{1,2}([ap]m)\s+(\w+\-\w+)/ do 
+    get /every\s+(\d+)\s*mins\s+from\s+(\d{1,2}):(\d{1,2})([ap]m)(?:\s+until\s+|\s*-\s*)(\d{1,2}):\d{1,2}([ap]m)\s+(\w+\-\w+)/x do 
          |interval_mins, r_hrs1, mins1, meridiem1, r_hrs2, meridiem2, wdays|
 
       hrs1 = meridiem1 == 'pm' ? r_hrs1.to_i + 12 : r_hrs1
@@ -140,7 +142,12 @@ class ChronicCron
     get(/every hour/){ "0 * * * *"}
     
     # e.g. every 2 days
-    get(/every (\d{1,2}) days?/){|days| "* * */%s * *" % [days]}    
+    get(/every (\d{1,2}) days?/) do |days|
+      
+      log.info 'ChronicCron/expressions/get: r130' if log
+      "* * */%s * *" % [days]
+    end
+    
     get(/#{daily}/){ "0 0 * * *"}
 
     get /(?:any\s?time)?(?: today)? between (\S+) and (\S+)/ do |s1, s2|
@@ -221,6 +228,7 @@ class ChronicCron
     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
       "%s %s * * %s/2" % [mins.to_i, hrs , wday]
     end       
     
@@ -236,7 +244,8 @@ 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
+      
       "%s %s * * %s/2" % [t.min,t.hour,t.wday]
 
     end        
@@ -250,11 +259,13 @@ class ChronicCron
     end       
 
     # e.g.  every 2 weeks at 6am starting from 7th Jan
-     get /every (\w+) weeks\s+(?:at\s+([^\s]+))?/ do |interval, raw_time|
+     get /^every (\w+) weeks(?:\s+at\s+([^\s]+))?/ do |interval, raw_time|
 
-      t = Chronic.parse(raw_time, :now => @now)
+      t = raw_time ? Chronic.parse(raw_time, :now => @now) : @now
       t += WEEK * interval.to_i until t > @now
       mins, hrs = t.to_a.values_at(1,2)
+      
+      log.info 'ChronicCron/expressions/get: r270' if log      
 
       "%s %s * * %s/%s" % [mins, hrs, t.wday, interval]
     end    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTExMDE3NTIwNVoXDTE3MTExMDE3NTIwNVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE3MTExNDIzMzEwNVoXDTE4MTExNDIzMzEwNVowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMXvIIMnFzqgqEUdrqypkw6RdcfEI40u5r0bcgvbyhw6CZAZZKWk0q5Ziw7a
-  S1tatAttBGZLzVdeHnymo8vmiscNwdCS2gUDXCp8rlpah4BvCmKv3LLAnaEZK1ep
-  ftYwmRqNILNAmsiRbF5nmDcr7zR0vFeoZ5Vdl/ZBzaoMQ72RtJY8zoo5zpnZnpU6
-  ShRUsnEH08CtD8qh6ZljzTp96A1RRT7LUJQwK4UcIC0yjeTB2JsKs5iVePuo7y3p
-  CFAQF4vrUakYiTDz/n598bqgoUA4CNtWZl2gBQ3h1W+T31F2uUSfDmHbJhhnDAPL
-  TITa8E5aBl9deGJhyhHyjpj/tVUCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUh2SBKNkdbuyEwL8nsr5pfoVEM2wwJgYDVR0RBB8w
+  ggEBALoP6xDp6zr7JbSKtgrtFy1wXlw+gWUsUgo1HGm4JYsHi8EIiEqalydehRVy
+  lND168CJmdruvmvO7bjfvNzGXrYO5mRAzL54PLr7lzEbHNS3Xpac6EBbz7vU4bqV
+  Q1RGai6youjvBhH8AkUDKeVDu7oLYJhff7CIXH2QJH92XXVAO5RnY7u/K/lEjczZ
+  2bnw2R383aRi+6deHmzRtUK3nbQgxhZXcjm27Xb8aU+OPmmfvx/ZbdVxIb6SEVGO
+  964YEOiRX1KbbnifRtfKgLCySF59jZA7KIZNRGOkerfOCNrk/D8GVECWL5erLKbw
+  FipxWxCgik/d53/Tj/rtVI9jfGsCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQU+n2rEOLx53rnpxbluXFisamq6cEwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAs6RT28SG
-  9X2mZGolXDgPCWpJOAbB8c9WB+ptbJLeLCFuGwWpp4bqAkx4FBpLG096xwSrNkQ4
-  81EO1GAXvLZmY8cIf0UrGXrW5rAvWPXkJlMW+10sO8yGDMMtQ5QijBECToyN4417
-  6PciD+0Dtqud1TvvkcWEZ+eu2/AjeHN4MfLoEv5rEXtQl7yQ3fF3Lh8skc9eoGji
-  X96JRh2ZgKjqCh+r806HDBd1oCjzY9iFBukHV/vVe103rVdKZP0DcFJcE6UsLqAH
-  0wcgVFIVtcpX9C67gxjhpnaGcldx1X9px9b4jorMz4yZHdq+MonVlmQlYfhPLRog
-  krK/e35wvDmTqQ==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAjcAZZRIC
+  hlLlASQ8THr7VLOa09WmEhlQ8QPm8HwiKoN0dTrq7V+tXyVVagJeVK1Lz/bsE4D+
+  qZdibGXJ6m4uF3V99qsu+3yQE6hJCT8WL1dc8V6Gv0SL/6aNU+0+wFxa2zPONhJ3
+  kCK3BJoBrAF4DycYLZ7NNi9Gk2UjFery1+51XOozsnIjawiyS1x/vx6LgO+ZxDFy
+  KLkHJMGcM015IMO7DrDYieCXK7FEJ1bF2OTF4nuOQo5TP7hFugK7sW7EC3kUVLly
+  q95F5t9M4vy0Q8baeY7AJ7+f6Z5LLLCK4MyPO2y4aYy209dwdEY2zHZOA+CLkPEU
+  p0BvK7yY4ZqPZw==
   -----END CERTIFICATE-----
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Converts a human-readable time (e.g. 10:15 daily)  into a cron format (e,g,