fugit 1.5.3 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd6f6af6264734f4eb10d5aa8e88cbcfbca029fb697f20b7a0ae37d220c55653
-  data.tar.gz: 25606c4f975d71350a360f4feb092a54f88bbb022fef31e4eb13c22d98b36b8f
+  metadata.gz: 318e360c503855580a65262f188ae07d02a17c1e833aeb5d8d21e25a67a9805c
+  data.tar.gz: 54b9eaeba60e6c1a64db0ca2b5e86ed09e74d8c4afeb32677314946f8b1d5211
 SHA512:
-  metadata.gz: 253c2fc474a22ff93caa8b1f465af16565ab8b69037f7e83dc1e42719085d95342ee9d7a43200bdb05bcc9815dc29f590c5d86df51b7f526e25bb6d96dd4ef02
-  data.tar.gz: '0951e692d8026d3a66c374e99f872bd03270f77e93232bbbecefac44c8b9b17253b46218dbb36f9f009441bb6d602c04f40dad7782df31674e26244c1ce59055'
+  metadata.gz: c2813ab3974e9dcc7b3b6552bc8a5855617ac40b26190f84a3cbd413108d4b2ebc6a8c9418389a873844161289f60d48bece8fc10ca25295414e2e04c1da1474
+  data.tar.gz: 6e8587a3894c801bc220f967e3f5b0fed6e1bdea0bc606841fe188f890c8a0f6756f4b5357fd4cd887ff7d9bfd0a6bde68a1405ff369f7b4d41b8ec3e14c1c4b

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 # CHANGELOG.md
 
 
+## fugit 1.7.1 released 2022-09-21
+
+* Change behaviour for "0 0/5 * * *", gh-79
+  go "every 5h start hour 0", previous behaviour only triggered at hour 0
+
+
+## fugit 1.7.0 released 2022-09-15
+
+* Introduce the & cron syntax (day-of-month AND day-of-week), gh-78
+* Change how cron deals with modulo and offset, gh-76
+* Be liberal with extra commas, gh-77
+
+
+## fugit 1.6.0 release 2022-08-25
+
+* Ensure input strings are stripped before parsing, gh-74
+
+
 ## fugit 1.5.3 released 2022-04-02
 
 * Fix Fugit::Cron.to_s vs "0 13 * * wed%2", gh-68

data/CREDITS.md

@@ -1,7 +1,11 @@
 
 # fugit credits
 
-* Peter Goldstein, https://github.com/petergoldstein GHA 3.3 j9.3, gh-65
+* Joseph Halter, https://github.com/JosephHalter, gh-79
+* James Healy, https://github.com/yob, gh-76
+* John Bachir, https://github.com/jjb, gh-74
+* Vivek Miyani, https://github.com/vivekmiyani, gh-71
+* Peter Goldstein, https://github.com/petergoldstein infra, gh-65, -72
 * Pascal Zumkehr https://github.com/codez gh-62, Santiago into DST vs Time.zone
 * Ggallardoh https://github.com/Ggallardoh gh-60, America/Santiago into DST
 * Khaled AbuShqear https://github.com/shqear93 gh-57, "12pm"

data/README.md

@@ -32,7 +32,7 @@ The intersection of those two projects is where fugit is born:
 ### Projects using fugit
 
 * [arask](https://github.com/Ebbe/arask) - "Automatic RAils taSKs" uses fugit to parse cron strings
-* [sideqik-cron](https://github.com/ondrejbartas/sidekiq-cron) - recent versions of Sideqik-Cron use fugit to parse cron strings
+* [sidekiq-cron](https://github.com/ondrejbartas/sidekiq-cron) - recent versions of Sidekiq-Cron use fugit to parse cron strings
 * [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) -
 * [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)
@@ -160,7 +160,34 @@ The man page says:
 
 Fugit follows this specification.
 
-There is a solution though, please read on.
+Since fugit 1.7.0, by adding `&` right after a day specifier, the `day-of-month OR day-of-week` becomes `day-of-month AND day-of-week`.
+
+```ruby
+# standard cron
+
+p Fugit.parse_cron('0 0 */2 * 1-5').next_time('2022-08-09').to_s
+  # ==> "2022-08-10 00:00:00 +0900"
+
+# with an &
+
+p Fugit.parse_cron('0 0 */2 * 1-5&').next_time('2022-08-09').to_s # or
+p Fugit.parse_cron('0 0 */2& * 1-5').next_time('2022-08-09').to_s
+p Fugit.parse_cron('0 0 */2& * 1-5&').next_time('2022-08-09').to_s
+  # ==> "2022-08-11 00:00:00 +0900"
+
+
+# standard cron
+
+p Fugit.parse_cron('59 6 1-7 * 2').next_time('2020-03-15').to_s
+  # ==> "2020-03-17 06:59:00 +0900"
+
+# with an &
+
+p Fugit.parse_cron('59 6 1-7 * 2&').next_time('2020-03-15').to_s
+p Fugit.parse_cron('59 6 1-7& * 2').next_time('2020-03-15').to_s
+p Fugit.parse_cron('59 6 1-7& * 2&').next_time('2020-03-15').to_s
+  # ==> "2020-04-07 06:59:00 +0900"
+```
 
 ### the hash extension
 

data/fugit.gemspec

@@ -32,7 +32,7 @@ Time tools for flor and the floraison project. Cron parsing and occurrence compu
   s.files = Dir[
     'README.{md,txt}',
     'CHANGELOG.{md,txt}', 'CREDITS.{md,txt}', 'LICENSE.{md,txt}',
-    'Makefile',
+    #'Makefile',
     'lib/**/*.rb', #'spec/**/*.rb', 'test/**/*.rb',
     "#{s.name}.gemspec",
   ]

data/lib/fugit/cron.rb

@@ -38,7 +38,7 @@ module Fugit
         return nil unless s.is_a?(String)
 
 #p s; Raabro.pp(Parser.parse(s, debug: 3), colors: true)
-        h = Parser.parse(s)
+        h = Parser.parse(s.strip)
 
         return nil unless h
 
@@ -167,7 +167,7 @@ module Fugit
 
     def weekday_modulo_match?(nt, mod)
 
-      (nt.rweek + mod[1]) % mod[0] == 0
+      (nt.rweek % mod[0]) == (mod[1] % mod[0])
     end
 
     def weekday_match?(nt)
@@ -199,8 +199,14 @@ module Fugit
 
     def day_match?(nt)
 
-      return weekday_match?(nt) || monthday_match?(nt) \
-        if @weekdays && @monthdays
+      if @weekdays && @monthdays
+
+        return weekday_match?(nt) && monthday_match?(nt) \
+          if @day_and
+            #
+            # extension for fugit, gh-78
+
+        return weekday_match?(nt) || monthday_match?(nt)
           #
           # From `man 5 crontab`
           #
@@ -212,6 +218,8 @@ module Fugit
           # at 4:30 am on the 1st and 15th of each month, plus every Friday.
           #
           # as seen in gh-5 and gh-35
+      end
+
 
       return false unless weekday_match?(nt)
       return false unless monthday_match?(nt)
@@ -482,6 +490,7 @@ module Fugit
 
       @original = original
       @cron_s = nil # just to be sure
+      @day_and = h[:&]
 
       determine_seconds(h[:sec])
       determine_minutes(h[:min])
@@ -500,8 +509,6 @@ module Fugit
 
       sta, edn, sla = r
 
-      sla = nil if sla == 1 # don't get fooled by /1
-
       edn = max if sla && edn.nil?
 
       return [ nil ] if sta.nil? && edn.nil? && sla.nil?
@@ -516,6 +523,8 @@ module Fugit
 
     def range(min, max, sta, edn, sla)
 
+      return [ nil ] if sta == min && edn == max && sla == 1
+
       fail ArgumentError.new(
         'both start and end must be negative in ' +
         { min: min, max: max, sta: sta, edn: edn, sla: sla }.inspect
@@ -660,7 +669,9 @@ module Fugit
       def s(i); rex(nil, i, /[ \t]+/); end
       def star(i); str(nil, i, '*'); end
       def hyphen(i); str(nil, i, '-'); end
-      def comma(i); str(nil, i, ','); end
+      def comma(i); rex(nil, i, /,([ \t]*,)*/); end
+      def comma?(i); rex(nil, i, /([ \t]*,)*/); end
+      def and?(i); rex(nil, i, /&?/); end
 
       def slash(i); rex(:slash, i, /\/\d\d?/); end
 
@@ -720,12 +731,12 @@ module Fugit
       def list_mon(i); jseq(:mon, i, :mon_elt, :comma); end
       def list_dow(i); jseq(:dow, i, :dow_elt_, :comma); end
 
-      def lsec_(i); seq(nil, i, :list_sec, :s); end
-      def lmin_(i); seq(nil, i, :list_min, :s); end
-      def lhou_(i); seq(nil, i, :list_hou, :s); end
-      def ldom_(i); seq(nil, i, :list_dom, :s); end
-      def lmon_(i); seq(nil, i, :list_mon, :s); end
-      alias ldow list_dow
+      def lsec_(i); seq(nil, i, :comma?, :list_sec, :comma?, :s); end
+      def lmin_(i); seq(nil, i, :comma?, :list_min, :comma?, :s); end
+      def lhou_(i); seq(nil, i, :comma?, :list_hou, :comma?, :s); end
+      def ldom_(i); seq(nil, i, :comma?, :list_dom, :comma?, :and?, :s); end
+      def lmon_(i); seq(nil, i, :comma?, :list_mon, :comma?, :s); end
+      def ldow(i); seq(nil, i, :comma?, :list_dow, :comma?, :and?); end
 
       def _tz_name(i)
         rex(nil, i, / +[A-Z][a-zA-Z0-9+\-]+(\/[A-Z][a-zA-Z0-9+\-_]+){0,2}/)
@@ -736,10 +747,12 @@ module Fugit
       def _tz(i); alt(:tz, i, :_tz_delta, :_tz_name); end
 
       def classic_cron(i)
-        seq(:ccron, i, :lmin_, :lhou_, :ldom_, :lmon_, :ldow, :_tz, '?')
+        seq(:ccron, i,
+          :lmin_, :lhou_, :ldom_, :lmon_, :ldow, :_tz, '?')
       end
       def second_cron(i)
-        seq(:scron, i, :lsec_, :lmin_, :lhou_, :ldom_, :lmon_, :ldow, :_tz, '?')
+        seq(:scron, i,
+          :lsec_, :lmin_, :lhou_, :ldom_, :lmon_, :ldow, :_tz, '?')
       end
 
       def cron(i)
@@ -821,6 +834,7 @@ module Fugit
           .inject({}) { |h, tt|
             h[tt.name] = tt.name == :tz ? rewrite_tz(tt) : rewrite_entry(tt)
             h }
+        hcron[:&] = true if t.string.index('&')
 
         z, tz = hcron[:tz]; return nil if z && ! tz
 

data/lib/fugit/nat.rb

@@ -15,6 +15,8 @@ module Fugit
 
         return nil unless s.is_a?(String)
 
+        s = s.strip
+
 #p s; Raabro.pp(Parser.parse(s, debug: 3), colours: true)
 #(p s; Raabro.pp(Parser.parse(s, debug: 1), colours: true)) rescue nil
 

data/lib/fugit.rb

@@ -3,7 +3,7 @@
 
 module Fugit
 
-  VERSION = '1.5.3'
+  VERSION = '1.7.1'
 end
 
 require 'time'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.7.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-02 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -83,7 +83,6 @@ files:
 - CHANGELOG.md
 - CREDITS.md
 - LICENSE.txt
-- Makefile
 - README.md
 - fugit.gemspec
 - lib/fugit.rb
@@ -117,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: time tools for flor

data/Makefile

@@ -1,55 +0,0 @@
-
-## gem tasks ##
-
-NAME = \
-  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.name")
-VERSION = \
-  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.version")
-
-count_lines:
-	find lib -name "*.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
-	find spec -name "*_spec.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
-cl: count_lines
-
-scan:
-	scan lib/**/*.rb
-
-gemspec_validate:
-	@echo "---"
-	ruby -e "s = eval(File.read(Dir['*.gemspec'].first)); p s.validate"
-	@echo "---"
-
-name: gemspec_validate
-	@echo "$(NAME) $(VERSION)"
-
-cw:
-	find lib -name "*.rb" -exec ruby -cw {} \;
-
-build: gemspec_validate
-	gem build $(NAME).gemspec
-	mkdir -p pkg
-	mv $(NAME)-$(VERSION).gem pkg/
-
-push: build
-	gem push --otp "$(OTP)" pkg/$(NAME)-$(VERSION).gem
-
-spec:
-	bundle exec rspec
-test: spec
-
-
-## specific to project ##
-
-info:
-	uname -a
-	bundle exec ruby -v
-	bundle exec ruby -Ilib -r et-orbi -e "EtOrbi._make_info"
-
-tzones:
-	bundle exec ruby -r tzinfo -e "TZInfo::Timezone.all.each { |tz| p tz.name }"
-#tzonesd:
-#	bundle exec ruby -r tzinfo -r tzinfo-data -e "::TZInfo::Timezone.all.each { |tz| p tz.name }"
-
-
-.PHONY: count_lines scan gemspec_validate name cw build push spec info tzones
-