rsmp 0.32.0 → 0.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4dc16f45d38459c4ab31445f39e74c8e0fe71ce906759a4f842ddcc8ca78471
-  data.tar.gz: 50d8ff8a27a2f16ddba8206236cc17997a582b5b5ec01348a55e9a7b3a8004b7
+  metadata.gz: 25b1ee80906e4f8346ddd47e2541a1b3c535c2df0b1d534ff2fcf198ab0cae95
+  data.tar.gz: 0ed36d0bc9035d429a9fcdbae3de7208ec36801ba6ed703075229f2744940d0b
 SHA512:
-  metadata.gz: 735d346b07fb2ad71cead5a0d934bb415125429e2fa628e9c4aa93a73f7e1e40a8db5cce27b6329fbb520f13f9018fb2f221e4cf60051818043e58cbab2f0523
-  data.tar.gz: aad8d0d4b871916080c7c981a00fea551fb0c7b62599149b017b955d46e6c810fd246682206d89f2a6a99b5ec19cc0285fb6c68e2cde8b594cbe40402e542834
+  metadata.gz: 12384ded80fb0f30d9ac4d4a481249aee54be92d7b3efbdbcad80b435e4220d0add53430db0c05ee12a9d275c748b973e2b39e26f095766da33385479e9422c9
+  data.tar.gz: '079712e0c3b2ee6bb579ed71d99fff229d8a06e275080982c71e48ea0c4dbf1aa55bbdf0c1baca9229aa747007aac42a709668b705788cd6071565a7d9f520a3'

data/.github/workflows/rspec.yaml

@@ -9,13 +9,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes
-        ruby: ['3.3']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+        ruby-version: 3.3
+        bundler-cache: true
     - run: bundle exec rspec -f d

data/.tool-versions

@@ -1 +1 @@
-ruby 3.3.2
+ruby 3.3.5

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    rsmp (0.32.0)
-      async (~> 2.12.0)
-      async-io (~> 1.43.0)
+    rsmp (0.32.2)
+      async (~> 2.16)
+      async-io (~> 1.43)
       colorize (~> 1.1)
-      rsmp_schema (~> 0.7.0)
+      logger (~> 1.6)
+      ostruct (~> 0.6)
+      rsmp_schema (~> 0.7)
 
 GEM
   remote: https://rubygems.org/
@@ -16,8 +18,8 @@ GEM
       cucumber (>= 8.0, < 10.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    async (2.12.1)
-      console (~> 1.25, >= 1.25.2)
+    async (2.16.1)
+      console (~> 1.26)
       fiber-annotation
       io-event (~> 1.6, >= 1.6.5)
     async-io (1.43.2)
@@ -43,7 +45,7 @@ GEM
       multi_test (~> 1.1)
       sys-uname (~> 1.2)
     cucumber-ci-environment (10.0.1)
-    cucumber-core (13.0.2)
+    cucumber-core (13.0.3)
       cucumber-gherkin (>= 27, < 28)
       cucumber-messages (>= 20, < 23)
       cucumber-tag-expressions (> 5, < 7)
@@ -51,16 +53,12 @@ GEM
       bigdecimal
     cucumber-gherkin (27.0.0)
       cucumber-messages (>= 19.1.4, < 23)
-    cucumber-html-formatter (21.3.1)
-      cucumber-messages (> 19, < 25)
+    cucumber-html-formatter (21.7.0)
+      cucumber-messages (> 19, < 27)
     cucumber-messages (22.0.0)
     cucumber-tag-expressions (6.1.0)
     diff-lcs (1.5.1)
     ffi (1.17.0)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x64-mingw-ucrt)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
     fiber-annotation (0.2.0)
     fiber-local (1.1.0)
       fiber-storage
@@ -73,8 +71,10 @@ GEM
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
+    logger (1.6.1)
     mini_mime (1.1.5)
     multi_test (1.1.0)
+    ostruct (0.6.0)
     rake (13.2.1)
     regexp_parser (2.9.2)
     rsmp_schema (0.7.0)
@@ -84,9 +84,9 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
@@ -111,14 +111,14 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  aruba (~> 2.2.0)
-  bundler (~> 2.5.7)
-  cucumber (~> 9.2.0)
-  rake (~> 13.2.0)
+  aruba (~> 2.2)
+  bundler (~> 2.5)
+  cucumber (~> 9.2)
+  rake (~> 13.2)
   rsmp!
-  rspec (~> 3.13.0)
-  rspec-expectations (~> 3.13.1)
-  timecop (~> 0.9.9)
+  rspec (~> 3.13)
+  rspec-expectations (~> 3.13)
+  timecop (~> 0.9)
 
 BUNDLED WITH
-   2.5.11
+   2.5.18

data/config/tlc.yaml

@@ -2,7 +2,6 @@ site_id: RN+SI0001
 supervisors:
   - ip: 127.0.0.1
     port: 12111
-core_versions: '3.2.2'
 sxl: tlc
 sxl_version: '1.2.1'
 components:

data/lib/rsmp/cli.rb

@@ -45,7 +45,7 @@ module RSMP
       end
 
       if options[:core]
-        settings['core_versions'] = [options[:core]]
+        settings['core_version'] = options[:core]
       end
 
       site_class = RSMP::Site
@@ -133,7 +133,7 @@ module RSMP
 
       if options[:core]
         settings['guest'] = {}
-        settings['guest']['core_versions'] = [options[:core]]
+        settings['guest']['core_version'] = options[:core]
       end
 
       if options[:log]

data/lib/rsmp/proxy.rb

@@ -474,9 +474,14 @@ module RSMP
     end
 
     def core_versions
-      return [RSMP::Schema.latest_core_version] if @site_settings["core_versions"] == 'latest'
-      return RSMP::Schema.core_versions if @site_settings["core_versions"] == 'all'
-      [@site_settings["core_versions"]].flatten
+      version = @site_settings["core_version"]
+      if version == 'latest'
+        [RSMP::Schema.latest_core_version]
+      elsif version
+        [version]
+      else
+        RSMP::Schema.core_versions
+      end
     end
 
     def check_core_version message
@@ -486,7 +491,7 @@ module RSMP
       if candidates.any?
         @core_version = candidates.sort_by { |v| Gem::Version.new(v) }.last  # pick latest version
       else
-        reason = "RSMP versions [#{message.versions.join(',')}] requested, but only [#{versions.join(',')}] supported."
+        reason = "RSMP versions [#{message.versions.join(', ')}] requested, but only [#{versions.join(', ')}] supported."
         dont_acknowledge message, "Version message rejected", reason, force: true
         raise HandshakeError.new reason
       end

data/lib/rsmp/site.rb

@@ -6,7 +6,7 @@ module RSMP
   class Site < Node
     include Components
 
-    attr_reader :core_versions, :site_settings, :logger, :proxies
+    attr_reader :core_version, :site_settings, :logger, :proxies
 
     def initialize options={}
       super options
@@ -32,7 +32,6 @@ module RSMP
         'supervisors' => [
           { 'ip' => '127.0.0.1', 'port' => 12111 }
         ],
-        'core_versions' => 'all',
         'sxl' => 'tlc',
         'sxl_version' => RSMP::Schema.latest_version(:tlc),
         'intervals' => {
@@ -57,6 +56,7 @@ module RSMP
       end
 
       @site_settings = defaults.deep_merge options[:site_settings]
+
       check_sxl_version
       check_core_versions
       setup_components @site_settings['components']
@@ -69,16 +69,10 @@ module RSMP
     end
 
   def check_core_versions
-      return if @site_settings['core_versions'] == 'all'
-      requested = [@site_settings['core_versions']].flatten
-      invalid = requested - RSMP::Schema::core_versions
-      if invalid.any?
-        if invalid.size == 1
-          error_str = "Unknown core version: #{invalid.first}"
-        else
-          error_str = "Unknown core versions: [#{invalid.join(' ')}]"
-        end
-
+    version = @site_settings['core_version']
+      return unless version
+      unless RSMP::Schema::core_versions.include? version
+        error_str = "Unknown core version: #{version}"
         raise RSMP::ConfigurationError.new(error_str)
       end
     end
@@ -89,23 +83,13 @@ module RSMP
 
     def log_site_starting
       log "Starting #{site_type_name} #{@site_settings["site_id"]}", level: :info, timestamp: @clock.now
-
       sxl = "Using #{@site_settings["sxl"]} sxl #{@site_settings["sxl_version"]}"
-
-      versions = @site_settings["core_versions"]
-      if versions.is_a?(Array) && versions.size == 1
-        versions = versions.first
-      end
-      if versions == 'all'
+      version = @site_settings["core_version"]
+      unless version
         core = "accepting all core versions [#{RSMP::Schema.core_versions.join(', ')}]"
       else
-        if versions.is_a?(String)
-          core = "accepting only core version #{versions}"
-        else
-          core = "accepting core versions [#{versions.join(', ')}]"
-        end
+        core = "accepting only core version #{version}"
       end
-
       log "#{sxl}, #{core}", level: :info, timestamp: @clock.now
     end
 

data/lib/rsmp/supervisor.rb

@@ -4,7 +4,7 @@
 
 module RSMP
   class Supervisor < Node
-    attr_reader :core_versions, :site_id, :supervisor_settings, :proxies, :logger
+    attr_reader :core_version, :site_id, :supervisor_settings, :proxies, :logger
 
     def initialize options={}
       handle_supervisor_settings( options[:supervisor_settings] || {} )
@@ -22,7 +22,6 @@ module RSMP
         'port' => 12111,
         'ips' => 'all',
         'guest' => {
-          'core_versions' => 'all',
           'sxl' => 'tlc',
           'intervals' => {
             'timer' => 1,
@@ -37,7 +36,7 @@ module RSMP
 
       # merge options into defaults
       @supervisor_settings = defaults.deep_merge(supervisor_settings)
-      @core_versions = @supervisor_settings["guest"]["core_versions"]
+      @core_version = @supervisor_settings["guest"]["core_version"]
       check_site_sxl_types
     end
 

data/lib/rsmp/supervisor_proxy.rb

@@ -43,7 +43,7 @@ module RSMP
     end
 
     def start_handshake
-      send_version @site_settings['site_id'], @site_settings["core_versions"]
+      send_version @site_settings['site_id'], core_versions
     end
 
     # connect to the supervisor and initiate handshake supervisor

data/lib/rsmp/tlc/traffic_controller.rb

@@ -408,7 +408,7 @@ module RSMP
 
       def find_plan plan_nr
         plan = @plans[plan_nr.to_i]
-        raise InvalidMessage.new "unknown signal plan #{plan_nr}, known only [#{@plans.keys.join(',')}]" unless plan
+        raise InvalidMessage.new "unknown signal plan #{plan_nr}, known only [#{@plans.keys.join(', ')}]" unless plan
         plan
       end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.32.0"
+  VERSION = "0.32.2"
 end

data/rsmp.gemspec

@@ -30,16 +30,18 @@ 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.12.0"
-  spec.add_dependency "async-io", "~> 1.43.0"
+  spec.add_dependency "logger", "~> 1.6"
+  spec.add_dependency "ostruct", "~> 0.6"
+  spec.add_dependency "async", "~> 2.16"
+  spec.add_dependency "async-io", "~> 1.43"
   spec.add_dependency "colorize", "~> 1.1"
-  spec.add_dependency "rsmp_schema", "~> 0.7.0"
+  spec.add_dependency "rsmp_schema", "~> 0.7"
 
-  spec.add_development_dependency "bundler", "~> 2.5.7"
-  spec.add_development_dependency "rake", "~> 13.2.0"
-  spec.add_development_dependency "rspec", "~> 3.13.0"
-  spec.add_development_dependency "rspec-expectations", "~> 3.13.1"
-  spec.add_development_dependency "timecop", "~> 0.9.9"
-  spec.add_development_dependency "cucumber", "~> 9.2.0"
-  spec.add_development_dependency "aruba" , "~> 2.2.0"
+  spec.add_development_dependency "bundler", "~> 2.5"
+  spec.add_development_dependency "rake", "~> 13.2"
+  spec.add_development_dependency "rspec", "~> 3.13"
+  spec.add_development_dependency "rspec-expectations", "~> 3.13"
+  spec.add_development_dependency "timecop", "~> 0.9"
+  spec.add_development_dependency "cucumber", "~> 9.2"
+  spec.add_development_dependency "aruba" , "~> 2.2"
 end

metadata

@@ -1,43 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.32.2
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-03 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '2.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: '1.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: '1.43'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -58,112 +86,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.7
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.7
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.2.0
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.2.0
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.0
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.0
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.2.0
+        version: '9.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.2.0
+        version: '9.2'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 description: Easy RSMP site and supervisor communication.
 email:
 - zf0f@kk.dk
@@ -265,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.