rsmp 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dde978c380def64dfcad00d0a7c9845a7c57476828623664dcf2ace7f3f6b669
-  data.tar.gz: 6dadc564b21089271b9921f876b95c899ad42c5bbc27b9250d34b47648447937
+  metadata.gz: 40f0ef33eec84edcea172dbc53cf139679e09afb1a717f3081a05c0c5abc94e0
+  data.tar.gz: 1d86aeb5a6c3e74757484d1db0e5f89fce122ea66799f275174baa2602d8ab0a
 SHA512:
-  metadata.gz: 7bc25b5125c599a5c46db4c919e8bf6891ddad0631de6264dfe5df97eac5cdf85768f099df8f41bff26203fb6fb15d95f4b09c8e2d4b32e80b24b3065be88d1e
-  data.tar.gz: 8b58da0f830cc4e4fa7f0906a2d691a3d1548b364c21e320c0f597ce4da873dd16b2db0d5e196c70f21fa9126c24a4e3f4c951586768cad0f99b78047ed7eb18
+  metadata.gz: a0c09b4ffe312e417095caf7ef426ce4d84649ac81b47d6f6247aa6b42cd689eb3940e23d13eaca8bd0736037571e389d543aeed92972e36de6948a1dd6aab42
+  data.tar.gz: cc6ec0019034ea0153448e744ec9cfcf78c3b772bcfcc70b5fc239fb68a295f58c0ca566f66fbe3632b6c0e723d3490cfbf5c5631454ce8c8527d7ac5c8c5bd9

data/.github/workflows/rspec.yaml

@@ -1,14 +1,21 @@
 # This workflow runs RSpec tests
 
 name: RSpec
-on: [push, pull_request]
+on: [push]
 jobs:
   test:
-    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest, windows-2022]
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: ['3.0', '3.1']
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        # ruby-version is not needed because we have a .ruby-version file
+        ruby-version: ${{ matrix.ruby }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - run: bundle exec rspec
+    - run: bundle exec rspec -f d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.9.0)
+    rsmp (0.9.1)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)
@@ -64,9 +64,11 @@ GEM
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
     ffi (1.15.5)
+    ffi (1.15.5-x64-mingw-ucrt)
+    ffi (1.15.5-x64-mingw32)
     fiber-local (1.0.0)
     hana (1.3.7)
-    json_schemer (0.2.18)
+    json_schemer (0.2.19)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
@@ -77,7 +79,7 @@ GEM
     multi_test (0.1.2)
     nio4r (2.5.8)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.2.1)
     rsmp_schemer (0.3.2)
       json_schemer (~> 0.2.18)
     rspec (3.10.0)
@@ -101,6 +103,9 @@ GEM
     uri_template (0.7.0)
 
 PLATFORMS
+  x64-mingw-ucrt
+  x64-mingw32
+  x86_64-darwin-19
   x86_64-darwin-20
   x86_64-darwin-21
   x86_64-linux

data/README.md

@@ -13,16 +13,6 @@ $ gem install bundler
 $ bundle
 ```
 
-Install git submodules:
-The JSON Schema is is included as a git submodule. To install it:
-
-```console
-$ git submodule init     # initialize local submodule config
-$ git submodule update   # fetch submodules
-```
-
-Alternatively, you can pass --recurse-submodules to the git clone command, and it will automatically initialize and update each submodule in the repository.
-
 ## Usage
 ### Site and Supervisor
 The RSMP::Site and RSMP::Supervisor classes can be used to run a RSMP site.

data/cucumber.yml

@@ -0,0 +1 @@
+default: --publish-quiet

data/lib/rsmp/cli.rb

@@ -161,5 +161,10 @@ module RSMP
       RSMP::Convert::Export::JSONSchema.write sxl, options[:out]
     end
 
+    # avoid Thor returnin 0 on failures, see
+    # https://github.com/coinbase/salus/pull/380/files
+    def self.exit_on_failure?
+      true
+    end
   end
 end

data/lib/rsmp/deep_merge.rb

@@ -1,5 +1,6 @@
 class Hash
   def deep_merge(other_hash)
+    return self unless other_hash
     self.merge(other_hash) do |key, old, fresh|
       if old.is_a?(Hash) && fresh.is_a?(Hash)
         old.deep_merge(fresh)

data/lib/rsmp/site_proxy.rb

@@ -72,7 +72,7 @@ module RSMP
         else
           super message
       end
-    rescue RSMP::RepeatedAlarmError, RSMP::RepeatedStatusError
+    rescue RSMP::RepeatedAlarmError, RSMP::RepeatedStatusError => 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

@@ -71,10 +71,13 @@ module RSMP
     def connect_tcp
       @endpoint = Async::IO::Endpoint.tcp(@ip, @port)
 
-      # Async::IO::Endpoint#connect renames the current task. run in a subtask to avoid this
+      # Async::IO::Endpoint#connect renames the current task. run in a subtask to avoid this see issue #22
       @task.async do |task|
         task.annotate 'socket task'
-        @socket = @endpoint.connect
+        # this timeout is a workaround for #connect hanging on windows if the other side is not present yet
+        task.with_timeout 1.1 do
+          @socket = @endpoint.connect
+        end
       end.wait
 
       @stream = Async::IO::Stream.new(@socket)

data/lib/rsmp/task.rb

@@ -29,7 +29,7 @@ module RSMP
     end
 
     # get the status of our task, or nil of no task
-    def status
+    def task_status
       @task.status if @task
     end
 

data/lib/rsmp/tlc/traffic_controller.rb

@@ -49,6 +49,8 @@ module RSMP
 
         @inputs = '0'*@num_inputs
         @input_activations = '0'*@num_inputs
+        @input_forced = '0'*@num_inputs
+        @input_forced_values = '0'*@num_inputs
         @input_results = '0'*@num_inputs
 
         @day_time_table = {}
@@ -167,6 +169,10 @@ module RSMP
 
         plan = "P#{@plan}"
 
+        # create folders if needed
+        FileUtils.mkdir_p File.dirname(@live_output)
+
+        # append a line with the current state to the file
         File.open @live_output, 'w' do |file|
           file.puts "#{modes}  #{plan.rjust(2)}  #{@cycle_counter.to_s.rjust(3)}  #{str}\r"
         end
@@ -228,18 +234,27 @@ module RSMP
         end
       end
 
+      def recompute_input idx
+        if @input_forced[idx] == '1'
+          @input_results[idx] = @input_forced_values[idx]
+        elsif @input_activations[idx]=='1'
+          @input_results[idx] = '1'
+        else
+          @input_results[idx] = bool_to_digit( @inputs[idx]=='1' )
+        end
+      end
+
       def handle_m0006 arg
         @node.verify_security_code 2, arg['securityCode']
         input = arg['input'].to_i
         idx = input - 1
         return unless idx>=0 && input<@num_inputs # TODO should NotAck
-        @input_activations[idx] = (arg['status']=='True' ? '1' : '0')
-        result = @input_activations[idx]=='1' || @inputs[idx]=='1'
-        @input_results[idx] = (result ? '1' : '0')
+        @input_activations[idx] = bool_string_to_digit arg['status']
+        recompute_input idx
         if @input_activations[idx]
-          log "Activate input #{idx}", level: :info
+          log "Activating input #{idx+1}", level: :info
         else
-          log "Deactivate input #{idx}", level: :info
+          log "Deactivating input #{idx+1}", level: :info
         end
       end
 
@@ -302,8 +317,39 @@ module RSMP
         @node.verify_security_code 2, arg['securityCode']
       end
 
+      def bool_string_to_digit bool
+        case bool
+          when 'True'
+            '1'
+          when 'False'
+            '0'
+          else
+            raise RSMP::MessageRejected.new "Invalid boolean '#{bool}', must be 'True' or 'False'"
+        end
+      end
+
+      def bool_to_digit bool
+        bool ?  '1' : '0'
+      end
+
       def handle_m0019 arg
         @node.verify_security_code 2, arg['securityCode']
+        input = arg['input'].to_i
+        idx = input - 1
+        unless idx>=0 && input<@num_inputs # TODO should NotAck
+          log "Can't force input #{idx+1}, only have #{@num_inputs} inputs", level: :warning
+          return
+        end
+        @input_forced[idx] = bool_string_to_digit arg['status']
+        if @input_forced[idx]
+          @input_forced_values[idx] = bool_string_to_digit arg['inputValue']
+        end
+        recompute_input idx
+        if @input_forced[idx]
+          log "Forcing input #{idx+1} to #{@input_forced_values[idx]}, #{@input_results}", level: :info
+        else
+          log "Releasing input #{idx+1}", level: :info
+        end
       end
 
       def handle_m0020 arg
@@ -336,7 +382,7 @@ module RSMP
 
       def set_input i, value
         return unless i>=0 && i<@num_inputs
-        @inputs[i] = (arg['value'] ? '1' : '0')
+        @inputs[i] = bool_to_digit arg['value']
       end
 
       def set_fixed_time_control status
@@ -402,7 +448,7 @@ module RSMP
       def handle_s0002 status_code, status_name=nil
         case status_name
         when 'detectorlogicstatus'
-          TrafficControllerSite.make_status @detector_logics.map { |dl| dl.value ? '1' : '0' }.join
+          TrafficControllerSite.make_status @detector_logics.map { |dl| bool_to_digit(dl.value) }.join
         end
       end
 
@@ -557,7 +603,7 @@ module RSMP
       def handle_s0021 status_code, status_name=nil
         case status_name
         when 'detectorlogics'
-          TrafficControllerSite.make_status @detector_logics.map { |logic| logic.forced=='True' ? '1' : '0'}.join
+          TrafficControllerSite.make_status @detector_logics.map { |logic| bool_to_digit(logic.forced)}.join
         end
       end
 
@@ -611,7 +657,7 @@ module RSMP
       def handle_s0029 status_code, status_name=nil
         case status_name
         when 'status'
-          TrafficControllerSite.make_status ''
+          TrafficControllerSite.make_status @input_forced
         end
       end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -201,6 +201,7 @@ files:
 - bin/setup
 - config/supervisor.yaml
 - config/tlc.yaml
+- cucumber.yml
 - documentation/classes_and_modules.md
 - documentation/collecting_message.md
 - documentation/message_distribution.md