fugit 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6c020a2dc2dea8ee73eae196c502e1353839f84
-  data.tar.gz: d4d43e932e0e4de4d07d402db975bf2a642df687
+  metadata.gz: a1f0b03b24c2f3467b85203b569060a3bd1e43e5
+  data.tar.gz: d7b5598b726f4dfc49e9ab73bc970ce4e02e6944
 SHA512:
-  metadata.gz: 7c7f5319195ca991c848826b336023f429fc21ad033b26d67b7011872b91d1e9f8fb639b2618eda9dd1e199d7e473599e356924f302bb5cbaba20817aa6ab050
-  data.tar.gz: 4358df79feebbdb50509b78735fad8210d5c3d001d6a0b3d5a85aa375be08605816ea87510abc8188b5e42d091cd4d47af91a18061d956dc10a115fd9397c7eb
+  metadata.gz: 3e6b92e0d2805d0bc4cc109342d7e4692b460e9d805ffff44c17bd645bddf88ea78f51b9d092fce6cbfb7ff31f62ca53dd88f009cc25c1759210e26c267d065c
+  data.tar.gz: 52b960a0e3ceb3e0fdaec890e4b8731bc17a25bce5d161cfdfbb1b7a5d7ddc6126284bffa7262239c557e150b7b58fcccb9fff5188c1306ec2ba18d1ca7f00a3

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## fugit 1.3.2 released 2019-08-14
+
+* Allow for "* 0-24 * * *", gh-30
+
+
 ## fugit 1.3.1 released 2019-07-27
 
 * Fix nat parsing for 'every day at 18:00 and 18:15', gh-29

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* Jessica Stokes https://github.com/ticky 0-24 issue with cron, gh-30
 * Shai Coleman https://github.com/shaicoleman parse_nat enhancements, gh-24, gh-25, and gh-28
 * 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

@@ -63,7 +63,7 @@ Fugit.parse('nada')
 ## `Fugit.do_parse(s)`
 
 `Fugit.do_parse(s)` is equivalent to `Fugit.parse(s)`, but instead of returning nil, it raises an error if the given string contains no time information.
-```
+```ruby
 Fugit.do_parse('nada')
   # ==> /home/jmettraux/w/fugit/lib/fugit/parse.rb:32
   #     :in `do_parse': found no time information in "nada" (ArgumentError)
@@ -184,10 +184,12 @@ p d.to_long_s  # => "2 years, 2 months, 1 day, and 5 hours"
 d += 3600
 
 p d.to_plain_s  # => "2Y2M1D5h3600s"
+
+p Fugit::Duration.parse('1y2M1d4h').to_sec # => 36820800
 ```
 
 The `to_*_s` methods are also available as class methods:
-```
+```ruby
 p Fugit::Duration.to_plain_s('1y2M1d4h')
   # => "1Y2M1D4h"
 p Fugit::Duration.to_iso_s('1y2M1d4h')

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -497,23 +497,28 @@ module Fugit
 
       loop do
 
-#p({ cur: cur })
         a << cur
         break if cur == edn
 
         cur += 1
-        cur = min if cur > max
-#p cur
+        if cur > max
+          cur = min
+          edn = edn - max - 1 if edn > max
+        end
 
         fail RuntimeError.new(
           "too many loops for " +
           { min: omin, max: omax, sta: sta, edn: edn, sla: sla }.inspect +
           " #range, breaking, " +
           "please fill an issue at https://git.io/fjJC9"
-        ) if a.length > omax
+        ) if a.length > 2 * omax
+          # there is a #uniq afterwards, hence the 2* for 0-24 and friends
       end
 
-      a.each_with_index.select { |e, i| i % sla == 0 }.collect(&:first)
+      a.each_with_index
+        .select { |e, i| i % sla == 0 }
+        .collect(&:first)
+        .uniq
     end
 
     def compact(key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-27 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro