rsmp 0.20.7 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77314f562ebf956079f50f9cabd90be180010d39d55ecc2b96aceeab7b6da553
-  data.tar.gz: 2c67e8fcca60ecdefec7edb539f56b7625046f3ef7e8d7a0801640c05f8f0535
+  metadata.gz: cf205a7a04823c34cc07dc8b0f67ede5a6ef23526ddad4786babc2d79f1d4869
+  data.tar.gz: f63deaeaace582207b320895d7b93cdb5f8772bb9fa8891b5f47616eae9b200d
 SHA512:
-  metadata.gz: 68a66a9531bff5c01cd743ae61a2b159bae2ce0dc6cfd393b5fa9deddda3838d771cfd1025a25ec8231a5d099d5e1976bbbc9418738ee0ba528875e3d8e63327
-  data.tar.gz: bac2a033fa66291905fa0ba5a66d79a9bb114900ff7d62f4ec696b7ba5271b8454793c1866f9607f0de0638c9950a09822640935541e9663ee01f74295469834
+  metadata.gz: '06580d98b22a7e1570821362bd770f06715637b57abb5c172dc3ceed1be4a887289081382787e2df2661beb20c8487e3be051c3cc66ffebd491766423c160c6d'
+  data.tar.gz: 732432f40ab180bf37aa39c2f54f8c296678a9c7c673c694eae7334d041be10c80fff84f47625f153f0f3389cabb40b31cdae5168014c306b6a44ba5ca41f8f9

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.20.7)
-      async (~> 2.6.2)
-      async-io (~> 1.35.0)
+    rsmp (0.22.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
@@ -116,7 +116,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 +125,4 @@ DEPENDENCIES
   timecop (~> 0.9.6)
 
 BUNDLED WITH
-   2.4.13
+   2.4.20

data/lib/rsmp/node.rb

@@ -44,19 +44,19 @@ module RSMP
       @error_queue.enqueue e
     end
 
-    def defer item
-      @deferred << item
+    def defer key, item=nil
+      @deferred << [key, item]
     end
 
     def process_deferred
       cloned = @deferred.clone    # clone in case do_deferred restarts the current task
       @deferred.clear
-      cloned.each do |item|
-        do_deferred item
+      cloned.each do |pair|
+        do_deferred pair.first, pair.last
       end
     end
 
-    def do_deferred item
+    def do_deferred key,item=nil
     end
 
     def clear_deferred

data/lib/rsmp/tlc/traffic_controller.rb

@@ -344,6 +344,45 @@ module RSMP
 
       def handle_m0013 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
+        set, clear = [], []
+        arg['status'].split(';').map do |part|
+          offset, set_bits, clear_bits = part.split(',').map { |i| i.to_i }
+          set_bits.to_s(2).reverse.each_char.with_index do |bit,i|
+            set << i + offset if bit == '1'
+          end
+          clear_bits.to_s(2).reverse.each_char.with_index do |bit,i|
+            clear << i + offset if bit == '1'
+          end
+        end
+
+        set = set.uniq.sort
+        clear = clear.uniq.sort
+
+        # if input is both activated and deacticvated, there is no need to acticate first
+        set -= (set & clear)
+
+        [set,clear].each do |inputs|
+          inputs.each do |input|
+            if input<1
+            raise MessageRejected.new("Cannot acticate inputs #{set} and deactive inputs #{clear}: input #{input} is invalid (must be 1 or higher)"
+              ) if input<1
+            end
+            if input>@inputs.size
+              raise MessageRejected.new("Cannot acticate inputs #{set} and deactive inputs #{clear}: input #{input} is invalid (only #{@inputs.size} inputs present)")
+            end
+          end
+        end
+
+        log "Activating inputs #{set} and deactivating inputs #{clear}", level: :info
+
+        set.each do |input|
+          change = @inputs.set input, true
+          input_logic input, change if change != nil
+        end
+        clear.each do |input|
+          change = @inputs.set input, false
+          input_logic input, change if change != nil
+        end
       end
 
       def find_plan plan_nr
@@ -432,6 +471,7 @@ module RSMP
           log "Releasing input #{input}", level: :info
         end
         change = @inputs.set_forcing input, force, forced_value
+
         input_logic input, change if change != nil
       end
 

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -149,8 +149,8 @@ module RSMP
         end
       end
 
-      def do_deferred item
-        case item
+      def do_deferred key, item=nil
+        case key
         when :restart
           log "Restarting TLC", level: :info
           restart

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.20.7"
+  VERSION = "0.22.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.20.7
+  version: 0.22.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-09-29 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