fugit 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea3f936965644ad47a2baf7b60d8a16825e8a92966bb5d4ca205f6f77205b0b
-  data.tar.gz: 00d9608f82444554090bf4839b93b8e2a5196ed6fab378770d06de49bf478a41
+  metadata.gz: fe81053d0e3bb0538a7ca7bc780aaa639101ffcaffc990269e1ae3444a159758
+  data.tar.gz: 1e3ff923022521df2db2eca790fa6f61d688e06925a0d73aeda3b7dead09f898
 SHA512:
-  metadata.gz: 1fe5f2034b40d4441c76e36075d9c9a6a31a54ac5c82e9c2961304f58875f75a2d63acd91a264f175b4ec16b74e98e46bd82bbd6e79619c2bd8f469804a4119b
-  data.tar.gz: 1668baf1ece5ab7d1a8198c67b4d659ab0f900113c7511761cb68242b13f9e4af581d109e46a523260aa9b55ec9d2442da47f680cd5c1794d03efebf5a81ba84
+  metadata.gz: 4e6be88654cfcd12a9cf58e9aedc9ceafa1128c28589c72c878aa610624891d9f1cbd8185e17dd71e127449ab57ba08eda0f07e500a73ca4e293e2a925877e6b
+  data.tar.gz: 1730c644df07fd0bb2453b8a5964904eac450cbffcdf48ae0002d37a5c5dca378740c54e2581b1becca42b1a1a64ad6dc1d47da940efabe338bea10c9d9508d3

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 # CHANGELOG.md
 
 
+## fugit 1.6.0 release 2022-08-25
+
+* Ensure input strings are stripped before parsing, gh-74
+
+
+## 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

data/CREDITS.md

@@ -1,6 +1,10 @@
 
 # fugit credits
 
+* John Bachir, https://github.com/jjb, gh-74
+* Vivek Miyani, https://github.com/vivekmiyani, gh-71
+* Peter Goldstein, https://github.com/petergoldstein infra, gh-65, -72
+* 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

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

@@ -32,11 +32,12 @@ The intersection of those two projects is where fugit is born:
 ### Projects using fugit
 
 * [arask](https://github.com/Ebbe/arask) - "Automatic RAils taSKs" uses fugit to parse cron strings
-* [sideqik-cron](https://github.com/ondrejbartas/sidekiq-cron) - recent versions of Sideqik-Cron use fugit to parse cron strings
+* [sidekiq-cron](https://github.com/ondrejbartas/sidekiq-cron) - recent versions of Sidekiq-Cron use fugit to parse cron strings
 * [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
+* [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

@@ -38,7 +38,7 @@ module Fugit
         return nil unless s.is_a?(String)
 
 #p s; Raabro.pp(Parser.parse(s, debug: 3), colors: true)
-        h = Parser.parse(s)
+        h = Parser.parse(s.strip)
 
         return nil unless h
 
@@ -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 ]
@@ -97,14 +99,14 @@ module Fugit
 
         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
-          # leads to gh-60...
+        return if @t.hour == 0
 
-        if @t.hour == 0
-          # it's good, carry on...
-        elsif @t.hour < 12
-          @t = ::EtOrbi.make(@t.year, @t.month, @t.day, @t.zone)
+        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
@@ -620,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/nat.rb

@@ -15,6 +15,8 @@ module Fugit
 
         return nil unless s.is_a?(String)
 
+        s = s.strip
+
 #p s; Raabro.pp(Parser.parse(s, debug: 3), colours: true)
 #(p s; Raabro.pp(Parser.parse(s, debug: 1), colours: true)) rescue nil
 

data/lib/fugit.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2022-08-25 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.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: time tools for flor