fugit 1.11.2 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0951fa769cae432ad6e27c721a2abd80464c0d664a9254ba034de7dfcaaef23
-  data.tar.gz: 27bf22062b2e54764ae30cf68d39e8f514a5e5fdb43034a33b738ae3be9326b8
+  metadata.gz: 15a3ea665c020e35ce51dcbc82be9a74e6f4abcaa2441316b514c630ffdbc094
+  data.tar.gz: f99246722de255325b57ea46f7b3f24bbfc11d65f1eb98fde9a2a43a3c249df0
 SHA512:
-  metadata.gz: 5ceb6ff8033f80397465ddbb2b0d8ba17739208c7d0ecf3ce594fde86912c7d6ef8cccbff4b1f4e094bfa4fee6eeedbf9a3e136ba7732894e810c63a584442b8
-  data.tar.gz: 24ad8e57d86132aac3231e56f162abc5454d608bab8fa61d90c22ea9af334b30a3b32d072db72fa425cce244f38da18dfbb814a2b0e23bd588b5d86006ff5f4e
+  metadata.gz: cc55e7332f5f111ddf27d145fed7fbfeaeed30f492ba343d1f4067e776c96874b42bad9488b9683203040cc50333f74bab56fa6e61744ef92fb059f2a2c9f076
+  data.tar.gz: 5ee65240dd04fddb7777bee327f8fee0cfef5260ed55db9ec71ece64c5e5e6b53283aa7d26ba52facbca3882aee0920ff0dd3715fea5ad9153caca82ea712450

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 # CHANGELOG.md
 
 
+## fugit 1.12.1 released 2025-10-14
+
+* Fix Fugit::Cron#to_cron_s to include & if @day_and
+
+
+## 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,8 @@
 
 # fugit credits
 
+* Eric Claerhout https://github.com/swebra gh-114 rweek readme clarity
+* Hugh Kelsey https://github.com/hughkelsey gh-114 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,43 +296,188 @@ 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".
+Since 1.1.10, fugit 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.
 
 For odd Sundays, one can write `9 0 * * sun%2+1`.
 
-It can be combined, as in `9 0 * * sun%2,tue%3+2`
+It can be combined, as in `9 0 * * sun%2,tue%3+2`, which will match every other Sunday and 1 in 3 Tuesdays (with an offset of 2).
 
-But what does it reference to? It starts at 1 on 2019-01-01 (in the EtOrbi instance timezone, not the UTC "timezone").
+What does `sun%2` actually mean?
+```ruby
+t.wday == 0 && t.rweek % 2 == 0
+```
 
+What does `tue%3+2` mean?
 ```ruby
-require 'et-orbi' # >= 1.1.8
+t.wday == 2 && t.rweek % 3 == 2
+```
 
-# the reference
-p EtOrbi.parse('2019-01-01').wday       # => 2
-p EtOrbi.parse('2019-01-01').rweek      # => 1
-p EtOrbi.parse('2019-01-01').rweek % 2  # => 1
+#### et-orbi < 1.4.0 : reference set on Tuesday 2019-01-01
 
-# today (as of this coding...)
-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
+The original implementation of `#rweek` (and `#rday`) found in [et-orbi](https://github.com/floraison/et-orbi) was initially pointing to "Tuesday 2019-01-01" and it was set as rday 1 and rweek 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
+Consider this iteration through the days around 2019-01-01.
+```ruby
+require 'fugit'
 
-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
+t = EtOrbi.parse('2018-12-28 12:00')
 
-# ...
+15.times do |i|
+
+  puts " * %14s / rday: %5d / rweek: %5d" % [
+    t.strftime('%F %a'), t.rday, t.rweek ]
+
+  w = t.rweek
+  t = t.add(24 * 3600)
+  puts if t.rweek != w
+
+  if i == 7
+    puts "\n  (...)\n\n"
+    t = EtOrbi.parse('2025-10-04 12:00')
+  end
+end
 ```
 
-`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`
+For et-orbi 1.2.11, it yields:
+```
+ * 2018-12-28 Fri / rday:    -3 / rweek:     0
+ * 2018-12-29 Sat / rday:    -2 / rweek:     0
+ * 2018-12-30 Sun / rday:    -1 / rweek:     0
+ * 2018-12-31 Mon / rday:     0 / rweek:     0
+
+ * 2019-01-01 Tue / rday:     1 / rweek:     1
+ * 2019-01-02 Wed / rday:     2 / rweek:     1
+ * 2019-01-03 Thu / rday:     3 / rweek:     1
+ * 2019-01-04 Fri / rday:     4 / rweek:     1
+ * 2019-01-05 Sat / rday:     5 / rweek:     1
+
+  (...)
+
+ * 2025-10-04 Sat / rday:  2469 / rweek:   353
+ * 2025-10-05 Sun / rday:  2470 / rweek:   353
+ * 2025-10-06 Mon / rday:  2471 / rweek:   353
+
+ * 2025-10-07 Tue / rday:  2472 / rweek:   354
+ * 2025-10-08 Wed / rday:  2473 / rweek:   354
+ * 2025-10-09 Thu / rday:  2474 / rweek:   354
+```
+
+This [was problematic](https://github.com/floraison/fugit/issues/114), since the week started on, well, Tuesday.
+
+
+#### et-orbi >= 1.4.0 : reference set on Monday 2018-12-31
+
+Since 1.4.0, et-orbi starts by default on Monday (2018-12-31), as rday 0 with rweek 0.
+
+Thus, the above code yields:
+```
+ * 2018-12-28 Fri / rday:    -3 / rweek:    -1
+ * 2018-12-29 Sat / rday:    -2 / rweek:    -1
+ * 2018-12-30 Sun / rday:    -1 / rweek:    -1
+
+ * 2018-12-31 Mon / rday:     0 / rweek:     0
+ * 2019-01-01 Tue / rday:     1 / rweek:     0
+ * 2019-01-02 Wed / rday:     2 / rweek:     0
+ * 2019-01-03 Thu / rday:     3 / rweek:     0
+ * 2019-01-04 Fri / rday:     4 / rweek:     0
+ * 2019-01-05 Sat / rday:     5 / rweek:     0
+
+  (...)
+
+ * 2025-10-04 Sat / rday:  2469 / rweek:   352
+ * 2025-10-05 Sun / rday:  2470 / rweek:   352
+
+ * 2025-10-06 Mon / rday:  2471 / rweek:   353
+ * 2025-10-07 Tue / rday:  2472 / rweek:   353
+ * 2025-10-08 Wed / rday:  2473 / rweek:   353
+ * 2025-10-09 Thu / rday:  2474 / rweek:   353
+```
+
+
+#### modulo and et-orbi >= 1.4.0 sanity check
+
+Given the cron `"0 12 * * mon%2,wed%3+1"`, here is a piece of code that considers a range of 44 days and tells in its last column if YES or no if each of the days matches the cron.
+
+```ruby
+require 'fugit'
+
+c = Fugit.parse_cron('0 12 * * mon%2,wed%3+1')
+
+t = EtOrbi.parse('2025-09-20 12:00')
+
+44.times do
+
+  wd = t.strftime('%a')
+  wd = %w[ Mon Wed ].include?(wd) ? '*' + wd.upcase : ' ' + wd.downcase
+
+  puts "%14s | rweek: %3d | %%2: %d == 0 | %%3: %d == 1 | ? %3s" % [
+    t.strftime('%F') + ' ' + wd,
+    t.rweek,
+    t.rweek % 2, t.rweek % 3,
+    c.match?(t)
+      ].map { |e| e == true ? 'YES' : e == false ? 'no' : e }
+
+  w = t.rweek
+  t = t.add(24 * 3600)
+  puts if t.rweek != w
+end
+```
+
+Here's the output:
+```
+2025-09-20  sat | rweek: 350 | %2: 0 == 0 | %3: 2 == 1 | ?  no
+2025-09-21  sun | rweek: 350 | %2: 0 == 0 | %3: 2 == 1 | ?  no
+
+2025-09-22 *MON | rweek: 351 | %2: 1 == 0 | %3: 0 == 1 | ?  no
+2025-09-23  tue | rweek: 351 | %2: 1 == 0 | %3: 0 == 1 | ?  no
+2025-09-24 *WED | rweek: 351 | %2: 1 == 0 | %3: 0 == 1 | ?  no
+2025-09-25  thu | rweek: 351 | %2: 1 == 0 | %3: 0 == 1 | ?  no
+2025-09-26  fri | rweek: 351 | %2: 1 == 0 | %3: 0 == 1 | ?  no
+2025-09-27  sat | rweek: 351 | %2: 1 == 0 | %3: 0 == 1 | ?  no
+2025-09-28  sun | rweek: 351 | %2: 1 == 0 | %3: 0 == 1 | ?  no
+
+2025-09-29 *MON | rweek: 352 | %2: 0 == 0 | %3: 1 == 1 | ? YES
+2025-09-30  tue | rweek: 352 | %2: 0 == 0 | %3: 1 == 1 | ?  no
+2025-10-01 *WED | rweek: 352 | %2: 0 == 0 | %3: 1 == 1 | ? YES
+2025-10-02  thu | rweek: 352 | %2: 0 == 0 | %3: 1 == 1 | ?  no
+2025-10-03  fri | rweek: 352 | %2: 0 == 0 | %3: 1 == 1 | ?  no
+2025-10-04  sat | rweek: 352 | %2: 0 == 0 | %3: 1 == 1 | ?  no
+2025-10-05  sun | rweek: 352 | %2: 0 == 0 | %3: 1 == 1 | ?  no
+
+2025-10-06 *MON | rweek: 353 | %2: 1 == 0 | %3: 2 == 1 | ?  no
+2025-10-07  tue | rweek: 353 | %2: 1 == 0 | %3: 2 == 1 | ?  no
+2025-10-08 *WED | rweek: 353 | %2: 1 == 0 | %3: 2 == 1 | ?  no
+2025-10-09  thu | rweek: 353 | %2: 1 == 0 | %3: 2 == 1 | ?  no
+2025-10-10  fri | rweek: 353 | %2: 1 == 0 | %3: 2 == 1 | ?  no
+2025-10-11  sat | rweek: 353 | %2: 1 == 0 | %3: 2 == 1 | ?  no
+2025-10-12  sun | rweek: 353 | %2: 1 == 0 | %3: 2 == 1 | ?  no
+
+2025-10-13 *MON | rweek: 354 | %2: 0 == 0 | %3: 0 == 1 | ? YES
+2025-10-14  tue | rweek: 354 | %2: 0 == 0 | %3: 0 == 1 | ?  no
+2025-10-15 *WED | rweek: 354 | %2: 0 == 0 | %3: 0 == 1 | ?  no
+2025-10-16  thu | rweek: 354 | %2: 0 == 0 | %3: 0 == 1 | ?  no
+2025-10-17  fri | rweek: 354 | %2: 0 == 0 | %3: 0 == 1 | ?  no
+2025-10-18  sat | rweek: 354 | %2: 0 == 0 | %3: 0 == 1 | ?  no
+2025-10-19  sun | rweek: 354 | %2: 0 == 0 | %3: 0 == 1 | ?  no
+
+2025-10-20 *MON | rweek: 355 | %2: 1 == 0 | %3: 1 == 1 | ?  no
+2025-10-21  tue | rweek: 355 | %2: 1 == 0 | %3: 1 == 1 | ?  no
+2025-10-22 *WED | rweek: 355 | %2: 1 == 0 | %3: 1 == 1 | ? YES
+2025-10-23  thu | rweek: 355 | %2: 1 == 0 | %3: 1 == 1 | ?  no
+2025-10-24  fri | rweek: 355 | %2: 1 == 0 | %3: 1 == 1 | ?  no
+2025-10-25  sat | rweek: 355 | %2: 1 == 0 | %3: 1 == 1 | ?  no
+2025-10-26  sun | rweek: 355 | %2: 1 == 0 | %3: 1 == 1 | ?  no
+
+2025-10-27 *MON | rweek: 356 | %2: 0 == 0 | %3: 2 == 1 | ? YES
+2025-10-28  tue | rweek: 356 | %2: 0 == 0 | %3: 2 == 1 | ?  no
+2025-10-29 *WED | rweek: 356 | %2: 0 == 0 | %3: 2 == 1 | ?  no
+2025-10-30  thu | rweek: 356 | %2: 0 == 0 | %3: 2 == 1 | ?  no
+2025-10-31  fri | rweek: 356 | %2: 0 == 0 | %3: 2 == 1 | ?  no
+2025-11-01  sat | rweek: 356 | %2: 0 == 0 | %3: 2 == 1 | ?  no
+2025-11-02  sun | rweek: 356 | %2: 0 == 0 | %3: 2 == 1 | ?  no
+```
 
 
 ### 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)
@@ -735,7 +731,8 @@ module Fugit
           else
             a.collect(&:to_s).join('#')
           end }
-        .join(',')
+        .join(',') +
+      (@day_and ? '&' : '')
     end
 
     module Parser include Raabro

data/lib/fugit/nat.rb

@@ -719,6 +719,8 @@ module Fugit
         end
       end
 
+      SLASH_REGEX = /^(\d+|\*)\/(\d+)$/.freeze
+
       # Return nil if the cron is "not strict"
       #
       # For example, "0 0/17 * * *" (gh-86) is a perfectly valid
@@ -729,16 +731,18 @@ module Fugit
       #
       def restrict(a, cron)
 
-        if m = ((a[1] && a[1][0]) || '').match(/^(\d+|\*)\/(\d+)$/)
-#p m
-           sla = m[1].to_i
-          return nil unless [ 1, 2, 3, 4, 5, 6, 8, 12 ].include?(sla)
+        if m = ((a[0] && a[0] != [ 0 ] && a[0][0]) || '').match(SLASH_REGEX)
+          return nil unless (1..60).include?(m[1].to_i)
+        end
+        if m = ((a[1] && a[1][0]) || '').match(SLASH_REGEX)
+          return nil unless [ 1, 2, 3, 4, 5, 6, 8, 12 ].include?(m[1].to_i)
         end
 
         cron
       end
 
       def slot(key, default)
+
         s = @slots[key]
         s ? s.data0 : [ default ]
       end

data/lib/fugit/parse.rb

@@ -2,6 +2,8 @@
 
 module Fugit
 
+  DO_PARSE_ORDER = %i[ cron duration nat at ].freeze
+
   class << self
 
     def parse_cron(s); ::Fugit::Cron.parse(s); end
@@ -34,7 +36,7 @@ module Fugit
       result = nil
       errors = []
 
-      %i[ cron duration nat at ]
+      DO_PARSE_ORDER
         .each { |k|
           begin
             result ||= (opts[k] != false && self.send("do_parse_#{k}", s))

data/lib/fugit.rb

@@ -3,7 +3,7 @@
 
 module Fugit
 
-  VERSION = '1.11.2'
+  VERSION = '1.12.1'
 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.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-22 00:00:00.000000000 Z
+date: 2025-10-14 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