fugit 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0e67fe1fbf7a5e0213b828cc78c59d6cf5b36a6e
-  data.tar.gz: 920ea06ef202094e9b1c9c719fb06c55e0926b51
+SHA256:
+  metadata.gz: a10a8afb99cf16856e53766a86b1f0d13ddb0d2784c756cb525ceea8fbae7bd1
+  data.tar.gz: dcd1d01a8f5f8fc819854f430e12fc6bf69850e64060cffbe93c595be78785a2
 SHA512:
-  metadata.gz: d6f4c28d4e280b73a0b5a3c6bae84e328e06fa33cb573bc8fc1a3660e1c921dd666c793fd17a18f10bc4d630d5db2473c2d75659def60bb6fd7342c9e3dfbb51
-  data.tar.gz: 40ae39ba32717fcc2d0148d2e4a63a2cd179fa61ef5de13670057021b77a95c9bec1ae7f299a3117602e63a1b02c5b1de683748ef793fa74ec394a4a7861992c
+  metadata.gz: 4b29f59bffe4f786b90c0f0a42c26c682e78b523183863f7cfc8c486ecca9056bb96f5eae92b2ee9446ece5c84a10aeddd9a52077eece5357af8985853da99ee
+  data.tar.gz: a32ac9539496ff7f4bc1949f97eeefcf836a8f1607569080acafd2d338befd7cb97e10179ffee06d2da3ebead95830147f5f418a883a4bd2a77f549455761788

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## fugit 1.3.4 released 2020-04-06
+
+* Prevent #rough_frequency returning 0, gh-36
+
+
 ## fugit 1.3.3 released 2019-08-29
 
 * Fix Cron#match?(t) with respect to the cron's timezone, gh-31

data/CREDITS.md

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

data/LICENSE.txt

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

@@ -31,7 +31,7 @@ build: gemspec_validate
 	mv $(NAME)-$(VERSION).gem pkg/
 
 push: build
-	gem push pkg/$(NAME)-$(VERSION).gem
+	gem push --otp "$(OTP)" pkg/$(NAME)-$(VERSION).gem
 
 spec:
 	bundle exec rspec

data/README.md

@@ -36,6 +36,7 @@ The intersection of those two projects is where fugit is born:
 * [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) -
 * [flor](https://github.com/floraison/flor) - used in the [cron](https://github.com/floraison/flor/blob/master/doc/procedures/cron.md) procedure
 * [que-scheduler](https://github.com/hlascelles/que-scheduler) - a reliable job scheduler for [que](https://github.com/chanks/que)
+* [serial_scheduler](https://github.com/grosser/serial_scheduler) - ruby task scheduler without threading
 * ...
 
 ## `Fugit.parse(s)`
@@ -137,6 +138,49 @@ Example of cron strings understood by fugit:
 # and more...
 ```
 
+### the first Monday of the month
+
+Fugit tries to follow the `man 5 crontab` documentation.
+
+There is a surprising thing about this canon, all the columns are joined by ANDs, except for monthday and weekday which are joined together by OR if they are both set (they are not `*`).
+
+Many people (me included) [are suprised](https://superuser.com/questions/428807/run-a-cron-job-on-the-first-monday-of-every-month) when they try to specify "at 05:00 on the first Monday of the month" as `0 5 1-7 * 1` or `0 5 1-7 * mon` and the results are off.
+
+The man page says:
+
+> Note: The day of a command's execution can be specified by
+> two fields -- day of month, and day of week. If both fields
+> are restricted (ie, are not *), the command will be run when
+> either field matches the current time.
+> For example, ``30 4 1,15 * 5'' would cause a command to be run
+> at 4:30 am on the 1st and 15th of each month, plus every Friday.
+
+Fugit follows this specification.
+
+There is a solution though, please read on.
+
+### the hash extension
+
+Fugit understands `0 5 * * 1#1` or `0 5 * * mon#1` as "each first Monday of the month, at 05:00".
+
+```ruby
+'0 5 * * 1#1'    #
+'0 5 * * mon#1'  # the first Monday of the month at 05:00
+
+'0 6 * * 5#4,5#5'      #
+'0 6 * * fri#4,fri#5'  # the 4th and 5th Fridays of the month at 06:00
+
+'0 7 * * 5#-1'    #
+'0 7 * * fri#-1'  # the last Friday of the month at 07:00
+
+'0 7 * * 5#L'       #
+'0 7 * * fri#L'     #
+'0 7 * * 5#last'    #
+'0 7 * * fri#last'  # the last Friday of the month at 07:00
+
+'0 23 * * mon#2,tue'  # the 2nd Monday of the month and every Tuesday, at 23:00
+```
+
 ### the modulo extension
 
 Fugit, since 1.1.10, also understands cron strings like "`9 0 * * sun%2`" which can be read as "every other Sunday at 9am".
@@ -145,7 +189,7 @@ For odd Sundays, one can write `9 0 * * sun%2+1`.
 
 It can be combined, as in `9 0 * * sun%2,tue%3+2`
 
-But what does it references to? It starts at 1 on 2019-01-01.
+But what does it reference to? It starts at 1 on 2019-01-01.
 
 ```ruby
 require 'et-orbi' # >= 1.1.8

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -188,6 +188,17 @@ module Fugit
 
       return weekday_match?(nt) || monthday_match?(nt) \
         if @weekdays && @monthdays
+          #
+          # From `man 5 crontab`
+          #
+          # Note: The day of a command's execution can be specified
+          # by two fields -- day of month, and day of week.
+          # If both fields are restricted (ie, are not *), the command will be
+          # run when either field matches the current time.
+          # For example, ``30 4 1,15 * 5'' would cause a command to be run
+          # at 4:30 am on the 1st and 15th of each month, plus every Friday.
+          #
+          # as seen in gh-5 and gh-35
 
       return false unless weekday_match?(nt)
       return false unless monthday_match?(nt)
@@ -336,6 +347,7 @@ module Fugit
         return (a + [ a.first + v1 ])
           .each_cons(2)
           .collect { |a0, a1| a1 - a0 }
+          .select { |d| d > 0 } # weed out zero deltas
           .min * v0
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -117,8 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: time tools for flor