fugit 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c7da961f6616177b4837e7db2b8d2cbef8a73af0e39d482bbde88ca927d420
-  data.tar.gz: bdb787682ba39f3bd873c935378d7097291ff275c9c2443a4bf42990e71dfa92
+  metadata.gz: 11380138d493b9ed80a43bffc6a61f74de5a2c52132ae2b9746c8097b3f8015a
+  data.tar.gz: 40ec86bcc48074cc6d3a5bc02b7c2ae84ba3f9fc505104373fc83c7c984ec04b
 SHA512:
-  metadata.gz: c920de689a07b8e5b082afa2d67ff26a2ad3422e0a35afc0c02fee71d92d6a76da391d7ec6d03e55d62cbc1a46cbf1296bccb4a37ec9df9d72f35d3e4ecaf0ad
-  data.tar.gz: 11694200215f7506f64f862d7f63e86b3fc79be5ad4a4ddfe9278143c40991bcd2c89356e9e314d5caad125b0b26623daf3da64ee2e92b49ca1480b59fc220f3
+  metadata.gz: dbd303863f53f7fbf39544fe914e48226952ff4e5983769e7bf932d8a92fdae67514460363f0a1921c77d9dfd7431539935ea18383e3187e103770f46eeeba78
+  data.tar.gz: b558ec5b070e2119d5ed0b21f840afd375f2b1eed95ef4542bd78d17dc026402d17c890163f8f9b3e08f8899d01ff08f2d4d3b1baece4d0c5af0e56d72e6d3d9

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## fugit 1.14.0 released 2026-09-14
+
+* Reject input when length > 256
+
+
 ## fugit 1.13.0 released 2026-07-10
 
 * Random values support in cron string `"10 ~ * * *"` gh-121 Nicols Bachschmidt

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* Yaroslav Kurbatov https://github.com/viralpraxis input max length
 * Nicolas Bachschmidt https://github.com/baarde gh-120 weekday wrap fix
 * JebeenLee https://github.com/JebeenLee gh-117 divide by zero
 * Eric Claerhout https://github.com/swebra gh-114 rweek readme clarity
@@ -34,7 +35,7 @@
 * Niklas https://github.com/gr8bit gh-49, Fugit::Cron.parse('')
 * Matsuda Akira https://github.com/amatsuda gh-46, warning suppression
 * Honglooker https://github.com/honglooker gh-43, New York cron skip
-* Jérôme Dalbert https://github.com/jeromedalbert gh-41, gh-42
+* Jérôme Dalbert https://github.com/jeromedalbert gh-41, gh-42, gh-123
 * 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

data/fugit.gemspec

@@ -43,7 +43,9 @@ Time tools for flor and the floraison project. Cron parsing and occurrence compu
   s.add_runtime_dependency 'raabro', '~> 1.4'
   s.add_runtime_dependency 'et-orbi', '~> 1.4'
 
-  s.add_development_dependency 'rspec', '~> 3.8'
+  #s.add_development_dependency 'rspec', '~> 3.8'
+  s.add_development_dependency 'probatio', '~> 1.6'
+
   s.add_development_dependency 'chronic', '~> 0.10'
   s.add_development_dependency 'ostruct'
 

data/lib/fugit/cron.rb

@@ -37,6 +37,16 @@ module Fugit
         s0 = s
         s = s.strip
 
+        if s.length > ::Fugit::MAX_INPUT_LENGTH
+
+          fail ArgumentError.new(
+            'input too long for a cron string, ' +
+            "#{s.length} > #{MAX_INPUT_LENGTH}"
+          ) if opts[:do_parse]
+
+          return nil
+        end
+
         s =
           if s[0, 1] == '@'
             ss = s.split(/\s+/, 2)
@@ -53,7 +63,7 @@ module Fugit
 
       def do_parse(s, opts={})
 
-        parse(s, opts) ||
+        parse(s, opts.merge(do_parse: true)) ||
         fail(ArgumentError.new("invalid cron string #{trunc(s)}"))
       end
 

data/lib/fugit/duration.rb

@@ -26,6 +26,16 @@ module Fugit
         s = s.strip
 #p [ original, s ]; Raabro.pp(Parser.parse(s, debug: 3), colours: true)
 
+        if s.length > ::Fugit::MAX_INPUT_LENGTH
+
+          fail ArgumentError.new(
+            'input too long for a duration string, ' +
+            "#{s.length} > #{MAX_INPUT_LENGTH}"
+          ) if opts[:do_parse]
+
+          return nil
+        end
+
         h =
           if opts[:iso]
             IsoParser.parse(opts[:stricter] ? s : s.upcase)
@@ -40,7 +50,7 @@ module Fugit
 
       def do_parse(s, opts={})
 
-        parse(s, opts) ||
+        parse(s, opts.merge(do_parse: true)) ||
         fail(ArgumentError.new("not a duration #{s.inspect}"))
       end
 

data/lib/fugit/misc.rb

@@ -2,8 +2,8 @@
 
 module Fugit
 
-  DAY_S = (24 * 3600).freeze
-  YEAR_S = (365 * DAY_S).freeze
+  DAY_S = 24 * 3600
+  YEAR_S = 365 * DAY_S
 
   class << self
 

data/lib/fugit/nat.rb

@@ -7,8 +7,6 @@ module Fugit
   #
   module Nat
 
-    MAX_INPUT_LENGTH = 256
-
     class << self
 
       def parse(s, opts={})
@@ -19,10 +17,10 @@ module Fugit
 
         s = s.strip
 
-        if s.length > MAX_INPUT_LENGTH
+        if s.length > ::Fugit::MAX_INPUT_LENGTH
 
           fail ArgumentError.new(
-            "input too long for a nat string, " +
+            'input too long for a nat string, ' +
             "#{s.length} > #{MAX_INPUT_LENGTH}"
           ) if opts[:do_parse]
 
@@ -278,10 +276,27 @@ module Fugit
         rex(:interval, i, INTERVAL_REX)
       end
 
+      def _starting_at(i)
+        rex(nil, i, /[ \t]*(starting[ \t]+at|from)[ \t]+/i)
+      end
+      def _offset_unit(i)
+        rex(nil, i, /(second|minute|hour|day|month)s?[ \t]+/i)
+      end
+      def offset_count(i)
+        rex(:offset_count, i, /\d+/)
+      end
+
+        # starting at minute 1
+        # from minute 1
+      def offset(i)
+        seq(:offset, i, :_starting_at, :_offset_unit, :offset_count)
+      end
+
         # every day
         # every 1 minute
+        # every minute starting at minute 10
       def every_interval(i)
-        seq(:every_interval, i, :count, '?', :interval)
+        seq(:every_interval, i, :count, '?', :interval, :offset, '?')
       end
 
       def every_single_interval(i)
@@ -380,6 +395,7 @@ module Fugit
       end
 
       def rewrite_on_minutes(t)
+
 #Raabro.pp(t, colours: true)
         mins = t.subgather(:dmin).collect(&:strinp)
         #slot(:m, mins.join(','))
@@ -387,6 +403,7 @@ module Fugit
       end
 
       def rewrite_on_thex(t)
+
         case s = t.string
         #when /hour/i then slot(:h, 0)
         #else slot(:m, '*')
@@ -415,10 +432,12 @@ module Fugit
       end
 
       def rewrite_at_p(t)
+
         pt = t.sublookup(:point).strinpd
         pt = pt.start_with?('mon') ? 'M' : pt[0, 1]
         pts = t.subgather(:count).collect { |e| e.string.to_i }
 #p [ pt, pts ]
+
         case pt
         #when 'm' then slot(:m, pts)
         when 'm' then slot(:hm, '*', pts, strong: 1)
@@ -428,6 +447,7 @@ module Fugit
       end
 
       def rewrite_every_single_interval(t)
+
         case t.string
         when /year/i then [ slot(:month, 1, :weak), slot(:monthday, 1, :weak) ]
         #when /week/i then xxx...
@@ -438,11 +458,19 @@ module Fugit
       def rewrite_every_interval(t)
 
 #Raabro.pp(t, colours: true)
-        ci = t.subgather(nil).collect(&:string)
-        i = ci.pop.strip[0, 3]
-        c = (ci.pop || '1').strip
+        ct = t.sublookup(:count)
+        it = t.sublookup(:interval)
+        ot = t.sublookup(:offset)
+
+        c = (ct ? ct.string : '1').strip
+        i = it.string.strip[0, 3]
         i = (i == 'M' || i.downcase == 'mon') ? 'M' : i[0, 1].downcase
-        cc = c == '1' ? '*' : "*/#{c}"
+        off = ot ? ot.sublookup(:offset_count).string.to_i : nil
+        cc =
+          if off then "#{off}/#{c}"
+          elsif c == '1' then '*'
+          else "*/#{c}"
+          end
 
         case i
         when 'M' then slot(:month, cc)
@@ -465,17 +493,14 @@ module Fugit
       end
 
       def rewrite_tz(t)
-
         slot(:tz, t.string)
       end
 
       def rewrite_weekday(t)
-
         Fugit::Cron::Parser::WEEKDS.index(t.string[0, 3].downcase)
       end
 
       def rewrite_weekdays(t)
-
 #Raabro.pp(t, colours: true)
         slot(:weekday, _rewrite_subs(t, :weekday))
       end
@@ -542,12 +567,15 @@ module Fugit
       end
 
       def rewrite_to_hour(t)
+
 #Raabro.pp(t, colours: true)
         ht0, ht1 = t.subgather(nil)
         h0, h1 = rewrite(ht0), rewrite(ht1)
+
         fail ArgumentError.new(
           "cannot deal with #{ht0.strinp} to #{ht1.strinp}, minutes diverge"
         ) if h0.data1 != h1.data1
+
         slot(:hm, "#{h0._data0}-#{h1._data0}", 0, strong: 0)
       end
 

data/lib/fugit/parse.rb

@@ -65,11 +65,13 @@ module Fugit
       fail(ArgumentError.new("not cron or 'natural' cron string: #{s.inspect}"))
     end
 
+    # Still an exploration, but what was the goal? 2026-09-14
+    #
     def parse_max(s, opts={})
 
       s0 = s.lines.first
 
-      (0..[ ::Fugit::Nat::MAX_INPUT_LENGTH, s0.length - 1 ].min).each do |i|
+      (0..[ ::Fugit::MAX_INPUT_LENGTH, s0.length - 1 ].min).each do |i|
 
         s1 =
           s0[0, s0.length - i].rstrip

data/lib/fugit.rb

@@ -1,9 +1,9 @@
-# frozen_string_literal: true
-
 
 module Fugit
 
-  VERSION = '1.13.0'
+  VERSION = '1.14.0'.freeze
+
+  MAX_INPUT_LENGTH = 256
 end
 
 require 'time'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - John Mettraux
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -39,19 +38,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: probatio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +109,6 @@ metadata:
   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:
 - lib
@@ -125,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: time tools for flor
 test_files: []