rsmp 0.13.6 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cda7f9e8c968b04c5b584c0e9cb9af6ec139f955c3c305ddcb6d00b064d377f
-  data.tar.gz: 57adfef975bb4cdb7adad247f8a3aebbd04d081e6cf92655b86925008c35f831
+  metadata.gz: ff38488f573505ba26ab81c6f586c341a40bc6d00999b33fb97226c48d989dc1
+  data.tar.gz: 5c9d199fcbd87090a65d2148efe02a2521d726a272c0b20a0756570961439c6f
 SHA512:
-  metadata.gz: 0e525d88e1b2f6a71a62ed3c711eee82c918a8b14d3f893b2d8ecf4351f7d4516e39ba4be6462bd398ab01be543c86a238e3de37c38bc785f18a1cc3fb2e8e6c
-  data.tar.gz: ff0d0e1402d27b8952355cc3c65a2cb78166e334b35e281cf8707b063eb35ee606126d82650d7d94d37709cb70fbcf4e93710760bb659de13075bd8e8ce1792c
+  metadata.gz: 9f5dd8a06e3d7684eed3653b0b6b810e2d75f9447078dc93504a2aebd30bdb5b2ede91a7d8b5c3e30e4e2687e0e3c3faf1b5fc625c1b5c197f9a58b77a49f009
+  data.tar.gz: 503e4e15aec9293d4c1b0d057e57f79ed67680db3321ea7c6d513b4290c231da38c3d531f8ac32cf1bc4da649631c54c5374c6a388e90f1646ce3251e40dfd4d

data/.ruby-version

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

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rsmp (0.13.6)
-      async (~> 1.29.1)
-      async-io (~> 1.32.2)
+    rsmp (0.14.0)
+      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)
@@ -80,25 +80,25 @@ GEM
     nio4r (2.5.8)
     rake (13.0.6)
     regexp_parser (2.5.0)
-    rsmp_schemer (0.4.1)
+    rsmp_schemer (0.5.0)
       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/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/component_proxy.rb

@@ -25,6 +25,8 @@ module RSMP
         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)

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/convert/export/json_schema.rb

@@ -31,9 +31,9 @@ module RSMP
           if item['list']
             case item['type']
             when "boolean"
-              out["$ref"] = "../../core/definitions.json#/boolean_list"
+              out["$ref"] = "../../../core/3.1.1/definitions.json#/boolean_list"
             when "integer", "ordinal", "unit", "scale", "long"
-              out["$ref"] = "../../core/definitions.json#/integer_list"
+              out["$ref"] = "../../../core/3.1.1/definitions.json#/integer_list"
             else
               raise "Error: List of #{item['type']} is not supported: #{item.inspect}"
             end
@@ -51,11 +51,11 @@ module RSMP
             when "string", "base64"
               out["type"] = "string"
             when "boolean"
-              out["$ref"] = "../../core/definitions.json#/boolean"
+              out["$ref"] = "../../../core/3.1.1/definitions.json#/boolean"
             when "timestamp"
-              out["$ref"] = "../../core/definitions.json#/timestamp"
+              out["$ref"] = "../../../core/3.1.1/definitions.json#/timestamp"
             when "integer", "ordinal", "unit", "scale", "long"
-              out["$ref"] = "../../core/definitions.json#/integer"
+              out["$ref"] = "../../../core/3.1.1/definitions.json#/integer"
             else
               out["type"] = "string"
             end
@@ -153,9 +153,11 @@ module RSMP
           out["commands/#{key}.json"] = output_json json
         end
 
-        def self.output_root out
+        def self.output_root out, meta
           json = {
-            "description"=> "A schema validatating message against the RSMP SXL for Traffic Light Controllers",
+            "name"=> meta['name'],
+            "description"=> meta['description'],
+            "version"=> meta['version'],
             "allOf" => [
               {
                 "if" => { "required" => ["type"], "properties" => { "type" => { "const" => "CommandRequest" }}},
@@ -180,7 +182,7 @@ module RSMP
 
         def self.generate sxl
           out = {}
-          output_root out
+          output_root out, sxl[:meta]
           output_alarms out, sxl[:alarms]
           output_statuses out, sxl[:statuses]
           output_commands out, sxl[:commands]

data/lib/rsmp/convert/import/yaml.rb

@@ -19,15 +19,18 @@ module RSMP
 
         def self.convert yaml
           sxl = {
+            meta: {},
             alarms: {},
             statuses: {},
             commands: {}
           }
 
+          sxl[:meta] = yaml['meta']
+
           yaml['objects'].each_pair do |type,object|
-            object["alarms"].each { |id,item| sxl[:alarms][id] = item }
-            object["statuses"].each { |id,item| sxl[:statuses][id] = item }
-            object["commands"].each { |id,item| sxl[:commands][id] = item }
+            object["alarms"].each { |id,item| sxl[:alarms][id] = item } if object["alarms"]
+            object["statuses"].each { |id,item| sxl[:statuses][id] = item } if object["statuses"]
+            object["commands"].each { |id,item| sxl[:commands][id] = item } if object["commands"]
           end
           sxl
         end

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

@@ -212,7 +212,7 @@ module RSMP
 
       # additional items can be used when verifying the response,
       # but must be removed from the subscribe message
-      subscribe_list = status_list.map { |item| item.slice('sCI','n','uRt') }
+      subscribe_list = status_list.map { |item| item.slice('sCI','n','uRt','sOc') }
 
       # update our subcription list
       @status_subscriptions[component_id] ||= {}
@@ -220,9 +220,11 @@ module RSMP
         sCI = item["sCI"]
         n = item["n"]
         uRt = item["uRt"]
+        sOc = item["sOc"]
         @status_subscriptions[component_id][sCI] ||= {}
         @status_subscriptions[component_id][sCI][n] ||= {}
         @status_subscriptions[component_id][sCI][n]['uRt'] = uRt
+        @status_subscriptions[component_id][sCI][n]['sOc'] = sOc
       end
 
       component = find_component component_id
@@ -384,5 +386,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.6"
+  VERSION = "0.14.0"
 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.6
+  version: 0.14.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-08-16 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.