rsmp 0.13.5 → 0.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71b36c94ecbd9272b5ae78759835c9ea1bfa4180badc3194b9be53bedb79afd3
-  data.tar.gz: 31804088149dac7cd977cbb1a5245275b940f5c949b7568cd16173822cddbf4a
+  metadata.gz: '08492adc58ab046ad5b4ff844ce630aa3dba8962b768ec1787b4867c9d221a38'
+  data.tar.gz: a3f3d1182268d14369bbca723b3bc72cc1969327a4e0c3a6c268f7e920b0b1bb
 SHA512:
-  metadata.gz: 9a76596f45499c98ed5935ff4464f9111a43981042447d3900b0ad155ec146627e9241133820385494c51ecf12dc5799fcd8cc48b108b8f4f5278d05c458c5a3
-  data.tar.gz: 508136a654c2040c024405b25a03c1edb8bd179144e5c6e1b6b92ecce86a6fd4d4a447ca8a84b1b41381ff6c6519bd6a87ad8e929df9a3e8ac47bf7d8cb53503
+  metadata.gz: 3a1379ea993e6bb1bce084a27fd347db40859113b1d55cbfac6c175e9f66ba47b95aa1f2a41cdd933c4dcc2c0174a217861c13c88f3491b2e5c40bcb393cdcdb
+  data.tar.gz: ed45664a849d801cb9ab385365653055349c4ce4138c701ff5bf3413f71289524fdac532bd14d1b2b6a6d06db964529cef5ac845343428eea061143a440e9f04

data/.ruby-version

@@ -1 +1 @@
-3.1.0
+3.1.2

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rsmp (0.13.5)
-      async (~> 1.29.1)
-      async-io (~> 1.32.2)
+    rsmp (0.13.9)
+      async (~> 1.30.3)
+      async-io (~> 1.33.0)
       colorize (~> 0.8.1)
       rsmp_schemer
       thor (~> 1.2.1)
@@ -11,18 +11,18 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (2.0.0)
+    aruba (2.0.1)
       bundler (>= 1.17, < 3.0)
       childprocess (>= 2.0, < 5.0)
       contracts (>= 0.16.0, < 0.18.0)
       cucumber (>= 4.0, < 8.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    async (1.29.2)
+    async (1.30.3)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-io (1.32.2)
+    async-io (1.33.0)
       async
     builder (3.2.4)
     childprocess (4.1.0)
@@ -79,26 +79,26 @@ GEM
     multi_test (0.1.2)
     nio4r (2.5.8)
     rake (13.0.6)
-    regexp_parser (2.4.0)
-    rsmp_schemer (0.4.0)
-      json_schemer (~> 0.2.18)
+    regexp_parser (2.5.0)
+    rsmp_schemer (0.4.2)
+      json_schemer (~> 0.2.21)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
     sys-uname (1.2.2)
       ffi (~> 1.1)
     thor (1.2.1)
-    timecop (0.9.4)
+    timecop (0.9.5)
     timers (4.3.3)
     uri_template (0.7.0)
 
@@ -112,7 +112,7 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (~> 2.0.0)
-  bundler (~> 2.3.6)
+  bundler (~> 2.3.7)
   cucumber (~> 7.1.0)
   rake (~> 13.0.6)
   rsmp!
@@ -121,4 +121,4 @@ DEPENDENCIES
   timecop (~> 0.9.4)
 
 BUNDLED WITH
-   2.3.6
+   2.3.7

data/config/tlc.yaml

@@ -8,6 +8,7 @@ components:
   main:
     TC:
       cycle_time: 6
+      ntsOId: KK+AG9998=001TC000
   signal_group:
     A1:
     A2:

data/lib/rsmp/alarm_state.rb

@@ -17,6 +17,19 @@ module RSMP
       @rvs = []
     end
 
+    def to_hash
+      {
+        'cId' => component_id,
+        'aCId' => code,
+        'aTs' => Clock.to_s(timestamp),
+        'ack' => (acknowledged ? 'Acknowledged' : 'notAcknowledged'),
+        'sS' => (suspended ? 'suspended' : 'notSuspended'),
+        'aS' => (active ? 'Active' : 'inActive'),
+        'cat' => category,
+        'pri' => priority.to_s,
+        'rvs' => rvs
+      }
+    end
     def suspend
       change, @suspended = !@suspended, true
       update_timestamp if change
@@ -89,6 +102,5 @@ module RSMP
       @priority = message.attribute('pri').to_i
       @rvs = message.attribute('rvs')
     end
-
   end
 end

data/lib/rsmp/components.rb

@@ -50,8 +50,8 @@ module RSMP
         component = inferred.new node: self, id: component_id
         @components[ component_id] = component
         class_name = component.class.name.split('::').last
-        class_name << " compoent" unless class_name == 'Component'
-        log "Inferred #{class_name} #{component_id}", level: :debug
+        class_name << " component" unless (class_name == 'Component' || class_name == 'ComponentProxy')
+        log "Adding component #{component_id} with the inferred type #{class_name}", level: :debug
         component
       else
         raise UnknownComponent.new("Component #{component_id} not found") unless component

data/lib/rsmp/site.rb

@@ -15,7 +15,6 @@ module RSMP
       @proxies = []
       @sleep_condition = Async::Notification.new
       @proxies_condition = Async::Notification.new
-
       build_proxies
     end
 
@@ -93,27 +92,13 @@ module RSMP
       end
     end
 
-    def alarm_state_to_hash alarm_state
-      {
-        'cId' => alarm_state.component_id,
-        'aCId' => alarm_state.code,
-        'aTs' => Clock.to_s(alarm_state.timestamp),
-        'ack' => (alarm_state.acknowledged ? 'Acknowledged' : 'notAcknowledged'),
-        'sS' => (alarm_state.suspended ? 'suspended' : 'notSuspended'),
-        'aS' => (alarm_state.active ? 'Active' : 'inActive'),
-        'cat' => alarm_state.category,
-        'pri' => alarm_state.priority.to_s,
-        'rvs' => alarm_state.rvs
-      }
-    end
-
     def alarm_suspended_or_resumed alarm_state
-      alarm = AlarmIssue.new( alarm_state_to_hash(alarm_state).merge('aSp' => 'Suspend') )
+      alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Suspend') )
       send_alarm alarm
     end
 
     def alarm_activated_or_deactivated alarm_state
-      alarm = AlarmIssue.new( alarm_state_to_hash(alarm_state).merge('aSp' => 'Issue') )
+      alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Issue') )
       send_alarm alarm
     end
 

data/lib/rsmp/site_proxy.rb

@@ -384,5 +384,8 @@ module RSMP
       end
     end
 
+    def infer_component_type component_id
+      ComponentProxy
+    end
   end
 end

data/lib/rsmp/supervisor_proxy.rb

@@ -85,7 +85,10 @@ module RSMP
       sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
       log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
-      send_all_aggregated_status if @site_settings['send_after_connect']
+      if @site_settings['send_after_connect']
+        send_all_aggregated_status
+        send_active_alarms
+      end
       super
     end
 
@@ -116,9 +119,6 @@ module RSMP
     end
 
     def acknowledged_first_ingoing message
-      # TODO
-      # aggregateds status should only be send for later version of rsmp
-      # to handle verison differences, we probably need inherited classes
       case message.type
       when "Watchdog"
         handshake_complete
@@ -133,6 +133,17 @@ module RSMP
       end
     end
 
+    def send_active_alarms
+      @site.components.each_pair do |c_id,component|
+        component.alarms.each_pair do |alarm_code, alarm_state|
+          if alarm_state.active
+            alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Issue') )
+            send_message alarm
+          end
+        end
+      end
+    end
+
     def reconnect_delay
       return false if @site_settings['intervals']['reconnect'] == :no
       interval = @site_settings['intervals']['reconnect']

data/lib/rsmp/tlc/traffic_controller.rb

@@ -263,10 +263,10 @@ module RSMP
         if actions['raise']
           alarm_code = actions['raise']
           if change
-            log "Activating alarm #{alarm_code}, because input #{input} was activated", level: :info
+            log "Activating input #{input} is programmed to activate alarm #{alarm_code}", level: :info
             activate_alarm alarm_code
           else
-            log "Deactivating alarm #{alarm_code}, because input #{input} was deactivated", level: :info
+            log "Deactivating input #{input} is programmed to deactivate alarm #{alarm_code}", level: :info
             deactivate_alarm alarm_code
           end
         end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.13.5"
+  VERSION = "0.13.9"
 end

data/rsmp.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Easy RSMP site and supervisor communication.}
   spec.homepage      = "https://github.com/rsmp-nordic/rsmp"
   spec.licenses      = ['MIT']
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 3.0.0'
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/rsmp-nordic/rsmp"
@@ -30,13 +30,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "async", "~> 1.29.1"
-  spec.add_dependency "async-io", "~> 1.32.2"
+  spec.add_dependency "async", "~> 1.30.3"
+  spec.add_dependency "async-io", "~> 1.33.0"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.2.1"
   spec.add_dependency "rsmp_schemer"
 
-  spec.add_development_dependency "bundler", "~> 2.3.6"
+  spec.add_development_dependency "bundler", "~> 2.3.7"
   spec.add_development_dependency "rake", "~> 13.0.6"
   spec.add_development_dependency "rspec", "~> 3.10.0"
   spec.add_development_dependency "rspec-expectations", "~> 3.10.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.13.9
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.29.1
+        version: 1.30.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.29.1
+        version: 1.30.3
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.2
+        version: 1.33.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.2
+        version: 1.33.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 2.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -269,14 +269,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.