fugit 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35836e95c82a113fe2e5222a02522ab2bf36f1b0
-  data.tar.gz: 0fb6db1cb77893af937354da715b2eb8b14403f5
+  metadata.gz: a7fb0dc867cacf79033c0f54f5780cdc5a567106
+  data.tar.gz: e06aec6abab852f7ea09c459353bbcbb42c007ee
 SHA512:
-  metadata.gz: 7de61477e96c9612542641787346fb154394d8388eccccaeb1be257cb57410abe4e23d1377148539d92852674df3c58d0a44c9cc4816c50cd157515f185d59da
-  data.tar.gz: c1f23c4a8395ddc29a85415300608fbc45d5900cbb42c502fd51f02f7f8c5f6fe945fe9b010349e9bde6fc1df6f3ec105a977c8705722820be41c65b47656ff7
+  metadata.gz: 55c7bdcaa5820e11f83b5d61e66bf44a6de98cd778e1ca80daefacf2e71fd0707696ec1161896738b4934125ba63881fc7023e89fbe27a1be24495dabc6a0ae5
+  data.tar.gz: 8b3471be0e7710016eabcb5ba26ca01463e0463fd370c290d91bea9c41883896cffb03dbc65aad62d8f51a9a8aa821ab02b6020dfda67725908357902ebd3b97

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+## fugit 1.1.10 released 2019-04-12
+
+* Implement `"0 9 * * sun%2+1"`
+* Simplify cron parser
+
+
 ## fugit 1.1.9  released 2019-03-26
 
 * Fix cron `"0 9 29 feb *"` endless loop, gh-18

data/Makefile

@@ -11,6 +11,9 @@ count_lines:
 	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"
@@ -48,5 +51,5 @@ tzones:
 #	bundle exec ruby -r tzinfo -r tzinfo-data -e "::TZInfo::Timezone.all.each { |tz| p tz.name }"
 
 
-.PHONY: count_lines gemspec_validate name cw build push spec info tzones
+.PHONY: count_lines scan gemspec_validate name cw build push spec info tzones
 

data/README.md

@@ -104,6 +104,31 @@ Example of cron strings understood by fugit:
 # and more...
 ```
 
+### 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".
+
+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 references to? It starts at 1 on 2019-01-01.
+
+```ruby
+require 'et-orbi' # >= 1.1.8
+
+# 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
+
+# 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
+```
+
+
 ## `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).

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.1'
-  s.add_runtime_dependency 'et-orbi', '~> 1.1', '>= 1.1.7'
+  s.add_runtime_dependency 'et-orbi', '~> 1.1', '>= 1.1.8'
 
   s.add_development_dependency 'rspec', '~> 3.7'
   s.add_development_dependency 'chronic', '~> 0.10'

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.1.9'
+  VERSION = '1.1.10'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -11,8 +11,7 @@ module Fugit
       '@weekly' => '0 0 * * 0',
       '@daily' => '0 0 * * *',
       '@midnight' => '0 0 * * *',
-      '@hourly' => '0 * * * *',
-    }
+      '@hourly' => '0 * * * *' }
 
     attr_reader :original, :zone
     attr_reader :seconds, :minutes, :hours, :monthdays, :months, :weekdays, :timezone
@@ -49,17 +48,15 @@ module Fugit
 
     def to_cron_s
 
-      @cron_s ||= begin
-        [
-          @seconds == [ 0 ] ? nil : (@seconds || [ '*' ]).join(','),
-          (@minutes || [ '*' ]).join(','),
-          (@hours || [ '*' ]).join(','),
-          (@monthdays || [ '*' ]).join(','),
-          (@months || [ '*' ]).join(','),
-          (@weekdays || [ [ '*' ] ]).map { |d| d.compact.join('#') }.join(','),
-          @timezone ? @timezone.name : nil
-        ].compact.join(' ')
-      end
+      @cron_s ||= [
+        @seconds == [ 0 ] ? nil : (@seconds || [ '*' ]).join(','),
+        (@minutes || [ '*' ]).join(','),
+        (@hours || [ '*' ]).join(','),
+        (@monthdays || [ '*' ]).join(','),
+        (@months || [ '*' ]).join(','),
+        (@weekdays || [ [ '*' ] ]).map { |d| d.compact.join('#') }.join(','),
+        @timezone ? @timezone.name : nil
+          ].compact.join(' ')
     end
 
     class TimeCursor
@@ -73,7 +70,7 @@ module Fugit
       def time; @t; end
       def to_i; @t.to_i; end
 
-      %w[ year month day wday hour min sec wday_in_month ]
+      %w[ year month day wday hour min sec wday_in_month rweek rday ]
         .collect(&:to_sym).each { |k| define_method(k) { @t.send(k) } }
 
       def inc(i)
@@ -140,21 +137,35 @@ module Fugit
     def min_match?(nt); ( ! @minutes) || @minutes.include?(nt.min); end
     def sec_match?(nt); ( ! @seconds) || @seconds.include?(nt.sec); end
 
+    def weekday_hash_match?(nt, hsh)
+
+      phsh, nhsh = nt.wday_in_month
+
+      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
+    end
+
+    def weekday_modulo_match?(nt, mod)
+
+      nt.rweek % mod[0] == mod[1]
+    end
+
     def weekday_match?(nt)
 
       return true if @weekdays.nil?
 
-      wd, hsh = @weekdays.find { |d, _| d == nt.wday }
+      wd, hom = @weekdays.find { |d, _| d == nt.wday }
 
       return false unless wd
-      return true if hsh.nil?
+      return true if hom.nil?
 
-      phsh, nhsh = nt.wday_in_month
-
-      if hsh > 0
-        hsh == phsh # positive wday, from the beginning of the month
+      if hom.is_a?(Array)
+        weekday_modulo_match?(nt, hom)
       else
-        hsh == nhsh # negative wday, from the end of the month, -1 == last
+        weekday_hash_match?(nt, hom)
       end
     end
 
@@ -487,11 +498,11 @@ module Fugit
 
       @weekdays = []
 
-      arr.each do |a, z, s, h| # a to z, slash and hash
-        if h
-          @weekdays << [ a, h ]
-        elsif s
-          ((a || 0)..(z || (a ? a : 6))).step(s < 1 ? 1 : s)
+      arr.each do |a, z, sl, ha, mo| # a to z, slash, hash, and mod
+        if ha || mo
+          @weekdays << [ a, ha || mo ]
+        elsif sl
+          ((a || 0)..(z || (a ? a : 6))).step(sl < 1 ? 1 : sl)
             .each { |i| @weekdays << [ i ] }
         elsif z
           (a..z).each { |i| @weekdays << [ i ] }
@@ -527,20 +538,14 @@ module Fugit
 
       def slash(i); rex(:slash, i, /\/\d\d?/); end
 
-      def core_mos(i); rex(:mos, i, /[0-5]?\d/); end # min or sec
-      def core_hou(i); rex(:hou, i, /(2[0-4]|[01]?[0-9])/); end
-      def core_dom(i); rex(:dom, i, /(-?(3[01]|[12][0-9]|0?[1-9])|last|l)/i); end
-      def core_mon(i); rex(:mon, i, /(1[0-2]|0?[1-9]|#{MONTHS[1..-1].join('|')})/i); end
-      def core_dow(i); rex(:dow, i, /([0-7]|#{WEEKDS.join('|')})/i); end
+      def mos(i); rex(:mos, i, /[0-5]?\d/); end # min or sec
+      def hou(i); rex(:hou, i, /(2[0-4]|[01]?[0-9])/); end
+      def dom(i); rex(:dom, i, /(-?(3[01]|[12][0-9]|0?[1-9])|last|l)/i); end
+      def mon(i); rex(:mon, i, /(1[0-2]|0?[1-9]|#{MONTHS[1..-1].join('|')})/i); end
+      def dow(i); rex(:dow, i, /([0-7]|#{WEEKDS.join('|')})/i); end
 
       def dow_hash(i); rex(:hash, i, /#(-?[1-5]|last|l)/i); end
 
-      def mos(i); core_mos(i); end
-      def hou(i); core_hou(i); end
-      def dom(i); core_dom(i); end
-      def mon(i); core_mon(i); end
-      def dow(i); core_dow(i); end
-
       def _mos(i); seq(nil, i, :hyphen, :mos); end
       def _hou(i); seq(nil, i, :hyphen, :hou); end
       def _dom(i); seq(nil, i, :hyphen, :dom); end
@@ -568,9 +573,12 @@ module Fugit
       def sorws_mon(i); seq(:elt, i, :sor_mon, :slash, '?'); end
       def sorws_dow(i); seq(:elt, i, :sor_dow, :slash, '?'); end
 
-      def h_dow(i); seq(:elt, i, :core_dow, :dow_hash); end
+      def mod(i); rex(:mod, i, /%\d+(\+\d+)?/); end
+
+      def mod_dow(i); seq(:elt, i, :dow, :mod); end
+      def h_dow(i); seq(:elt, i, :dow, :dow_hash); end
 
-      def _sorws_dow(i); alt(nil, i, :h_dow, :sorws_dow); end
+      def _sorws_dow(i); alt(nil, i, :h_dow, :mod_dow, :sorws_dow); end
 
       def list_sec(i); jseq(:sec, i, :sorws_mos, :comma); end
       def list_min(i); jseq(:min, i, :sorws_mos, :comma); end
@@ -607,7 +615,7 @@ module Fugit
 
       # rewriting the parsed tree
 
-      def to_i(k, t)
+      def rewrite_bound(k, t)
 
         s = t.string.downcase
 
@@ -617,23 +625,38 @@ module Fugit
         s.to_i
       end
 
+      def rewrite_mod(k, t)
+
+        mod, plus = t.string
+          .split(/[%+]/).reject(&:empty?).collect(&:to_i)
+
+        [ mod, plus || 0 ]
+      end
+
       def rewrite_elt(k, t)
 
-        (a, z), others = t
-          .subgather(nil)
-          .partition { |tt| ![ :hash, :slash ].include?(tt.name) }
-        s = others.find { |tt| tt.name == :slash }
-        h = others.find { |tt| tt.name == :hash }
+        at, zt, slt, hat, mot = nil; t.subgather(nil).each do |tt|
+          case tt.name
+          when :slash then slt = tt
+          when :hash then hat = tt
+          when :mod then mot = tt
+          else if at; zt ||= tt; else; at = tt; end
+          end
+        end
+
+        sl = slt ? slt.string[1..-1].to_i : nil
+
+        ha = hat ? hat.string[1..-1] : nil
+        ha = -1 if ha && ha.upcase[0, 1] == 'L'
+        ha = ha.to_i if ha
 
-        h = h ? h.string[1..-1] : nil
-        h = -1 if h && h.upcase[0, 1] == 'L'
-        h = h.to_i if h
+        mo = mot ? rewrite_mod(k, mot) : nil
 
-        a = a ? to_i(k, a) : nil
-        z = z ? to_i(k, z) : nil
+        a = at ? rewrite_bound(k, at) : nil
+        z = zt ? rewrite_bound(k, zt) : nil
         a, z = z, a if a && z && a > z
 
-        [ a, z, s ? s.string[1..-1].to_i : nil, h ]
+        [ a, z, sl, ha, mo ]
       end
 
       def rewrite_entry(t)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -33,7 +33,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.1.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement