dynarex_cron 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c23f02febf1feaaf6bc8d7a23404310c896ecba5
-  data.tar.gz: 5202e38c98442d9a0c95278d5c13c247c86fe007
+  metadata.gz: 0d94bcaf6e26c355a32180f1e68a27b5e73ecff6
+  data.tar.gz: a99e0a754a774080e80b4c4d2a2255d2ab8984ad
 SHA512:
-  metadata.gz: 0b67822d7e522deddbce8d3154e1821468cececd01d934dc2930565014d6b66e224e11c21cb839bce51ff219a6ef86b7912ba2e7b714aad795429b8604c7a2b1
-  data.tar.gz: 4579c0bef8e73f2a9b1cde33ec5c6b21ddf418eed3b285c9eaa933eb4ebf3ec52aa6bfabefe31180876e59fa3bf894dcec97cb8076c78f14e546cffadb5636b4
+  metadata.gz: da312335793f100c883a7fac0bb024a057b7f75b242acbd96e6014d51c3e3c371e797472a0de93724fcac4f2d22bd008f8d3abfdb542cb2cae0eb048df9e1a6e
+  data.tar.gz: bfe43b8ba27d6db1c939c8d7b929a3844e15e71a711d36ffd1e528e495c705e4779cec229e67d9936eb948d7018bdf3dac2f48401fa8a138f917a4f7faf76e54

data/lib/dynarex_cron.rb

@@ -5,7 +5,6 @@
 require 'dynarex'
 require 'chronic_cron'
 require 'sps-pub'
-require 'logger'
 
 
 DF = "%Y-%m-%d %H:%M"
@@ -14,37 +13,38 @@ class DynarexCron
 
   # options: e.g. sps_address: 'sps', sps_port: '59000'
   #
-  def initialize(dynarex_file=nil, options={})
+  def initialize(dxfile=nil, sps_address: 'sps', sps_port: '59000',  \
+      log: nil, time_offset: 0)
     
-    opt = {sps_address: 'sps', sps_port: '59000',  \
-      log: nil, time_offset: 0}.merge options
-    @logger = Logger.new(opt[:log],'weekly') if opt[:log]
+
+    @dxfile, @sps_address, @sps_port, @log = dxfile, sps_address, sps_port, log
 
     # time_offset: used for testing a cron entry without having to change 
     #              the time of each entry
-    @time_offset = opt[:time_offset].to_i
+    @time_offset = time_offset.to_i
     
     @cron_entries = []
     
-    @dynarex_file = dynarex_file
 
-    if @dynarex_file then
+    if @dxfile then
 
-      dynarex = load_doc dynarex_file
+      dynarex = load_doc dxfile
       load_entries(dynarex)
     end 
 
-    @sps_address, @sps_port = opt[:sps_address], opt[:sps_port]
-    @pub = SPSPub.new address: @sps_address, port: @sps_port
+    @pub = SPSPub.new address: sps_address, port: sps_port
     
   end
 
   def start
 
     @running = true
-    puts '[' + (Time.now + @time_offset).strftime(DF) + '] DynarexCron started'
-    params = {uri: "ws://%s:%s" % [@sps_address, @sps_port]}
     
+    if @log then
+      @log.info 'DynarexCron/start: Time.now: ' \
+          + (Time.now + @time_offset).strftime(DF)
+    end
+        
 
     sleep 1 until Time.now.sec == 0
 
@@ -53,12 +53,12 @@ class DynarexCron
 
       iterate @cron_entries
 
-      if @dynarex_file.is_a? String then
+      if @dxfile.is_a? String then
 
-        # What happens if the @dynarex_file 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
-          buffer, _ = RXFHelper.read(@dynarex_file)
+          buffer, _ = RXFHelper.read(@dxfile)
           reload_entries buffer if @buffer != buffer          
         rescue
           puts 'dynarex_cron: warning: ' + ($!).inspect           
@@ -103,27 +103,35 @@ class DynarexCron
     end
   end  
   
-  def log(s, method_name=:debug)
-    return unless @logger
-    @logger.method(method_name).call s
-  end
 
   def iterate(cron_entries)
     
     cron_entries.each do |h|
       
       datetime = (Time.now + @time_offset).strftime(DF)
+      @log.info 'DynarexCron/iterate: datetime: ' + datetime if @log
+      @log.info 'DynarexCron/iterate: cron.to_time: ' + h[:cron].to_time.strftime(DF) if @log
       
       if h[:cron].to_time.strftime(DF) == datetime then
 
         begin
 
-          @pub.notice h[:fqm].gsub('!Time',Time.now.strftime("%H:%M"))          
+          if h[:fqm].empty? and @log then
+            @log.debug 'DynarexCron/iterate: no h[:fqw] found ' + h.inspect
+          end
+          
+          msg = h[:fqm].gsub('!Time',Time.now.strftime("%H:%M"))
 
-        rescue
-          log 'cron ' + h[:cron].inspect, :info
-          log h.inspect + ' : ' + ($!).inspect
+          @pub.notice msg
 
+        rescue
+          
+          if @log then
+            @log.debug 'DynarexCron/iterate: cron: ' + h[:cron].inspect
+            @log.debug 'DynarexCron/iterate: h: ' + h.inspect + ' : ' \
+                + ($!).inspect
+          end
+          
         end
         
         h[:cron].next # advances the time
@@ -139,4 +147,4 @@ class DynarexCron
     @buffer = buffer
   end   
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex_cron
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   tsPyW5OuDQXshrgmPt97DD8Btg4Tg5CGwnm0aeVYC/E4PnCMrtQNyPaRwBfvGrF0
   vXqXm6nxDCrL/w==
   -----END CERTIFICATE-----
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron
@@ -42,7 +42,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,27 +52,27 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: dynarex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.26
+        version: 1.7.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.26
+        version: 1.7.27
 - !ruby/object:Gem::Dependency
   name: sps-pub
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Publishes SimplePubSub messages by reading cron entries from a Dynarex document