rsmp 0.9.2 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fa8cde971466041262bd390c93f4f976cb0942ca6d78aadd2707e87e90fddb2
-  data.tar.gz: f7970833a69ea2ed5741a5b7f6d3619bfca25df8343f0b6a02a304dc7a74fce7
+  metadata.gz: 774c3a61fac3a93f87f5d8512da860cbf28cbfb47ff568d2035006d08ac98cf1
+  data.tar.gz: 238b160b9786c76e78639f9c470abcb196aa24476466a1e2ca53cbca8f41eb03
 SHA512:
-  metadata.gz: d3a857d4b29b9b1e2f9bbf0181ed86586ade1b15eedbbbd79fbc4ca0a3f65b5e67c8f96224b55a87a3c05622a75353fc7fb29d61e1ecfb8af464c99873cc0bae
-  data.tar.gz: 499d7c02e691e0a3aa0fdf2f1f000f30bbda8bc9240836f00c6e8ca0114298666a92ffd20953d57887f359bec45ca983cf12624fc0b49eee952eb24eea8b80ca
+  metadata.gz: c8573e91e6d88cc6be7806d81098e4894d3b220f50997867fca64b8c1161f5f6019fed0383a70c7ee48d61182cdd0a38feb9be3509d2c624224235147839831c
+  data.tar.gz: 487cc05ad5fdb48ad7efbc5415640f2d1aeac49bebb7c2989b97e251a6d1d34e2bce6c6b03596190083c4eeb9b48eaaf33023d8ce382961c25f09a2c17c9db8b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.9.2)
+    rsmp (0.9.5)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)

data/lib/rsmp/collect/alarm_collector.rb

@@ -0,0 +1,35 @@
+module RSMP
+  # Class for waiting for specific command responses
+  class AlarmCollector < Collector
+    def initialize proxy,options={}
+      @query = options[:query] || {}
+      super proxy, options.merge(
+        type: 'Alarm',
+        title:'alarm'
+      )
+    end
+
+    def type_match? message
+      return false if super(message) == false
+
+      # match fixed attributes
+      %w{aCId aSp ack aS sS cat pri}.each do |key|
+        return false if @query[key] && @query[key] != message.attribute(key)
+      end
+
+      # match rvs items
+      if @query['rvs']
+        query_rvs = @query['rvs']
+        message_rvs = message.attributes['rvs']
+        return false unless message_rvs
+        return false unless query_rvs.all? do |query_item|
+          return false unless message_rvs.any? do |message_item|
+            next message_item['n'] == query_item['n'] && message_item['v'] == query_item['v']
+          end
+          next true
+        end
+      end
+      true
+    end
+  end
+end

data/lib/rsmp/collect/alarm_query.rb

@@ -0,0 +1,15 @@
+module RSMP
+  # Match a specific alarm
+  class AlarmQuery < Query
+    # Match an alarm value against a query
+    def match? item
+      return false if @want['n'] && @want['n'] != item['n']
+      if @want['v'].is_a? Regexp
+        return false if item['v'] !~ @want['v']
+      elsif @want['v']
+        return false if item['v'] != @want['v']
+      end
+      true
+    end
+  end
+end

data/lib/rsmp/site_proxy.rb

@@ -346,14 +346,5 @@ module RSMP
       @supervisor.notify_error e, options if @supervisor
       distribute_error e, options
     end
-
-    def collect_alarms options={}
-      collect(@task,options.merge(type: "Alarm")) do |alarm|
-        next if options[:aCId] && options[:aCId] != alarm.attribute("aCId")
-        next if options[:aSp] && options[:aSp] != alarm.attribute("aSp")
-        next if options[:aS] && options[:aS] != alarm.attribute("aS")
-        :keep
-      end
-    end
   end
 end

data/lib/rsmp/tlc/traffic_controller.rb

@@ -272,7 +272,7 @@ module RSMP
         return unless idx>=0 && input<@num_inputs # TODO should NotAck
         @input_activations[idx] = bool_string_to_digit arg['status']
         recompute_input idx
-        if @input_activations[idx]
+        if @input_activations[idx] == '1'
           log "Activating input #{idx+1}", level: :info
         else
           log "Deactivating input #{idx+1}", level: :info

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.9.2"
+  VERSION = "0.9.5"
 end

data/lib/rsmp.rb

@@ -25,9 +25,11 @@ require 'rsmp/collect/filter'
 require 'rsmp/collect/query'
 require 'rsmp/collect/status_query'
 require 'rsmp/collect/command_query'
+require 'rsmp/collect/alarm_query'
 require 'rsmp/collect/status_collector'
 require 'rsmp/collect/command_response_collector'
 require 'rsmp/collect/aggregated_status_collector'
+require 'rsmp/collect/alarm_collector'
 require 'rsmp/component'
 require 'rsmp/site'
 require 'rsmp/proxy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -211,6 +211,8 @@ files:
 - lib/rsmp/archive.rb
 - lib/rsmp/cli.rb
 - lib/rsmp/collect/aggregated_status_collector.rb
+- lib/rsmp/collect/alarm_collector.rb
+- lib/rsmp/collect/alarm_query.rb
 - lib/rsmp/collect/collector.rb
 - lib/rsmp/collect/command_query.rb
 - lib/rsmp/collect/command_response_collector.rb