rsmp 0.42.0 → 0.42.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e00101c429f0533a6f979cbd9b23ce7cb37d30283fe71766916aab6d7634115a
-  data.tar.gz: b5bc3b782f93caf825ca8a7add57e5d1e1c09b08d9bc9bab4ebeba337707db22
+  metadata.gz: 49c61e299fa55246bbee0c3c0bbd28f294dc652fdcb754020292738bdd4b7e2f
+  data.tar.gz: 688d17de1f51cfd5a82b7c71b4d49db20365fdace976d481eaae93973400edd1
 SHA512:
-  metadata.gz: e0ee7eb5a3df9aa770e26625dce129b114176fee2ed671503dfdecb590839a9aff264599ebd2201f07339cab3295dfa08c6476cf27a91baef18277bc5fd3e352
-  data.tar.gz: 148b2eefca4411bf7262446632d407617b00f9ea17e8f0a0c427aeba48eb857c4292936b8474e0108c1a8d23841c10320eb4a6dc0c17c5a940c78a9fd91082eb
+  metadata.gz: 981237d8987c178ef8a9bca82ad3c6735553bc04165680da82b4b60cef9f40db4349db5ab9faa7fd10612516796e1ea33759e12578d6e0a165b4d0c3a36666d8
+  data.tar.gz: 2a0832841d760be46b2d507b391726734a1036dc191545c33f380fd27a3f4cce58e78272067ffaa51aebd97333c495b8624122055b0f89bef9df80df15f37b53

data/.rubocop.yml

@@ -40,6 +40,7 @@ Metrics/ParameterLists:
 # Allow some blocks to be longer for complex configurations and tests
 Metrics/BlockLength:
   Exclude:
+    - 'test/**/*'
     - 'test/**/*'
     - 'features/**/*'
     - '*.gemspec'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.42.0)
+    rsmp (0.42.2)
       async (~> 2.32)
       colorize (~> 1.1)
       io-endpoint (~> 0.15)
@@ -121,7 +121,7 @@ GEM
       rubocop (>= 1.72.1)
     ruby-progressbar (1.13.0)
     simpleidn (0.2.3)
-    sus (0.35.2)
+    sus (0.36.0)
     sus-fixtures-async (0.2.0)
       async
       sus (~> 0.10)

data/lib/rsmp/cli.rb

@@ -86,7 +86,8 @@ module RSMP
 
     def apply_basic_site_options(settings)
       settings['site_id'] = options[:id] if options[:id]
-      settings['core_version'] = options[:core] if options[:core]
+      settings['core_version'] = options[:core] || ENV['CORE_VERSION'] if options[:core] || ENV['CORE_VERSION']
+      settings['sxl_version'] = ENV['SXL_VERSION'] if ENV['SXL_VERSION']
     end
 
     def parse_supervisors(settings)

data/lib/rsmp/proxy/site/site_proxy.rb

@@ -50,8 +50,7 @@ module RSMP
 
     def handshake_complete
       super
-      sanitized_sxl_version = RSMP::Schema.sanitize_version(@site_sxl_version)
-      log "Connection to site #{@site_id} established, using core #{@core_version}, #{@sxl} #{sanitized_sxl_version}",
+      log "Connection to site #{@site_id} established, using core #{@core_version}, #{@sxl} #{@site_sxl_version}",
           level: :info
       start_watchdog
     end
@@ -126,12 +125,12 @@ module RSMP
       # note that the type comes from the site config, while the version
       # comes from the Version message send by the site
       type = @site_settings['sxl']
-      version = message.attribute 'SXL'
-      RSMP::Schema.find_schema! type, version, lenient: true
+      version = RSMP::Schema.sanitize_version(message.attribute('SXL'))
+      RSMP::Schema.find_schema! type, version
 
-      # store sxl version requested by site
+      # store sanitized sxl version requested by site
       # TODO should check agaist site settings
-      @site_sxl_version = message.attribute 'SXL'
+      @site_sxl_version = version
     rescue RSMP::Schema::UnknownSchemaError => e
       dont_acknowledge message, "Rejected #{message.type} message,", e.to_s
     end

data/lib/rsmp/tlc/modules/modes.rb

@@ -196,8 +196,8 @@ module RSMP
 
         # S0006 - Emergency route status (deprecated, use S0035)
         def handle_s0006(_status_code, status_name = nil, options = {})
-          if Proxy.version_meets_requirement? options[:sxl_version],
-                                              '>=1.2.0'
+          if RSMP::Proxy.version_meets_requirement? options[:sxl_version],
+                                                    '>=1.2.0'
             log 'S0006 is depreciated, use S0035 instead.',
                 level: :warning
           end

data/lib/rsmp/tlc/modules/system.rb

@@ -63,22 +63,36 @@ module RSMP
         end
 
         # S0091 - Operator logged in/out OP-panel
-        def handle_s0091(_status_code, status_name = nil, _options = {})
-          case status_name
-          when 'user'
-            TrafficControllerSite.make_status 0
-          when 'username'
-            TrafficControllerSite.make_status ''
+        def handle_s0091(_status_code, status_name = nil, options = {})
+          if RSMP::Proxy.version_meets_requirement?(options[:sxl_version], '>=1.1')
+            case status_name
+            when 'user'
+              TrafficControllerSite.make_status 0
+            end
+          else
+            case status_name
+            when 'user'
+              TrafficControllerSite.make_status 'nobody'
+            when 'status'
+              TrafficControllerSite.make_status 'logout'
+            end
           end
         end
 
         # S0092 - Operator logged in/out web-interface
-        def handle_s0092(_status_code, status_name = nil, _options = {})
-          case status_name
-          when 'user'
-            TrafficControllerSite.make_status 0
-          when 'username'
-            TrafficControllerSite.make_status ''
+        def handle_s0092(_status_code, status_name = nil, options = {})
+          if RSMP::Proxy.version_meets_requirement?(options[:sxl_version], '>=1.1')
+            case status_name
+            when 'user'
+              TrafficControllerSite.make_status 0
+            end
+          else
+            case status_name
+            when 'user'
+              TrafficControllerSite.make_status 'nobody'
+            when 'status'
+              TrafficControllerSite.make_status 'logout'
+            end
           end
         end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.42.0'.freeze
+  VERSION = '0.42.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.42.2
 platform: ruby
 authors:
 - Emil Tin