chronic_cron 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bda37336df08c15781de2f92da0c38856fc99617a2a9981d678a02d6c7cab433
-  data.tar.gz: 90f135067b113779770df25b1ff01d58e3052027da8967d31e959a852e670eab
+  metadata.gz: d2aa1ee213393540b1f82770bdd33cfa00443a7d0c1d23571f46450cb51c51eb
+  data.tar.gz: ab48a734ac469da60395a23e6c4587ff1af4026801e8dbe46e0b20c4ff88884e
 SHA512:
-  metadata.gz: 18323a22bcbd7acd242858d2791468bda38cf7f1ad90c5cb1383161795062b7317696607ecab37787cae76849cf20af70fb1c5b9500bea90ccf59791f4cd215d
-  data.tar.gz: 741f4e6cfc99e92130a66cea286e6186ba3090e601c8e1f5bcd5ba681e92abf4b3f4fda85a4574be3414fbb73ae96d45c99f4db814a011ebc407760f858987c0
+  metadata.gz: f5f34e35492918a0709184ba47b5a6dfb113bbd6f3e4f9b03bc7258c1805c261a45cc6f67f0af57e8d69743cdb574b0a4ff2047d3a3903b232d29768ea5cd06c
+  data.tar.gz: bf88b16ff4fa13c1fa5efaa367821b1afabe194be4927cdda20c98daf8fbd23f5111f38f6d86164a406331a53958d1b6564e5f8b948ecf9a793450a676160f9b

data/lib/chronic_cron.rb

@@ -10,6 +10,7 @@ require 'timetoday'
 
 class ChronicCron
   include AppRoutes
+  using ColouredText
   
   attr_reader :to_expression  
   
@@ -17,6 +18,8 @@ class ChronicCron
     
     @now, @log, @debug = now, log, debug
     
+    puts ('@now: ' + @now.inspect).debug if @debug    
+    
     super()
     @params = {input: s}
     expressions(@params)
@@ -269,8 +272,10 @@ class ChronicCron
 ([ap]m)/i do |day, month,  raw_hrs, mins, meridiem|
 
       now = Chronic.parse(month, now: @now)
+      puts ('now: ' + now.inspect).debug if @debug
       
       d = last_wdayofmonth(day, now)
+      puts ('d: ' + d.inspect).debug if @debug
 
       hrs = in24hrs(raw_hrs, meridiem)
       
@@ -335,16 +340,46 @@ class ChronicCron
       "* * * * %s/2" % [wday]
 
     end       
+    
+
+    # e.g.  every 2 weeks (starting 7th Jan 2020)
+    get /^every (\w+) weeks \(starting ([^\)]+)/ do |interval, raw_date|
+
+      if @debug then
+        puts ('raw_date: ' + raw_date.inspect).debug
+        puts ('now: ' + @now.inspect).debug
+      end
+      
+      t = raw_date ? Chronic.parse(raw_date, :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: r260' if log      
+      if @debug then
+        puts 'ChronicCron#expressions 260'
+        puts ('t: ' + t.inspect).debug
+      end
+
+      "%s %s * * %s/%s" % [mins, hrs, t.wday, interval]
+    end    
 
     # e.g.  every 2 weeks at 6am starting from 7th Jan
      get /^every (\w+) weeks(?:\s+at\s+([^\s]+))?/ do |interval, raw_time|
 
+      if @debug then
+        puts ('raw_time: ' + raw_time.inspect).debug
+        puts ('now: ' + @now.inspect).debug
+      end
+      
       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      
-      puts 'ChronicCron#expressions 270' if @debug
+      if @debug then
+        puts 'ChronicCron#expressions 270'
+        puts ('t: ' + t.inspect).debug
+      end
 
       "%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.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MTExNDIzMzEwNVoXDTE4MTExNDIzMzEwNVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALoP6xDp6zr7JbSKtgrtFy1wXlw+gWUsUgo1HGm4JYsHi8EIiEqalydehRVy
-  lND168CJmdruvmvO7bjfvNzGXrYO5mRAzL54PLr7lzEbHNS3Xpac6EBbz7vU4bqV
-  Q1RGai6youjvBhH8AkUDKeVDu7oLYJhff7CIXH2QJH92XXVAO5RnY7u/K/lEjczZ
-  2bnw2R383aRi+6deHmzRtUK3nbQgxhZXcjm27Xb8aU+OPmmfvx/ZbdVxIb6SEVGO
-  964YEOiRX1KbbnifRtfKgLCySF59jZA7KIZNRGOkerfOCNrk/D8GVECWL5erLKbw
-  FipxWxCgik/d53/Tj/rtVI9jfGsCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU+n2rEOLx53rnpxbluXFisamq6cEwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAjcAZZRIC
-  hlLlASQ8THr7VLOa09WmEhlQ8QPm8HwiKoN0dTrq7V+tXyVVagJeVK1Lz/bsE4D+
-  qZdibGXJ6m4uF3V99qsu+3yQE6hJCT8WL1dc8V6Gv0SL/6aNU+0+wFxa2zPONhJ3
-  kCK3BJoBrAF4DycYLZ7NNi9Gk2UjFery1+51XOozsnIjawiyS1x/vx6LgO+ZxDFy
-  KLkHJMGcM015IMO7DrDYieCXK7FEJ1bF2OTF4nuOQo5TP7hFugK7sW7EC3kUVLly
-  q95F5t9M4vy0Q8baeY7AJ7+f6Z5LLLCK4MyPO2y4aYy209dwdEY2zHZOA+CLkPEU
-  p0BvK7yY4ZqPZw==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwOTEwMTczMDU2WhcN
+  MjAwOTA5MTczMDU2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQD+oxz1
+  IhGNszjzVKXOIivImj03s3bNue3UNjX7PPAXpDo5zP8uAGMGcdqjcNzgUziuSnuP
+  603LcDLmVqjAxaGoCq9nLMXij095YbDN4MZDBzXJw5tsb3jJXC43GWNCnFrO8xKP
+  PS2JtF8ou4Cgc+D0rzNvuW/iEDoVrPLAbCI2e3ANmcf7BQCaSETdz7iOZJUPLuKU
+  4PO25XNVVLncZ5t6Y7XLzKPZj2szaLKlHD8DolyF6+g8JA41QKn4KPsdGj9zyFu3
+  BFy7PDGeBRtCWyngl5jwyWQH/xZMGFw619pM/fAVneQF/Bh+IPwp+XU5cw3e7VAG
+  vOd9uAERpGOBNS4Oyh4CDoRK9Er3psySKWv3tGBdcRSfaPzYxaJbQ+KCOEFYgMdK
+  Sj1jMv+JRZq7WfZVn4Zw9ZUjmjVD0vrkGwQIhAe8gpEo2goVRtCVleZhl2mZB5sc
+  0KkOCDJ3oLXBtMB3WmvYvxO1hqBjK5iQ9ZsQj48b2UVu6PhMcVtk66i0qTMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUhUUXcJrt
+  tdgHkH3nDEQuZnFvxkYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAflvokfPPdUQKrl2dENm7i9AzvnwMDE5AsQyU/+u0
+  RHo139tQZr5D55LxgkpcQx4M9RCygV3Jv+psxI4s/Utpai2fSzUe+HcZ5nbYDtQ1
+  rVRTUWel2UELJfJfUvpvZkGP80YS2uzM/VRnGBfs5/cQabw3FeC10+/Rb6hkxhaR
+  bkNt7UEQqcRRJ3+xktAA63KM1cgfKvjLdw8ZRyZ23rC6DRiPXqLnF9Ec1IM9iuf3
+  Khw3BV/KbJ0V/4adcv6w59Yt8QipeCiP8rC6oMVVUJ64zhyLqwOiG7gUndpz2+Fj
+  kVwMY2OIYwSnx8RzxhRJO9ubYwR8nj6hVlZFCeNqwy7KLfohyuTIrgkfvHGlMEMA
+  /IOiCQ02XiDAWeE1CekdGItDmcotFwoCSuWai+Y4rg+JX1JaJQApPEM0tabWX83n
+  djri2zyv3s3ucIBaOlC4bOZZiydDSAXx/S/SRGyvA1/ZKgR5h+zu6T2GKcusq7QA
+  2O89BwLoEmEP437kjQ6HjyqC
   -----END CERTIFICATE-----
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
@@ -57,22 +61,22 @@ dependencies:
   name: cron_format
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -97,22 +101,22 @@ dependencies:
   name: timetoday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -139,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Converts a human-readable time (e.g. 10:15 daily) into a cron format (e,g,

metadata.gz.sig

@@ -1,3 +1 @@
-��1@��	UZ�Q�ְԗ+�|8R�T�W�$��[�9�@�*p6g9�2��Zҩ�YYҒ�|����A�
-����ܹ{�m^�6���U9�p��`{�`���C�ky'���^�=ޏHp���
,���s�q��;
-�l�`��?�ւ��Cd���2��B��r�K��� ��OF�޺�_�k9S�+ k- �@cG�N�7 ��
+/
��8"��l��Qj�Q�iG�.:̊���ђ���2�PU$���e����ߞf־��:cN�O�u#�ऩ��ۙr����kE�����\���,aA�]���:���L��I��z�-