rsmp 0.7.0 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9a318474a865aca223c43e6bfe2bb2bf55a1e0a4584a7d28c80fc87295bc1f9
-  data.tar.gz: 64e892b4fe5b4dbd4aa910542634d82e9120f6c698eb57920c718657be200c1d
+  metadata.gz: 8e33d1daa5e26bfea0abc96970804ebc66f294200c5e952c4febf8105b4a9041
+  data.tar.gz: 6bb4d576fb0f9738f10a885265d3f58d56df78cac77ea520671d3d269de981f4
 SHA512:
-  metadata.gz: 0c9cada8fb00a82666968a656e6896f35942ef480d0ee0e5a442be38b25cc20b89460c6317e13b3087a2c2e7b70432bd8dd69d33a010cca13685f100fc4c0aed
-  data.tar.gz: 305d823c21f5de5f32fc143fdc5d7ad0e2c7947940fd4b261e6dd94b222c58657173cacf14c7a4aae59b263eebb1d5d7060d1b0645a99cd414a76cc8d65d55e0
+  metadata.gz: ec2bda9f884954830d81b65bdee1bdfeee7183e3e7655e4677defad2d0a47e76bc4004c966ef6119f7623570d9febc03a84358897803733c07255b471503097f
+  data.tar.gz: b660975c624bb275c7853cc8060d0c95c0abac5a60f79ab0c2327324d9e7757b618c6dc4e2e91de4924fe1b1de0c5eb480e5cf35fd620e6c4c19aa923e33051e

data/.ruby-version

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.7.0)
+    rsmp (0.7.4)
       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)
@@ -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/component.rb

@@ -85,7 +85,7 @@ module RSMP
           raise RepeatedAlarmError.new("no changes from previous alarm #{previous.m_id_short}")
         end
         if Time.parse(message.attribute('aTs')) < Time.parse(previous.attribute('aTs'))
-          raise RepeatedAlarmError.new("timestamp is earlier than previous alarm #{previous.m_id_short}")
+          raise TimestampError.new("timestamp is earlier than previous alarm #{previous.m_id_short}")
         end
       end
     ensure

data/lib/rsmp/logger.rb

@@ -50,7 +50,7 @@ module RSMP
         'statuses' => ['StatusRequest','StatusSubscribe','StatusUnsubscribe','StatusResponse','StatusUpdate'],
         'commands' => ['CommandRequest','CommandResponse'],
         'watchdogs' => 'Watchdog',
-        'alarms' => ['Alarm','AlarmRequest'],
+        '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

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -19,7 +19,12 @@ module RSMP
         @signal_plans = {}
         return unless signal_plans
         signal_plans.each_pair do |id,settings|
-          @signal_plans[id.to_i] = SignalPlan.new(nr: id.to_i, states:settings['states'],dynamic_bands:settings['dynamic_bands'])
+          states = nil
+          bands = nil
+          states = settings['states'] if settings
+          dynamic_bands = settings['dynamic_bands'] if settings
+
+          @signal_plans[id.to_i] = SignalPlan.new(nr: id.to_i, states:states,dynamic_bands:dynamic_bands)
         end
       end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.7.0"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.4
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2021-12-02 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.