dynarex_cron 0.9.2 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7d6d831aa410f982a4d6e362fc3054e93b897198
-  data.tar.gz: 2b9761c099406b8e3433f30e188d0ae72b2b8cc9
+SHA256:
+  metadata.gz: b3a65ddcd1590f382710f6f67cb50ac1143fed13c8af76dde93c76fce3a99e24
+  data.tar.gz: f2c111a396fc622e35cdbcd18007dc03df688a705813be5e25338bc6e55655d3
 SHA512:
-  metadata.gz: c0880d7fcb65d010950510a5561306df1ea96ab96cb809d996b82e53df0d6a72a288ade8496ea3c9ee2935fd3e63e40daf1ec1227c24ea2866408a11a89d13b0
-  data.tar.gz: 94e202eec354151472036d76aa5a0790221514ea2a84d71119c2eb9a5f1bbb144fcf54f0ef08951964e7360bf44e3d9c64fb3bf43341e8bd0a85fcd47abad666
+  metadata.gz: e782e76c62832d6cb67d090e1c074e368d1f5ffde353b53f20a7d7f4f14a029d0f287cb2da7a4b916da9a4f517eba1d616a9f05a4b95698e70b60dc8e9751a4b
+  data.tar.gz: cfece8f878d52864670ef0751b8ca6b3f1eeab8b256c63f243bf1497e073b76f7720ff21c2bcb14c6c42ef1852e610ff0e3d38fc88409b8405dbfc35cc545bba

data/lib/dynarex_cron.rb

@@ -5,47 +5,49 @@
 require 'dynarex'
 require 'chronic_cron'
 require 'sps-pub'
+require 'rxfreader'
 
 
 DF = "%Y-%m-%d %H:%M"
 
 class DynarexCron
+  using ColouredText
 
   # options: e.g. sps_address: 'sps', sps_port: '59000'
   #
   def initialize(dxfile=nil, sps_address: 'sps', sps_port: '59000',  \
-      log: nil, time_offset: 0, logtopic: 'DynarexCron')
-    
+      log: nil, time_offset: 0, logtopic: 'DynarexCron', debug: false)
+
 
     @dxfile, @sps_address, @sps_port, @log = dxfile, sps_address, sps_port, log
 
-    # time_offset: used for testing a cron entry without having to change 
+    # time_offset: used for testing a cron entry without having to change
     #              the time of each entry
     @time_offset = time_offset.to_i
-    
+
     @cron_entries = []
     @logtopic = logtopic
-    
+
 
     if @dxfile then
 
       dynarex,_ = load_doc dxfile
       load_entries(dynarex)
-    end 
+    end
 
     @pub = SPSPub.new address: sps_address, port: sps_port
-    
+
   end
 
   def start
 
     @running = true
-    
+
     if @log then
       @log.info @logtopic + '/start: Time.now: ' \
           + (Time.now + @time_offset).strftime(DF)
     end
-        
+
 
     sleep 1 until Time.now.sec == 0
 
@@ -56,17 +58,17 @@ class DynarexCron
 
       if @dxfile.is_a? String then
 
-        # What happens if the @dxfile is a URL and the web server is 
+        # What happens if the @dxfile is a URL and the web server is
         # temporarily unavailable? i.e. 503 Service Temporarily Unavailable
         begin
 
           dx, buffer = load_doc(@dxfile)
-          load_entries dx if @buffer != buffer          
+          load_entries dx if @buffer != buffer
           @buffer = buffer
-          
+
         rescue
-          @log.debug @logtopic + '/start: warning: ' + ($!).inspect
-        end        
+          @log.debug @logtopic + '/start: warning: ' + ($!).inspect if @log
+        end
 
       end
 
@@ -76,11 +78,11 @@ class DynarexCron
     end
 
   end
-  
+
   def stop()
     @running = false
   end
-  
+
   private
 
   def load_doc(dynarex_file)
@@ -88,42 +90,43 @@ class DynarexCron
     if dynarex_file.is_a?(Dynarex) then
       dynarex_file
     else
-      
-      buffer, _ = RXFHelper.read(dynarex_file)      
-      dx = buffer =~ /<?dynarex/ ? Dynarex.new.import(buffer) : \
+
+      buffer, _ = RXFReader.read(dynarex_file)
+      dx = buffer =~ /<\?dynarex/ ? Dynarex.new.import(buffer) : \
           Dynarex.new(buffer)
-      
+
       [dx, buffer]
     end
-        
+
   end
 
   def load_entries(dx)
-    
+
     if dx.summary[:sps_address] then
       @sps_address, @sps_port = dx.summary[:sps_address]\
                                                     .split(':',2) << '59000'
     end
-    
-    @cron_entries = dx.to_h
-    @cron_entries.each do |h| 
+
+    @cron_entries = dx.to_a
+    @cron_entries.each do |h|
       h[:cron] = ChronicCron.new(h[:expression], Time.now + @time_offset)
     end
-  end  
-  
+  end
+
 
   def iterate(cron_entries)
-    
+
+    puts ('h:' +  h.inspect).debug if @debug
     cron_entries.each do |h|
-      
+
       datetime = (Time.now + @time_offset).strftime(DF)
-      
+
       if @log then
         @log.info @logtopic + '/iterate: datetime: ' + datetime
         @log.info @logtopic + '/iterate: cron.to_time: ' \
             + h[:cron].to_time.strftime(DF)
       end
-      
+
       if h[:cron].to_time.strftime(DF) == datetime then
 
         begin
@@ -131,26 +134,26 @@ class DynarexCron
           if h[:fqm].empty? and @log then
             @log.debug @logtopic + '/iterate: no h[:fqw] found ' + h.inspect
           end
-          
+
           msg = h[:fqm].gsub('!Time',Time.now.strftime("%H:%M"))
 
           @pub.notice msg
 
         rescue
-          
+
           if @log then
             @log.debug @logtopic + '/iterate: cron: ' + h[:cron].inspect
             @log.debug @logtopic + '/iterate: h: ' + h.inspect + ' : ' \
                 + ($!).inspect
           end
-          
+
         end
-        
+
         h[:cron].next # advances the time
-            
+
       end
 
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex_cron
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.5
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTIxODEyNTg1MFoXDTE3MTIxODEyNTg1MFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAN2Vvyb/QYOsoGhEsfMN27RtbJDiIzBlwitRF5NnJK0aHIIDWuYZQ36kVtlH
-  pUf7FN+amWMN3RfiqkWSy103UT69WFY1wbLYAGdL9ieuknSZyO66wdBYLHQphD6w
-  Q86Zm694ssWU4Dcavh9ypoY3r+Wy5PLUcL7YbxpGRvWepgXKkS1DFmXY+5PgxJ63
-  0d11cBgiT7wv7k3Osd0eKtqCKIuEfzuvoQn6WXed+LpYWkGcEOpDHjl1thkydecG
-  DP8qqyFF5hVDlfrkI65t1YLFVOT9mbIQW0gAVG6hRFH9vYesHpkrLLISD+bimitP
-  RVH8qW3iEg7njDwe8DI7IhEsOZMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUw2BMTuvargaO7vV0snp09RhsOekwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAFcSx0vfR
-  VLNEv1Zm4aAg3pkRi71Do+y6keHtBvLeF5UljenC7JPx0H46iAxNqv/6bwiksTxb
-  +IZJEaRXIVcaUJFEk9IYSf3ZaijmuCoaQFJq/vR7dB0oaW/BNgmVvMv0xa9L4nQ3
-  iamse+N40ZmDhkt7i0h82swMVWTc+txpFZuNvj0gxVy9McbiEBBQDgptaUO00mLh
-  tlWlMwHcUP6KQK2/QpJY3TWCMiwN5fNC6a3u5icFKo/zeFfMeq55/OIbdLykHTro
-  tsPyW5OuDQXshrgmPt97DD8Btg4Tg5CGwnm0aeVYC/E4PnCMrtQNyPaRwBfvGrF0
-  vXqXm6nxDCrL/w==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIzMTkxNzU1WhcN
+  MjMwMjIzMTkxNzU1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDFXfJg
+  P6tLaBWbkPH2MDIJpCzva3ezz/wf91uGqXJ4BCfFINnlKgttCDvQ47KO7UYVJdJq
+  xQxUmwJpMb/krNZEycr+ZDnK/oFecdHvp3rZi7Bg27kRG7JhdcI3J8/McRhkdikw
+  PGapgqcWi9RMHoIFls7J5lWJcTcjDBp0X0XiE0R+IQdEfMKjyAejKZ8U47H58mfV
+  27UXGFP5J4VXxn3sg8KrAZ7SIayqrEJ6097bfLN6MrwMRBfdM/OTVtovdokLW9bV
+  oiqR1Q+DE1MTTI+V3bbRmk+Ld9uwsSCJxINwBrWGbqxJ4h8gB8nkCzLzoD9phHzY
+  9gjpfSq8a1F1XO4YmggedvHBxMYLBF/4vbbIKD8RPtU/4MSoP1CO+r9U82tW8/0U
+  zLIoYRxxOIOX7k5s6ZLfxmdYv3IYmNZk/kBzdgSc2Rmeo8OdyFJmMVZpp05yDo/x
+  2mD+QgzxGywbHTPAISBoUaZ/IYb/GK4oFq4QWVXS0SnTxvrnxgX5U/6W/ZUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUzEO3sAWo
+  at0zmR9LEgYy1sIuvGgwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAwOiOhvxF0ZAp1FLwh/pPiWfutxzSg9whgO39QCjN
+  0VGfvsv79ftsgWM5Dlg3aweXRGYcs/eYf9FmGMBKFCrUvjtdI5S8mf95FuUYGmaC
+  vU8/h+gsH06K57XVxf/rgsbM+sfE4w2ZyES7LCxbJeYSoRtwb2u4o8lf/qvjj1cn
+  XDxcDp9Ztkkr9c8/WRUjXChYJQm+0kWADV6RNaKAr2zmvFXDtRTWzXB6K7HeW3fx
+  g4THKiqKhW+/UOB8kO+NlSU5pqHw+u4vtHTE3fBJKojIIzFqhxi1xyHhGJAzFIj/
+  /FaMLQm+L5ABBAp60vrKd/2JmMgS3iEYH3egyO3dfGa3UJAsKxEwPxljK/EGXweo
+  ClrBAGwpXmkf1AidnP86ZppXGDhqbYnNHPw3lB+NLAOP4IYvHDmpX7t/gwWt8pdU
+  JlMWB3ikne4OWo45avLsjICkmisnLJ84HSc2oYQ9n/dCIO1KK/DprLKZAN1CqNd/
+  I84GSXqtRpTn4jeExOFOFvme
   -----END CERTIFICATE-----
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron
@@ -39,40 +43,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: dynarex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.27
+        version: 1.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.27
+        version: 1.9.6
 - !ruby/object:Gem::Dependency
   name: sps-pub
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +98,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.5
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Publishes SimplePubSub messages by reading cron entries from a Dynarex document