fugit 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0c9e5123de2ba25d006290c43946a4028fc3467ec3f424bf57b23ce5c41cd65
-  data.tar.gz: c9f6a5bdc8d40e7b6c585dca633066df98ff22b298c9158c333c54c2fbb2bab3
+  metadata.gz: ae056967c15463b2aed7a2839f383b9965968ae19414d214f37841ccabdeb7e5
+  data.tar.gz: 33ddf5842af78f3bba3a477800dfde053bee82cde318575f7c78d3e25df8e910
 SHA512:
-  metadata.gz: 9135ff881b272674fb1768d2548efca04541f1aab790b04c6a9e060e172c722df7c73bd9dc98a221f7ab4e566b4600cb7e3f667ced5fbc92d7683667c7ab1c21
-  data.tar.gz: 0f6e3113b06d2bc287a608f6215c3a902e3eedf410f6c83e5e7d9da79122b6562f9d400d3cf19f1cc45b662b72e1d740115aedf0502f9552e8af6bdb39db750f
+  metadata.gz: 13c7b00c76df998cac5c3ab8e754e7519b34c91c4653afa2da3d036d874c020ad10b34d596e20147f0d3c73e8b3904197896d0dd914b093e571d2e699df44632
+  data.tar.gz: 59422402187e49a0ffe1b53f4798f3cab4427aa734bad7cfac8eafdb001e08728a7577f7c5f83ad197a3eaa06007c3a871714ccc8036fca1cf6361a3ed9f7a23

data/CHANGELOG.md

@@ -2,6 +2,34 @@
 # CHANGELOG.md
 
 
+## 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
+
+
+## fugit 1.4.2 released 2021-01-12
+
+* Fix Fugit::Cron.previous_time vs last day of month, gh-51
+* Let Fugit::Cron.parse('') return nil, gh-49
+
+
 ## fugit 1.4.1 released 2020-11-25
 
 * Suppress warning, gh-46, thanks @amatsuda

data/CREDITS.md

@@ -1,13 +1,20 @@
 
 # fugit credits
 
+* 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('')
 * 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
 * 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/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2017-2020, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2017-2021, John Mettraux, jmettraux+flor@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,7 +1,7 @@
 
 # fugit
 
-[![Build Status](https://secure.travis-ci.org/floraison/fugit.svg)](http://travis-ci.org/floraison/fugit)
+[![tests](https://github.com/floraison/fugit/workflows/test/badge.svg)](https://github.com/floraison/fugit/actions)
 [![Gem Version](https://badge.fury.io/rb/fugit.svg)](http://badge.fury.io/rb/fugit)
 [![Join the chat at https://gitter.im/floraison/fugit](https://badges.gitter.im/floraison/fugit.svg)](https://gitter.im/floraison/fugit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -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`
 
@@ -350,6 +366,10 @@ Fugit::Nat.parse('every day at 16:15 nada 18:30', multi: true)
 
 `multi: false` is the default behaviour, return a single `Fugit::Cron` instance or nil when it cannot parse.
 
+### Nat Midnight
+
+`"Every day at midnight"` is supported, but `"Every monday at midnight"` will be interpreted (as of Fugit <= 1.4.x) as `"Every monday at 00:00"`. Sorry about that.
+
 
 ## LICENSE
 

data/lib/fugit.rb

@@ -2,7 +2,7 @@
 
 module Fugit
 
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -79,10 +79,7 @@ module Fugit
       %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)
-        @t = @t + i
-        self
-      end
+      def inc(i); @t = @t + i; self; end
       def dec(i); inc(-i); end
 
       def inc_month
@@ -95,6 +92,8 @@ module Fugit
 
       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
       end
       def inc_hour
         inc((60 - @t.min) * 60 - @t.sec)
@@ -112,12 +111,7 @@ module Fugit
       end
 
       def dec_month
-
-        #dec(@t.day * 24 * 3600 + @t.hour * 3600 + @t.min * 60 + @t.sec + 1)
-          #
-          # gh-18, so that '0 9 29 feb *' doesn't get skipped (over and over)
-          #
-        dec(@t.day * 24 * 3600 + 1)
+        dec((@t.day - 1) * DAY_S + @t.hour * 3600 + @t.min * 60 + @t.sec + 1)
       end
 
       def dec_day
@@ -156,7 +150,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)
@@ -337,7 +331,7 @@ module Fugit
       [ :seconds, 1, 60 ],
       [ :minutes, 60, 60 ],
       [ :hours, 3600, 24 ],
-      [ :days, 24 * 3600, 365 ] ].freeze
+      [ :days, DAY_S, 365 ] ].freeze
 
     def rough_frequency
 
@@ -379,7 +373,7 @@ module Fugit
 
         @delta_min = deltas.min; @delta_max = deltas.max
         @occurrences = deltas.size
-        @span_years = span / (365 * 24 * 3600)
+        @span_years = span / YEAR_S
         @yearly_occurrences = @occurrences.to_f / @span_years
       end
 
@@ -491,6 +485,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?
 
@@ -780,8 +776,12 @@ module Fugit
 
       def rewrite_cron(t)
 
-        hcron = t
+        st = t
           .sublookup(nil) # go to :ccron or :scron
+
+        return nil unless st
+
+        hcron = st
           .subgather(nil) # list min, hou, mon, ...
           .inject({}) { |h, tt|
             h[tt.name] = tt.name == :tz ? rewrite_tz(tt) : rewrite_entry(tt)

data/lib/fugit/duration.rb

@@ -61,10 +61,10 @@ module Fugit
     end
 
     KEYS = {
-      yea: { a: 'Y', r: 'y', i: 'Y', s: 365 * 24 * 3600, x: 0, l: 'year' },
-      mon: { a: 'M', r: 'M', i: 'M', s: 30 * 24 * 3600, x: 1, l: 'month' },
-      wee: { a: 'W', r: 'w', i: 'W', s: 7 * 24 * 3600, I: true, l: 'week' },
-      day: { a: 'D', r: 'd', i: 'D', s: 24 * 3600, I: true, l: 'day' },
+      yea: { a: 'Y', r: 'y', i: 'Y', s: YEAR_S, x: 0, l: 'year' },
+      mon: { a: 'M', r: 'M', i: 'M', s: 30 * DAY_S, x: 1, l: 'month' },
+      wee: { a: 'W', r: 'w', i: 'W', s: 7 * DAY_S, I: true, l: 'week' },
+      day: { a: 'D', r: 'd', i: 'D', s: DAY_S, I: true, l: 'day' },
       hou: { a: 'h', r: 'h', i: 'H', s: 3600, I: true, l: 'hour' },
       min: { a: 'm', r: 'm', i: 'M', s: 60, I: true, l: 'minute' },
       sec: { a: 's', r: 's', i: 'S', s: 1, I: true, l: 'second' } }.freeze

data/lib/fugit/misc.rb

@@ -2,6 +2,9 @@
 
 module Fugit
 
+  DAY_S = (24 * 3600).freeze
+  YEAR_S = (365 * DAY_S).freeze
+
   class << self
 
     def isostamp(show_date, show_time, show_usec, time)

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.1
+  version: 1.5.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro