dynarex_cron 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c96a52e108c3548cfdd0ace9597459948c3f3f0d
-  data.tar.gz: 80b2145ba25bc05a262f12d51afa7ac0c54597f0
+  metadata.gz: 50ddabd424bdebc70f64092c80431839151e5ba5
+  data.tar.gz: 6cd42774d6718f4cf3528dcdd0be63347e212754
 SHA512:
-  metadata.gz: 571ebc4a746d47f3985fbd4885570be16c82351eee94f0cec70611861eceb80577677586b65cc00500bb0b34f8ae625fad505c80c312d732023d74059675a054
-  data.tar.gz: e20579ba72f4ea5bfbe8cc630e2c497dd47aa63944762015e6f28b6546b73b11b39ce9955ed3eb754828bba89529a95a9c471f2a193751c4bf61d9f82cb32756
+  metadata.gz: ebb728bb6a28f3f38db4b7cdcf5932dea5d50c6c0e6f7ea8dac5454c18c3abf134863d078d41a6d4b9640d2e5734407faf1410e7114f89ecea3dd9281df24b53
+  data.tar.gz: 477bc7f6d63da17edca61dc6df30bfee7aac48daf32142923776dc804117805ca3a434f29ce8c2d67a9e2690c585ade8f4b5bf5516a20ef9440cb92c5a93c69f

data/lib/dynarex_cron.rb

@@ -4,7 +4,7 @@
 
 require 'dynarex'
 require 'chronic_cron'
-require 'simplepubsub'
+require 'websocket-eventmachine-client'
 require 'rscript'
 require 'chronic_duration'
 require 'logger'
@@ -13,11 +13,12 @@ DF = "%Y-%m-%d %H:%M"
 
 class DynarexCron
 
-  # options: e.g. sps_address, 'sps', drb_server: 57000
+  # options: e.g. sps_address: 'sps', sps_port: '59000'
   #
   def initialize(dynarex_file=nil, options={})
     
-    opt = {sps_address: nil, drb_server: nil, log: nil}.merge options
+    opt = {sps_address: nil, sps_port='59000', drb_port: nil, log: nil}\
+      .merge options
     @logger = Logger.new(opt[:log],'weekly') if opt[:log]
     
     @cron_entries, @cron_events  = [], []
@@ -26,35 +27,46 @@ class DynarexCron
     load_entries() if @dynarex_file    
     load_events() if @include_url
 
-    @sps_address = opt[:sps_address]
-    
-    if opt[:drb_server] then
-      
+    @sps_address, @sps_port = opt[:sps_address], opt[:sps_port]
+
+    if opt[:drb_port] then
+
       Thread.new {
         
         # start up the DRb service
-        DRb.start_service 'druby://:' + opt[:drb_server], self
+        DRb.start_service 'druby://:' + opt[:drb_port], self
 
         # wait for the DRb service to finish before exiting
         DRb.thread.join    
       }
-    end
+    end    
+
   end
 
   def start
+
     @running = true
-    puts '[' + Time.now.strftime(DF) + '] DynarexCron started'
-    
-    while @running == true
+    puts '[' + Time.now.strftime(DF) + '] DynarexCron started'    
+    params = {uri: "ws://%s:%s" % [@sps_address, @sps_port]}
+
+    @ws = WebSocket::EventMachine::Client
+
+    EventMachine.run do
 
-      iterate @cron_entries
-      iterate @cron_events
-      sleep 60 # wait for 60 seconds
+      @ws.connect(params)
+
+      EM.add_periodic_timer(60) do
+        iterate @cron_entries
+        iterate @cron_events
+      end
     end
+
   end
   
   def stop()
     @running = false
+    @ws.close
+    EM.stop_event_loop
   end
   
   def load_entries()
@@ -84,7 +96,9 @@ class DynarexCron
       
       if h[:cron].to_time.strftime(DF) == Time.now.strftime(DF) then
         
-        Thread.new { run(h[:job]) }
+        topic, msg = h[:job].match(/^pub(?:lish)\s+([^:]+):(.*)/).captures
+        @ws.send "%s: %s" % [topic, msg]
+
         begin
           h[:cron].next # advances the time
         rescue
@@ -94,107 +108,66 @@ class DynarexCron
         
       end
     end        
-  end  
+  end   
   
-  def run(job)
-
-    case job
-
-      when /^(run )/
-        code2, args = RScript.new.read ($').scan(/[^'"]+/).map(&:strip)
-        eval code2
-
-      when /^(pub\s*(?:lish)?\s+)/
-
-        return unless @sps_address
-        SimplePubSub::Client.connect(@sps_address) do |client|
-          topic, msg = ($').split(/:\s*/,2)
-          client.publish(topic, msg)
-        end
-
-      when /^`([^`]+)/
-        `#{$1}`
-
-      when %r{http://}
-        open(s, 'UserAgent' => 'DynarexCron v0.1')
-
-      else
-        eval(s)
-    end
-
-  end
-
 end
 
-
 class DynarexEvents < DynarexCron
 
   attr_reader :to_a
 
-  # options: e.g. sps_address, 'sps', drb_server: 58000
-  #
   def initialize(dynarex_file=nil, options={})
     
-    opt = {sps_address: nil, drb_server: nil}.merge options
+    opt = {sps_address: nil}.merge options
+    
+    @cron_events  = []
     
-    @entries, @cron_events  = [], []
-
     @dynarex_file = dynarex_file
     load_events()
 
     @sps_address = opt[:sps_address]
     
-    if opt[:drb_server] then
-
-      Thread.new {
-        
-        # start up the DRb service
-        DRb.start_service 'druby://:' + opt[:drb_server], self
-
-        # wait for the DRb service to finish before exiting
-        DRb.thread.join    
-      }
-    end
   end    
 
-  def add_entry(h)
-    # if the entry already exists delete it
-    @entries.delete @entries.find {|x| x[:job] == h[:job]}
-    @entries << h
-  end
-
   def load_events()
     
     dynarex = Dynarex.new @dynarex_file
-    @entries = dynarex.to_h || @entries
-    @cron_events = self.to_a if @entries
-    'events loaded and refreshed'
+    @entries = dynarex.to_h
+    @cron_events = self.to_a
   end  
   
   alias refresh load_events
   
   def start
+
     @running = true
     puts '[' + Time.now.strftime(DF) + '] DynarexEvents started'
-    
-    while @running == true
-      iterate @cron_events
-      sleep 60 # wait for 60 seconds
+    params = {uri: "ws://%s:%s" % [@sps_address, @sps_port]}    
+
+    @ws = WebSocket::EventMachine::Client
+
+    EventMachine.run do
+
+      @ws.connect(params)
+
+      EM.add_periodic_timer(60) do
+        iterate @cron_events
+      end
+
     end
   end  
   
   def to_a()
-
-    return unless @entries
-
+    
     @entries.inject([]) do |r,h| 
 
-      h[:cron] = ChronicCron.new(h[:date] + ' ' + h[:recurring].to_s ) 
-      h[:job] ||= 'pub event: ' + h[:title]
+      h[:cron] = ChronicCron.new(h[:date]) 
+      h[:job] = 'pub event: ' + h[:title]
 
-      if h[:reminder].to_s.length > 0 then
+      if h[:reminder].length > 0 then
         rmndr = {}
-        rmndr[:cron] = ChronicCron.new((Chronic.parse(h[:date]) - ChronicDuration.parse(h[:reminder])).to_s)
+        rmndr[:cron] = ChronicCron.new((Chronic.parse(h[:date]) - 
+                                     ChronicDuration.parse(h[:reminder])).to_s)
         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.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   y6cNz+NnybgoQfG28NcwV1e/31NTJk5VqdKHKnTfPcp/y35T9YoElNn5cSs93qc5
   U5VVkvsVQudaZw==
   -----END CERTIFICATE-----
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -62,7 +62,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplepubsub
+  name: websocket-eventmachine-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="