rsmp 0.33.2 → 0.33.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f45a8754f0d229c77dd94069219416b680bf5e1beaa23412732980231cf634
-  data.tar.gz: 5855e1ea8d0cb8f7aec66e652f5e5553a296b3cdef08aee9b514fed43c838640
+  metadata.gz: 7695095d716cbc6f3b6713584bf7b78fc2323a6d9ea80abe28c0ebd8eddfa14b
+  data.tar.gz: b9efc9a38e5ea2020a2038c28bfbf6c45e2555b4804f763726750995e0c40d5c
 SHA512:
-  metadata.gz: d2d37ad752b3b9ebcfe13d544a594d642cd5b887b647bfc54a5d5af898609f77b1bfd8402d66759abfe5b2fc43657615befc4f9be4d1bb176e84c364da5a9449
-  data.tar.gz: 653a2f991a9aecf1ecd46a12a6179cac1d4b830edf75880f4c078fa3f7309eb10430415c9e3c9db1e2de247a9263bcc0ae9edf8e9b39b432267ee163564a82f3
+  metadata.gz: 9ccd49421abfa90e1d0dd3c8e84e6346623a4ee3eaf7aa9af8183974e0f867f520c37562d8468338179dd4425aded09f18cd169b9921744f61d368a975c7cf52
+  data.tar.gz: 6feabda3a5a2ba01042fb594e7c479545d15c48b4d41d22c0f0d0121f15d4d3e4f3c23b2e3e4f7da7f853e4746146bf91c8999e6decddb33846ef60d2a98cd0a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.33.2)
+    rsmp (0.33.4)
       async (~> 2.16)
       async-io (~> 1.43)
       colorize (~> 1.1)
@@ -18,8 +18,8 @@ GEM
       cucumber (>= 8.0, < 10.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    async (2.17.0)
-      console (~> 1.26)
+    async (2.21.1)
+      console (~> 1.29)
       fiber-annotation
       io-event (~> 1.6, >= 1.6.5)
     async-io (1.43.2)
@@ -27,11 +27,11 @@ GEM
     bigdecimal (3.1.8)
     builder (3.3.0)
     colorize (1.1.0)
-    console (1.27.0)
+    console (1.29.2)
       fiber-annotation
       fiber-local (~> 1.1)
       json
-    contracts (0.17)
+    contracts (0.17.2)
     cucumber (9.2.0)
       builder (~> 3.2)
       cucumber-ci-environment (> 9, < 11)
@@ -56,7 +56,7 @@ GEM
     cucumber-html-formatter (21.7.0)
       cucumber-messages (> 19, < 27)
     cucumber-messages (22.0.0)
-    cucumber-tag-expressions (6.1.0)
+    cucumber-tag-expressions (6.1.1)
     diff-lcs (1.5.1)
     ffi (1.17.0)
     fiber-annotation (0.2.0)
@@ -64,19 +64,19 @@ GEM
       fiber-storage
     fiber-storage (1.0.0)
     hana (1.3.7)
-    io-event (1.6.5)
-    json (2.7.2)
+    io-event (1.7.4)
+    json (2.9.0)
     json_schemer (2.3.0)
       bigdecimal
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
-    logger (1.6.1)
+    logger (1.6.2)
     mini_mime (1.1.5)
     multi_test (1.1.0)
-    ostruct (0.6.0)
+    ostruct (0.6.1)
     rake (13.2.1)
-    regexp_parser (2.9.2)
+    regexp_parser (2.9.3)
     rsmp_schema (0.8.4)
       json_schemer (~> 2.3.0)
       thor (~> 1.3.1)
@@ -84,17 +84,17 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     simpleidn (0.2.3)
-    sys-uname (1.3.0)
+    sys-uname (1.3.1)
       ffi (~> 1.1)
     thor (1.3.2)
     timecop (0.9.10)

data/lib/rsmp/site_proxy.rb

@@ -137,7 +137,7 @@ module RSMP
 
     def process_aggregated_status message
       se = message.attribute("se")
-      validate_aggregated_status(message,se) == false
+      validate_aggregated_status(message,se)
       c_id = message.attributes["cId"]
       component = find_component c_id
       unless component

data/lib/rsmp/supervisor_proxy.rb

@@ -172,19 +172,24 @@ module RSMP
 
     def send_aggregated_status component, options={}
       m_id = options[:m_id] || RSMP::Message.make_m_id
+
+      # For core <=3.1.2, se items must be send as strings
+      # For core > 3.1.2, se items must be send as booleans
+      if Proxy::version_meets_requirement?(core_version,"<=3.1.2")
+        se = component.aggregated_status_bools.map {|bool| bool ? "true" : "false"}
+      else
+        se = component.aggregated_status_bools
+      end
+
       message = AggregatedStatus.new({
         "aSTS" => clock.to_s,
         "cId" =>  component.c_id,
         "fP" => nil,
         "fS" => nil,
-        "se" => component.aggregated_status_bools,
+        "se" => se,
         "mId" => m_id,
       })
 
-      # Core 3.1.2 or earlier requires that se items to be send as strings
-      if Proxy::version_meets_requirement?(core_version,"<=3.1.2")
-        message.attributes["se"].map! {|bool| bool ? "true" : "false"}
-      end
 
       set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
@@ -200,7 +205,7 @@ module RSMP
 
     def process_aggregated_status message
       se = message.attribute("se")
-      validate_aggregated_status(message,se) == false
+      validate_aggregated_status(message,se)
       on = set_aggregated_status se
       log "Received #{message.type} status [#{on.join(', ')}]", message: message, level: :log
       acknowledge message

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.33.2"
+  VERSION = "0.33.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.33.2
+  version: 0.33.4
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger