fugit 1.3.6 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b61604e15e2cb24d4fb124306affea15a644c2591fc3a49649981616351d66
-  data.tar.gz: 235eec423691346077fd9cfdaed895e28843ecf6681b5aa00a83cfcf9ca711a3
+  metadata.gz: 86abe0dec557524b3ae8c7947f48ab15a52e49b240ecdb3f4103c916348e6e4c
+  data.tar.gz: d440e0d52d49b6ad2893b05c269b7c6f96936cfcb4a3904750b3204568d2344a
 SHA512:
-  metadata.gz: 1fd5abf6871b1cb60220bf7d6089be6bff48dfae80a05db6d031def126275940d50cbc5dfcaad493f2b6d327b66162c2a44329966459bfb3d9d5b912e3b7e68c
-  data.tar.gz: '08a846fcce60834f8f0c289e14317249123f1f4028c478953ed04f759e633080c4d843f55c56fb973a104e1b44bbbbc92eecc978a954d7b0b317d7b23b82611b'
+  metadata.gz: 13fe87e6bc9d37cf3822c1bed665651be254b8e4a3d262f20950dc6f14d6170495721a0cd79ca8324b35048d90ce71d996b654f23da2b4780df536b9f4bd8071
+  data.tar.gz: 2623e274a96a689639fbbbcc22f77bc86f8bcc0f49644e459673a54eadfd39deecf8158b85948b6969339b7d6c9e2554537aa4c6575f63a56fd0333626b0ed88

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 # 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
+
+
 ## fugit 1.3.6 released 2020-06-01
 
 * Introduce new nat syntaxed, gh-38

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* 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/README.md

@@ -9,7 +9,7 @@ Time tools for [flor](https://github.com/floraison/flor) and the floraison group
 
 It uses [et-orbi](https://github.com/floraison/et-orbi) to represent time instances and [raabro](https://github.com/floraison/raabro) as a basis for its parsers.
 
-Fugit is a core dependency of [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) 3.5.x.
+Fugit is a core dependency of [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) >= 3.5.
 
 
 ## Related projects

data/lib/fugit.rb

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

data/lib/fugit/nat.rb

@@ -96,10 +96,14 @@ module Fugit
         when 's', 'sec', 'second', 'seconds'
           h[:sec] = eone(e)
         when 'm', 'min', 'mins', 'minute', 'minutes'
-          #(h[:hms] ||= []) << [ '*', eone(e) ]
           h[:hms] ||= [ [ '*', eone(e) ] ]
         when 'h', 'hour', 'hours'
-          h[:hms] ||= [ [ eone(e), 0 ] ]
+          hms = h[:hms]
+          if hms && hms.size == 1 && hms.first.first == '*'
+            hms.first[0] = eone(e)
+          elsif ! hms
+            h[:hms] = [ [ eone(e), 0 ] ]
+          end
         when 'd', 'day', 'days'
           h[:dom] = "*/#{e1}" if e1 > 1
           h[:hms] ||= [ [ 0, 0 ] ]
@@ -268,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)
@@ -473,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.6
+  version: 1.3.8
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -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