rsmp 0.7.1 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75a0ca211283d5cb97be9e6f6eaf24209a68884b8e368358d0933feef870c743
-  data.tar.gz: 4ca8a761d69ae30d8dab706cbe93cdd2dc3ae7667f73d8a9c217467f2f52844a
+  metadata.gz: ca0e580278192b1577388628e8a761a8b0fe61f175c40bdd6c40fc62ab61d700
+  data.tar.gz: 0dd69084856cd0ba08acd74655c6a856bc6222a00bfbfb0031aff24c8df2c17a
 SHA512:
-  metadata.gz: f21887cb5550e4f7b242bbd2fbc42c3d5ffaeb99eddcebf4a5af64e8766961c50f20c9fb885d6e8a7e718615b18e6731f01256162b57c437283f50e94646427b
-  data.tar.gz: 3875d442deeb61c61c75d46099967da3b7f93b7e35fbc206a7d87cc9f5474004a42b91d6dafe59f2eff5fd94f8b9d1eadbb1ae66ce63e2d4ae793ed6fc38692b
+  metadata.gz: 4fa7f6e6f31e8d47369fb769a95d3a519262098d0821387ddfc29ef865e08ccd8f0cd49f65697eeb3ea28e0fb33783291feb2be9706784fc53891c4aaf8f6b66
+  data.tar.gz: 10b21ec864bb578e281686f1926303741d3182f42a2d6a82bb7a90f744fd4b50cfd704eeb773da99d96cdc1796a1876ea2b7f9d0296f303c4644d132f1d46761

data/.ruby-version

@@ -0,0 +1 @@
+3.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.7.1)
+    rsmp (0.7.5)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)
@@ -34,7 +34,7 @@ GEM
     childprocess (4.1.0)
     colorize (0.8.1)
     concurrent-ruby (1.1.9)
-    console (1.13.1)
+    console (1.14.0)
       fiber-local
     contracts (0.17)
     cucumber (6.1.0)
@@ -95,7 +95,7 @@ GEM
       thor
       thread_safe
     rake (13.0.3)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rsmp_schemer (0.3.2)
       json_schemer (~> 0.2.18)
     rspec (3.10.0)
@@ -124,6 +124,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-darwin-21
 
 DEPENDENCIES
   aruba (~> 1.1.2)
@@ -136,4 +137,4 @@ DEPENDENCIES
   timecop (~> 0.9.4)
 
 BUNDLED WITH
-   2.2.21
+   2.2.32

data/lib/rsmp/cli.rb

@@ -3,6 +3,10 @@ require 'rsmp'
 
 module RSMP
   class CLI < Thor
+    desc "version", "Show version"
+    def version
+      puts RSMP::VERSION
+    end
 
     desc "site", "Run RSMP site"
     method_option :config, :type => :string, :aliases => "-c", banner: 'Path to .yaml config file'

data/lib/rsmp/logger.rb

@@ -50,7 +50,7 @@ module RSMP
         'statuses' => ['StatusRequest','StatusSubscribe','StatusUnsubscribe','StatusResponse','StatusUpdate'],
         'commands' => ['CommandRequest','CommandResponse'],
         'watchdogs' => 'Watchdog',
-        'alarms' => ['AlarmIssue','AlarmRequest','AlarmAcknowledged','AlarmSuspend','AlarmResume'],
+        'alarms' => ['Alarm'],
         'aggregated_status' => ['AggregatedStatus','AggregatedStatusRequest']
       }
 
@@ -105,12 +105,10 @@ module RSMP
 
       if item[:message]
         type = item[:message].type
-        ack = type == "MessageAck" || type == "MessageNotAck"
+        ack = (type == "MessageAck" || type == "MessageNotAck")
         @ignorable.each_pair do |key,types|
-          next unless types
           ignore = [types].flatten
           if @settings[key] == false
-            #p [type,ignore_type, [ignore_type].flatten.include?(type)]
             return false if ignore.include?(type)
             if ack
               return false if item[:message].original && ignore.include?(item[:message].original.type)

data/lib/rsmp/site_proxy.rb

@@ -68,7 +68,7 @@ module RSMP
         else
           super message
       end
-    rescue RSMP::RepeatedAlarmError, RSMP::RepeatedStatusError => e
+    rescue RSMP::RepeatedAlarmError, RSMP::RepeatedStatusError, TimestampError => e
       str = "Rejected #{message.type} message,"
       dont_acknowledge message, str, "#{e}"
       notify_error e.exception("#{str}#{e.message} #{message.json}")

data/lib/rsmp/supervisor_proxy.rb

@@ -244,10 +244,13 @@ module RSMP
       @status_subscriptions[component] ||= {}
       update_list[component] ||= {} 
       now = Time.now  # internal timestamp
+      subs = @status_subscriptions[component]
 
       message.attributes["sS"].each do |arg|
         sCI = arg["sCI"]
         subcription = {interval: arg["uRt"].to_i, last_sent_at: now}
+        subs[sCI] ||= {}
+        subs[sCI][arg["n"]] = subcription
         update_list[component][sCI] ||= []
         update_list[component][sCI] << arg["n"]
       end
@@ -279,11 +282,7 @@ module RSMP
     end
 
     def fetch_last_sent_status component, code, name
-      if @last_status_sent && @last_status_sent[component] && @last_status_sent[component][code]
-        @last_status_sent[component][code][name]
-      else
-        nil
-      end
+      @last_status_sent.dig component, code, name
     end
 
     def store_last_sent_status message
@@ -307,10 +306,12 @@ module RSMP
         by_code.each_pair do |code,by_name|
           by_name.each_pair do |name,subscription|
             current = nil
+            should_send = false
             if subscription[:interval] == 0 
               # send as soon as the data changes
               if component_object
                 current, age = *(component_object.get_status code, name)
+                current = current.to_s
               end
               last_sent = fetch_last_sent_status component, code, name
               if current != last_sent

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.7.1"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -189,6 +189,7 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -262,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.