rsmp 0.37.0 → 0.38.0

metadata

@@ -1,56 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Emil Tin
 bindir: exe
 cert_chain: []
-date: 2025-09-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.32'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.32'
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: async
+  name: io-endpoint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.32'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.32'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: io-stream
   requirement: !ruby/object:Gem::Requirement
@@ -66,33 +66,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: io-endpoint
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rsmp_schema
   requirement: !ruby/object:Gem::Requirement
@@ -107,104 +107,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.2'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.2'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
 description: Easy RSMP site and supervisor communication.
 email:
 - zf0f@kk.dk
@@ -213,12 +115,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/devcontainer.json"
 - ".github/copilot-instructions.md"
 - ".github/workflows/copilot-setup-steps.yml"
 - ".github/workflows/rspec.yaml"
+- ".github/workflows/rubocop.yaml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
+- ".rubocop.yml"
 - ".tool-versions"
 - CHANGELOG.md
 - Gemfile
@@ -237,51 +142,85 @@ files:
 - documentation/tasks.md
 - exe/rsmp
 - lib/rsmp.rb
-- lib/rsmp/alarm_state.rb
-- lib/rsmp/archive.rb
 - lib/rsmp/cli.rb
 - lib/rsmp/collect/ack_collector.rb
 - lib/rsmp/collect/aggregated_status_collector.rb
 - lib/rsmp/collect/alarm_collector.rb
 - lib/rsmp/collect/alarm_matcher.rb
 - lib/rsmp/collect/collector.rb
+- lib/rsmp/collect/collector/logging.rb
+- lib/rsmp/collect/collector/reporting.rb
+- lib/rsmp/collect/collector/status.rb
 - lib/rsmp/collect/command_matcher.rb
 - lib/rsmp/collect/command_response_collector.rb
 - lib/rsmp/collect/distributor.rb
 - lib/rsmp/collect/filter.rb
 - lib/rsmp/collect/matcher.rb
-- lib/rsmp/collect/message_matchers.rb
 - lib/rsmp/collect/queue.rb
 - lib/rsmp/collect/receiver.rb
 - lib/rsmp/collect/state_collector.rb
 - lib/rsmp/collect/status_collector.rb
 - lib/rsmp/collect/status_matcher.rb
-- lib/rsmp/component.rb
-- lib/rsmp/component_base.rb
-- lib/rsmp/component_proxy.rb
-- lib/rsmp/components.rb
+- lib/rsmp/component/alarm_state.rb
+- lib/rsmp/component/component.rb
+- lib/rsmp/component/component_base.rb
+- lib/rsmp/component/component_proxy.rb
+- lib/rsmp/component/components.rb
 - lib/rsmp/convert/export/json_schema.rb
 - lib/rsmp/convert/import/yaml.rb
-- lib/rsmp/deep_merge.rb
-- lib/rsmp/error.rb
-- lib/rsmp/inspect.rb
-- lib/rsmp/logger.rb
-- lib/rsmp/logging.rb
+- lib/rsmp/helpers/clock.rb
+- lib/rsmp/helpers/deep_merge.rb
+- lib/rsmp/helpers/error.rb
+- lib/rsmp/helpers/inspect.rb
+- lib/rsmp/log/archive.rb
+- lib/rsmp/log/colorization.rb
+- lib/rsmp/log/filtering.rb
+- lib/rsmp/log/logger.rb
+- lib/rsmp/log/logging.rb
 - lib/rsmp/message.rb
-- lib/rsmp/node.rb
-- lib/rsmp/protocol.rb
-- lib/rsmp/proxy.rb
-- lib/rsmp/rsmp.rb
-- lib/rsmp/site.rb
-- lib/rsmp/site_proxy.rb
-- lib/rsmp/supervisor.rb
-- lib/rsmp/supervisor_proxy.rb
-- lib/rsmp/task.rb
+- lib/rsmp/node/node.rb
+- lib/rsmp/node/protocol.rb
+- lib/rsmp/node/site/site.rb
+- lib/rsmp/node/supervisor/modules/configuration.rb
+- lib/rsmp/node/supervisor/modules/connection.rb
+- lib/rsmp/node/supervisor/modules/sites.rb
+- lib/rsmp/node/supervisor/supervisor.rb
+- lib/rsmp/node/task.rb
+- lib/rsmp/proxy/modules/acknowledgements.rb
+- lib/rsmp/proxy/modules/receive.rb
+- lib/rsmp/proxy/modules/send.rb
+- lib/rsmp/proxy/modules/state.rb
+- lib/rsmp/proxy/modules/tasks.rb
+- lib/rsmp/proxy/modules/versions.rb
+- lib/rsmp/proxy/modules/watchdogs.rb
+- lib/rsmp/proxy/proxy.rb
+- lib/rsmp/proxy/site/modules/aggregated_status.rb
+- lib/rsmp/proxy/site/modules/alarms.rb
+- lib/rsmp/proxy/site/modules/commands.rb
+- lib/rsmp/proxy/site/modules/status.rb
+- lib/rsmp/proxy/site/site_proxy.rb
+- lib/rsmp/proxy/supervisor/modules/aggregated_status.rb
+- lib/rsmp/proxy/supervisor/modules/alarms.rb
+- lib/rsmp/proxy/supervisor/modules/commands.rb
+- lib/rsmp/proxy/supervisor/modules/status.rb
+- lib/rsmp/proxy/supervisor/supervisor_proxy.rb
 - lib/rsmp/tlc/detector_logic.rb
-- lib/rsmp/tlc/inputs.rb
+- lib/rsmp/tlc/input_states.rb
+- lib/rsmp/tlc/modules/detector_logics.rb
+- lib/rsmp/tlc/modules/display.rb
+- lib/rsmp/tlc/modules/helpers.rb
+- lib/rsmp/tlc/modules/inputs.rb
+- lib/rsmp/tlc/modules/modes.rb
+- lib/rsmp/tlc/modules/outputs.rb
+- lib/rsmp/tlc/modules/plans.rb
+- lib/rsmp/tlc/modules/signal_groups.rb
+- lib/rsmp/tlc/modules/startup_sequence.rb
+- lib/rsmp/tlc/modules/system.rb
+- lib/rsmp/tlc/modules/traffic_data.rb
 - lib/rsmp/tlc/signal_group.rb
 - lib/rsmp/tlc/signal_plan.rb
 - lib/rsmp/tlc/signal_priority.rb
+- lib/rsmp/tlc/startup_sequence.rb
 - lib/rsmp/tlc/traffic_controller.rb
 - lib/rsmp/tlc/traffic_controller_site.rb
 - lib/rsmp/version.rb
@@ -294,6 +233,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
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -301,14 +241,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.
 test_files: []

data/lib/rsmp/archive.rb

@@ -1,76 +0,0 @@
-# Archive of log items, which can be messages or info items.
-# All items are timestamped, and stored chronologically.
-
-module RSMP
-  class Archive
-    include Inspect
-
-    attr_reader :items
-
-    @@index = 0
-
-    def initialize  max=100
-      @items = []
-      @max = max
-    end
-
-    def inspect
-      "#<#{self.class.name}:#{self.object_id}, #{inspector(:@items)}>"
-    end
-
-    def self.prepare_item item
-      raise ArgumentError unless item.is_a? Hash
-
-      cleaned = item.select { |k,v| [:author,:level,:ip,:port,:site_id,:component,:text,:message,:exception].include? k }
-      cleaned[:timestamp] = Clock.now
-      if item[:message]
-        cleaned[:direction] = item[:message].direction
-        cleaned[:component] = item[:message].attributes['cId']
-      end
-
-      cleaned
-    end
-
-    def self.increase_index
-      @@index += 1
-    end
-
-    def self.current_index
-      @@index
-    end
-
-    def by_level levels
-      items.select { |item| levels.include? item[:level] }
-    end
-
-    def strings
-      items.map { |item| item[:str] }
-    end
-
-    def add item
-      item[:index] = RSMP::Archive.increase_index
-      @items << item
-      if @items.size > @max
-        @items.shift
-      end
-    end
-
-    private
-
-    def find options, &block
-      # search backwards from newest to older, stopping once messages
-      # are older that options[:earliest]
-      out = []
-      @items.reverse_each do |item|
-        break if options[:earliest] && item[:timestamp] < options[:earliest]
-        next if options[:level] && item[:level] != options[:level]
-        next if options[:type] && (item[:message] == nil || (item[:message].type != options[:type]))
-        next if options[:with_message] && !(item[:direction] && item[:message])
-        next if block_given? && block.call != true
-        out.unshift item
-      end
-      out
-    end
-  end
-
-end

data/lib/rsmp/component_base.rb

@@ -1,87 +0,0 @@
-module RSMP
-
-  # RSMP component base class.
-
-  class ComponentBase
-    include Inspect
-
-    attr_reader :c_id, :ntsOId, :xNId, :node, :alarms, :statuses,
-      :aggregated_status, :aggregated_status_bools, :grouped
-
-    AGGREGATED_STATUS_KEYS = [ :local_control,
-                               :communication_distruption,
-                               :high_priority_alarm,
-                               :medium_priority_alarm,
-                               :low_priority_alarm,
-                               :normal,
-                               :rest,
-                               :not_connected ]
-
-    def initialize node:, id:,  ntsOId: nil, xNId: nil, grouped: false
-      if grouped==false && (ntsOId || xNId)
-        raise RSMP::ConfigurationError.new("ntsOId and xNId are only allowed for grouped objects")
-      end
-      @c_id = id
-      @ntsOId = ntsOId
-      @xNId = xNId
-      @node = node
-      @grouped = grouped
-      clear_aggregated_status
-      @alarms = {}
-    end
-
-    def now
-      node.now
-    end
-
-    def clear_alarm_timestamps
-      @alarms.values.each {|alarm| alarm.clear_timestamp }
-    end
-
-    def get_alarm_state alarm_code
-      alarm = @alarms[alarm_code] ||= RSMP::AlarmState.new component: self, code: alarm_code
-    end
-
-    def clear_aggregated_status
-      @aggregated_status = []
-      @aggregated_status_bools = Array.new(8,false)
-      @aggregated_status_bools[5] = true
-    end
-
-    def log str, options
-      default = { component: c_id}
-      @node.log str, default.merge(options)
-    end
-
-    def set_aggregated_status status, options={}
-      status = [status] if status.is_a? Symbol
-      raise InvalidArgument unless status.is_a? Array
-      input = status & AGGREGATED_STATUS_KEYS
-      if input != @aggregated_status
-        AGGREGATED_STATUS_KEYS.each_with_index do |key,index|
-          @aggregated_status_bools[index] = status.include?(key)
-        end
-        aggregated_status_changed options
-      end
-    end
-
-    def set_aggregated_status_bools status
-      raise InvalidArgument unless status.is_a? Array
-      raise InvalidArgument unless status.size == 8
-      if status != @aggregated_status_bools
-        @aggregated_status = []
-        AGGREGATED_STATUS_KEYS.each_with_index do |key,index|
-          on = status[index] == true
-          @aggregated_status_bools[index] = on
-          @aggregated_status << key if on
-        end
-        aggregated_status_changed
-      end
-    end
-
-    def aggregated_status_changed options={}
-      @node.aggregated_status_changed self, options
-    end
-
-  end
-end

data/lib/rsmp/component_proxy.rb

@@ -1,57 +0,0 @@
-module RSMP
-  # A proxy to a remote RSMP component.
-  class ComponentProxy < ComponentBase
-    def initialize node:, id:, ntsOId: nil, xNId: nil, grouped: false
-      super
-      @alarms = {}
-      @statuses = {}
-      @allow_repeat_updates = {}
-    end
-
-    # allow the next status update to be a repeat value
-    def allow_repeat_updates subscribe_list
-      subscribe_list.each do |item|
-        sCI = item['sCI']
-        n = item['n']
-        @allow_repeat_updates[sCI] ||= Set.new  # Set is like an array, but with no duplicates
-        @allow_repeat_updates[sCI] << n
-      end
-    end
-
-    # Check that were not receiving repeated update values.
-    # The check is not performed for item with an update interval.
-    def check_repeat_values message, subscription_list
-      message.attribute('sS').each do |item|
-        sCI, n, s, q = item['sCI'], item['n'], item['s'], item['q']
-        uRt = subscription_list.dig(c_id,sCI,n,'uRt')
-        next if uRt.to_i > 0
-        sOc = subscription_list.dig(c_id,sCI,n,'sOc')
-        next if sOc == false
-        next if @allow_repeat_updates[sCI] && @allow_repeat_updates[sCI].include?(n)
-        new_values = {'s'=>s,'q'=>q}
-        old_values = @statuses.dig(sCI,n)
-        if new_values == old_values
-          raise RSMP::RepeatedStatusError.new "no change for #{sCI} '#{n}'"
-        end
-      end
-    end
-        # Store the latest status update values
-    def store_status message
-      message.attribute('sS').each do |item|
-        sCI, n, s, q = item['sCI'], item['n'], item['s'], item['q']
-        @statuses[sCI] ||= {}
-        @statuses[sCI][n] = {'s'=>s,'q'=>q}
-
-        # once a value is received, don't allow the value to be a repeat
-        @allow_repeat_updates[sCI].delete(n) if @allow_repeat_updates[sCI]
-      end
-    end
-
-    # handle incoming alarm
-    def handle_alarm message
-      code = message.attribute('aCId')
-      alarm = get_alarm_state code
-      alarm.update_from_message message
-    end
-  end
-end

data/lib/rsmp/components.rb

@@ -1,65 +0,0 @@
-# Things shared between sites and site proxies
-
-module RSMP
-  module Components
-    attr_reader :components, :main
-
-    def initialize_components
-      @components = {}
-      @main = nil
-    end
-
-    def aggregated_status_changed component, options={}
-    end
-
-    def setup_components settings
-      return unless settings
-      check_main_component settings
-      settings.each_pair do |type,components_by_type|
-        if components_by_type
-          components_by_type.each_pair do |id,component_settings|
-            component_settings ||= {}
-            @components[id] = build_component(id:id, type:type, settings:component_settings)
-            @main = @components[id] if type=='main'
-          end
-        end
-      end
-    end
-
-    def check_main_component settings
-      unless settings['main'] && settings['main'].size >= 1
-        raise ConfigurationError.new("main component must be defined")
-      end
-      if settings['main'].size > 1
-        raise ConfigurationError.new("only one main component can be defined, found #{settings['main'].keys.join(', ')}")
-      end
-    end
-
-    def add_component component
-      @components[component.c_id] = component
-    end
-
-    def infer_component_type component_id
-      raise UnknownComponent.new("Component #{component_id} mising and cannot infer type")
-    end
-
-    def find_component component_id, build: true
-      component = @components[component_id]
-      return component if component
-      if build
-        inferred_type = infer_component_type component_id
-        component = inferred_type.new node: self, id: component_id
-        @components[ component_id] = component
-        class_name = component.class.name.split('::').last
-        class_name << " component" unless (class_name == 'Component' || class_name == 'ComponentProxy')
-        log "Added component #{component_id} with the inferred type #{class_name}", level: :debug
-        component
-      else
-      end
-    end
-
-    def clear_alarm_timestamps
-      @components.values.each {|component| component.clear_alarm_timestamps }
-    end
-  end
-end