fugit 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a2fdae36b04308242e58a5da6b2d5e65e749cb10b02d0d408988611067e46b
-  data.tar.gz: 19d7a91ec345a2b35c1b7568e3a6cfe4e70fc6f780e0332972507bbef6bda0e7
+  metadata.gz: 30b1280ebc1d629dbbdcba1b02718a535b0fdec70c9d690f3d5208181ffe4577
+  data.tar.gz: 918af2ece3f4c94eb1145b60da397a43ee574023831bae4b7c0b95e6a97e389b
 SHA512:
-  metadata.gz: 1f5eccb6a96c688390dfdf231ba30812b05bdb22010ff1820b08eae5348809dd5793900c45c073500b8e1358ab90b4e40ee6bfd8badf4838d8e5b13a1d0f1428
-  data.tar.gz: 69fdda6d16c19beebae198a0610d69ab4496f1873b2ee7b825737f635ffd8744d054436f0b51dd372caa45e2945d8051d6a191b89ecd27d3c4a8b72bca59cffa
+  metadata.gz: 37b8ad132efdd2b9be99fb9fd1ab6f505024fd309865cf007d9ade6df20207a4165e49679a4113614010f7436ddbf28e2fc6ecbdbbedc713bb3e4def3f2b03ca
+  data.tar.gz: 4fc6e3a8f080b698151cc6dadfb1d2869cb736a4e6c60ce7fe6c26a598f83b693d32f37edd1f42cd20dd0efdb47dd04cde097fca07d0bf5fe6eb9412b72ef0cf

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## 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

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* 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

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)
 
@@ -350,6 +350,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.2'
+  VERSION = '1.4.3'
 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,7 @@ 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
       end
       def inc_hour
         inc((60 - @t.min) * 60 - @t.sec)
@@ -112,7 +110,7 @@ module Fugit
       end
 
       def dec_month
-        dec((@t.day - 1) * 24 * 3600 + @t.hour * 3600 + @t.min * 60 + @t.sec + 1)
+        dec((@t.day - 1) * DAY_S + @t.hour * 3600 + @t.min * 60 + @t.sec + 1)
       end
 
       def dec_day
@@ -332,7 +330,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
 
@@ -374,7 +372,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
 

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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro