fugit 1.4.4 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 396cc931521c222b522a89e3840d3e1bd42e0927f20d5d3f0532122eafd62f74
-  data.tar.gz: a04d54cd9894c593674031f704133f825769438e85a91330baaa42ad27089d68
+  metadata.gz: 7c15d1aa5444c8526cae61312916c90cde61e1e516faa8bdb330ade277ef3669
+  data.tar.gz: 5126ecd62951257326cb483e0b694ff4ffe7a02a7ef5eda53359e26aa43b43eb
 SHA512:
-  metadata.gz: e97aebd235b532d3ad3a3df969b7189d1e628c3e1229d9d8d5a89b48fd552ebd856faf203289e9171df9b32e7a79b89ff33675799b83c6381eafc1f61945605e
-  data.tar.gz: eaaed3254216b7082d8715990768d6b6588a864899e6911f74e967dfa83ed93221032420f82bd3f7215536365ee9340b2f2f6a2e175826456c9367d80d3ed9c4
+  metadata.gz: d04b7906c8134bc36f98a4cc3a5b598f430f1125c0169aa162cd8f789bb812479cdc17a65154ad6afb9f102b784d4d6a2831fe7a1512ef3a4b81ebe4eca22087
+  data.tar.gz: 1de022b1f39ba9a4f9cdeea4eed9427b1b33c3b9e121def7680a481b4036ad7542a4e5340814e7aa4a9937f03cc144b2fc2661975682b3683948cc4b7445bd0e

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 # CHANGELOG.md
 
 
+## fugit 1.5.2 released 2021-09-18
+
+* Simplify inc_day, gh-62
+
+
+## fugit 1.5.1 released 2021-08-18
+
+* Fix #next_time break issue for America/Santiago into DST, gh-60
+
+
+## fugit 1.5.0 released 2021-06-08
+
+* Accept "at 12 noon" and "at 12 midday" as "* 12 * * *", gh-57
+* Accept "at 12pm" as "0 12 * * *", not "0 24 * * *", gh-57
+* Accept "15/30 * * * *" as "15-59/30 * * * *", gh-56
+
+
+## fugit 1.4.5 released 2021-04-22
+
+* Accept "* * * Mon%2+2", gh-47
+
+
 ## fugit 1.4.4 released 2021-03-25
 
 * Ensure leaving ZH DST is OK, gh-53

data/CREDITS.md

@@ -1,6 +1,11 @@
 
 # fugit credits
 
+* 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"
+* John W Higgins https://github.com/wishdev gh-56, 15/30 cron decision
+* Karen Sawrey https://github.com/karensawrey gh-47, Mon%2+1 rework idea
 * Olle Jonsson https://github.com/olleolleolle gha Ruby 3.0
 * Andy Pfister https://github.com/andyundso gh-53, entering DST
 * Solteszad https://github.com/solteszad gh-51, fix previous_time vs last day of month
@@ -11,7 +16,7 @@
 * 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
-* Jessica Stokes https://github.com/ticky 0-24 issue with cron, gh-30
+* Jessica Stokes https://github.com/ticky 0-24 issue with cron, gh-30 and gh-47
 * Shai Coleman https://github.com/shaicoleman parse_nat enhancements, gh-24, gh-25, gh-28, and gh-37
 * Jan Stevens https://github.com/JanStevens Fugit.parse('every 15 minutes') gh-22
 * Fabio Pitino https://github.com/hspazio nil on February 30 gh-21

data/README.md

@@ -138,6 +138,8 @@ Example of cron strings understood by fugit:
 # and more...
 ```
 
+Please note that `'15/30 * * * *'` is interpreted as `'15-59/30 * * * *'` since fugit 1.4.6.
+
 ### the first Monday of the month
 
 Fugit tries to follow the `man 5 crontab` documentation.
@@ -203,8 +205,22 @@ p EtOrbi.parse('2019-01-01').rweek % 2  # => 1
 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
+
+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
+
+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
+
+# ...
 ```
 
+`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`
+
 
 ## `Fugit::Duration`
 

data/lib/fugit/cron.rb

@@ -83,18 +83,33 @@ module Fugit
       def dec(i); inc(-i); end
 
       def inc_month
+
         y = @t.year
         m = @t.month + 1
         if m == 13; m = 1; y += 1; end
+
         @t = ::EtOrbi.make(y, m, @t.zone)
+
         self
       end
 
       def inc_day
+
         inc((24 - @t.hour) * 3600 - @t.min * 60 - @t.sec)
-        #inc( - @t.hour * 3600) if @t.hour != 0 # compensate for entering DST
-        inc( - @t.hour * 3600) if @t.hour > 0 && @t.hour < 7
+
+        return if @t.hour == 0
+
+        if @t.hour < 12
+          begin
+            @t = ::EtOrbi.make(@t.year, @t.month, @t.day, @t.zone)
+          rescue ::TZInfo::PeriodNotFound
+            inc((24 - @t.hour) * 3600)
+          end
+        else
+          inc((24 - @t.hour) * 3600)
+        end
       end
+
       def inc_hour
         inc((60 - @t.min) * 60 - @t.sec)
       end
@@ -150,7 +165,7 @@ module Fugit
 
     def weekday_modulo_match?(nt, mod)
 
-      nt.rweek % mod[0] == mod[1]
+      (nt.rweek + mod[1]) % mod[0] == 0
     end
 
     def weekday_match?(nt)
@@ -485,6 +500,8 @@ module Fugit
 
       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?
       return [ sta ] if sta && edn.nil?
 

data/lib/fugit/nat.rb

@@ -201,7 +201,7 @@ module Fugit
       end
 
       def ampm(i)
-        rex(:ampm, i, /[ \t]*(am|pm)/i)
+        rex(:ampm, i, /[ \t]*(am|pm|noon|midday|midnight)/i)
       end
       def dark(i)
         rex(:dark, i, /[ \t]*dark/i)
@@ -473,17 +473,21 @@ module Fugit
         slot(:monthday, "#{md0}-#{md1}")
       end
 
+      def adjust_h(h, ap)
+        h = h.to_i
+        ap = ap || ''
+        (h < 12 && ap == 'pm' || ap == 'midnight') ? h + 12 : h
+      end
+
       def rewrite_digital_hour(t)
         h, m, ap = t.strinpd.split(/[: \t]+/)
-        h, m = h.to_i, m.to_i
-        h += 12 if ap && ap == 'pm'
-        slot(:hm, h.to_i, m.to_i)
+        h, m = adjust_h(h, ap), m.to_i
+        slot(:hm, h, m)
       end
 
       def rewrite_simple_hour(t)
         h, ap = t.subgather(nil).collect(&:strinpd)
-        h = h.to_i
-        h = h + 12 if ap == 'pm'
+        h = adjust_h(h, ap)
         slot(:hm, h, 0)
       end
 
@@ -500,7 +504,7 @@ module Fugit
         m = NMINUTES[m] || m
 #p [ 1, '-->', h, m ]
 
-        h += 12 if h < 13 && apt && apt.strinpd == 'pm'
+        h = adjust_h(h, apt && apt.strinpd)
 
         slot(:hm, h, m)
       end

data/lib/fugit.rb

@@ -2,7 +2,7 @@
 
 module Fugit
 
-  VERSION = '1.4.4'
+  VERSION = '1.5.2'
 end
 
 require 'time'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.2
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: time tools for flor