fugit 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 318e360c503855580a65262f188ae07d02a17c1e833aeb5d8d21e25a67a9805c
-  data.tar.gz: 54b9eaeba60e6c1a64db0ca2b5e86ed09e74d8c4afeb32677314946f8b1d5211
+  metadata.gz: fe369cec5c3fb690ead6f7638fcd430db71fd6525070c45aa48a8c7b3c3d4171
+  data.tar.gz: ce486e692afb9bf796122005314c89185373b07d596684b8c7a3f395bf36d1b4
 SHA512:
-  metadata.gz: c2813ab3974e9dcc7b3b6552bc8a5855617ac40b26190f84a3cbd413108d4b2ebc6a8c9418389a873844161289f60d48bece8fc10ca25295414e2e04c1da1474
-  data.tar.gz: 6e8587a3894c801bc220f967e3f5b0fed6e1bdea0bc606841fe188f890c8a0f6756f4b5357fd4cd887ff7d9bfd0a6bde68a1405ff369f7b4d41b8ec3e14c1c4b
+  metadata.gz: 94b9b504e574dbff1f6b0abab21028c97c0303533a8b45747ae6250c6d866c83c7b1999c5cce4680f5015f62946e9ba2f0a2e28af0faf5dc6194c3649b615b97
+  data.tar.gz: a70bdcd045774d4290cc7d014c62793e28f4a322bf8a3f93d7ee5ce2b2d37744481d32896ce5c88ff89cd3fddfe7ec37bf41c5d3b480dafea45a0d246e1636bd

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 # CHANGELOG.md
 
 
+## fugit 1.8.0 released 2022-12-06
+
+* Introduce Fugit.parse_cronish and .do_parse_cronish, gh-70
+
+
+## fugit 1.7.2 released 2022-11-03
+
+* Fix 'every day at 12:15 am', gh-81
+* Fix 'every day at 5:00pm', gh-81
+
+
 ## fugit 1.7.1 released 2022-09-21
 
 * Change behaviour for "0 0/5 * * *", gh-79

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* ski-nine, https://github.com/ski-nine, gh-81
 * Joseph Halter, https://github.com/JosephHalter, gh-79
 * James Healy, https://github.com/yob, gh-76
 * John Bachir, https://github.com/jjb, gh-74

data/README.md

@@ -89,6 +89,25 @@ Fugit.parse_nat('every day at noon').class  # ==> ::Fugit::Cron
 
 As `Fugit.parse(s)` returns nil when it doesn't grok its input, and `Fugit.do_parse(s)` fails when it doesn't grok, each of the `parse_` methods has its partner `do_parse_` method.
 
+## parse_cronish and do_parse_cronish
+
+Sometimes you know a cron expression or an "every" natural expression will come in and you want to discard the rest.
+
+```
+require 'fugit'
+
+Fugit.parse_cronish('0 0 1 jan *').class             # ==> ::Fugit::Cron
+Fugit.parse_cronish('every saturday at noon').class  # ==> ::Fugit::Cron
+
+Fugit.parse_cronish('12y12M')        # ==> nil
+```
+
+`.parse_cronish(s)` will return a `Fugit::Cron` instance or else nil.
+
+`.do_parse_cronish(s)` will return a `Fugit::Cron` instance or else fail with an `ArgumentError`.
+
+Introduced in fugit 1.8.0.
+
 ## `Fugit::Cron`
 
 A class `Fugit::Cron` to parse cron strings and then `#next_time` and `#previous_time` to compute the next or the previous occurrence respectively.
@@ -399,6 +418,36 @@ Fugit::Nat.parse('every day at 16:15 nada 18:30', multi: true)
 `"Every day at midnight"` is supported, but `"Every monday at midnight"` will be interpreted (as of Fugit <= 1.4.x) as `"Every monday at 00:00"`. Sorry about that.
 
 
+### 12 AM and PM
+
+How does fugit react with `"12 am"`, `"12 pm"`, `"12 midnight"`, etc?
+
+```ruby
+require 'fugit'
+
+p Fugit.parse('every day at 12am').original  # ==> "0 0 * * *"
+p Fugit.parse('every day at 12pm').original  # ==> "0 12 * * *"
+
+p Fugit.parse('every day at 12:00am').original   # ==> "0 0 * * *"
+p Fugit.parse('every day at 12:00pm').original   # ==> "0 12 * * *"
+p Fugit.parse('every day at 12:00 am').original  # ==> "0 0 * * *"
+p Fugit.parse('every day at 12:00 pm').original  # ==> "0 12 * * *"
+p Fugit.parse('every day at 12:15am').original   # ==> "15 0 * * *"
+p Fugit.parse('every day at 12:15pm').original   # ==> "15 12 * * *"
+p Fugit.parse('every day at 12:15 am').original  # ==> "15 0 * * *"
+p Fugit.parse('every day at 12:15 pm').original  # ==> "15 12 * * *"
+
+p Fugit.parse('every day at 12 noon').original         # ==> "0 12 * * *"
+p Fugit.parse('every day at 12 midnight').original     # ==> "0 24 * * *"
+p Fugit.parse('every day at 12:00 noon').original      # ==> "0 12 * * *"
+p Fugit.parse('every day at 12:00 midnight').original  # ==> "0 24 * * *"
+p Fugit.parse('every day at 12:15 noon').original      # ==> "15 12 * * *"
+p Fugit.parse('every day at 12:15 midnight').original  # ==> "15 24 * * *"
+
+  # as of fugit 1.7.2
+```
+
+
 ## LICENSE
 
 MIT, see [LICENSE.txt](LICENSE.txt)

data/lib/fugit/nat.rb

@@ -176,6 +176,7 @@ module Fugit
         #'every week on monday 18:23' => '23 18 * * 1',
         #
         # every month on the 1st
+        #
       def on(i)
         seq(:on, i, :_on, :on_objects)
       end
@@ -196,12 +197,6 @@ module Fugit
         seq(nil, i, :_in_or_on, '?', :tz)
       end
 
-      def digital_hour(i)
-        rex(
-          :digital_hour, i,
-          /(2[0-4]|[0-1]?[0-9]):([0-5][0-9])([ \t]*(am|pm))?/i)
-      end
-
       def ampm(i)
         rex(:ampm, i, /[ \t]*(am|pm|noon|midday|midnight)/i)
       end
@@ -209,6 +204,13 @@ module Fugit
         rex(:dark, i, /[ \t]*dark/i)
       end
 
+      def digital_h(i)
+        rex(:digital_h, i, /(2[0-4]|[0-1]?[0-9]):([0-5][0-9])/i)
+      end
+      def digital_hour(i)
+        seq(:digital_hour, i, :digital_h, :ampm, '?')
+      end
+
       def simple_h(i)
          rex(:simple_h, i, /#{(0..24).to_a.reverse.join('|')}/)
       end
@@ -451,20 +453,24 @@ module Fugit
       end
 
       def rewrite_tz(t)
+
         slot(:tz, t.string)
       end
 
       def rewrite_weekday(t)
+
         Fugit::Cron::Parser::WEEKDS.index(t.string[0, 3].downcase)
       end
 
       def rewrite_weekdays(t)
+
 #Raabro.pp(t, colours: true)
         slot(:weekday, _rewrite_subs(t, :weekday))
       end
       alias rewrite_on_weekdays rewrite_weekdays
 
       def rewrite_to_weekday(t)
+
         wd0, wd1 = _rewrite_subs(t, :weekday)
         #wd1 = 7 if wd1 == 0
         slot(:weekday, "#{wd0}-#{wd1}")
@@ -475,21 +481,35 @@ module Fugit
         slot(:monthday, "#{md0}-#{md1}")
       end
 
-      def adjust_h(h, ap)
-        h = h.to_i
-        ap = ap || ''
-        (h < 12 && ap == 'pm' || ap == 'midnight') ? h + 12 : h
+      # Try to follow https://en.wikipedia.org/wiki/12-hour_clock#Confusion_at_noon_and_midnight
+      #
+      def adjust_h(h, m, ap)
+
+        if ap == 'midnight' && h == 12
+          24
+        elsif ap == 'pm' && h < 12 # post meridian
+          h + 12
+        elsif ap == 'am' && h == 12 # ante meridian
+          0
+        else
+          h
+        end
       end
 
       def rewrite_digital_hour(t)
-        h, m, ap = t.strinpd.split(/[: \t]+/)
-        h, m = adjust_h(h, ap), m.to_i
+
+        h, m = t.sublookup(:digital_h).strinpd.split(':').collect(&:to_i)
+        ap = t.sublookup(:ampm)
+        h, m = adjust_h(h, m, ap && ap.strinpd), m
+
         slot(:hm, h, m)
       end
 
       def rewrite_simple_hour(t)
+
         h, ap = t.subgather(nil).collect(&:strinpd)
-        h = adjust_h(h, ap)
+        h = adjust_h(h.to_i, 0, ap)
+
         slot(:hm, h, 0)
       end
 
@@ -501,12 +521,10 @@ module Fugit
 
         h = ht.strinp
         m = mt ? mt.strinp : 0
-#p [ 0, '-->', h, m ]
         h = NHOURS[h]
         m = NMINUTES[m] || m
-#p [ 1, '-->', h, m ]
 
-        h = adjust_h(h, apt && apt.strinpd)
+        h = adjust_h(h, m, apt && apt.strinpd)
 
         slot(:hm, h, m)
       end

data/lib/fugit/parse.rb

@@ -33,6 +33,19 @@ module Fugit
       fail(ArgumentError.new("found no time information in #{s.inspect}"))
     end
 
+    def parse_cronish(s, opts={})
+
+      r = parse_cron(s) || parse_nat(s, opts)
+
+      r.is_a?(::Fugit::Cron) ? r : nil
+    end
+
+    def do_parse_cronish(s, opts={})
+
+      parse_cronish(s) ||
+      fail(ArgumentError.new("not cron or 'natural' cron string: #{s.inspect}"))
+    end
+
     def determine_type(s)
 
       case self.parse(s)

data/lib/fugit.rb

@@ -3,7 +3,7 @@
 
 module Fugit
 
-  VERSION = '1.7.1'
+  VERSION = '1.8.0'
 end
 
 require 'time'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - John Mettraux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -101,7 +101,7 @@ metadata:
   bug_tracker_uri: https://github.com/floraison/fugit/issues
   homepage_uri: https://github.com/floraison/fugit
   source_code_uri: https://github.com/floraison/fugit
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: time tools for flor
 test_files: []