rsmp 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fa8cde971466041262bd390c93f4f976cb0942ca6d78aadd2707e87e90fddb2
-  data.tar.gz: f7970833a69ea2ed5741a5b7f6d3619bfca25df8343f0b6a02a304dc7a74fce7
+  metadata.gz: b4eb81e9be58fe5645d41ffe88fad923aac8ba5db14382ce0532d17721b18b0c
+  data.tar.gz: 806810e243027d1349631b1b0153c452557e9b7ad01470ff51376c6a181a3810
 SHA512:
-  metadata.gz: d3a857d4b29b9b1e2f9bbf0181ed86586ade1b15eedbbbd79fbc4ca0a3f65b5e67c8f96224b55a87a3c05622a75353fc7fb29d61e1ecfb8af464c99873cc0bae
-  data.tar.gz: 499d7c02e691e0a3aa0fdf2f1f000f30bbda8bc9240836f00c6e8ca0114298666a92ffd20953d57887f359bec45ca983cf12624fc0b49eee952eb24eea8b80ca
+  metadata.gz: cfa09b0e9692c42999c97866166631e5e805c16741af046b21670a5cdaad862afa9fd532d266877da1c623b0ebb42f4d23854bac9dcb1884e095dabf6027b97a
+  data.tar.gz: 493156ab24d418536dd57a5d0a68d008320b9c896e99b33e9ed6023c061f597467569865645895b106f3e13423c686f5c3c89c2177cafbd28a1707c387a5a00c

data/Gemfile.lock

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

data/lib/rsmp/collect/alarm_collector.rb

@@ -0,0 +1,20 @@
+module RSMP
+  # Class for waiting for specific command responses
+  class AlarmCollector < Collector
+    def initialize proxy, want, options={}
+      @want = want
+      super proxy, options.merge(
+        type: 'Alarm',
+        title:'alarm'
+      )
+    end
+
+    def type_match? message
+      return false if super(message) == false
+      [:aCId, :aSp, :ack, :aS, :sS, :cat, :pri].each do |key|
+        return false if @want[key] && @want[key] != message.attribute(key.to_s)
+      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/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 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.3
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-03-09 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