dynarex_cron 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 318c027711a6c2c28f955a92994386c853e37448
-  data.tar.gz: 2ba17d030d4ef26264b6322ab5bacf1a49d066ab
+  metadata.gz: 076ae88a768c151597d0bdda36be16d55c697ed5
+  data.tar.gz: 18d8493b651c6f6c09a0d58b9b3bf29efc7efa9f
 SHA512:
-  metadata.gz: 720d9850041e60b2bf4e57de3a721f241ada3ba3b6656631966b018aabe944cba3feb7af2b81243aea864d2a218f1a9070bbf786b2d13bb2379d2fcba31c6894
-  data.tar.gz: 5573ff3d3706e04022c7bf7eda27ea110516a8c2cb4a0f3e64039591a9db903164a12dab95cbf660c4ff3ec16f4fd48dff2224af3b2c08c1e728598cf69a1057
+  metadata.gz: 947ad1e25b48eb6036116938f696e0a3e17a1f5c1c6f4fd29bcda8b693c0782b41ec221fabf97449f1494c389deda25e0e8b96043ca90198c00bb3d53f5100f7
+  data.tar.gz: 280e496fc0c6da71891efe6574cf2284b7454f4cbd6a98532a8a40fc73b998b50192f82dfba0ceff7b5ff7696387a54768fe4118b8866da33b776e01ae847a03

data/lib/dynarex_cron.rb

@@ -6,35 +6,86 @@ require 'dynarex'
 require 'chronic_cron'
 require 'simplepubsub'
 require 'rscript'
+require 'dynarex-events'
 
 DF = "%Y-%m-%d %H:%M"
 
 class DynarexCron
 
-  def initialize(dynarex_file, sps_address=nil)
-    dynarex = Dynarex.new dynarex_file
-    @cron_entries = dynarex.to_h
-    @cron_entries.each {|h| h[:cron] = ChronicCron.new(h[:expression]) }
-    @sps_address = sps_address
+  def initialize(dynarex_file=nil, options={})
+    
+    opt = {sps_address: nil, drb_server: false}.merge options
+    
+    @cron_entries, @cron_events  = [], []
+    
+    @dynarex_file = dynarex_file
+    load_entries() if @dynarex_file    
+    load_events() if @include_url
+
+    @sps_address = opt[:sps_address]
+    
+    if opt[:drb_server] == true then
+      
+      Thread.new {
+        
+        # start up the DRb service
+        DRb.start_service 'druby://:57000', self
+
+        # wait for the DRb service to finish before exiting
+        DRb.thread.join    
+      }
+    end
   end
 
   def start
+    @running = true
     puts '[' + Time.now.strftime(DF) + '] DynarexCron started'
+    
+    while @running == true
 
-    while true
-      #puts Time.now.inspect
-      @cron_entries.each do |h|
-        if h[:cron].to_time.strftime(DF) == Time.now.strftime(DF) then
-          Thread.new { run(h[:job]) }
-          h[:cron].next # advances the time
-        end
-      end
+      iterate @cron_entries
+      iterate @cron_events
       sleep 60 # wait for 60 seconds
     end
   end
+  
+  def stop()
+    @running = false
+  end
+  
+  def load_entries()
+    
+    dynarex = Dynarex.new @dynarex_file
+    
+    @include_url = dynarex.summary[:include]
+    @cron_entries = dynarex.to_h
+    @cron_entries.each {|h| h[:cron] = ChronicCron.new(h[:expression]) }    
+  end
+  
+  alias refresh_entries load_entries
+  
+  def load_events()
+    
+    de = DynarexEvents.new(@include_url)
+    @cron_events = de.to_a
+  end
+  
+  alias refresh_events load_events  
 
   private
 
+  def iterate(cron_entries)
+    
+    cron_entries.each do |h|
+      
+      if h[:cron].to_time.strftime(DF) == Time.now.strftime(DF) then
+        
+        Thread.new { run(h[:job]) }
+        h[:cron].next # advances the time
+      end
+    end        
+  end  
+  
   def run(job)
 
     case job

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex_cron
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   y6cNz+NnybgoQfG28NcwV1e/31NTJk5VqdKHKnTfPcp/y35T9YoElNn5cSs93qc5
   U5VVkvsVQudaZw==
   -----END CERTIFICATE-----
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -89,6 +89,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dynarex-events
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: james@r0bertson.co.uk
 executables: []