dynarex_cron 0.5.3 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3139d44b6db16578a36bc08dc006fec8ccf5b287
-  data.tar.gz: 89b56fe3106d2b88f11e3f60cb9dbb4e8a4ae785
+  metadata.gz: 420b00ecdd29552efc3582140a5532b874a51a0f
+  data.tar.gz: 28f95e9900e219d0abe42a763c7d4f0b4574f3ff
 SHA512:
-  metadata.gz: 81cbd636ca30d77aa8b2754fa989157f3e959411691d37de786e1fabf75380b70ea3872b79e082a66e21221d864dbc58cf0baf9beca7daa5177a5f4bf7b94cbd
-  data.tar.gz: 44139283cdaff56684a7780c6b312243291635623da242c8879b3419e332221a66d6a718ec1eb292922fed28804666040099f17fde1d36a2bcdd621cd9022d7b
+  metadata.gz: b7c3c210391ab3bc54eed2760ce5e224492417716c273e72ab794aa6c76aabd2f81dd14f14fd8e5ba517cafb1d85c61821bb4392aafa2d805a8fddd298627e35
+  data.tar.gz: 534c6105d76475f2916f471e0b9273c361674ddf6037b3779a1352e81b09ae84697987c8ef491ed5d2c5c52dd886e28053ca86bf8ab3efe9b51cd45072fc01a7

data/lib/dynarex_cron.rb

@@ -4,8 +4,6 @@
 
 require 'dynarex'
 require 'chronic_cron'
-require 'rscript'
-require 'chronic_duration'
 require 'logger'
 require 'run_every'
 require 'sps-pub'
@@ -27,7 +25,7 @@ class DynarexCron
     #              the time of each entry
     @time_offset = opt[:time_offset].to_i
     
-    @cron_entries, @cron_events  = [], []
+    @cron_entries = []
     
     @dynarex_file = dynarex_file
 
@@ -37,8 +35,6 @@ class DynarexCron
       load_entries(dynarex)
     end 
 
-    load_events() if @include_url and @include_url.length > 0
-
     @sps_address, @sps_port = opt[:sps_address], opt[:sps_port]
 
 
@@ -53,11 +49,10 @@ class DynarexCron
     RunEvery.new(seconds: 60) do
 
       iterate @cron_entries
-      iterate @cron_events
 
       if @dynarex_file.is_a? String then
 
-        # What happens is the @dynarex_file is a URL and the web server is 
+        # What happens if the @dynarex_file is a URL and the web server is 
         # temporarily unavailable? i.e. 503 Service Temporarily Unavailable
         begin
           buffer, _ = RXFHelper.read(@dynarex_file)
@@ -91,8 +86,6 @@ class DynarexCron
   end
 
   def load_entries(dynarex)
-
-    @include_url = dynarex.summary[:include]
     
     if dynarex.summary[:sps_address] then
       @sps_address, @sps_port = dynarex.summary[:sps_address]\
@@ -105,12 +98,6 @@ class DynarexCron
     end
   end  
   
-  def load_events()
-    
-    de = DynarexEvents.new(@include_url)
-    @cron_events = de.to_a
-  end  
-
   def log(s, method_name=:debug)
     return unless @logger
     @logger.method(method_name).call s
@@ -148,63 +135,4 @@ class DynarexCron
     @buffer = buffer
   end   
   
-end
-
-class DynarexEvents < DynarexCron
-
-  attr_reader :to_a
-
-  def initialize(dynarex_file=nil, options={})
-    
-    opt = {sps_address: nil, time_offset: 0}.merge options
-    
-    @time_offset = opt[:time_offset]
-    @cron_events  = []
-    
-    @dynarex_file = dynarex_file
-    load_events()
-
-    @sps_address = opt[:sps_address]
-    
-  end    
-
-  def load_events()
-    
-    dynarex = Dynarex.new @dynarex_file
-    @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'
-    params = {uri: "ws://%s:%s" % [@sps_address, @sps_port]}    
-
-    RunEvery.new(seconds: 60) { iterate @cron_events }
-    
-  end  
-  
-  def to_a()
-    
-    @entries.inject([]) do |r,h| 
-
-      time = Time.now + @time_offset
-      h[:cron] = ChronicCron.new(h[:date], time) 
-      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[:fqm] = 'event: reminder ' + h[:title]
-        r << rmndr
-      end
-
-      r << h
-    end
-    
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex_cron
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.1
 platform: ruby
 authors:
 - James Robertson
@@ -53,26 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.33
-- !ruby/object:Gem::Dependency
-  name: chronic_duration
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: dynarex
   requirement: !ruby/object:Gem::Requirement
@@ -113,26 +93,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: rscript
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.25
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.25
 - !ruby/object:Gem::Dependency
   name: run_every
   requirement: !ruby/object:Gem::Requirement