fugit 1.11.2 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0951fa769cae432ad6e27c721a2abd80464c0d664a9254ba034de7dfcaaef23
-  data.tar.gz: 27bf22062b2e54764ae30cf68d39e8f514a5e5fdb43034a33b738ae3be9326b8
+  metadata.gz: 31f13ce15ee0d51e6029539634fd55e14401f60ba03cdc6ad90c8e47bd4b711e
+  data.tar.gz: 91db0bb6fd6aa714e44e4c6d2b67fdbffc70495da77bf9946cda8d859bdf510a
 SHA512:
-  metadata.gz: 5ceb6ff8033f80397465ddbb2b0d8ba17739208c7d0ecf3ce594fde86912c7d6ef8cccbff4b1f4e094bfa4fee6eeedbf9a3e136ba7732894e810c63a584442b8
-  data.tar.gz: 24ad8e57d86132aac3231e56f162abc5454d608bab8fa61d90c22ea9af334b30a3b32d072db72fa425cce244f38da18dfbb814a2b0e23bd588b5d86006ff5f4e
+  metadata.gz: 604a819a90770a746f33f2d93cdab4524f036a71ac901d311fb74c438f20eaa01a4fb13187f5eca96b7a449354d7864ef3b515674088b3bc60b36710afd8c9df
+  data.tar.gz: c83c544fa51e1a3e8bc2f76ff163276caa61a93927db6bbfe47642d91ffa85281c8522e1b36a2e9c988c85963c34edc86b47fab98dc1ee516a4495df63839ac8

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 # CHANGELOG.md
 
 
+## fugit 1.12.0 released 2025-09-30
+
+* Upgrade et-orbi to ~> 1.4.0 for EtOrbi.rweek_ref=, gh-114
+  this changes the rweek reference point to 2018-12-31 (Monday)
+* Fix `12 0 * * wed%4+1,wed%4` issue where 1 wed was ignored, gh-114
+
+
 ## fugit 1.11.2 released 2025-08-22
 
 * Fix "every day at midnight America/Los_Angeles", gh-113, Mark R. James

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* Hugh Kelsey https://github.com/hughkelsey gh-94 rweek/rday / wed%4+1,wed%4
 * Mark R. James, https://github.com/mrj, AM vs America/Los_Angeles, gh-113
 * Tejas Bubane, https://github.com/tejasbubane, r3.4 in test matrix, gh-109
 * Luis Castillo, https://github.com/lekastillo, nice_hash gh-108

data/README.md

@@ -296,7 +296,7 @@ The hash extension can only be used in the day-of-week field.
 
 ### the modulo extension
 
-Fugit, since 1.1.10, also understands cron strings like "`9 0 * * sun%2`" which can be read as "every other Sunday at 9am".
+Fugit, since 1.1.10, also understands cron strings like `9 0 * * sun%2` which can be read as "every other Sunday at 9am" or `12 0 * * mon%4` for "every fourth monday at noon".
 
 The modulo extension can only be used in the day-of-week field.
 
@@ -306,34 +306,117 @@ It can be combined, as in `9 0 * * sun%2,tue%3+2`
 
 But what does it reference to? It starts at 1 on 2019-01-01 (in the EtOrbi instance timezone, not the UTC "timezone").
 
+Since [et-orbi](https://github.com/floraison/et-orbi) 1.4.0, the reference has been switched to make `Monday 2018-12-31` as the reference, so that weeks start on Monday (read a bit below on how to make it start on another day).
+
 ```ruby
-require 'et-orbi' # >= 1.1.8
+require 'et-orbi' # >= 1.1.8 and < 1.4.0
+
+class EtOrbi::EoTime
+  def d # debug
+    "%14s | rday: %4d | rweek: %3d" % [ strftime('%a'), rday, rweek ]
+  end
+end
 
 # the reference
-p EtOrbi.parse('2019-01-01').wday       # => 2
-p EtOrbi.parse('2019-01-01').rweek      # => 1
+puts EtOrbi.parse('2019-01-01').d       # => Tue | rday:    1 | rweek:   1
 p EtOrbi.parse('2019-01-01').rweek % 2  # => 1
 
 # today (as of this coding...)
-p EtOrbi.parse('2019-04-11').wday       # => 4
-p EtOrbi.parse('2019-04-11').rweek      # => 15
+puts EtOrbi.parse('2019-04-11').d       # => Thu | rday:  101 | 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
+p c.match?('2019-01-01')  # => false, since rweek % 2 == 1
+p 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
+p c.match?('2019-01-01')  # => true, since (rweek + 1) % 2 == 0
+p c.match?('2019-01-08')  # => false, since (rweek + 1) % 2 == 1
 
 # ...
+
+class EtOrbi::EoTime
+  def d # debug
+    "%14s | rday: %4d | rweek: %3d" % [ strftime('%F %a'), rday, rweek ]
+  end
+end
+
+c = Fugit.parse_cron('20 0 * * mon%2,wed%3+1')
+puts c.next('2025-09-21').take(10).map(&:d)
+  #
+  # => 2025-09-24 Wed | rday: 2459 | rweek: 352
+  #    2025-09-29 Mon | rday: 2464 | rweek: 352
+  #    2025-10-13 Mon | rday: 2478 | rweek: 354
+  #    2025-10-15 Wed | rday: 2480 | rweek: 355
+  #    2025-10-27 Mon | rday: 2492 | rweek: 356
+  #    2025-11-05 Wed | rday: 2501 | rweek: 358
+  #    2025-11-10 Mon | rday: 2506 | rweek: 358
+  #    2025-11-24 Mon | rday: 2520 | rweek: 360
+  #    2025-11-26 Wed | rday: 2522 | rweek: 361
+  #    2025-12-08 Mon | rday: 2534 | rweek: 362
 ```
 
 `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`
 
+```ruby
+require 'et-orbi' # >= 1.4.0
+
+class EtOrbi::EoTime
+  def d # debug
+    "%14s | rday: %4d | rweek: %3d" % [ strftime('%a'), rday, rweek ]
+  end
+end
+
+puts EtOrbi.parse('2018-12-30').d  # =>  Sun | rday:   -1 | rweek:  -1
+puts EtOrbi.parse('2018-12-31').d  # =>  Mon | rday:    0 | rweek:   0  >REF<
+puts EtOrbi.parse('2019-01-01').d  # =>  Tue | rday:    1 | rweek:   0
+puts EtOrbi.parse('2019-01-02').d  # =>  Wed | rday:    2 | rweek:   0
+puts EtOrbi.parse('2019-01-31').d  # =>  Thu | rday:   31 | rweek:   4
+
+puts EtOrbi.parse('2019-04-11').d  # =>  Thu | rday:  101 | rweek:  14
+puts EtOrbi.parse('2025-09-30').d  # =>  Tue | rday: 2465 | rweek: 352
+
+class EtOrbi::EoTime
+  def d # debug
+    "%14s | rday: %4d | rweek: %3d" % [ strftime('%F %a'), rday, rweek ]
+  end
+end
+
+p EtOrbi.rweek_ref # => "2018-12-31"
+
+c = Fugit.parse_cron('20 0 * * mon%2,wed%3+1')
+puts c.next('2025-09-21').take(10).map(&:d)
+  #
+  # => 2025-09-29 Mon | rday: 2464 | rweek: 352
+  #    2025-10-01 Wed | rday: 2466 | rweek: 352
+  #    2025-10-13 Mon | rday: 2478 | rweek: 354
+  #    2025-10-22 Wed | rday: 2487 | rweek: 355
+  #    2025-10-27 Mon | rday: 2492 | rweek: 356
+  #    2025-11-10 Mon | rday: 2506 | rweek: 358
+  #    2025-11-12 Wed | rday: 2508 | rweek: 358
+  #    2025-11-24 Mon | rday: 2520 | rweek: 360
+  #    2025-12-03 Wed | rday: 2529 | rweek: 361
+  #    2025-12-08 Mon | rday: 2534 | rweek: 362
+```
+
+One can tell et-orbi >= 1.4.0 which day to take as reference:
+```ruby
+EtOrbi.rweek_ref = :us      # or
+EtOrbi.rweek_ref = :sunday  # to start on a Sunday (2018-12-30)
+
+EtOrbi.rweek_ref = :iso      # or
+EtOrbi.rweek_ref = :monday   # or
+EtOrbi.rweek_ref = :default  # to start on a Monday (2019-12-31)
+
+EtOrbi.rweek_ref = :saturday  # to start on, well, a Saturday (2019-01-05)
+
+EtOrbi.rweek_ref = '2025-09-30'   # to start on this very Tuesday...
+
+p EtOrbi.rweek_ref # to determine what the current setting is...
+```
+
 
 ### the second extension
 

data/fugit.gemspec

@@ -41,7 +41,7 @@ Time tools for flor and the floraison project. Cron parsing and occurrence compu
     # this dependency appears in 'et-orbi'
 
   s.add_runtime_dependency 'raabro', '~> 1.4'
-  s.add_runtime_dependency 'et-orbi', '~> 1', '>= 1.2.11'
+  s.add_runtime_dependency 'et-orbi', '~> 1.4'
 
   s.add_development_dependency 'rspec', '~> 3.8'
   s.add_development_dependency 'chronic', '~> 0.10'

data/lib/fugit/cron.rb

@@ -175,34 +175,30 @@ module Fugit
 
     def weekday_hash_match?(nt, hsh)
 
+      return false unless hsh.is_a?(Integer)
+
       phsh, nhsh = nt.wday_in_month
+        #
+        # positive wday, from the beginning of the month
+        # negative wday, from the end of the month, -1 == last
 
-      if hsh > 0
-        hsh == phsh # positive wday, from the beginning of the month
-      else
-        hsh == nhsh # negative wday, from the end of the month, -1 == last
-      end
+      (hsh == phsh) || (hsh == nhsh)
     end
 
     def weekday_modulo_match?(nt, mod)
 
-      (nt.rweek % mod[0]) == (mod[1] % mod[0])
+      mod.is_a?(Array) &&
+      ((nt.rweek % mod[0]) == (mod[1] % mod[0]))
     end
 
     def weekday_match?(nt)
 
-      return true if @weekdays.nil?
-
-      wd, hom = @weekdays.find { |d, _| d == nt.wday }
-
-      return false unless wd
-      return true if hom.nil?
-
-      if hom.is_a?(Array)
-        weekday_modulo_match?(nt, hom)
-      else
-        weekday_hash_match?(nt, hom)
-      end
+      @weekdays.nil? ||
+      @weekdays.find { |wd, hom|
+        (nt.wday == wd) &&
+        (hom.nil? ||
+         weekday_modulo_match?(nt, hom) ||
+         weekday_hash_match?(nt, hom)) }
     end
 
     def monthday_match?(nt)

data/lib/fugit.rb

@@ -3,7 +3,7 @@
 
 module Fugit
 
-  VERSION = '1.11.2'
+  VERSION = '1.12.0'
 end
 
 require 'time'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.12.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-22 00:00:00.000000000 Z
+date: 2025-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.11
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.11
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement