fugit 1.7.2 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d28dc94bc31e025df55b67c79f2f59eed365940872e287479e788cb9023178dd
-  data.tar.gz: 6f8d62b8d8921831a4de92d60a23c4cf83cfe79eea852c625744951156cb3d05
+  metadata.gz: b1839fa07acc6287be95f8076c19afa2c9d6c9b5500ac1b03febab61959b5057
+  data.tar.gz: 839ff5c0f85ccd51625febfdbfedd017e46962d288cf313307b706830dc838c9
 SHA512:
-  metadata.gz: 3afc5fd6553abed3c73d7526e25b871ba0f5f26b8f415fccfec183b261e5ccb4e9f3fc6b176b550fa47de385f8991efe08936d2d96d6951a15dba81533f2ebcc
-  data.tar.gz: e5cbdb64a9f6ee28e8f938c76dcdf44211ce751ca0dc1834d669b8494e40424fb7c5e8e98f7eb608e8855c29648b9c99e9faf06436ab05a795a87bffc771118c
+  metadata.gz: 5336bf251441fa3f7372d48aec2196cf86831b24c64110955f2ccf2df2e6e1ec84a68b318b53be8282f87794f40c09778bddd47abec3f65fe1469544a758fabb
+  data.tar.gz: 0fdd70455097838c21c3f03c9dca20889b4aba07f67d790136e40be2d8686b0a6ad8a594fff1fe28e7cd4d322ad66a8a31aa71750cd435c7601345487ae89bdb

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 # CHANGELOG.md
 
 
+## fugit 1.8.1 released 2023-01-20
+
+* Fix for month subtraction, gh-84, @mreinsch
+* Fix duration - time, gh-85, @mreinsch
+
+
+## fugit 1.8.0 released 2022-12-06
+
+* Introduce Fugit.parse_cronish and .do_parse_cronish, gh-70
+
+
 ## fugit 1.7.2 released 2022-11-03
 
 * Fix 'every day at 12:15 am', gh-81

data/CREDITS.md

@@ -1,6 +1,8 @@
 
 # fugit credits
 
+* Michael Reinsch, https://github.com/mreinsch, gh-84 and gh-85
+* Marc Anguera, https://github.com/markets, gh-70 and Sidekiq-Cron
 * ski-nine, https://github.com/ski-nine, gh-81
 * Joseph Halter, https://github.com/JosephHalter, gh-79
 * James Healy, https://github.com/yob, gh-76

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2017-2022, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2017-2023, 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

@@ -89,6 +89,25 @@ Fugit.parse_nat('every day at noon').class  # ==> ::Fugit::Cron
 
 As `Fugit.parse(s)` returns nil when it doesn't grok its input, and `Fugit.do_parse(s)` fails when it doesn't grok, each of the `parse_` methods has its partner `do_parse_` method.
 
+## parse_cronish and do_parse_cronish
+
+Sometimes you know a cron expression or an "every" natural expression will come in and you want to discard the rest.
+
+```
+require 'fugit'
+
+Fugit.parse_cronish('0 0 1 jan *').class             # ==> ::Fugit::Cron
+Fugit.parse_cronish('every saturday at noon').class  # ==> ::Fugit::Cron
+
+Fugit.parse_cronish('12y12M')        # ==> nil
+```
+
+`.parse_cronish(s)` will return a `Fugit::Cron` instance or else nil.
+
+`.do_parse_cronish(s)` will return a `Fugit::Cron` instance or else fail with an `ArgumentError`.
+
+Introduced in fugit 1.8.0.
+
 ## `Fugit::Cron`
 
 A class `Fugit::Cron` to parse cron strings and then `#next_time` and `#previous_time` to compute the next or the previous occurrence respectively.

data/lib/fugit/duration.rb

@@ -68,8 +68,10 @@ module Fugit
       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
-    INFLA_KEYS, NON_INFLA_KEYS =
-      KEYS.partition { |k, v| v[:I] }.freeze
+
+    INFLA_KEYS, NON_INFLA_KEYS = KEYS
+      .partition { |k, v| v[:I] }
+      .collect(&:freeze)
 
     def _to_s(key)
 
@@ -240,7 +242,7 @@ module Fugit
           n, m = at[1] / 12, at[1] % 12
           at[0], at[1] = at[0] + n, m
         elsif at[1] < 1
-          n, m = -at[1] / 12, -at[1] % 12
+          n, m = (-at[1]) / 12 + 1, (11+at[1]) % 12 + 1
           at[0], at[1] = at[0] - n, m
         end
 
@@ -269,7 +271,7 @@ module Fugit
       when Numeric then add_numeric(-a)
       when Fugit::Duration then add_duration(-a)
       when String then add_duration(-self.class.parse(a))
-      when ::Time, ::EtOrbi::EoTime then add_to_time(a)
+      when ::Time, ::EtOrbi::EoTime then opposite.add_to_time(a)
       else fail ArgumentError.new(
         "cannot subtract #{a.class} instance to a Fugit::Duration")
       end

data/lib/fugit/parse.rb

@@ -33,6 +33,19 @@ module Fugit
       fail(ArgumentError.new("found no time information in #{s.inspect}"))
     end
 
+    def parse_cronish(s, opts={})
+
+      r = parse_cron(s) || parse_nat(s, opts)
+
+      r.is_a?(::Fugit::Cron) ? r : nil
+    end
+
+    def do_parse_cronish(s, opts={})
+
+      parse_cronish(s) ||
+      fail(ArgumentError.new("not cron or 'natural' cron string: #{s.inspect}"))
+    end
+
     def determine_type(s)
 
       case self.parse(s)

data/lib/fugit.rb

@@ -3,7 +3,7 @@
 
 module Fugit
 
-  VERSION = '1.7.2'
+  VERSION = '1.8.1'
 end
 
 require 'time'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro