rsmp 0.41.0 → 0.42.1

data/lib/rsmp/tlc/proxy/status.rb

@@ -7,16 +7,12 @@ module RSMP
         # Fetch the current signal plan from the remote TLC.
         def fetch_signal_plan(options: {})
           validate_ready 'fetch signal plan'
-
-          status_list = [{
-            'sCI' => 'S0014',
-            'n' => 'status'
-          }, {
-            'sCI' => 'S0014',
-            'n' => 'source'
-          }]
-
-          request_status main.c_id, status_list, @timeouts.merge(options)
+          timeout = options[:timeout] || @timeouts['status_response']
+          collector = request_status_and_collect({ S0014: %i[status source] }, within: timeout)
+          collector.ok!
+          collector.messages.last.attributes['sS'].to_h do |item|
+            [item['n'], item['s']]
+          end
         end
 
         # Subscribe to one or more statuses and wait until they match the expected values.
@@ -39,10 +35,10 @@ module RSMP
           log "Wait for #{description}", level: :debug
 
           begin
-            subscribe_to_status component_id, subscribe_list, collect!: { timeout: timeout }
+            subscribe_to_status_and_collect(subscribe_list, component: component_id, within: timeout).ok!
           ensure
             unsubscribe_list = status_list.map { |item| item.slice('sCI', 'n') }
-            unsubscribe_to_status component_id, unsubscribe_list
+            unsubscribe_to_status unsubscribe_list, component: component_id
           end
         end
 
@@ -75,10 +71,9 @@ module RSMP
         def read_cycle_times(options: {})
           validate_ready 'read cycle times'
           timeout = options[:timeout] || @timeouts['status_response']
-          result = request_status main.c_id,
-                                  [{ 'sCI' => 'S0028', 'n' => 'status' }],
-                                  collect!: { timeout: timeout }
-          result[:collector].messages.first.attributes['sS'].first['s'].split(',').to_h do |item|
+          collector = request_status_and_collect({ S0028: [:status] }, within: timeout)
+          collector.ok!
+          collector.messages.first.attributes['sS'].first['s'].split(',').to_h do |item|
             item.split('-').map(&:to_i)
           end
         end
@@ -88,10 +83,9 @@ module RSMP
         def read_current_plan(options: {})
           validate_ready 'read current plan'
           timeout = options[:timeout] || @timeouts['status_response']
-          result = request_status main.c_id,
-                                  [{ 'sCI' => 'S0014', 'n' => 'status' }],
-                                  collect!: { timeout: timeout }
-          result[:collector].messages.first.attributes['sS'].first['s'].to_i
+          collector = request_status_and_collect({ S0014: [:status] }, within: timeout)
+          collector.ok!
+          collector.messages.first.attributes['sS'].first['s'].to_i
         end
 
         # Read the value of a single dynamic band for a given plan and band index via S0023.
@@ -99,16 +93,15 @@ module RSMP
         def read_dynamic_band(plan:, band:, options: {})
           validate_ready 'read dynamic band'
           timeout = options[:timeout] || @timeouts['status_response']
-          result = request_status main.c_id,
-                                  [{ 'sCI' => 'S0023', 'n' => 'status' }],
-                                  collect!: { timeout: timeout }
-          extract_band_value(result, plan, band)
+          collector = request_status_and_collect({ S0023: [:status] }, within: timeout)
+          collector.ok!
+          extract_band_value(collector, plan, band)
         end
 
         private
 
-        def extract_band_value(result, plan, band)
-          result[:collector].messages.first.attributes['sS'].first['s'].split(',').each do |item|
+        def extract_band_value(collector, plan, band)
+          collector.messages.first.attributes['sS'].first['s'].split(',').each do |item|
             some_plan, some_band, value = item.split('-')
             return value.to_i if some_plan.to_i == plan.to_i && some_band.to_i == band.to_i
           end

data/lib/rsmp/tlc/proxy/system.rb

@@ -6,7 +6,7 @@ module RSMP
       module System
         # M0103 — Change security code for a given level.
         # Does not use security_code_for since the codes are passed explicitly.
-        def set_security_code(level:, old_code:, new_code:, options: {})
+        def set_security_code(level:, old_code:, new_code:, within:)
           validate_ready 'set security code'
           raise 'TLC main component not found' unless main
 
@@ -26,16 +26,15 @@ module RSMP
             'n' => 'newSecurityCode',
             'v' => new_code.to_s
           }]
-
-          send_command_with_confirm main.c_id, command_list, options, "security code level #{level}", nil
+          send_command_and_collect(command_list, within: within).ok!
         end
 
         # M0104 — Set the clock on the remote TLC. clock must respond to year/month/day/hour/min/sec.
-        def set_clock(clock, options: {})
+        def set_clock(clock, within:)
           validate_ready 'set clock'
           raise 'TLC main component not found' unless main
 
-          send_command_with_confirm main.c_id, clock_command_list(clock), options, 'clock', nil
+          send_command_and_collect(clock_command_list(clock), within: within).ok!
         end
 
         private

data/lib/rsmp/tlc/traffic_controller_proxy.rb

@@ -35,7 +35,7 @@ module RSMP
         @timeouts = node.supervisor_settings.dig('default', 'timeouts') || {}
       end
 
-      def subscribe_to_timeplan(options: {})
+      def subscribe_to_timeplan
         validate_ready 'subscribe to timeplan'
 
         status_list = [
@@ -44,11 +44,9 @@ module RSMP
         ]
         status_list.each { |item| item['sOc'] = true } if use_soc?
 
-        merged_options = @timeouts.merge(options)
-
         raise 'TLC main component not found' unless main
 
-        subscribe_to_status main.c_id, status_list, merged_options
+        subscribe_to_status status_list, component: main.c_id
       end
 
       # Override status update processing to automatically store cached status values.
@@ -94,33 +92,6 @@ module RSMP
         code
       end
 
-      # Send a command and, if confirm: or confirm!: is present in options, wait for
-      # confirming status updates afterwards.
-      #
-      # confirm_description - human-readable label used in log output
-      # confirm_status_list  - status items to wait for (passed to wait_for_status)
-      # component_id         - component to wait on (defaults to main)
-      #
-      # If options[:confirm] is set, timeout errors are silently swallowed.
-      # If options[:confirm!] is set, timeout errors are raised.
-      def send_command_with_confirm(component_id, command_list, options, confirm_description, confirm_status_list)
-        result = send_command component_id, command_list, @timeouts.merge(options.except(:confirm, :confirm!))
-
-        confirm_opts = options[:confirm] || options[:confirm!]
-        return result unless confirm_opts
-        return result if confirm_status_list.nil? || confirm_status_list.empty?
-
-        timeout = confirm_opts.is_a?(Hash) ? confirm_opts[:timeout] : nil
-        wait_kwargs = { timeout: timeout }.compact
-        begin
-          wait_for_status confirm_description, confirm_status_list, **wait_kwargs
-        rescue RSMP::TimeoutError
-          raise if options[:confirm!]
-        end
-
-        result
-      end
-
       # Process a single status item and update the corresponding cached value.
       def cache_status_item(item)
         case item['sCI']

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.41.0'.freeze
+  VERSION = '0.42.1'.freeze
 end

data/lib/rsmp.rb

@@ -12,6 +12,8 @@ require 'json_schemer'
 require 'async/queue'
 require 'rsmp_schema'
 
+require_relative 'rsmp/status_list'
+require_relative 'rsmp/command_list'
 require_relative 'rsmp/helpers/clock'
 require_relative 'rsmp/helpers/deep_merge'
 require_relative 'rsmp/helpers/error'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.42.1
 platform: ruby
 authors:
 - Emil Tin
@@ -118,8 +118,8 @@ files:
 - ".devcontainer/devcontainer.json"
 - ".github/copilot-instructions.md"
 - ".github/workflows/copilot-setup-steps.yml"
-- ".github/workflows/rspec.yaml"
 - ".github/workflows/rubocop.yaml"
+- ".github/workflows/sus.yaml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
@@ -134,6 +134,7 @@ files:
 - bin/console
 - bin/setup
 - config/supervisor.yaml
+- config/sus.rb
 - config/tlc.yaml
 - cucumber.yml
 - documentation/classes_and_modules.md
@@ -162,6 +163,7 @@ files:
 - lib/rsmp/collect/state_collector.rb
 - lib/rsmp/collect/status_collector.rb
 - lib/rsmp/collect/status_matcher.rb
+- lib/rsmp/command_list.rb
 - lib/rsmp/component/alarm_state.rb
 - lib/rsmp/component/component.rb
 - lib/rsmp/component/component_base.rb
@@ -212,6 +214,7 @@ files:
 - lib/rsmp/proxy/supervisor/modules/commands.rb
 - lib/rsmp/proxy/supervisor/modules/status.rb
 - lib/rsmp/proxy/supervisor/supervisor_proxy.rb
+- lib/rsmp/status_list.rb
 - lib/rsmp/tlc/detector_logic.rb
 - lib/rsmp/tlc/input_states.rb
 - lib/rsmp/tlc/modules/detector_logics.rb