rsmp 0.3.5 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22d8796a378484c9c7a9d50b3bc48386db2e12893c5af07a1ef83825d2f1b0e
-  data.tar.gz: ee6a4ebb4fcf094cb45e1f541e6f228e6ea9c3364fca6e1526e4fe46026751f2
+  metadata.gz: 0f137a9e58a8af4524954c33515926c1b6eb2dc8aa7e4fa9bfd00b22f6e5e4bb
+  data.tar.gz: a9710492f633d584e6ac0acdac9b8f5bf9b820dbe3ad14ca31295bc56b41e232
 SHA512:
-  metadata.gz: a1a495ba2c110ebb42db60596516de255b9c9a9cb903fdd66bf77bd27a3f5d5b786b273436b522af3dbf57e983651676b9a9e67aee7387ba134ef89812261618
-  data.tar.gz: 21f2e48b596dcca6296da89f687ec46d3845eaafb6cad497a16ac4fabca1cb5574da6df324256f4929b7207eeccd17697bd5021b328b4d265ff7d836d2a5e2c3
+  metadata.gz: cb33932006870bcedfbf3a8d07311c1a752ffccdb23c5d72303b80e47fef0f1b61a4a9fc01521afb8c02bfa32a039b54356687e2d912c03ae9c6238159fdc291
+  data.tar.gz: c7161ce4a72fbf33394336ad1d8a8db1aedb5148c8988c66fd7ea361b1afa8efddbccb34e376c47ac030ed30b785b118670f4005412752d490b66696213081f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.3.5)
+    rsmp (0.3.9)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)

data/lib/rsmp/component.rb

@@ -13,7 +13,7 @@ module RSMP
                                :rest,
                                :not_connected ]
 
-    def initialize node:, id:, grouped:
+    def initialize node:, id:, grouped: false
       @c_id = id
       @node = node
       @grouped = grouped

data/lib/rsmp/components.rb

@@ -38,10 +38,23 @@ module RSMP
       Component.new id:id, node: self, grouped: type=='main'
     end
 
-    def find_component component_id
+    def infer_component_type component_id
+      Component
+    end
+
+    def find_component component_id, build: true
       component = @components[component_id]
-      raise UnknownComponent.new("Component #{component_id} not found") unless component
-      component
+      return component if component
+      if build
+        inferred = infer_component_type component_id
+        component = inferred.new node: self, id: component_id
+        @components[ component_id] = component
+        class_name = component.class.name.split('::').last
+        log "Inferred #{class_name} component #{component_id}", level: :info
+        component
+      else
+        raise UnknownComponent.new("Component #{component_id} not found") unless component
+      end
     end
 
   end

data/lib/rsmp/site_proxy.rb

@@ -125,17 +125,11 @@ module RSMP
       se = message.attribute("se")
       validate_aggregated_status(message,se) == false
       c_id = message.attributes["cId"]
-      component = @components[c_id]
-      if component == nil
-        if @site_settings == nil || @site_settings['components'] == nil
-          component = build_component(id:c_id, type:nil)
-          @components[c_id] = component
-          log "Adding component #{c_id} to site #{@site_id}", level: :info
-        else
-          reason = "component #{c_id} not found"
-          dont_acknowledge message, "Ignoring #{message.type}:", reason
-          return
-        end
+      component = find_component c_id
+      unless component
+        reason = "component #{c_id} not found"
+        dont_acknowledge message, "Ignoring #{message.type}:", reason
+        return
       end
 
       component.set_aggregated_status_bools se
@@ -341,20 +335,12 @@ module RSMP
       @supervisor.notify_error e, options if @supervisor
     end
 
-    def wait_for_alarm parent_task, options={}
-      matching_alarm = nil
-      message = collect(parent_task,options.merge(type: "Alarm", with_message: true, num: 1)) do |message|
-        # TODO check components
-        matching_alarm = nil
-        alarm = message
+    def collect_alarms parent_task, options={}
+      collect(parent_task,options.merge(type: "Alarm")) do |alarm|
         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: message, status: matching_alarm }
+        true
       end
     end
 

data/lib/rsmp/tlc.rb

@@ -5,7 +5,7 @@ module RSMP
   class TrafficController < Component
     attr_reader :pos, :cycle_time
 
-    def initialize node:, id:, cycle_time:
+    def initialize node:, id:, cycle_time: 10
       super node: node, id: id, grouped: true
       @signal_groups = []
       @detector_logics = []
@@ -293,7 +293,8 @@ module RSMP
     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
+        RSMP::Tlc.make_status @detector_logics.each { |dl| p dl.value }
+        RSMP::Tlc.make_status @detector_logics.map { |dl| dl.value ? '1' : '0' }.join
       end
     end
 
@@ -625,13 +626,15 @@ module RSMP
   class SignalGroup < Component
     attr_reader :plan, :state
 
-    def initialize node:, id:, plan:
+    # plan is a string, with each character representing a signal phase at a particular second  in the cycle
+    def initialize node:, id:, plan: nil
       super node: node, id: id, grouped: false
       @plan = plan
       move 0
     end
 
     def get_state pos
+      return 'a' unless @plan  # if no plan, use phase a, which means disabled/dark
       if pos > @plan.length
         '.'
       else
@@ -701,7 +704,7 @@ module RSMP
   end
 
   class DetectorLogic < Component
-    attr_reader :status, :forced, :value
+    attr_reader :forced, :value
 
     def initialize node:, id:
       super node: node, id: id, grouped: false
@@ -781,13 +784,20 @@ module RSMP
 
     def handle_m0008 arg
       @node.verify_security_code 2, arg['securityCode']
-      force_detector_logic arg['status']=='True', arg['value']='True'
+      status = arg['status']=='True'
+      mode = arg['mode']=='True'
+      force_detector_logic status, mode
       arg
     end
 
-    def force_detector_logic status, value
-      @forced = status
+    def force_detector_logic forced, value
+      @forced = forced
       @value = value
+      if @forced
+        log "Forcing to #{value}", level: :info
+      else
+        log "Releasing", level: :info
+      end
     end
 
   end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.3.5"
+  VERSION = "0.3.9"
 end

data/test.rb

@@ -0,0 +1,27 @@
+class A
+	def go &block
+		@block = block			# block will be converted automatically to a Proc
+		indirect
+	end
+
+	def call
+		@block.call
+	end
+
+	def indirect
+		call
+	end
+
+end
+
+a = A.new
+
+a.go do
+	break		# this is ok. break causes the block to exit, and the encasing method to return - go() will exit
+end
+
+# this raises an error. the block we passed to go() will be called again, and it tries to break
+# but we're not inside a method we can exit from
+
+
+a.indirect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.9
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -231,6 +231,7 @@ files:
 - lib/rsmp/version.rb
 - lib/rsmp/wait.rb
 - rsmp.gemspec
+- test.rb
 homepage: https://github.com/rsmp-nordic/rsmp
 licenses:
 - MIT
@@ -254,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.