fugit 1.4.3 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30b1280ebc1d629dbbdcba1b02718a535b0fdec70c9d690f3d5208181ffe4577
-  data.tar.gz: 918af2ece3f4c94eb1145b60da397a43ee574023831bae4b7c0b95e6a97e389b
+  metadata.gz: 8ea3f936965644ad47a2baf7b60d8a16825e8a92966bb5d4ca205f6f77205b0b
+  data.tar.gz: 00d9608f82444554090bf4839b93b8e2a5196ed6fab378770d06de49bf478a41
 SHA512:
-  metadata.gz: 37b8ad132efdd2b9be99fb9fd1ab6f505024fd309865cf007d9ade6df20207a4165e49679a4113614010f7436ddbf28e2fc6ecbdbbedc713bb3e4def3f2b03ca
-  data.tar.gz: 4fc6e3a8f080b698151cc6dadfb1d2869cb736a4e6c60ce7fe6c26a598f83b693d32f37edd1f42cd20dd0efdb47dd04cde097fca07d0bf5fe6eb9412b72ef0cf
+  metadata.gz: 1fe5f2034b40d4441c76e36075d9c9a6a31a54ac5c82e9c2961304f58875f75a2d63acd91a264f175b4ec16b74e98e46bd82bbd6e79619c2bd8f469804a4119b
+  data.tar.gz: 1668baf1ece5ab7d1a8198c67b4d659ab0f900113c7511761cb68242b13f9e4af581d109e46a523260aa9b55ec9d2442da47f680cd5c1794d03efebf5a81ba84

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 # CHANGELOG.md
 
 
+## 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
+
+
 ## fugit 1.4.3 released 2021-03-23
 
 * Fix entering DST issue, gh-53

data/CREDITS.md

@@ -1,6 +1,11 @@
 
 # fugit credits
 
+* 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
 * Niklas https://github.com/gr8bit gh-49, Fugit::Cron.parse('')
@@ -10,7 +15,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.rb

@@ -2,7 +2,7 @@
 
 module Fugit
 
-  VERSION = '1.4.3'
+  VERSION = '1.5.1'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -83,17 +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 # compensate for entering DST
+        #inc( - @t.hour * 3600) if @t.hour > 0 && @t.hour < 7
+          # leads to gh-60...
+
+        if @t.hour == 0
+          # it's good, carry on...
+        elsif @t.hour < 12
+          @t = ::EtOrbi.make(@t.year, @t.month, @t.day, @t.zone)
+        else
+          inc((24 - @t.hour) * 3600)
+        end
       end
+
       def inc_hour
         inc((60 - @t.min) * 60 - @t.sec)
       end
@@ -149,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)
@@ -484,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-08-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