fugit 1.5.0 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae056967c15463b2aed7a2839f383b9965968ae19414d214f37841ccabdeb7e5
-  data.tar.gz: 33ddf5842af78f3bba3a477800dfde053bee82cde318575f7c78d3e25df8e910
+  metadata.gz: fd6f6af6264734f4eb10d5aa8e88cbcfbca029fb697f20b7a0ae37d220c55653
+  data.tar.gz: 25606c4f975d71350a360f4feb092a54f88bbb022fef31e4eb13c22d98b36b8f
 SHA512:
-  metadata.gz: 13c7b00c76df998cac5c3ab8e754e7519b34c91c4653afa2da3d036d874c020ad10b34d596e20147f0d3c73e8b3904197896d0dd914b093e571d2e699df44632
-  data.tar.gz: 59422402187e49a0ffe1b53f4798f3cab4427aa734bad7cfac8eafdb001e08728a7577f7c5f83ad197a3eaa06007c3a871714ccc8036fca1cf6361a3ed9f7a23
+  metadata.gz: 253c2fc474a22ff93caa8b1f465af16565ab8b69037f7e83dc1e42719085d95342ee9d7a43200bdb05bcc9815dc29f590c5d86df51b7f526e25bb6d96dd4ef02
+  data.tar.gz: '0951e692d8026d3a66c374e99f872bd03270f77e93232bbbecefac44c8b9b17253b46218dbb36f9f009441bb6d602c04f40dad7782df31674e26244c1ce59055'

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 # CHANGELOG.md
 
 
+## fugit 1.5.3 released 2022-04-02
+
+* Fix Fugit::Cron.to_s vs "0 13 * * wed%2", gh-68
+
+
+## fugit 1.5.2 released 2021-09-18
+
+* Simplify inc_day, gh-62
+
+
+## fugit 1.5.1 released 2021-08-18
+
+* Fix #next_time break issue for America/Santiago into DST, gh-60
+
+
 ## fugit 1.5.0 released 2021-06-08
 
 * Accept "at 12 noon" and "at 12 midday" as "* 12 * * *", gh-57

data/CREDITS.md

@@ -1,6 +1,9 @@
 
 # fugit credits
 
+* Peter Goldstein, https://github.com/petergoldstein GHA 3.3 j9.3, gh-65
+* Pascal Zumkehr https://github.com/codez gh-62, Santiago into DST vs Time.zone
+* Ggallardoh https://github.com/Ggallardoh gh-60, America/Santiago into DST
 * 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

data/LICENSE.txt

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

@@ -37,6 +37,7 @@ The intersection of those two projects is where fugit is born:
 * [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
+* [delayed_cron_job](https://github.com/codez/delayed_cron_job) - an extension to Delayed::Job that allows you to set cron expressions for your jobs
 * ...
 
 ## `Fugit.parse(s)`

data/fugit.gemspec

@@ -41,7 +41,7 @@ Time tools for flor and the floraison project. Cron parsing and occurrence compu
     # this dependency appears in 'et-orbi'
 
   s.add_runtime_dependency 'raabro', '~> 1.4'
-  s.add_runtime_dependency 'et-orbi', '~> 1.1', '>= 1.1.8'
+  s.add_runtime_dependency 'et-orbi', '~> 1', '>= 1.2.7'
 
   s.add_development_dependency 'rspec', '~> 3.8'
   s.add_development_dependency 'chronic', '~> 0.10'

data/lib/fugit/cron.rb

@@ -60,7 +60,7 @@ module Fugit
         (@hours || [ '*' ]).join(','),
         (@monthdays || [ '*' ]).join(','),
         (@months || [ '*' ]).join(','),
-        (@weekdays || [ [ '*' ] ]).map { |d| d.compact.join('#') }.join(','),
+        weekdays_to_cron_s,
         @timezone ? @timezone.name : nil
           ].compact.join(' ')
     end
@@ -74,6 +74,8 @@ module Fugit
       end
 
       def time; @t; end
+      def to_t; @t; end
+        #
       def to_i; @t.to_i; end
 
       %w[ year month day wday hour min sec wday_in_month rweek rday ]
@@ -83,18 +85,33 @@ module Fugit
       def dec(i); inc(-i); end
 
       def inc_month
+
         y = @t.year
         m = @t.month + 1
         if m == 13; m = 1; y += 1; end
+
         @t = ::EtOrbi.make(y, m, @t.zone)
+
         self
       end
 
       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
+
+        return if @t.hour == 0
+
+        if @t.hour < 12
+          begin
+            @t = ::EtOrbi.make(@t.year, @t.month, @t.day, @t.zone)
+          rescue ::TZInfo::PeriodNotFound
+            inc((24 - @t.hour) * 3600)
+          end
+        else
+          inc((24 - @t.hour) * 3600)
+        end
       end
+
       def inc_hour
         inc((60 - @t.min) * 60 - @t.sec)
       end
@@ -605,6 +622,24 @@ module Fugit
       @zone, @timezone = z
     end
 
+    def weekdays_to_cron_s
+
+      return '*' unless @weekdays
+
+      @weekdays
+        .collect { |a|
+          if a.length == 1
+            a[0].to_s
+          elsif a[1].is_a?(Array)
+            a11 = a[1][1]
+            off = (a11 < 0) ? a11.to_s : (a11 > 0) ? "+#{a11}" : ''
+            "#{a[0]}%#{a[1][0]}" + off
+          else
+            a.collect(&:to_s).join('#')
+          end }
+        .join(',')
+    end
+
     module Parser include Raabro
 
       WEEKDAYS =

data/lib/fugit.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+
 module Fugit
 
-  VERSION = '1.5.0'
+  VERSION = '1.5.3'
 end
 
 require 'time'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.3
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2022-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: time tools for flor