fugit 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3e29ff88eb9d7ce1e5214af33683f577967b86ded3ee9f90be8c628fa982e40
-  data.tar.gz: 7adb64aaee08b7c354a3e619eda0edb96696ad4fd1d19d39c06e9a9768d058b7
+  metadata.gz: 86abe0dec557524b3ae8c7947f48ab15a52e49b240ecdb3f4103c916348e6e4c
+  data.tar.gz: d440e0d52d49b6ad2893b05c269b7c6f96936cfcb4a3904750b3204568d2344a
 SHA512:
-  metadata.gz: db82aa99da670c23ba90424e015afcc8e0b5fff419d62806439bd94f171b8e0df18bbf0d3531343e814d2f9a1709a577f91f0d12024be3654df0f73922a255d5
-  data.tar.gz: 5bd2ae16ad1e244a6a4f26f24ba8f5291c0e1ee3271b5ccbe86c1dcd3131a383731829c838826f8dbc94ecd6e14fa6d918576a3e2347882fb635e50c8c9c3ce4
+  metadata.gz: 13fe87e6bc9d37cf3822c1bed665651be254b8e4a3d262f20950dc6f14d6170495721a0cd79ca8324b35048d90ce71d996b654f23da2b4780df536b9f4bd8071
+  data.tar.gz: 2623e274a96a689639fbbbcc22f77bc86f8bcc0f49644e459673a54eadfd39deecf8158b85948b6969339b7d6c9e2554537aa4c6575f63a56fd0333626b0ed88

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## fugit 1.3.8 released 2020-08-06
+
+* Parse 'every day at 8:30' and ' at 8:30 pm', gh-42
+
+
 ## fugit 1.3.7 released 2020-08-05
 
 * Parse 'every 12 hours at minute 50', gh-41

data/CREDITS.md

@@ -1,7 +1,7 @@
 
 # fugit credits
 
-* Jérôme Dalbert https://github.com/jeromedalbert every 12h at min 50, gh-41
+* Jérôme Dalbert https://github.com/jeromedalbert gh-41, gh-42
 * Danny Ben Shitrit https://github.com/DannyBen nat variants, gh-38
 * Dominik Sander https://github.com/dsander #rough_frequency 0, gh-36
 * Milovan Zogovic https://github.com/assembler Cron#match? vs TZ, gh-31

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.3.7'
+  VERSION = '1.3.8'
 end
 
 require 'time'

data/lib/fugit/nat.rb

@@ -272,8 +272,12 @@ rex(:xxx, i, 'TODO')
         seq(:simple_hour, i, :shour, :am_pm, '?')
       end
 
+      def dig_hour_b(i); rex(nil, i, /(2[0-4]|[01][0-9]|[0-9]):[0-5]\d/); end
+      def dig_hour_a(i); rex(nil, i, /(2[0-4]|[01][0-9])[0-5]\d/); end
+      def dig_hour(i); alt(nil, i, :dig_hour_a, :dig_hour_b); end
+        #
       def digital_hour(i)
-        rex(:digital_hour, i, /(2[0-4]|[01][0-9]):?[0-5]\d/)
+        seq(:digital_hour, i, :dig_hour, :am_pm, '?')
       end
 
       def at_point(i)
@@ -477,8 +481,10 @@ rex(:xxx, i, 'TODO')
         [ v, 0 ]
       end
       def rewrite_digital_hour(t)
-        m = t.string.match(/(\d\d?):?(\d\d)/)
-        [ m[1].to_i, m[2].to_i ]
+        m = t.string.match(/(\d\d?):?(\d\d)(\s+pm)?/i)
+        hou = m[1].to_i; hou += 12 if m[3] && hou < 12
+        min = m[2].to_i
+        [ hou, min ]
       end
 
       def rewrite_weekday(t)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro