dynarex_cron 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcd4c445c4891f04885ad7cb9f158bf7fc03cf05
-  data.tar.gz: 8ca0c29688eb219e887b3aef685d221e366a588b
+  metadata.gz: 2cee6a9f450859a2e9c06757466a50b5cf46ec49
+  data.tar.gz: 3f3e70a1ed17a8727d04ef65dd6c12d04db15613
 SHA512:
-  metadata.gz: 22b42c0fd9c936b758c70c51070e10f7ddd7230f0e1a16cca5bc094f0ef7ea7fb1317501384230edf190a4d0ebef13beacf017c9c31970763c5a5a8b5d43665f
-  data.tar.gz: f73afe6073c469acd830be897a92b8b13ad4eb144f78e196c4d32ef6974599efa389b9495adf8608b21e16064657030d54737cf32b51f3103d52422dab4bc48f
+  metadata.gz: 092fc7315f2c6676acaf313e373218feae75fb61520efbb5994bd8d990716f6c68ee27c7d81d825dee0ba0b7ac70a91c124e945f3af9a6d258a4610765333138
+  data.tar.gz: 1c8211193e4a49bb3d30e9eecb58faaa151158d41ab0bcf7405f25c3284cb30e79ea18a59f3be2639b8931ac5b838196a88bc9037d4ace8ef829c99dfd6e643d

data/lib/dynarex_cron.rb

@@ -17,9 +17,13 @@ class DynarexCron
   #
   def initialize(dynarex_file=nil, options={})
     
-    opt = {sps_address: nil, sps_port: '59000', drb_port: nil, log: nil}\
-      .merge options
+    opt = {sps_address: 'sps', sps_port: '59000', drb_port: nil, \
+      log: nil, time_offset: 0}.merge options
     @logger = Logger.new(opt[:log],'weekly') if opt[: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
     
     @cron_entries, @cron_events  = [], []
     
@@ -46,7 +50,7 @@ class DynarexCron
   def start
 
     @running = true
-    puts '[' + Time.now.strftime(DF) + '] DynarexCron started'    
+    puts '[' + (Time.now + @time_offset).strftime(DF) + '] DynarexCron started'
     params = {uri: "ws://%s:%s" % [@sps_address, @sps_port]}
 
     c = WebSocket::EventMachine::Client
@@ -71,11 +75,14 @@ class DynarexCron
   
   def load_entries()
     
-    dynarex = Dynarex.new @dynarex_file
+    dynarex = @dynarex_file.is_a?(Dynarex) ? @dynarex_file : \
+                                        Dynarex.new(@dynarex_file)
     
     @include_url = dynarex.summary[:include]
     @cron_entries = dynarex.to_h
-    @cron_entries.each {|h| h[:cron] = ChronicCron.new(h[:expression]) }    
+    @cron_entries.each do |h| 
+      h[:cron] = ChronicCron.new(h[:expression], Time.now + @time_offset)
+    end
   end
   
   alias refresh_entries load_entries
@@ -94,16 +101,20 @@ class DynarexCron
     
     cron_entries.each do |h|
       
-      if h[:cron].to_time.strftime(DF) == Time.now.strftime(DF) then
+      datetime = (Time.now + @time_offset).strftime(DF)
+
+      if h[:cron].to_time.strftime(DF) == datetime then
         
         r = h[:job].match(/^pub(?:lish)?\s+([^:]+):(.*)/)
 
         next unless r
-        topic, msg = r.captures
-        @ws.send "%s: %s" % [topic, msg]
 
         begin
+
+          topic, msg = r.captures
+          @ws.send "%s: %s" % [topic, msg]
           h[:cron].next # advances the time
+
         rescue
           
           @logger.debug h.inspect ' : ' + ($!) if @logger
@@ -164,13 +175,14 @@ class DynarexEvents < DynarexCron
     
     @entries.inject([]) do |r,h| 
 
-      h[:cron] = ChronicCron.new(h[:date]) 
+      time = Time.now + @time_offset
+      h[:cron] = ChronicCron.new(h[:date], time) 
       h[:job] = 'pub event: ' + h[:title]
 
       if h[:reminder].length > 0 then
         rmndr = {}
         rmndr[:cron] = ChronicCron.new((Chronic.parse(h[:date]) - 
-                                     ChronicDuration.parse(h[:reminder])).to_s)
+                              ChronicDuration.parse(h[:reminder])).to_s, time)
         rmndr[:job] = 'pub 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.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   y6cNz+NnybgoQfG28NcwV1e/31NTJk5VqdKHKnTfPcp/y35T9YoElNn5cSs93qc5
   U5VVkvsVQudaZw==
   -----END CERTIFICATE-----
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: dynarex_cron