fugit 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1839fa07acc6287be95f8076c19afa2c9d6c9b5500ac1b03febab61959b5057
-  data.tar.gz: 839ff5c0f85ccd51625febfdbfedd017e46962d288cf313307b706830dc838c9
+  metadata.gz: '0099e4aa474e4886e99da33f4b76abd19f259d3a6eb64cd2bfe12f99f6256a23'
+  data.tar.gz: 38c3fbe7b620cc6460f1b7b7d3e96298400c82d7dec7ef9d4b543925dff6e74a
 SHA512:
-  metadata.gz: 5336bf251441fa3f7372d48aec2196cf86831b24c64110955f2ccf2df2e6e1ec84a68b318b53be8282f87794f40c09778bddd47abec3f65fe1469544a758fabb
-  data.tar.gz: 0fdd70455097838c21c3f03c9dca20889b4aba07f67d790136e40be2d8686b0a6ad8a594fff1fe28e7cd4d322ad66a8a31aa71750cd435c7601345487ae89bdb
+  metadata.gz: 75e41e393e779e06ec6280e6e2065877b4771fcca8b63307af13f7fe2407fc9a1fef75eca5a690fe9f3cec6b791deaa4c8b23c925326b24753c5ae8197d5a5bd
+  data.tar.gz: e9ac1c2b0412a9e2549257b1d73490f4319335c847a6faff212dd8c8a9cbaa52787617491d76648763efbd24caffc39a91e08f06910970905dc810ef9fec36cc

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+## fugit 1.9.0 released 2023-10-24
+
+* Let nat parse "last", gh-88
+* Change that I am not sure about, gh-86
+
+
 ## fugit 1.8.1 released 2023-01-20
 
 * Fix for month subtraction, gh-84, @mreinsch

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* Marcos Belluci, https://github.com/delbetu, gh-88 , 1st and last nat
 * 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

data/README.md

@@ -3,7 +3,6 @@
 
 [![tests](https://github.com/floraison/fugit/workflows/test/badge.svg)](https://github.com/floraison/fugit/actions)
 [![Gem Version](https://badge.fury.io/rb/fugit.svg)](http://badge.fury.io/rb/fugit)
-[![Join the chat at https://gitter.im/floraison/fugit](https://badges.gitter.im/floraison/fugit.svg)](https://gitter.im/floraison/fugit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Time tools for [flor](https://github.com/floraison/flor) and the floraison group.
 

data/lib/fugit/cron.rb

@@ -40,8 +40,6 @@ module Fugit
 #p s; Raabro.pp(Parser.parse(s, debug: 3), colors: true)
         h = Parser.parse(s.strip)
 
-        return nil unless h
-
         self.allocate.send(:init, s, h)
       end
 
@@ -488,18 +486,22 @@ module Fugit
 
     def init(original, h)
 
+      return nil unless h
+
       @original = original
       @cron_s = nil # just to be sure
       @day_and = h[:&]
 
-      determine_seconds(h[:sec])
-      determine_minutes(h[:min])
-      determine_hours(h[:hou])
-      determine_monthdays(h[:dom])
-      determine_months(h[:mon])
-      determine_weekdays(h[:dow])
-      determine_timezone(h[:tz])
+      valid =
+        determine_seconds(h[:sec]) &&
+        determine_minutes(h[:min]) &&
+        determine_hours(h[:hou]) &&
+        determine_monthdays(h[:dom]) &&
+        determine_months(h[:mon]) &&
+        determine_weekdays(h[:dow]) &&
+        determine_timezone(h[:tz])
 
+      return nil unless valid
       return nil unless compact_month_days
 
       self
@@ -509,10 +511,12 @@ module Fugit
 
       sta, edn, sla = r
 
+      return false if sla && sla > max
+
       edn = max if sla && edn.nil?
 
-      return [ nil ] if sta.nil? && edn.nil? && sla.nil?
-      return [ sta ] if sta && edn.nil?
+      return nil if sta.nil? && edn.nil? && sla.nil?
+      return sta if sta && edn.nil?
 
       sla = 1 if sla == nil
       sta = min if sta == nil
@@ -563,42 +567,41 @@ module Fugit
         .uniq
     end
 
-    def compact(key)
+    def do_determine(key, arr, min, max)
 
-      arr = instance_variable_get(key)
+      null = false
 
-      return instance_variable_set(key, nil) if arr.include?(nil)
-        # reductio ad astrum
+      r = arr
+        .collect { |v|
+          expand(min, max, v) }
+        .flatten(1)
+        .collect { |e|
+          return false if e == false
+          null = null || e == nil
+          (key == :hours && e == 24) ? 0 : e }
 
-      arr.uniq!
-      arr.sort!
+      return nil if null
+      r.uniq.sort
     end
 
     def determine_seconds(arr)
-      @seconds = (arr || [ 0 ]).inject([]) { |a, s| a.concat(expand(0, 59, s)) }
-      compact(:@seconds)
+      (@seconds = do_determine(:seconds, arr || [ 0 ], 0, 59)) != false
     end
 
     def determine_minutes(arr)
-      @minutes = arr.inject([]) { |a, m| a.concat(expand(0, 59, m)) }
-      compact(:@minutes)
+      (@minutes = do_determine(:minutes, arr, 0, 59)) != false
     end
 
     def determine_hours(arr)
-      @hours = arr
-        .inject([]) { |a, h| a.concat(expand(0, 23, h)) }
-        .collect { |h| h == 24 ? 0 : h }
-      compact(:@hours)
+      (@hours = do_determine(:hours, arr, 0, 23)) != false
     end
 
     def determine_monthdays(arr)
-      @monthdays = arr.inject([]) { |a, d| a.concat(expand(1, 31, d)) }
-      compact(:@monthdays)
+      (@monthdays = do_determine(:monthdays, arr, 1, 31)) != false
     end
 
     def determine_months(arr)
-      @months = arr.inject([]) { |a, m| a.concat(expand(1, 12, m)) }
-      compact(:@months)
+      (@months = do_determine(:months, arr, 1, 12)) != false
     end
 
     def determine_weekdays(arr)
@@ -624,11 +627,15 @@ module Fugit
       @weekdays.uniq!
       @weekdays.sort!
       @weekdays = nil if @weekdays.empty?
+
+      true
     end
 
     def determine_timezone(z)
 
       @zone, @timezone = z
+
+      true
     end
 
     def weekdays_to_cron_s

data/lib/fugit/nat.rb

@@ -642,9 +642,9 @@ module Fugit
           fail(ArgumentError.new(
             "multiple crons in #{opts[:_s].inspect} - #{@slots.inspect}"))
         elsif multi == true
-          hms.collect { |hm| parse_cron(hm) }
+          hms.collect { |hm| parse_cron(hm, opts) }
         else
-          parse_cron(hms.first)
+          parse_cron(hms.first, opts)
         end
       end
 
@@ -678,7 +678,7 @@ module Fugit
           .to_a
       end
 
-      def parse_cron(hm)
+      def parse_cron(hm, opts)
 
         a = [
           slot(:second, '0'),
@@ -691,11 +691,39 @@ module Fugit
         a << tz.data0 if tz
         a.shift if a.first == [ '0' ]
 
+        letters_last = lambda { |x| x.is_a?(Numeric) ? x : 999_999 }
+
         s = a
-          .collect { |e| e.uniq.sort.collect(&:to_s).join(',') }
+          .collect { |e|
+            e.uniq.sort_by(&letters_last).collect(&:to_s).join(',') }
           .join(' ')
 
-        Fugit::Cron.parse(s)
+        c = Fugit::Cron.parse(s)
+
+        if opts[:strict]
+          restrict(a, c)
+        else
+          c
+        end
+      end
+
+      # Return nil if the cron is "not strict"
+      #
+      # For example, "0 0/17 * * *" (gh-86) is a perfectly valid
+      # cron string, but makes not much sense when derived via `.parse_nat`
+      # from "every 17 hours".
+      #
+      # It happens here because it's nat being strict, not cron.
+      #
+      def restrict(a, cron)
+
+        if m = ((a[1] && a[1][0]) || '').match(/^(\d+|\*)\/(\d+)$/)
+#p m
+           sla = m[1].to_i
+          return nil unless [ 1, 2, 3, 4, 5, 6, 8, 12 ].include?(sla)
+        end
+
+        cron
       end
 
       def slot(key, default)

data/lib/fugit.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: time tools for flor