rsmp 0.21.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d74ffd79480198d71bde613b754e2ab6195e7e793ed7294f192752df001c528
-  data.tar.gz: 417ff3b2692fae04709d688225b12b26fe1e69c189206855545a26b8e993f1c2
+  metadata.gz: 86e6971159c3de6157fdb7fd34884adc1a62aff9fee429798d7841b8c66be7cb
+  data.tar.gz: 2860409f7063b95317fb7bac60a12fdd50d0a48ae48cb97d888b452157ee9444
 SHA512:
-  metadata.gz: 661ccaa898f510a89c039f5c678e2fa796ac8efb152c6c6d0945a89afcfb111013744fa0fd8bd341d7103e47ddc9da94f55e9211b2cda16a2ee94456b72e5e8a
-  data.tar.gz: 2d2586aeec689c66fdb19d3548f1cf2f06131fadadab8a919cd894f9ca178d822b6522c7de72d235ecd35b919236ae42cf9b42c22287713bdd2a9dfd109eaf36
+  metadata.gz: ab3400ead4fe96f24ff033f48bf8c47a5eb1b7497ffff876232b5797a6b99ab73907469b2699d2159ad15d9a7c06b3c189c936e16dc1d693f31c513ccd91b984
+  data.tar.gz: 51b681148cad227590653ac1d7834e5d4375374c6d89228bdaa019896cb882560ca3b71c225d0db473bde05a8b34f7788078f02ab48c9a50d94f47cc6791df23

data/.github/workflows/rspec.yaml

@@ -13,7 +13,7 @@ jobs:
         ruby: ['3.2']
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.21.0)
-      async (~> 2.6.2)
-      async-io (~> 1.35.0)
+    rsmp (0.23.0)
+      async (~> 2.6.4)
+      async-io (~> 1.36.0)
       colorize (~> 0.8.1)
-      rsmp_schema (~> 0.4.0)
+      rsmp_schema (~> 0.5)
       thor (~> 1.2.2)
 
 GEM
@@ -18,17 +18,17 @@ GEM
       cucumber (>= 4.0, < 9.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    async (2.6.3)
+    async (2.6.4)
       console (~> 1.10)
       fiber-annotation
       io-event (~> 1.1)
       timers (~> 4.1)
-    async-io (1.35.0)
+    async-io (1.36.0)
       async
     builder (3.2.4)
     childprocess (4.1.0)
     colorize (0.8.1)
-    console (1.21.0)
+    console (1.23.2)
       fiber-annotation
       fiber-local
     contracts (0.17)
@@ -59,24 +59,24 @@ GEM
     diff-lcs (1.5.0)
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
-    ffi (1.15.5)
+    ffi (1.16.2)
     fiber-annotation (0.2.0)
     fiber-local (1.0.0)
     hana (1.3.7)
-    io-event (1.2.3)
+    io-event (1.3.2)
     json_schemer (0.2.25)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
       uri_template (~> 0.7)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
+    mime-types-data (3.2023.0808)
     multi_test (1.1.0)
     rake (13.0.6)
     regexp_parser (2.8.1)
-    rsmp_schema (0.4.5)
+    rsmp_schema (0.5)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)
     rspec (3.12.0)
@@ -88,16 +88,16 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
     sys-uname (1.2.3)
       ffi (~> 1.1)
     thor (1.2.2)
-    timecop (0.9.6)
+    timecop (0.9.8)
     timers (4.3.5)
     unf (0.1.4)
       unf_ext
@@ -106,6 +106,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
   x64-mingw-ucrt
   x64-mingw32
   x86_64-darwin-19
@@ -116,7 +117,7 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (~> 2.1.0)
-  bundler (~> 2.4.13)
+  bundler (~> 2.4.20)
   cucumber (~> 8.0.0)
   rake (~> 13.0.6)
   rsmp!
@@ -125,4 +126,4 @@ DEPENDENCIES
   timecop (~> 0.9.6)
 
 BUNDLED WITH
-   2.4.13
+   2.4.20

data/config/tlc.yaml

@@ -2,9 +2,9 @@ site_id: RN+SI0001
 supervisors:
   - ip: 127.0.0.1
     port: 12111
-core_versions: '3.2'
+core_versions: '3.2.1'
 sxl: tlc
-sxl_version: '1.1'
+sxl_version: '1.2'
 components:
   main:
     TC:

data/lib/rsmp/supervisor_proxy.rb

@@ -302,7 +302,7 @@ module RSMP
     end
 
     def rsmpify_value v
-      return v if v.is_a? Array
+      return v if v.is_a?(Array) || v.is_a?(Set)
       v.to_s
     end
 

data/lib/rsmp/tlc/traffic_controller.rb

@@ -58,8 +58,8 @@ module RSMP
         @plan_source = 'startup'
         @intersection = 0
         @intersection_source = 'startup'
-        @emergency_route = false
-        @emergency_route_number = 0
+        @emergency_routes = Set.new
+        @last_emergency_route = nil
         @traffic_situation = 0
         @traffic_situation_source = 'startup'
         @day_time_table = {}
@@ -286,13 +286,22 @@ module RSMP
 
       def handle_m0005 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
-        @emergency_route = (arg['status'] == 'True')
-        @emergency_route_number = arg['emergencyroute'].to_i
+        route = arg['emergencyroute'].to_i
+        enable = (arg['status'] == 'True')
+        @last_emergency_route = route
 
-        if @emergency_route
-          log "Switching to emergency route #{@emergency_route_number}", level: :info
+        if enable
+          if @emergency_routes.add? route
+            log "Enabling emergency route #{route}", level: :info
+          else
+            log "Emergency route #{route} already enabled", level: :info
+          end
         else
-          log "Switching off emergency route", level: :info
+          if @emergency_routes.delete? route
+            log "Disabling emergency route #{route}", level: :info
+          else
+            log "Emergency route #{route} already disabled", level: :info
+          end
         end
       end
 
@@ -604,7 +613,7 @@ module RSMP
              'S0008', 'S0009', 'S0010', 'S0011', 'S0012', 'S0013', 'S0014',
              'S0015', 'S0016', 'S0017', 'S0018', 'S0019', 'S0020', 'S0021',
              'S0022', 'S0023', 'S0024', 'S0026', 'S0027', 'S0028',
-             'S0029', 'S0030', 'S0031', 'S0032', 'S0033',
+             'S0029', 'S0030', 'S0031', 'S0032', 'S0033', 'S0035',
              'S0091', 'S0092', 'S0095', 'S0096', 'S0097',
              'S0205', 'S0206', 'S0207', 'S0208'
           return send("handle_#{code.downcase}", code, name, options)
@@ -661,9 +670,17 @@ module RSMP
       def handle_s0006 status_code, status_name=nil, options={}
         case status_name
         when 'status'
-          TrafficControllerSite.make_status @emergency_route
+          TrafficControllerSite.make_status @emergency_routes.include?(@last_emergency_route)
         when 'emergencystage'
-          TrafficControllerSite.make_status @emergency_route_number
+          TrafficControllerSite.make_status @last_emergency_route || 0
+        end
+      end
+
+      def handle_s0035 status_code, status_name=nil, options={}
+        case status_name
+        when 'emergencyroutes'
+          list = @emergency_routes.sort.map {|route| {'id'=>route.to_s}}
+          TrafficControllerSite.make_status list
         end
       end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.21.0"
+  VERSION = "0.23.0"
 end

data/rsmp.gemspec

@@ -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", "~> 2.6.2"
-  spec.add_dependency "async-io", "~> 1.35.0"
+  spec.add_dependency "async", "~> 2.6.4"
+  spec.add_dependency "async-io", "~> 1.36.0"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.2.2"
-  spec.add_dependency "rsmp_schema", "~> 0.4.0"
+  spec.add_dependency "rsmp_schema", "~> 0.5"
 
-  spec.add_development_dependency "bundler", "~> 2.4.13"
+  spec.add_development_dependency "bundler", "~> 2.4.20"
   spec.add_development_dependency "rake", "~> 13.0.6"
   spec.add_development_dependency "rspec", "~> 3.12.0"
   spec.add_development_dependency "rspec-expectations", "~> 3.12.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.6.4
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.0
+        version: 1.36.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.0
+        version: 1.36.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.13
+        version: 2.4.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.13
+        version: 2.4.20
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement