fugit 1.11.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da93feee9bdfd44a793ce2b45b81109c0f7cd08ff9a930d15629a29c6a381e07
-  data.tar.gz: 32d9b447734805d3b58ae64c70a6699b931ef4fb4e6a76d8f279e66d4b5cb7df
+  metadata.gz: 31f13ce15ee0d51e6029539634fd55e14401f60ba03cdc6ad90c8e47bd4b711e
+  data.tar.gz: 91db0bb6fd6aa714e44e4c6d2b67fdbffc70495da77bf9946cda8d859bdf510a
 SHA512:
-  metadata.gz: e7ac7afec4cfdcfdac22e5d2113892a0c7cb1f790d205bc32ecaea75c30f6ceb73af811824712c6781b480831f2a09479a6344af0d9b3c0ee92ae5cff7ef6c38
-  data.tar.gz: d87ecc490a49f19680891a82979903987843b5853ecfdc9ebee57d0b047fa4dffa96dfbbde43ef5d3011dbd07d492ac8f7a151fa6354478050c18efae9b911e4
+  metadata.gz: 604a819a90770a746f33f2d93cdab4524f036a71ac901d311fb74c438f20eaa01a4fb13187f5eca96b7a449354d7864ef3b515674088b3bc60b36710afd8c9df
+  data.tar.gz: c83c544fa51e1a3e8bc2f76ff163276caa61a93927db6bbfe47642d91ffa85281c8522e1b36a2e9c988c85963c34edc86b47fab98dc1ee516a4495df63839ac8

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 # 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
+* Avoid Hash#partition https://bugs.ruby-lang.org/issues/16252
+* Fix Fugit::Nat "zero dark forty", gh-107
+* Ensure @yearly and other specials accept a timezone
+
+
 ## fugit 1.11.1 released 2024-08-15
 
 * Prevent nat parsing chocking on long input (> 256 chars), gh-104

data/CREDITS.md

@@ -1,6 +1,11 @@
 
 # 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
+* Geremia Taglialatela, https://github.com/tagliala, gh-105 gh-107
 * https://github.com/personnumber3377, gh-104 Fugit.parse choke on long input
 * Michael Scrivo, https://github.com/mscrivo, gh-103
 * Benjamin Darcet, https://github.com/bdarcet gh-95 gh-96 et-orbi #rweek

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2017-2024, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2017-2025, John Mettraux, jmettraux+flor@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -17,31 +17,33 @@ Fugit is a core dependency of [rufus-scheduler](https://github.com/jmettraux/ruf
 
 The intersection of those two projects is where fugit is born:
 
-* [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) - a cron/at/in/every/interval in-process scheduler, in fact, it's the father project to this fugit project
-* [flor](https://github.com/floraison/flor) - a Ruby workflow engine, fugit provides the foundation for its time scheduling capabilities
+* [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) — a cron/at/in/every/interval in-process scheduler, in fact, it's the father project to this fugit project
+* [flor](https://github.com/floraison/flor) — a Ruby workflow engine, fugit provides the foundation for its time scheduling capabilities
 
 ### Similar, sometimes overlapping projects
 
-* [chronic](https://github.com/mojombo/chronic) - a pure Ruby natural language date parser
-* [parse-cron](https://github.com/siebertm/parse-cron) - parses cron expressions and calculates the next occurrence after a given date
-* [ice_cube](https://github.com/seejohnrun/ice_cube) - Ruby date recurrence library
-* [ISO8601](https://github.com/arnau/ISO8601) - Ruby parser to work with ISO8601 dateTimes and durations
-* [chrono](https://github.com/r7kamura/chrono) - a chain of logics about chronology
-* [CronCalc](https://github.com/mizinsky/cron_calc) - calculates cron job occurrences
-* [Recurrence](https://github.com/fnando/recurrence) - a simple library to handle recurring events
+* [chronic](https://github.com/mojombo/chronic) — a pure Ruby natural language date parser
+* [parse-cron](https://github.com/siebertm/parse-cron) — parses cron expressions and calculates the next occurrence after a given date
+* [ice_cube](https://github.com/seejohnrun/ice_cube) — Ruby date recurrence library
+* [ISO8601](https://github.com/arnau/ISO8601) — Ruby parser to work with ISO8601 dateTimes and durations
+* [chrono](https://github.com/r7kamura/chrono) — a chain of logics about chronology
+* [CronCalc](https://github.com/mizinsky/cron_calc) — calculates cron job occurrences
+* [Recurrence](https://github.com/fnando/recurrence) — a simple library to handle recurring events
+* [CronConfigParser](https://github.com/madogiwa0124/cron_config_parser) — parse the cron configuration for readability
 * ...
 
 ### Projects using fugit
 
-* [arask](https://github.com/Ebbe/arask) - "Automatic RAils taSKs" uses fugit to parse cron strings
-* [sidekiq-cron](https://github.com/ondrejbartas/sidekiq-cron) - uses fugit to parse cron strings since version 1.0.0, it was using rufus-scheduler previously
-* [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) - as seen above
-* [flor](https://github.com/floraison/flor) - used in the [cron](https://github.com/floraison/flor/blob/master/doc/procedures/cron.md) procedure
-* [que-scheduler](https://github.com/hlascelles/que-scheduler) - a reliable job scheduler for [que](https://github.com/chanks/que)
-* [serial_scheduler](https://github.com/grosser/serial_scheduler) - ruby task scheduler without threading
-* [delayed_cron_job](https://github.com/codez/delayed_cron_job) - an extension to Delayed::Job that allows you to set cron expressions for your jobs
-* [GoodJob](https://github.com/bensheldon/good_job) - a multithreaded, Postgres-based, Active Job backend for Ruby on Rails
-* [Solid Queue](https://github.com/rails/solid_queue) - a DB-based queuing backend for Active Job, designed with simplicity and performance in mind
+* [arask](https://github.com/Ebbe/arask) — "Automatic RAils taSKs" uses fugit to parse cron strings
+* [sidekiq-cron](https://github.com/ondrejbartas/sidekiq-cron) — uses fugit to parse cron strings since version 1.0.0, it was using rufus-scheduler previously
+* [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) — as seen above
+* [flor](https://github.com/floraison/flor) — used in the [cron](https://github.com/floraison/flor/blob/master/doc/procedures/cron.md) procedure
+* [que-scheduler](https://github.com/hlascelles/que-scheduler) — a reliable job scheduler for [que](https://github.com/chanks/que)
+* [serial_scheduler](https://github.com/grosser/serial_scheduler) — ruby task scheduler without threading
+* [delayed_cron_job](https://github.com/codez/delayed_cron_job) — an extension to Delayed::Job that allows you to set cron expressions for your jobs
+* [GoodJob](https://github.com/bensheldon/good_job) — a multithreaded, Postgres-based, Active Job backend for Ruby on Rails
+* [Solid Queue](https://github.com/rails/solid_queue) — a DB-based queuing backend for Active Job, designed with simplicity and performance in mind
+* [qron](https://github.com/floraison/qron) — stupid cron thread that wakes up from time to time to do what's in its crontab
 * ...
 
 ## `Fugit.parse(s)`
@@ -112,6 +114,7 @@ Fugit.parse_cronish('12y12M')        # ==> nil
 
 Introduced in fugit 1.8.0.
 
+
 ## `Fugit::Cron`
 
 A class `Fugit::Cron` to parse cron strings and then `#next_time` and `#previous_time` to compute the next or the previous occurrence respectively.
@@ -204,13 +207,28 @@ Example of cron strings understood by fugit:
 
 Please note that `'15/30 * * * *'` is interpreted as `'15-59/30 * * * *'` since fugit 1.4.6.
 
+### time zones
+
+Fugit accepts a IANA timezone identifier right after a cron string:
+```ruby
+'5 0 * * *  Europe/Rome'      # 5 minutes after midnight, every day, Rome tz
+'0 22 * * 1-5  Asia/Tbilisi'  # at 2200 on weekdays in Georgia
+
+'@yearly Asia/Kuala_Lumpur'  # turns into '0 0 1 1 * Asia/Kuala_Lumpur'
+'@monthly Asia/Jakarta'      # turns into '0 0 1 * * Asia/Jakarta'
+  #
+  # those two "ats" and friends since fugit 1.11.2...
+```
+
+When no time zone is specified, fugit uses Ruby's provided timezone.
+
 ### the first Monday of the month
 
 Fugit tries to follow the `man 5 crontab` documentation.
 
 There is a surprising thing about this canon, all the columns are joined by ANDs, except for monthday and weekday which are joined together by OR if they are both set (they are not `*`).
 
-Many people (me included) [are suprised](https://superuser.com/questions/428807/run-a-cron-job-on-the-first-monday-of-every-month) when they try to specify "at 05:00 on the first Monday of the month" as `0 5 1-7 * 1` or `0 5 1-7 * mon` and the results are off.
+Many people (me included) [are surprised](https://superuser.com/questions/428807/run-a-cron-job-on-the-first-monday-of-every-month) when they try to specify "at 05:00 on the first Monday of the month" as `0 5 1-7 * 1` or `0 5 1-7 * mon` and the results are off.
 
 The man page says:
 
@@ -278,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.
 
@@ -286,131 +304,131 @@ For odd Sundays, one can write `9 0 * * sun%2+1`.
 
 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.
+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`
 
-
-### the second extension
-
-Fugit accepts cron strings with five elements, `minute hour day-of-month month day-of-week`, the standard cron format or six elements `second minute hour day-of-month month day-of-week`.
-
-```ruby
-c = Fugit.parse('* * * * *') # every minute
-c = Fugit.parse('5 * * * *') # every hour at minute 5
-c = Fugit.parse('* * * * * *') # every second
-c = Fugit.parse('5 * * * * *') # every minute at second 5
-```
-
-
-## `Fugit::Duration`
-
-A class `Fugit::Duration` to parse duration strings (vanilla [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) ones and [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) ones).
-
-Provides duration arithmetic tools.
-
 ```ruby
-require 'fugit'
+require 'et-orbi' # >= 1.4.0
 
-d = Fugit::Duration.parse('1y2M1d4h')
+class EtOrbi::EoTime
+  def d # debug
+    "%14s | rday: %4d | rweek: %3d" % [ strftime('%a'), rday, rweek ]
+  end
+end
 
-p d.to_plain_s  # => "1Y2M1D4h"
-p d.to_iso_s    # => "P1Y2M1DT4H" ISO 8601 duration
-p d.to_long_s   # => "1 year, 2 months, 1 day, and 4 hours"
+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
 
-d += Fugit::Duration.parse('1y1h')
+puts EtOrbi.parse('2019-04-11').d  # =>  Thu | rday:  101 | rweek:  14
+puts EtOrbi.parse('2025-09-30').d  # =>  Tue | rday: 2465 | rweek: 352
 
-p d.to_long_s  # => "2 years, 2 months, 1 day, and 5 hours"
+class EtOrbi::EoTime
+  def d # debug
+    "%14s | rday: %4d | rweek: %3d" % [ strftime('%F %a'), rday, rweek ]
+  end
+end
 
-d += 3600
+p EtOrbi.rweek_ref # => "2018-12-31"
 
-p d.to_plain_s  # => "2Y2M1D5h3600s"
-
-p Fugit::Duration.parse('1y2M1d4h').to_sec # => 36820800
+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
 ```
 
-There is a `#deflate` method
-
+One can tell et-orbi >= 1.4.0 which day to take as reference:
 ```ruby
-Fugit::Duration.parse(1000).to_plain_s # => "1000s"
-Fugit::Duration.parse(3600).to_plain_s # => "3600s"
-Fugit::Duration.parse(1000).deflate.to_plain_s # => "16m40s"
-Fugit::Duration.parse(3600).deflate.to_plain_s # => "1h"
+EtOrbi.rweek_ref = :us      # or
+EtOrbi.rweek_ref = :sunday  # to start on a Sunday (2018-12-30)
 
-# or event shorter
-Fugit.parse(1000).deflate.to_plain_s # => "16m40s"
-Fugit.parse(3600).deflate.to_plain_s # => "1h"
-```
+EtOrbi.rweek_ref = :iso      # or
+EtOrbi.rweek_ref = :monday   # or
+EtOrbi.rweek_ref = :default  # to start on a Monday (2019-12-31)
 
-There is also an `#inflate` method
+EtOrbi.rweek_ref = :saturday  # to start on, well, a Saturday (2019-01-05)
 
-```ruby
-Fugit::Duration.parse('1h30m12').inflate.to_plain_s # => "5412s"
-Fugit.parse('1h30m12').inflate.to_plain_s # => "5412s"
+EtOrbi.rweek_ref = '2025-09-30'   # to start on this very Tuesday...
 
-Fugit.parse('1h30m12').to_sec # => 5412
-Fugit.parse('1h30m12').to_sec.to_s + 's' # => "5412s"
+p EtOrbi.rweek_ref # to determine what the current setting is...
 ```
 
-The `to_*_s` methods are also available as class methods:
-```ruby
-p Fugit::Duration.to_plain_s('1y2M1d4h')
-  # => "1Y2M1D4h"
-p Fugit::Duration.to_iso_s('1y2M1d4h')
-  # => "P1Y2M1DT4H" ISO 8601 duration
-p Fugit::Duration.to_long_s('1y2M1d4h')
-  # => "1 year, 2 months, 1 day, and 4 hours"
-```
 
-## `Fugit::At`
+### the second extension
 
-Points in time are parsed and given back as EtOrbi::EoTime instances.
+Fugit accepts cron strings with five elements, `minute hour day-of-month month day-of-week`, the standard cron format or six elements `second minute hour day-of-month month day-of-week`.
 
 ```ruby
-Fugit::At.parse('2017-12-12').to_s
-  # ==> "2017-12-12 00:00:00 +0900" (at least here in Hiroshima)
-
-Fugit::At.parse('2017-12-12 12:00:00 America/New_York').to_s
-  # ==> "2017-12-12 12:00:00 -0500"
+c = Fugit.parse('* * * * *') # every minute
+c = Fugit.parse('5 * * * *') # every hour at minute 5
+c = Fugit.parse('* * * * * *') # every second
+c = Fugit.parse('5 * * * * *') # every minute at second 5
 ```
 
-Directly with `Fugit.parse_at(s)` is OK too:
-```ruby
-Fugit.parse_at('2017-12-12 12:00:00 America/New_York').to_s
-  # ==> "2017-12-12 12:00:00 -0500"
-```
-
-Directly with `Fugit.parse(s)` is OK too:
-```ruby
-Fugit.parse('2017-12-12 12:00:00 America/New_York').to_s
-  # ==> "2017-12-12 12:00:00 -0500"
-```
 
 ## `Fugit::Nat`
 
@@ -511,6 +529,96 @@ p Fugit.parse('every day at 12:15 midnight').original  # ==> "15 24 * * *"
 ```
 
 
+## `Fugit::Duration`
+
+A class `Fugit::Duration` to parse duration strings (vanilla [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) ones and [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) ones).
+
+Provides duration arithmetic tools.
+
+```ruby
+require 'fugit'
+
+d = Fugit::Duration.parse('1y2M1d4h')
+
+p d.to_plain_s  # => "1Y2M1D4h"
+p d.to_iso_s    # => "P1Y2M1DT4H" ISO 8601 duration
+p d.to_long_s   # => "1 year, 2 months, 1 day, and 4 hours"
+
+d += Fugit::Duration.parse('1y1h')
+
+p d.to_long_s  # => "2 years, 2 months, 1 day, and 5 hours"
+
+d += 3600
+
+p d.to_plain_s  # => "2Y2M1D5h3600s"
+
+p Fugit::Duration.parse('1y2M1d4h').to_sec # => 36820800
+```
+
+There is a `#deflate` method
+
+```ruby
+Fugit::Duration.parse(1000).to_plain_s # => "1000s"
+Fugit::Duration.parse(3600).to_plain_s # => "3600s"
+Fugit::Duration.parse(1000).deflate.to_plain_s # => "16m40s"
+Fugit::Duration.parse(3600).deflate.to_plain_s # => "1h"
+
+# or event shorter
+Fugit.parse(1000).deflate.to_plain_s # => "16m40s"
+Fugit.parse(3600).deflate.to_plain_s # => "1h"
+```
+
+There is also an `#inflate` method
+
+```ruby
+Fugit::Duration.parse('1h30m12').inflate.to_plain_s # => "5412s"
+Fugit.parse('1h30m12').inflate.to_plain_s # => "5412s"
+
+Fugit.parse('1h30m12').to_sec # => 5412
+Fugit.parse('1h30m12').to_sec.to_s + 's' # => "5412s"
+```
+
+The `to_*_s` methods are also available as class methods:
+```ruby
+p Fugit::Duration.to_plain_s('1y2M1d4h')
+  # => "1Y2M1D4h"
+p Fugit::Duration.to_iso_s('1y2M1d4h')
+  # => "P1Y2M1DT4H" ISO 8601 duration
+p Fugit::Duration.to_long_s('1y2M1d4h')
+  # => "1 year, 2 months, 1 day, and 4 hours"
+```
+
+
+## `Fugit::At`
+
+Points in time are parsed and given back as EtOrbi::EoTime instances.
+
+```ruby
+Fugit::At.parse('2017-12-12').to_s
+  # ==> "2017-12-12 00:00:00 +0900" (at least here in Hiroshima)
+
+Fugit::At.parse('2017-12-12 12:00:00 America/New_York').to_s
+  # ==> "2017-12-12 12:00:00 -0500"
+```
+
+Directly with `Fugit.parse_at(s)` is OK too:
+```ruby
+Fugit.parse_at('2017-12-12 12:00:00 America/New_York').to_s
+  # ==> "2017-12-12 12:00:00 -0500"
+```
+
+Directly with `Fugit.parse(s)` is OK too:
+```ruby
+Fugit.parse('2017-12-12 12:00:00 America/New_York').to_s
+  # ==> "2017-12-12 12:00:00 -0500"
+```
+
+
+## KNOWN ISSUES
+
+The gem [nice_hash](https://github.com/MarioRuiz/nice_hash) gets in the way of `fugit`, as seen in [issue 108](https://github.com/floraison/fugit/issues/108). It prevents `fugit` from correctly parsing cron strings.
+
+
 ## LICENSE
 
 MIT, see [LICENSE.txt](LICENSE.txt)

data/fugit.gemspec

@@ -20,18 +20,18 @@ Time tools for flor and the floraison project. Cron parsing and occurrence compu
 
   s.metadata = {
     'changelog_uri' => s.homepage + '/blob/master/CHANGELOG.md',
-    'documentation_uri' => s.homepage,
     'bug_tracker_uri' => s.homepage + '/issues',
-    #'mailing_list_uri' => 'https://groups.google.com/forum/#!forum/floraison',
+    'documentation_uri' => s.homepage,
     'homepage_uri' =>  s.homepage,
     'source_code_uri' => s.homepage,
+    #'mailing_list_uri' => 'https://groups.google.com/forum/#!forum/floraison',
     #'wiki_uri' => s.homepage + '/wiki',
+    'rubygems_mfa_required' => 'true',
   }
 
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
-    'README.{md,txt}',
-    'CHANGELOG.{md,txt}', 'CREDITS.{md,txt}', 'LICENSE.{md,txt}',
+    '{README,CHANGELOG,CREDITS,LICENSE}.{md,txt}',
     #'Makefile',
     'lib/**/*.rb', #'spec/**/*.rb', 'test/**/*.rb',
     "#{s.name}.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

@@ -32,15 +32,23 @@ module Fugit
       def parse(s)
 
         return s if s.is_a?(self)
+        return nil unless s.is_a?(String)
 
-        s = SPECIALS[s] || s
+        s0 = s
+        s = s.strip
 
-        return nil unless s.is_a?(String)
+        s =
+          if s[0, 1] == '@'
+            ss = s.split(/\s+/, 2)
+            [ SPECIALS[ss[0]] || ss, *ss[1..-1] ].join(' ')
+          else
+            s
+          end
 
 #p s; Raabro.pp(Parser.parse(s, debug: 3), colors: true)
-        h = Parser.parse(s.strip)
+        h = Parser.parse(s)
 
-        self.allocate.send(:init, s, h)
+        self.allocate.send(:init, s0, h)
       end
 
       def do_parse(s)
@@ -167,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/duration.rb

@@ -67,11 +67,20 @@ module Fugit
       day: { a: 'D', r: 'd', i: 'D', s: DAY_S, I: true, l: 'day' },
       hou: { a: 'h', r: 'h', i: 'H', s: 3600, I: true, l: 'hour' },
       min: { a: 'm', r: 'm', i: 'M', s: 60, I: true, l: 'minute' },
-      sec: { a: 's', r: 's', i: 'S', s: 1, I: true, l: 'second' } }.freeze
-
-    INFLA_KEYS, NON_INFLA_KEYS = KEYS
-      .partition { |k, v| v[:I] }
-      .collect(&:freeze)
+      sec: { a: 's', r: 's', i: 'S', s: 1, I: true, l: 'second' }
+        }.freeze
+
+    #INFLA_KEYS, NON_INFLA_KEYS = KEYS
+    #  .partition { |k, v| v[:I] }
+    #  .collect(&:freeze)
+        #
+        # https://bugs.ruby-lang.org/issues/16252
+        #
+    kes = KEYS.entries
+    INFLA_KEYS,
+    NON_INFLA_KEYS =
+      kes.select { |_, v| v[:I] }.freeze,
+      kes.select { |_, v| ! v[:I] }.freeze
 
     def _to_s(key)
 

data/lib/fugit/nat.rb

@@ -54,7 +54,7 @@ module Fugit
         %w[ zero ] + one_to_nine +
         %w[ ten eleven twelve thirteen fourteen fifteen sixteen seventeen
             eighteen nineteen ] +
-          %w[ twenty thirty fourty fifty ]
+          %w[ twenty thirty forty fifty ]
             .collect { |a|
               ([ nil ] + one_to_nine)
                 .collect { |b| [ a, b ].compact.join('-') } }
@@ -210,7 +210,7 @@ module Fugit
       end
 
       def ampm(i)
-        rex(:ampm, i, /[ \t]*(am|pm|noon|midday|midnight)/i)
+        rex(:ampm, i, /[ \t]*(am|AM|pm|PM|[Nn]oon|[Mm]idday|[Mm]idnight)/)
       end
       def dark(i)
         rex(:dark, i, /[ \t]*dark/i)

data/lib/fugit/parse.rb

@@ -63,6 +63,24 @@ module Fugit
       fail(ArgumentError.new("not cron or 'natural' cron string: #{s.inspect}"))
     end
 
+    def parse_max(s, opts={})
+
+      s0 = s.lines.first
+
+      (0..[ ::Fugit::Nat::MAX_INPUT_LENGTH, s0.length - 1 ].min).each do |i|
+
+        s1 =
+          s0[0, s0.length - i].rstrip
+        f =
+          opts[:cronish] ? parse_cronish(s1, opts) :
+          parse(s1, opts)
+
+        return [ s1, f ] if f
+      end
+
+      nil
+    end
+
     def determine_type(s)
 
       case self.parse(s)

data/lib/fugit.rb

@@ -3,7 +3,7 @@
 
 module Fugit
 
-  VERSION = '1.11.1'
+  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.1
+  version: 1.12.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-15 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
@@ -97,10 +91,11 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/floraison/fugit/blob/master/CHANGELOG.md
-  documentation_uri: https://github.com/floraison/fugit
   bug_tracker_uri: https://github.com/floraison/fugit/issues
+  documentation_uri: https://github.com/floraison/fugit
   homepage_uri: https://github.com/floraison/fugit
   source_code_uri: https://github.com/floraison/fugit
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -116,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: time tools for flor