rsmp 0.1.13 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2c272fba5c28e4b5746aa03efac286b646d635cb23ae8c68d3c6cb08ba657ae
-  data.tar.gz: 1051548b65417edbbf31550f4a6a02ae4df7c98aba190682e5c4a5faed3af116
+  metadata.gz: 1b583271d38fc35e2badabf94b0a8a764f07a8e36025c2902922d926adbf320b
+  data.tar.gz: 9e37dd8939d68a19e1cf16580c558c813e8a5d6214a733cc8dce08fe4957be59
 SHA512:
-  metadata.gz: 33b1fb0ad681f71b58571e31a3ef59415ad45ee7ec4a5b947eb494f0474e9a46b85e25e25f977d88da28e4d91011f92b35dc2c1b49c6630d3c7eb5b14ec170a3
-  data.tar.gz: b0614210f4db03d2aba012f07f7df76aefaae0b96db5779558f46c5ca5433c1b0df1ae3f41e828936f45593fdd7e69723df84895510ba798e64964213c0c4cee
+  metadata.gz: 1af3ecb44fc6c9e9fa0735b524c1561eafd91ef05775c0be325c8093635354e535d9d8f024d05cbc256859319a13795dfff34233165b8b57c53ac82fb76dbbd5
+  data.tar.gz: aeaa068f63614bcd8e3af873400e5af54810c51e7a1941d62834c1bd2d94a3ff4ae62e59d89ad3242749fff54126aa3ccabf3bf3ac672f29c9cac9611ebddd47

data/Gemfile.lock

@@ -1,35 +1,34 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.13)
+    rsmp (0.1.17)
       async (~> 1.23.0)
-      async-io (~> 1.27.1)
+      async-io (~> 1.27.4)
       colorize (~> 0.8.1)
-      json_schemer (~> 0.2.8)
-      thor (~> 0.20.3)
+      json_schemer (~> 0.2.11)
+      thor (~> 1.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.14.11)
-      childprocess (>= 0.6.3, < 3.0.0)
-      contracts (~> 0.9)
-      cucumber (>= 1.3.19)
+    aruba (1.0.0)
+      childprocess (~> 3.0)
+      contracts (~> 0.16.0)
+      cucumber (>= 2.4, < 4.0)
       ffi (~> 1.9)
-      rspec-expectations (>= 2.99)
-      thor (~> 0.19)
+      rspec-expectations (~> 3.4)
+      thor (~> 1.0)
     async (1.23.0)
       console (~> 1.0)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-io (1.27.1)
+    async-io (1.27.5)
       async (~> 1.14)
-    backports (3.15.0)
-    builder (3.2.3)
-    childprocess (2.0.0)
-      rake (< 13.0)
+    backports (3.17.0)
+    builder (3.2.4)
+    childprocess (3.0.0)
     colorize (0.8.1)
-    console (1.7.0)
+    console (1.8.2)
     contracts (0.16.0)
     cucumber (3.1.2)
       builder (>= 2.1.2)
@@ -50,35 +49,33 @@ GEM
     diff-lcs (1.3)
     ecma-re-validator (0.2.0)
       regexp_parser (~> 1.2)
-    ffi (1.11.1)
+    ffi (1.12.2)
     gherkin (5.1.0)
     hana (1.3.5)
-    json_schemer (0.2.8)
+    json_schemer (0.2.11)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
       uri_template (~> 0.7)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     multi_test (0.1.2)
     nio4r (2.5.2)
-    rake (10.5.0)
-    regexp_parser (1.6.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.1)
+    regexp_parser (1.7.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rspec-with_params (0.2.0)
-      rspec (~> 3.0)
-    thor (0.20.3)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    thor (1.0.1)
     timecop (0.9.1)
     timers (4.3.0)
     uri_template (0.7.0)
@@ -87,15 +84,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.14.11)
-  bundler (~> 2.0)
+  aruba (~> 1.0.0)
+  bundler (~> 2.1.4)
   cucumber (~> 3.1.2)
-  rake (~> 10.0)
+  rake (~> 13.0.1)
   rsmp!
-  rspec (~> 3.0)
-  rspec-expectations (~> 3.8.3)
-  rspec-with_params (~> 0.2.0)
+  rspec (~> 3.9.0)
+  rspec-expectations (~> 3.9.1)
   timecop (~> 0.9.1)
 
 BUNDLED WITH
-   2.1.0.pre.2
+   2.1.4

data/README.md

@@ -163,6 +163,12 @@ The ```site``` command will start an RSMP site, which will try to connect to one
 2019-11-11 12:22:00 UTC  RN+SU0001  C1  <--  8280  Sent AggregatedStatus
 ```
 
+
+Use the the --type switch to select a specific type of site. Messages will be validated against the corresponding SXL JSON schema. Without any type specified, messages will be validated against the core RSMP schema only.
+
+Use the ```tlc``` site type to run an emulation of a traffic light controller. This type of site implements enough of functionality to pass all the rsmp_validator tests. You can setup signal group components, in the config file.
+
+
 ### CLI help and options.
 Use ```--help <command>``` to get a list of available options.
 

data/config/site.yaml

@@ -12,8 +12,8 @@ rsmp_versions:
   - 3.1.4
 
 components:
-  C1:
-    type: main
+  main:
+    C1:
 
 watchdog_interval: 1
 watchdog_timeout: 2

data/config/tlc.yaml

@@ -3,25 +3,21 @@ supervisors:
   - ip: 127.0.0.1
     port: 12111
 
-sxl: traffic_light_controller
-
-rsmp_versions:
-  - 3.1.1
-  - 3.1.2
-  - 3.1.3
-  - 3.1.4
-
 components:
-  TC:
-    type: main
-    cycle_time: 6
-  A1:
-    type: signal_group
-    plan: 'GGyrrr'
-  B1:
-    type: signal_group
-    plan: 'rrrGGy'
-
+  main:
+    TC:
+      cycle_time: 6
+  signal_group:
+    A1:
+      plan: '11NBBB'
+    A2:
+      plan: '1NBBBB'
+    B1:
+      plan: 'BBB11N'
+    B2:
+      plan: 'BBB1NB'
+  detector_logic:
+    DL1:
 watchdog_interval: 1
 watchdog_timeout: 2
 acknowledgement_timeout: 1

data/lib/rsmp/cli.rb

@@ -18,7 +18,7 @@ module RSMP
 			if options[:config]
 				if File.exist? options[:config]
 					settings = YAML.load_file options[:config]
-					log_settings = settings.delete 'log'
+					log_settings = settings.delete('log') || {}
 				else
 					puts "Error: Config #{options[:config]} not found"
 					exit
@@ -29,9 +29,9 @@ module RSMP
 				settings['site_id'] = options[:id]
 			end
 
-		if options[:supervisors]
-			options[:supervisors].split(',').each do |supervisor|
-				settings[:supervisors] ||= []
+			if options[:supervisors]
+				options[:supervisors].split(',').each do |supervisor|
+					settings[:supervisors] ||= []
 					ip, port = supervisor.split ':'
 					ip = '127.0.0.1' if ip.empty?
 					port = '12111' if port.empty?

data/lib/rsmp/component.rb

@@ -1,6 +1,6 @@
 module RSMP
   class Component
-    attr_reader :c_id, :alarms, :statuses, :aggregated_status, :aggregated_status_bools, :grouped
+    attr_reader :c_id, :node, :alarms, :statuses, :aggregated_status, :aggregated_status_bools, :grouped
 
     AGGREGATED_STATUS_KEYS = [ :local_control,
                                :communication_distruption,
@@ -58,11 +58,17 @@ module RSMP
     def alarm code:, status:
     end
 
-    def status code:, value:
-    end
-
     def log str, options
       @node.log str, options
     end
+
+    def handle_command command_code, arg
+      raise UnknownCommand.new "Command #{command_code} not implemented by #{self.class}"
+    end
+
+    def get_status status_code, status_name=nil
+      raise UnknownStatus.new "Status #{status_code}/#{status_name} not implemented by #{self.class}"
+    end
+
   end
 end

data/lib/rsmp/site.rb

@@ -141,14 +141,5 @@ module RSMP
         proxy.stop
       end
     end
-
-    def handle_command command_code, arg
-      raise UnknownCommand.new "Command #{command_code} not implemented"
-    end
-
-    def get_status status_code, status_name=nil
-      raise UnknownStatus.new "Status #{status_code}/#{status_name} not implemented"
-    end
-
   end
 end

data/lib/rsmp/site_base.rb

@@ -13,8 +13,10 @@ module RSMP
 
     def setup_components settings
       return unless settings
-      settings.each_pair do |id,settings|
-        @components[id] = build_component(id,settings)
+      settings.each_pair do |type,components_by_type|
+        components_by_type.each_pair do |id,settings|
+          @components[id] = build_component(id:id, type:type, settings:settings)
+        end
       end
     end
 
@@ -22,8 +24,8 @@ module RSMP
       @components[component.c_id] = component
     end
 
-    def build_component id, settings={}
-      Component.new id: id, node: self, grouped: true
+    def build_component id:, type:, settings:{}
+      Component.new id:id, node: self, grouped: true
     end
 
     def find_component component_id

data/lib/rsmp/site_proxy.rb

@@ -81,7 +81,7 @@ module RSMP
       component = @components[c_id]
       if component == nil
         if @site_settings == nil || @site_settings['components'] == nil
-          component = build_component c_id
+          component = build_component(id:c_id, type:nil)
           @components[c_id] = component
           log "Adding component #{c_id} to site #{@site_id}", level: :info
         else
@@ -196,7 +196,11 @@ module RSMP
           next if options[:sCI] && options[:sCI] != status['sCI']
           next if options[:n] && options[:n] != status['n']
           next if options[:q] && options[:q] != status['q']
-          next if options[:s] && options[:s] != status['s']
+          if options[:s].is_a? Regexp
+            next if options[:s] && status['s'] !~ options[:s]
+          else
+            next if options[:s] && options[:s] != status['s']
+          end
           matching_status = status
           break
         end
@@ -207,6 +211,24 @@ module RSMP
       end
     end
 
+    def wait_for_alarm options={}
+      raise ArgumentError unless options[:component]
+      matching_alarm = nil
+      item = @archive.capture(@task,options.merge(type: "Alarm", with_message: true, num: 1)) do |item|
+        # TODO check components
+        matching_alarm = nil
+        alarm = item[:message]
+        next if options[:aCId] && options[:aCId] != alarm.attribute("aCId")
+        next if options[:aSp] && options[:aSp] != alarm.attribute("aSp")
+        next if options[:aS] && options[:aS] != alarm.attribute("aS")
+        matching_alarm = alarm
+        break
+      end
+      if item
+        { message: item[:message], status: matching_alarm }
+      end
+    end
+
     def send_command component, args
       raise NotReady unless @state == :ready
       message = RSMP::CommandRequest.new({
@@ -266,4 +288,4 @@ module RSMP
 
 
   end
-end
+end

data/lib/rsmp/supervisor_proxy.rb

@@ -155,10 +155,12 @@ module RSMP
     end
 
     def process_command_request message
-      log "Received #{message.type}", message: message, level: :log 
+      log "Received #{message.type}", message: message, level: :log
+      component_id = message.attributes["cId"]
+      component = @site.find_component component_id
       commands = simplify_command_requests message.attributes["arg"]
       commands.each_pair do |command_code,arg|
-        @site.handle_command(command_code,arg).merge('cCI'=>command_code)
+        component.handle_command command_code,arg
       end
 
       rvs = message.attributes["arg"].map do |item|
@@ -167,7 +169,7 @@ module RSMP
         item
       end
       response = CommandResponse.new({
-        "cId"=>message.attributes["cId"],
+        "cId"=>component_id,
         "cTS"=>RSMP.now_string,
         "rvs"=>rvs
       })
@@ -180,8 +182,8 @@ module RSMP
       component = @site.find_component component_id
       log "Received #{message.type}", message: message, level: :log
       sS = message.attributes["sS"].map do |arg|
-        value, quality =  @site.get_status arg['sCI'], arg['n']
-        { "s" => value, "q" => quality }.merge arg
+        value, quality =  component.get_status arg['sCI'], arg['n']
+        { "s" => value.to_s, "q" => quality.to_s }.merge arg
       end
       response = StatusResponse.new({
         "cId"=>component_id,
@@ -283,11 +285,12 @@ module RSMP
 
     def send_status_updates update_list
       now = RSMP.now_string
-      update_list.each_pair do |component,by_code|
+      update_list.each_pair do |component_id,by_code|
+        component = @site.find_component component_id
         sS = []
         by_code.each_pair do |code,names|
           names.map do |status_name|
-            value,quality = @site.get_status code, status_name
+            value,quality = component.get_status code, status_name
             sS << { "sCI" => code,
                      "n" => status_name,
                      "s" => value.to_s,
@@ -295,7 +298,7 @@ module RSMP
           end
         end
         update = StatusUpdate.new({
-          "cId"=>component,
+          "cId"=>component_id,
           "sTs"=>now,
           "sS"=>sS
         })

data/lib/rsmp/tlc.rb

@@ -6,20 +6,42 @@ module RSMP
     attr_reader :pos, :cycle_time
     def initialize node:, id:, cycle_time:
       super node: node, id: id, grouped: true
+      @signal_groups = []
+      @detector_logics = []
+      @plans = []
       @pos = 0
       @cycle_time = cycle_time
-      @signal_groups = []
       @plan = 0
-      @dark_mode = 'False'
-      @yellow_flash = 'False'
-      @booting = 'False'
+      @dark_mode = false
+      @yellow_flash = false
+      @booting = false
+      @control_mode = 'control'
       @police_key = 0
+      @intersection = 0
+      @is_starting = false
+      @emergency_route = false
+      @emergency_route_number = 0
+      @traffic_situation = 0
+      @num_traffic_situations = 1
+      @manual_control = false
+      @fixed_time_control = false
+      @isolated_control = false
+      @yellow_flash = false
+      @all_red = false
+
+      @num_inputs = 8
+      @inputs = '0'*@num_inputs
+      @input_activations = '0'*@num_inputs
+      @input_results = '0'*@num_inputs
     end
 
     def add_signal_group group
       @signal_groups << group
     end
 
+    def add_detector_logic logic
+      @detector_logics << logic
+    end
     def timer now
       pos = now.to_i % @cycle_time
       if pos != @pos
@@ -32,19 +54,27 @@ module RSMP
       @signal_groups.each do |group|
         group.move pos
       end
-      output_states
-
       if pos == 0
         aggrated_status_changed
       end
     end
 
     def output_states
-      #print "\t#{pos.to_s.ljust(3)} #{format_signal_group_status}\r"
+      str = @signal_groups.map do |group|
+        s = "#{group.c_id}:#{group.state}"
+        if group.state =~ /^[1-9]$/
+          s.colorize(:green)
+      elsif group.state =~ /^[NOP]$/
+          s.colorize(:yellow)
+        else
+          s.colorize(:red)
+        end
+      end.join ' '
+      print "\t#{pos.to_s.ljust(3)} #{str}\r"
     end
 
     def format_signal_group_status
-      @signal_groups.map { |group|group.state }.join
+      @signal_groups.map { |group| group.state }.join
     end
 
     def handle_command command_code, arg
@@ -53,6 +83,14 @@ module RSMP
         handle_m0001 arg
       when 'M0002'
         handle_m0002 arg
+      when 'M0003'
+        handle_m0003 arg
+      when 'M0004'
+        handle_m0004 arg
+      when 'M0005'
+        handle_m0005 arg
+      when 'M0006'
+        handle_m0006 arg
       when 'M0007'
         handle_m0007 arg
       else
@@ -61,25 +99,56 @@ module RSMP
     end
 
     def handle_m0001 arg
-      verify_security_code arg['securityCode']
+      @node.verify_security_code arg['securityCode']
       switch_mode arg['status']
-      arg
     end
 
     def handle_m0002 arg
-      verify_security_code arg['securityCode']
-      if arg['status'] = 'True'
+      @node.verify_security_code arg['securityCode']
+      if RSMP::Tlc.from_rsmp_bool(arg['status'])
         switch_plan arg['timeplan']
       else
         switch_plan 0   # TODO use clock/calender
       end
-      arg
     end
 
+    def handle_m0003 arg
+      @node.verify_security_code arg['securityCode']
+      @traffic_situation = arg['traficsituation'].to_i
+    end
+
+    def handle_m0004 arg
+      @node.verify_security_code arg['securityCode']
+      # restarting the node means we will disconnect and reconnect.
+      # note that this will happen immediately, and no
+      # command response will therefore be sent
+      log "Restarting TLC", level: :info
+      @node.restart
+    end
+
+    def handle_m0005 arg
+      @node.verify_security_code arg['securityCode']
+      @emergency_route = arg['status'] == 'True'
+      @emergency_route_number = arg['emergencyroute'].to_i
+    end
+
+    def handle_m0006 arg
+      @node.verify_security_code arg['securityCode']
+      input = arg['input'].to_i
+      return unless input>=0 && input<@num_inputs
+      @input_activations[input] = (arg['status']=='True' ? '1' : '0')
+      result = @input_activations[input]=='1' || @inputs[input]=='1'
+      @input_results[input] = (result ? '1' : '0')
+    end
+
+    def set_input i, value
+      return unless i>=0 && i<@num_inputs
+      @inputs[i] = (arg['value'] ? '1' : '0')
+    end
+    
     def handle_m0007 arg
-      verify_security_code arg['securityCode']
+      @node.verify_security_code arg['securityCode']
       set_fixed_time_control arg['status']
-      arg
     end
 
     def set_fixed_time_control status
@@ -89,51 +158,355 @@ module RSMP
     def switch_plan plan
       log "Switching to plan #{plan}", level: :info
       @plan = plan.to_i
-      plan
     end
 
-   def switch_mode mode
+    def switch_mode mode
       log "Switching to mode #{mode}", level: :info
       case mode
       when 'NormalControl'
-        @yellow_flash = 'False'
-        @dark_mode = 'False'
+        @yellow_flash = false
+        @dark_mode = false
       when 'YellowFlash'
-        @yellow_flash = 'True'
-        @dark_mode = 'False'
+        @yellow_flash = true
+        @dark_mode = false
       when 'Dark'
-        @yellow_flash = 'False'
-        @dark_mode = 'True'
+        @yellow_flash = false
+        @dark_mode = true
       end
       mode
     end
 
-    def get_status status_code, status_name=nil
-      case status_code
-      when 'S0001'
-        return format_signal_group_status, "recent"
-      when 'S0005'
-        return @booting, "recent"
-      when 'S0007'
-        if @dark_mode == 'True'
-          return 'False', "recent"
-        else
-          return 'True', "recent"
-        end
-      when 'S0009'
-        return @fixed_time_control.to_s, "recent"
-      when 'S0013'
-        return @police_key.to_s, "recent"
-      when 'S0014'
-        return @plan.to_s, "recent"
-      when 'S0011'
-        return @yellow_flash, "recent"
+    def get_status code, name=nil
+      case code
+      when 'S0001', 'S0002', 'S0003', 'S0004', 'S0005', 'S0006', 'S0007',
+           'S0008', 'S0009', 'S0010', 'S0011', 'S0012', 'S0013', 'S0014',
+           'S0015', 'S0016', 'S0017', 'S0018', 'S0019', 'S0020', 'S0021',
+           'S0022', 'S0023', 'S0024', 'S0026', 'S0027', 'S0028',
+           'S0029',
+           'S0091', 'S0092', 'S0095', 'S0096',
+           'S0205', 'S0206', 'S0207', 'S0208'
+        return send("handle_#{code.downcase}", code, name)
       else
-        raise InvalidMessage.new "unknown status code #{status_code}"
+        raise InvalidMessage.new "unknown status code #{code}"
       end
     end
 
-    def verify_security_code code
+    def handle_s0001 status_code, status_name=nil
+      case status_name
+      when 'signalgroupstatus'
+        return RSMP::Tlc.make_status format_signal_group_status
+      when 'cyclecounter'
+        RSMP::Tlc.make_status @pos.to_s
+      when 'basecyclecounter'
+        RSMP::Tlc.make_status @pos.to_s
+      when 'stage'
+        RSMP::Tlc.make_status 0.to_s
+      end
+    end
+
+    def handle_s0002 status_code, status_name=nil
+      case status_name
+      when 'detectorlogicstatus'
+        RSMP::Tlc.make_status @detector_logics.map { |dl| dl.forced ? '1' : '0' }.join
+      end
+    end
+
+    def handle_s0003 status_code, status_name=nil
+      case status_name
+      when 'inputstatus'
+        RSMP::Tlc.make_status @input_results
+      when 'extendedinputstatus'
+        RSMP::Tlc.make_status 0.to_s
+      end
+    end
+
+    def handle_s0004 status_code, status_name=nil
+      case status_name
+      when 'outputstatus'
+        RSMP::Tlc.make_status 0
+      when 'extendedoutputstatus'
+        RSMP::Tlc.make_status 0
+      end
+    end
+
+    def handle_s0005 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status @is_starting
+      end
+    end
+
+    def handle_s0006 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status @emergency_route
+      when 'emergencystage'
+        RSMP::Tlc.make_status @emergency_route_number
+      end
+    end
+
+    def handle_s0007 status_code, status_name=nil
+      case status_name
+      when 'intersection'
+        RSMP::Tlc.make_status @intersection
+      when 'status'
+        RSMP::Tlc.make_status !@dark_mode
+      end
+    end
+
+    def handle_s0008 status_code, status_name=nil
+      case status_name
+      when 'intersection'
+        RSMP::Tlc.make_status @intersection
+      when 'status'
+        RSMP::Tlc.make_status @manual_control
+      end
+    end
+
+    def handle_s0009 status_code, status_name=nil
+      case status_name
+      when 'intersection'
+        RSMP::Tlc.make_status @intersection
+      when 'status'
+        RSMP::Tlc.make_status @fixed_time_control
+      end
+    end
+
+    def handle_s0010 status_code, status_name=nil
+      case status_name
+      when 'intersection'
+        RSMP::Tlc.make_status @intersection
+      when 'status'
+        RSMP::Tlc.make_status @isolated_control
+      end
+    end
+
+    def handle_s0011 status_code, status_name=nil
+      case status_name
+      when 'intersection'
+        RSMP::Tlc.make_status @intersection
+      when 'status'
+        RSMP::Tlc.make_status @yellow_flash
+      end
+    end
+
+    def handle_s0012 status_code, status_name=nil
+      case status_name
+      when 'intersection'
+        RSMP::Tlc.make_status @intersection
+      when 'status'
+        RSMP::Tlc.make_status @all_red
+      end
+    end
+
+    def handle_s0013 status_code, status_name=nil
+      case status_name
+      when 'intersection'
+        RSMP::Tlc.make_status @intersection
+      when 'status'
+        RSMP::Tlc.make_status @police_key
+      end
+    end
+
+    def handle_s0014 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status @plan
+      end
+    end
+
+    def handle_s0015 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status @traffic_situation
+      end
+    end
+
+    def handle_s0016 status_code, status_name=nil
+      case status_name
+      when 'number'
+        RSMP::Tlc.make_status @detector_logics.size
+      end
+    end
+
+    def handle_s0017 status_code, status_name=nil
+      case status_name
+      when 'number'
+        RSMP::Tlc.make_status @signal_groups.size
+      end
+    end
+
+    def handle_s0018 status_code, status_name=nil
+      case status_name
+      when 'number'
+        RSMP::Tlc.make_status @plans.size
+      end
+    end
+
+    def handle_s0019 status_code, status_name=nil
+      case status_name
+      when 'number'
+        RSMP::Tlc.make_status @num_traffic_situations
+      end
+    end
+
+    def handle_s0020 status_code, status_name=nil
+      case status_name
+      when 'intersection'
+        RSMP::Tlc.make_status @intersection
+      when 'controlmode'
+        RSMP::Tlc.make_status @control_mode
+      end
+    end
+
+    def handle_s0021 status_code, status_name=nil
+      case status_name
+      when 'detectorlogics'
+        RSMP::Tlc.make_status @detector_logics.map { |logic| logic.forced=='True' ? '1' : '0'}.join
+      end
+    end
+
+    def handle_s0022 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status '1'
+      end
+    end
+
+    def handle_s0023 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status '1-1-0'
+      end
+    end
+
+    def handle_s0024 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status '1-0'
+      end
+    end
+
+    def handle_s0026 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status '0-00'
+      end
+    end
+
+    def handle_s0027 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status '00-00-00-00'
+      end
+    end
+
+    def handle_s0028 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status '00-00'
+      end
+    end
+
+    def handle_s0029 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status ''
+      end
+    end
+
+    def handle_s0091 status_code, status_name=nil
+      case status_name
+      when 'user'
+        RSMP::Tlc.make_status 'nobody'
+      when 'status'
+        RSMP::Tlc.make_status 'logout'
+      end
+    end
+
+    def handle_s0092 status_code, status_name=nil
+      case status_name
+      when 'user'
+        RSMP::Tlc.make_status 'nobody'
+      when 'status'
+        RSMP::Tlc.make_status 'logout'
+      end
+    end
+
+    def handle_s0095 status_code, status_name=nil
+      case status_name
+      when 'status'
+        RSMP::Tlc.make_status RSMP::VERSION
+      end
+    end
+
+    def handle_s0096 status_code, status_name=nil
+      case status_name
+      when 'year'
+        RSMP::Tlc.make_status RSMP.now_object.year.to_s.rjust(4, "0")
+      when 'month'
+        RSMP::Tlc.make_status RSMP.now_object.month.to_s.rjust(2, "0")
+      when 'day'
+        RSMP::Tlc.make_status RSMP.now_object.day.to_s.rjust(2, "0")
+      when 'hour'
+        RSMP::Tlc.make_status RSMP.now_object.hour.to_s.rjust(2, "0")
+      when 'minute'
+        RSMP::Tlc.make_status RSMP.now_object.min.to_s.rjust(2, "0")
+      when 'second'
+        RSMP::Tlc.make_status RSMP.now_object.sec.to_s.rjust(2, "0")
+      end
+    end
+
+    def handle_s0205 status_code, status_name=nil
+      case status_name
+      when 'start'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'vehicles'
+        RSMP::Tlc.make_status 0
+      end
+    end
+
+    def handle_s0206 status_code, status_name=nil
+      case status_name
+      when 'start'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'speed'
+        RSMP::Tlc.make_status 0
+      end
+    end
+
+    def handle_s0207 status_code, status_name=nil
+      case status_name
+      when 'start'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'occupancy'
+        RSMP::Tlc.make_status 0
+      end
+    end
+
+    def handle_s0208 status_code, status_name=nil
+      case status_name
+      when 'start'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'P'
+        RSMP::Tlc.make_status 0
+      when 'PS'
+        RSMP::Tlc.make_status 0
+      when 'L'
+        RSMP::Tlc.make_status 0
+      when 'LS'
+        RSMP::Tlc.make_status 0
+      when 'B'
+        RSMP::Tlc.make_status 0
+      when 'SP'
+        RSMP::Tlc.make_status 0
+      when 'MC'
+        RSMP::Tlc.make_status 0
+      when 'C'
+        RSMP::Tlc.make_status 0
+      when 'F'
+        RSMP::Tlc.make_status 0
+      end
     end
 
   end
@@ -158,6 +531,128 @@ module RSMP
     def move pos
       @state = get_state pos
     end
+
+    def get_status code, name=nil
+      case code
+      when 'S0025'
+        return send("handle_#{code.downcase}", code, name)
+      else
+        raise InvalidMessage.new "unknown status code #{code}"
+      end
+    end
+
+    def handle_s0025 status_code, status_name=nil
+      case status_name
+      when 'minToGEstimate'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'maxToGEstimate'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'likelyToGEstimate'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'ToGConfidence'
+        RSMP::Tlc.make_status 0
+      when 'minToREstimate'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'maxToREstimate'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'likelyToREstimate'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'ToRConfidence'
+        RSMP::Tlc.make_status 0
+      end
+    end
+  end
+
+  class DetectorLogic < Component
+    attr_reader :status, :forced, :value
+
+    def initialize node:, id:
+      super node: node, id: id, grouped: false
+      @forced = 0
+      @value = 0
+    end
+
+    def get_status code, name=nil
+      case code
+      when 'S0201', 'S0202', 'S0203', 'S0204'
+        return send("handle_#{code.downcase}", code, name)
+      else
+        raise InvalidMessage.new "unknown status code #{code}"
+      end
+    end
+
+    def handle_s0201 status_code, status_name=nil
+      case status_name
+      when 'starttime'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'vehicles'
+        RSMP::Tlc.make_status 0
+      end
+    end
+
+    def handle_s0202 status_code, status_name=nil
+      case status_name
+      when 'starttime'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'speed'
+        RSMP::Tlc.make_status 0
+      end
+    end
+
+    def handle_s0203 status_code, status_name=nil
+      case status_name
+      when 'starttime'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'occupancy'
+        RSMP::Tlc.make_status 0
+      end
+    end
+
+    def handle_s0204 status_code, status_name=nil
+      case status_name
+      when 'starttime'
+        RSMP::Tlc.make_status RSMP.now_string
+      when 'P'
+        RSMP::Tlc.make_status 0
+      when 'PS'
+        RSMP::Tlc.make_status 0
+      when 'L'
+        RSMP::Tlc.make_status 0
+      when 'LS'
+        RSMP::Tlc.make_status 0
+      when 'B'
+        RSMP::Tlc.make_status 0
+      when 'SP'
+        RSMP::Tlc.make_status 0
+      when 'MC'
+        RSMP::Tlc.make_status 0
+      when 'C'
+        RSMP::Tlc.make_status 0
+      when 'F'
+        RSMP::Tlc.make_status 0
+      end
+    end
+
+    def handle_command command_code, arg
+      case command_code
+      when 'M0008'
+        handle_m0008 arg
+      else
+        raise UnknownCommand.new "Unknown command #{command_code}"
+      end
+    end
+
+    def handle_m0008 arg
+      @node.verify_security_code arg['securityCode']
+      force_detector_logic arg['status']=='True', arg['value']='True'
+      arg
+    end
+
+    def force_detector_logic status, value
+      @forced = status
+      @value = value
+    end
+
   end
 
   class Tlc < Site
@@ -171,14 +666,18 @@ module RSMP
       end
     end
 
-    def build_component id, settings={}
-      component = case settings['type']
+    def build_component id:, type:, settings:{}
+      component = case type
       when 'main'
         @main = TrafficController.new node: self, id: id, cycle_time: settings['cycle_time']
       when 'signal_group'
         group = SignalGroup.new node: self, id: id, plan: settings['plan']
         @main.add_signal_group group
         group
+      when 'detector_logic'
+        logic = DetectorLogic.new node: self, id: id
+        @main.add_detector_logic logic
+        logic
       end
     end
 
@@ -222,14 +721,28 @@ module RSMP
       @main.timer now
     end
 
-    def handle_command command_code, arg
-      return unless @main
-      @main.handle_command command_code, arg
+    def verify_security_code code
     end
 
-    def get_status status_code, status_name=nil
-      return unless @main
-      @main.get_status status_code, status_name
+    def self.to_rmsp_bool bool
+      if bool
+        'True'
+      else
+        'False'
+      end
+    end
+
+    def self.from_rsmp_bool str
+      str == 'True'
+    end
+
+    def self.make_status value, q='recent'
+      case value
+      when true, false
+        return to_rmsp_bool(value), q
+      else
+        return value, q
+      end
     end
 
   end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.13"
+  VERSION = "0.1.17"
 end

data/rsmp.gemspec

@@ -42,17 +42,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "async", "~> 1.23.0"
-  spec.add_dependency "async-io", "~> 1.27.1"
+  spec.add_dependency "async-io", "~> 1.27.4"
   spec.add_dependency "colorize", "~> 0.8.1"
-  spec.add_dependency "thor", "~> 0.20.3"
-  spec.add_dependency "json_schemer", "~> 0.2.8"
-
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec-expectations", "~> 3.8.3"
-  spec.add_development_dependency "rspec-with_params", "~> 0.2.0"
+  spec.add_dependency "thor", "~> 1.0.1"
+  spec.add_dependency "json_schemer", "~> 0.2.11"
+
+  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "rake", "~> 13.0.1"
+  spec.add_development_dependency "rspec", "~> 3.9.0"
+  spec.add_development_dependency "rspec-expectations", "~> 3.9.1"
   spec.add_development_dependency "timecop", "~> 0.9.1"
   spec.add_development_dependency "cucumber", "~> 3.1.2"
-  spec.add_development_dependency "aruba", "~> 0.14.11"
+  spec.add_development_dependency "aruba", "~> 1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.17
 platform: ruby
 authors:
 - Emil Tin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.1
+        version: 1.27.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.1
+        version: 1.27.4
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -58,98 +58,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: json_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.2.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
-- !ruby/object:Gem::Dependency
-  name: rspec-with_params
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 3.9.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.11
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.11
+        version: 1.0.0
 description: Easy RSMP site and supervisor communication.
 email:
 - zf0f@kk.dk
@@ -359,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.