dynarex_cron 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cbd72788d4dcd778c062456b222c9c35640d23e
-  data.tar.gz: fd9760125e7972e2023852c40f0e816093934a76
+  metadata.gz: c96a52e108c3548cfdd0ace9597459948c3f3f0d
+  data.tar.gz: 80b2145ba25bc05a262f12d51afa7ac0c54597f0
 SHA512:
-  metadata.gz: 0295274d8bf32d1ad18c4d22eb43f74d8b5950cc1ac2cea5b1398c95e8875b80c866f449fa00be315874784e77fe3abb6d16e1c6a6066c409613b3b07f2a00ae
-  data.tar.gz: b731ef83679628ba8dd04c3b365b7ede63a037b12eb180564f996cca6572c6287290cfdf9ce5bc6e25b0a943c81e4ec22a5446361eb261607198b9437fef0cbf
+  metadata.gz: 571ebc4a746d47f3985fbd4885570be16c82351eee94f0cec70611861eceb80577677586b65cc00500bb0b34f8ae625fad505c80c312d732023d74059675a054
+  data.tar.gz: e20579ba72f4ea5bfbe8cc630e2c497dd47aa63944762015e6f28b6546b73b11b39ce9955ed3eb754828bba89529a95a9c471f2a193751c4bf61d9f82cb32756

data/lib/dynarex_cron.rb

@@ -13,9 +13,11 @@ DF = "%Y-%m-%d %H:%M"
 
 class DynarexCron
 
+  # options: e.g. sps_address, 'sps', drb_server: 57000
+  #
   def initialize(dynarex_file=nil, options={})
     
-    opt = {sps_address: nil, drb_server: false, log: nil}.merge options
+    opt = {sps_address: nil, drb_server: nil, log: nil}.merge options
     @logger = Logger.new(opt[:log],'weekly') if opt[:log]
     
     @cron_entries, @cron_events  = [], []
@@ -26,12 +28,12 @@ class DynarexCron
 
     @sps_address = opt[:sps_address]
     
-    if opt[:drb_server] == true then
+    if opt[:drb_server] then
       
       Thread.new {
         
         # start up the DRb service
-        DRb.start_service 'druby://:57000', self
+        DRb.start_service 'druby://:' + opt[:drb_server], self
 
         # wait for the DRb service to finish before exiting
         DRb.thread.join    
@@ -124,27 +126,30 @@ class DynarexCron
 
 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: false}.merge options
-    
-    @cron_events  = []
+    opt = {sps_address: nil, drb_server: nil}.merge options
     
+    @entries, @cron_events  = [], []
+
     @dynarex_file = dynarex_file
     load_events()
 
     @sps_address = opt[:sps_address]
     
-    if opt[:drb_server] == true then
-      
+    if opt[:drb_server] then
+
       Thread.new {
         
         # start up the DRb service
-        DRb.start_service 'druby://:57500', self
+        DRb.start_service 'druby://:' + opt[:drb_server], self
 
         # wait for the DRb service to finish before exiting
         DRb.thread.join    
@@ -152,11 +157,18 @@ class DynarexEvents < DynarexCron
     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
-    @cron_events = self.to_a
+    @entries = dynarex.to_h || @entries
+    @cron_events = self.to_a if @entries
+    'events loaded and refreshed'
   end  
   
   alias refresh load_events
@@ -172,16 +184,17 @@ class DynarexEvents < DynarexCron
   end  
   
   def to_a()
-    
+
+    return unless @entries
+
     @entries.inject([]) do |r,h| 
 
-      h[:cron] = ChronicCron.new(h[:date]) 
-      h[:job] = 'pub event: ' + h[:title]
+      h[:cron] = ChronicCron.new(h[:date] + ' ' + h[:recurring].to_s ) 
+      h[:job] ||= 'pub event: ' + h[:title]
 
-      if h[:reminder].length > 0 then
+      if h[:reminder].to_s.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
@@ -190,4 +203,4 @@ class DynarexEvents < DynarexCron
     end
     
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - James Robertson
@@ -31,76 +31,76 @@ cert_chain:
   y6cNz+NnybgoQfG28NcwV1e/31NTJk5VqdKHKnTfPcp/y35T9YoElNn5cSs93qc5
   U5VVkvsVQudaZw==
   -----END CERTIFICATE-----
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
   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'
 - !ruby/object:Gem::Dependency
   name: chronic_cron
   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'
 - !ruby/object:Gem::Dependency
   name: simplepubsub
   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'
 - !ruby/object:Gem::Dependency
   name: rscript
   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'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   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: 
@@ -120,12 +120,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []