dynarex_cron 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f4da172c476f1b1cbd30d80ab985a733c23fc5
-  data.tar.gz: 39d16067390706d3f0239315c293b134dc002b70
+  metadata.gz: 3139d44b6db16578a36bc08dc006fec8ccf5b287
+  data.tar.gz: 89b56fe3106d2b88f11e3f60cb9dbb4e8a4ae785
 SHA512:
-  metadata.gz: e028bab117671b1dc46b132826e0f2da8dc6f48e7286259d6511bc1f0c4b64dc5ef0d3dc28521f6f15a911c727bee329939a42743e8f602896b48553d0c7f5bd
-  data.tar.gz: 6d812dfda5347c5a88eed8230eb8049b3e17374b4970af88379647cffd0b9e9b528c6bfcf0d19f064403cf7f611e4176ae9b53d94f0f1949690f30bbb26f1eb3
+  metadata.gz: 81cbd636ca30d77aa8b2754fa989157f3e959411691d37de786e1fabf75380b70ea3872b79e082a66e21221d864dbc58cf0baf9beca7daa5177a5f4bf7b94cbd
+  data.tar.gz: 44139283cdaff56684a7780c6b312243291635623da242c8879b3419e332221a66d6a718ec1eb292922fed28804666040099f17fde1d36a2bcdd621cd9022d7b

data/lib/dynarex_cron.rb

@@ -125,18 +125,11 @@ class DynarexCron
       
       if h[:cron].to_time.strftime(DF) == datetime then
 
-        r = h[:job].match(/^pub(?:lish)?\s+([^:]+):(.*)/)
-
-        next unless r
-          
-          topic, msg = r.captures
-
-          log "sps_Address: %s sps_port: %s topic: %s message: %s" % \
-                                        [@sps_address, @sps_port, topic, msg]
+        log "sps_Address: %s sps_port: %s fqm: %s" % \
+                                        [@sps_address, @sps_port, h[:fqm]]
         begin
           
-          SPSPub.notice "%s: %s" % \
-                          [topic, msg], address: @sps_address, port:@sps_port
+          SPSPub.notice h[:fqm], address: @sps_address, port:@sps_port
           log 'before cron next', :info
           h[:cron].next # advances the time
         rescue
@@ -200,13 +193,13 @@ class DynarexEvents < DynarexCron
 
       time = Time.now + @time_offset
       h[:cron] = ChronicCron.new(h[:date], time) 
-      h[:job] = 'pub event: ' + h[:title]
+      h[:fqm] = 'event: ' + h[:title]
 
       if h[:reminder].length > 0 then
         rmndr = {}
         rmndr[:cron] = ChronicCron.new((Chronic.parse(h[:date]) - 
                               ChronicDuration.parse(h[:reminder])).to_s, time)
-        rmndr[:job] = 'pub event: reminder ' + h[:title]
+        rmndr[:fqm] = 'event: reminder ' + h[:title]
         r << rmndr
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex_cron
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   AYk47T0/8hx1QaR5nU5Db9LztjboHVugHlqfEKWwY2mURuQWP9iCCwiG3T1cC04z
   WnpuryTBFz7cvg==
   -----END CERTIFICATE-----
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron