rsmp 0.1.19 → 0.1.21

data/lib/rsmp/supervisor.rb

@@ -117,17 +117,17 @@ module RSMP
           level: :info,
           timestamp: RSMP.now_object
 
+      settings = @supervisor_settings['sites'][info[:ip]] || @supervisor_settings['sites'][:any]
       proxy = build_proxy({
         supervisor: self,
         task: @task,
-        settings: @supervisor_settings[:sites],
+        settings: settings,
         socket: socket,
         info: info,
         logger: @logger,
         archive: @archive
       })
       @proxies.push proxy
-      
       proxy.run     # will run until the site disconnects
     ensure
       @proxies.delete proxy

data/lib/rsmp/supervisor_proxy.rb

@@ -14,7 +14,6 @@ module RSMP
       @ip = options[:ip]
       @port = options[:port]
       @status_subscriptions = {}
-      @status_subscriptions_mutex = Mutex.new
       @sxl = @site_settings['sxl']
       @synthetic_id = Supervisor.build_id_from_ip_port @ip, @port
     end

data/lib/rsmp/tlc.rb

@@ -125,18 +125,29 @@ module RSMP
 
     def handle_m0005 arg
       @node.verify_security_code 2, arg['securityCode']
-      @emergency_route = arg['status'] == 'True'
+      @emergency_route = (arg['status'] == 'True')
       @emergency_route_number = arg['emergencyroute'].to_i
+
+      if @emergency_route
+        log "Switching to emergency route #{@emergency_route_number}", level: :info
+      else
+        log "Switching off emergency route", level: :info
+      end
     end
 
     def handle_m0006 arg
       @node.verify_security_code 2, arg['securityCode']
       input = arg['input'].to_i
       idx = input - 1
-      return unless idx>=0 && input<@num_inputs
+      return unless idx>=0 && input<@num_inputs # TODO should NotAck
       @input_activations[idx] = (arg['status']=='True' ? '1' : '0')
       result = @input_activations[idx]=='1' || @inputs[idx]=='1'
       @input_results[idx] = (result ? '1' : '0')
+      if @input_activations[idx]
+        log "Activate input #{idx}", level: :info
+      else
+        log "Deactivate input #{idx}", level: :info
+      end
     end
 
     def handle_m0007 arg
@@ -203,8 +214,13 @@ module RSMP
     end
 
     def switch_plan plan
-      log "Switching to plan #{plan}", level: :info
-      @plan = plan.to_i
+      plan_nr = plan.to_i
+      if plan_nr == 0
+        log "Switching to plan selection by time table", level: :info
+      else
+        log "Switching to plan #{plan_nr}", level: :info
+      end
+      @plan = plan_nr
     end
 
     def switch_mode mode

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.19"
+  VERSION = "0.1.21"
 end

data/lib/rsmp/wait.rb

@@ -1,163 +1,16 @@
-# Helper for waiting for an Async condition using a block
-
 module RSMP
   module Wait
-
+    # wait for an async condition to signal, then yield to block
+    # if block returns true we're done. otherwise, wait again
     def wait_for condition, timeout, &block
-      raise RuntimeError.new("Can't wait for state because task is stopped") unless @task.running? 
+      raise RuntimeError.new("Can't wait for condition because task is not running") unless @task.running?
       @task.with_timeout(timeout) do
-        while task.running? do
+        while @task.running? do
           value = condition.wait
           result = yield value 
           return result if result   # return result of check, if not nil
         end
       end
     end   
-
-    def capture_status_updates_or_responses task, type, options, m_id
-      task.annotate "wait for status update/response"
-      want = convert_status_list options[:status_list]
-      result = {}
-      # wait for a status update
-      item = @archive.capture(task,options.merge({
-        type: [type,'MessageNotAck'],
-        num: 1
-      })) do |item|
-        message = item[:message]
-        if message.is_a?(MessageNotAck) && message.attribute('oMId') == m_id
-          # set result to an exception, but don't raise it.
-          # this will be returned by the task and stored as the task result
-          # when the parent task call wait() on the task, the exception
-          # will be raised in the parent task, and caught by rspec.
-          # rspec will then show the error and record the test as failed
-          m_id_short = RSMP::Message.shorten_m_id m_id, 8
-          result = RSMP::MessageRejected.new "Status request #{m_id_short} was rejected: #{message.attribute('rea')}"
-          next true   # done, no more messages wanted
-        end
-        found = []
-        # look through querues
-        want.each_with_index do |query,i|
-          # look through status items in message
-          item[:message].attributes['sS'].each do |input|
-            ok = status_match? query, input
-            if ok
-              result[query] = input
-              found << i   # record which queries where matched succesfully
-            end
-          end
-        end
-        # remove queries that where matched
-        found.sort.reverse.each do |i|
-          want.delete_at i
-        end
-        want.empty? # any queries left to match?
-      end
-      result
-    rescue Async::TimeoutError
-      type_str = {'StatusUpdate'=>'update', 'StatusResponse'=>'response'}[type]
-      raise RSMP::TimeoutError.new "Did not received status #{type_str} in reply to #{m_id} within #{options[:timeout]}s"
-    end
-
-    def wait_for_status_updates_or_responses parent_task, type, options={}, &block
-      raise ArgumentError.new("component argument is missing") unless options[:component]
-      raise ArgumentError.new("status_list argument is missing") unless options[:status_list]
-      m_id = RSMP::Message.make_m_id    # make message id so we can start waiting for it
-
-      # wait for command responses in an async task
-      task = parent_task.async do |task|
-        capture_status_updates_or_responses task, type, options, m_id
-      end
-
-       # call block, it should send command request using the given m_id
-      yield m_id
-
-      # wait for the response and return it, raise exception if NotAck received, it it timed out
-      task.wait
-    end
-
-    def wait_for_status_updates parent_task, options={}, &block
-      wait_for_status_updates_or_responses parent_task, 'StatusUpdate', options, &block
-    end
-
-    def wait_for_status_responses parent_task, options={}, &block
-      wait_for_status_updates_or_responses parent_task, 'StatusResponse', options, &block
-    end
-
-    def process_command_response message
-      log "Received #{message.type}", message: message, level: :log
-      acknowledge message
-    end
-
-    def command_match? query, item
-      return false if query[:sCI] && query[:sCI] != item['sCI']
-      return false if query[:n] && query[:n] != item['n']
-      if query[:s].is_a? Regexp
-        return false if query[:v] && item['v'] !~ query[:v]
-      else
-        return false if query[:v] && item['v'] != query[:v]
-      end
-      true
-    end
-
-    def capture_command_responses parent_task, type, options, m_id
-      task.annotate "wait for command response"
-      want = options[:command_list].clone
-      result = {}
-      item = @archive.capture(parent_task,options.merge({
-        type: [type,'MessageNotAck'],
-        num: 1
-      })) do |item|
-        message = item[:message]
-        if message.is_a?(MessageNotAck) && message.attribute('oMId') == m_id
-           # and message.attribute('oMId')==m_id
-          # set result to an exception, but don't raise it.
-          # this will be returned by the task and stored as the task result
-          # when the parent task call wait() on the task, the exception
-          # will be raised in the parent task, and caught by rspec.
-          # rspec will then show the error and record the test as failed
-          m_id_short = RSMP::Message.shorten_m_id m_id, 8
-          result = RSMP::MessageRejected.new "Command request #{m_id_short} was rejected: #{message.attribute('rea')}"
-          next true   # done, no more messages wanted
-        end
-
-        found = []
-        # look through querues
-        want.each_with_index do |query,i|
-          # look through items in message
-          item[:message].attributes['rvs'].each do |input|
-            ok = command_match? query, input
-            if ok
-              result[query] = input
-              found << i   # record which queries where matched succesfully
-            end
-          end
-        end
-        # remove queries that where matched
-        found.sort.reverse.each do |i|
-          want.delete_at i
-        end
-        want.empty? # any queries left to match?
-      end
-      result
-    rescue Async::TimeoutError
-      raise RSMP::TimeoutError.new "Did not receive command response to #{m_id} within #{options[:timeout]}s"
-    end
-
-    def wait_for_command_responses parent_task, options={}, &block
-      raise ArgumentError.new("component argument is missing") unless options[:component]
-      raise ArgumentError.new("command_list argument is missing") unless options[:command_list]
-      m_id = RSMP::Message.make_m_id    # make message id so we can start waiting for it
-
-      # wait for command responses in an async task
-      task = parent_task.async do |task|
-        capture_command_responses task, 'CommandResponse', options, m_id
-      end
-
-       # call block, it should send command request using the given m_id
-      yield m_id
-
-      # wait for the response and return it, raise exception if NotAck received, it it timed out
-      task.wait
-    end
   end
 end

data/rsmp.gemspec

@@ -41,13 +41,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "async", "~> 1.23.0"
-  spec.add_dependency "async-io", "~> 1.27.4"
+  spec.add_dependency "async", "~> 1.28.3"
+  spec.add_dependency "async-io", "~> 1.30.1"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.0.1"
-  spec.add_dependency "json_schemer", "~> 0.2.11"
+  spec.add_dependency "json_schemer", "~> 0.2.17"
 
-  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "bundler", "~> 2.2.3"
   spec.add_development_dependency "rake", "~> 13.0.1"
   spec.add_development_dependency "rspec", "~> 3.9.0"
   spec.add_development_dependency "rspec-expectations", "~> 3.9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.21
 platform: ruby
 authors:
 - Emil Tin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.28.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.28.3
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.4
+        version: 1.30.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.4
+        version: 1.30.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.17
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -200,25 +200,28 @@ files:
 - config/site.yaml
 - config/supervisor.yaml
 - config/tlc.yaml
-- documentation/classes.md
+- documentation/classes_and_modules.md
+- documentation/message_distribution.md
 - exe/rsmp
 - lib/rsmp.rb
 - lib/rsmp/alarm.rb
 - lib/rsmp/archive.rb
-- lib/rsmp/base.rb
 - lib/rsmp/cli.rb
+- lib/rsmp/collector.rb
 - lib/rsmp/component.rb
+- lib/rsmp/components.rb
 - lib/rsmp/error.rb
+- lib/rsmp/listener.rb
 - lib/rsmp/logger.rb
+- lib/rsmp/logging.rb
 - lib/rsmp/message.rb
 - lib/rsmp/node.rb
-- lib/rsmp/probe.rb
-- lib/rsmp/probe_collection.rb
+- lib/rsmp/notifier.rb
 - lib/rsmp/proxy.rb
 - lib/rsmp/rsmp.rb
 - lib/rsmp/site.rb
-- lib/rsmp/site_base.rb
 - lib/rsmp/site_proxy.rb
+- lib/rsmp/site_proxy_wait.rb
 - lib/rsmp/supervisor.rb
 - lib/rsmp/supervisor_proxy.rb
 - lib/rsmp/tlc.rb
@@ -336,7 +339,7 @@ metadata:
   source_code_uri: https://github.com/rsmp-nordic/rsmp
   changelog_uri: https://github.com/rsmp-nordic/rsmp/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/rsmp-nordic/rsmp/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -351,8 +354,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.
 test_files: []

data/lib/rsmp/probe_collection.rb

@@ -1,28 +0,0 @@
-# Collection of probes
-
-module RSMP
-  class ProbeCollection
-
-    def initialize
-      @probes = []
-    end
-
-    def add probe
-      raise ArgumentError unless probe
-      @probes << probe
-    end
-
-    def remove probe
-      raise ArgumentError unless probe
-      @probes.delete probe
-    end
-
-    def process item
-      @probes.each { |probe| probe.process item }
-    end
-
-    def clear
-      @probes.each { |probe| probe.clear }
-    end
-  end
-end