fugit 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 396cc931521c222b522a89e3840d3e1bd42e0927f20d5d3f0532122eafd62f74
-  data.tar.gz: a04d54cd9894c593674031f704133f825769438e85a91330baaa42ad27089d68
+  metadata.gz: e49e2002591b450a853f0a27eb942fd69f69a59d6803c229bcdb51af471b6862
+  data.tar.gz: f9f6921007e4e0df0908e63f080d0f710ba60401299440347ecc994b6ccf56fc
 SHA512:
-  metadata.gz: e97aebd235b532d3ad3a3df969b7189d1e628c3e1229d9d8d5a89b48fd552ebd856faf203289e9171df9b32e7a79b89ff33675799b83c6381eafc1f61945605e
-  data.tar.gz: eaaed3254216b7082d8715990768d6b6588a864899e6911f74e967dfa83ed93221032420f82bd3f7215536365ee9340b2f2f6a2e175826456c9367d80d3ed9c4
+  metadata.gz: 22dc41bcc969d3505157572bbe899d7f160f8ab06ce42b3f4b494911ae69d96bde4be7422f55fd31c33491899b3af4ec50b4870f419145d103bd230d94affecd
+  data.tar.gz: 50d62627a4ed4fe54cf31d2901eebdd56f57a69f0464f0ede436184af604d1d18622e3159b487f9a92a35cfbf8a3ed65b58887dc3f43514e86a73e4db5d11692

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## fugit 1.4.5 released 2021-04-22
+
+* Accept "* * * Mon%2+2", gh-47
+
+
 ## fugit 1.4.4 released 2021-03-25
 
 * Ensure leaving ZH DST is OK, gh-53

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* Karen Sawrey https://github.com/karensawrey gh-47, Mon%2+1 rework idea
 * Olle Jonsson https://github.com/olleolleolle gha Ruby 3.0
 * Andy Pfister https://github.com/andyundso gh-53, entering DST
 * Solteszad https://github.com/solteszad gh-51, fix previous_time vs last day of month
@@ -11,7 +12,7 @@
 * Danny Ben Shitrit https://github.com/DannyBen nat variants, gh-38
 * Dominik Sander https://github.com/dsander #rough_frequency 0, gh-36
 * Milovan Zogovic https://github.com/assembler Cron#match? vs TZ, gh-31
-* Jessica Stokes https://github.com/ticky 0-24 issue with cron, gh-30
+* Jessica Stokes https://github.com/ticky 0-24 issue with cron, gh-30 and gh-47
 * Shai Coleman https://github.com/shaicoleman parse_nat enhancements, gh-24, gh-25, gh-28, and gh-37
 * Jan Stevens https://github.com/JanStevens Fugit.parse('every 15 minutes') gh-22
 * Fabio Pitino https://github.com/hspazio nil on February 30 gh-21

data/README.md

@@ -203,8 +203,22 @@ p EtOrbi.parse('2019-01-01').rweek % 2  # => 1
 p EtOrbi.parse('2019-04-11').wday       # => 4
 p EtOrbi.parse('2019-04-11').rweek      # => 15
 p EtOrbi.parse('2019-04-11').rweek % 2  # => 1
+
+c = Fugit.parse('* * * * tue%2')
+c.match?('2019-01-01')  # => false, since rweek % 2 == 1
+c.match?('2019-01-08')  # => true, since rweek % 2 == 0
+
+c = Fugit.parse('* * * * tue%2+1')
+c.match?('2019-01-01')  # => true, since (rweek + 1) % 2 == 0
+c.match?('2019-01-08')  # => false, since (rweek + 1) % 2 == 1
+
+# ...
 ```
 
+`sun%2` matches if Sunday and `current_date.rweek % 2 == 0`
+`tue%3+2` matches if Tuesday and `current_date.rweek + 2 % 3 == 0`
+`tue%x+y` matches if Tuesday and `current_date.rweek + y % x == 0`
+
 
 ## `Fugit::Duration`
 

data/lib/fugit.rb

@@ -2,7 +2,7 @@
 
 module Fugit
 
-  VERSION = '1.4.4'
+  VERSION = '1.4.5'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -150,7 +150,7 @@ module Fugit
 
     def weekday_modulo_match?(nt, mod)
 
-      nt.rweek % mod[0] == mod[1]
+      (nt.rweek + mod[1]) % mod[0] == 0
     end
 
     def weekday_match?(nt)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro