rsmp 0.8.2 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e4aee9252ad888e831e5ce0738eff5bba57fdd6f2ec2220d7e74936e0e8177
-  data.tar.gz: 5866b23cb324d0732de17f995abec6304f50673e9cfcaa7b440dea6858102cd8
+  metadata.gz: 437183789b08f12b23264bc2716b84fd6c2298c2abab58dfb0b64529d004ac7d
+  data.tar.gz: 5595afbb4edb5d3e66320cae10c92c98a13fd56848095bb8ec4bb3615a097b05
 SHA512:
-  metadata.gz: 0ff9a48cde72b3fb3963c421a321c4bd08c0edfb9afcd7b4b919e2e92aa37624259a5124c81f4bd0189cc6a3596414edc75a305fb19b0c348fadc4e836bdf7cf
-  data.tar.gz: 490aa51f0a4a5b9a6a197c0f6bbe11b8ae16934e5eecd76a486b6e4e34786ebbb334d4ddabf7340c9f13d4946cad4e162db49205a3fbf04fa064938bf6029e0f
+  metadata.gz: f3cdc4723d2d4616cc703d18aca6432c354bdbd7e4084c443a5f17aa8c420463d567813e73dc3fb454f02461b773149970932ee1d6d84f0434d8eaf21324a0ff
+  data.tar.gz: b90f7f2c8edc5722e0044cb31107779caabc4a9acbfce8bb713dd9a7d84e7272dd96fb2aad293c7d30e2350701758fe5300cfed776a774a754798cf8ac91037c

data/.ruby-version

@@ -1 +1 @@
-3.0.3
+3.1.0

data/Gemfile.lock

@@ -1,27 +1,21 @@
 PATH
   remote: .
   specs:
-    rsmp (0.8.2)
+    rsmp (0.8.6)
       async (~> 1.29.1)
-      async-io (~> 1.32.1)
+      async-io (~> 1.32.2)
       colorize (~> 0.8.1)
       rsmp_schemer
-      thor (~> 1.0.1)
+      thor (~> 1.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    aruba (1.1.2)
+    aruba (2.0.0)
       bundler (>= 1.17, < 3.0)
       childprocess (>= 2.0, < 5.0)
       contracts (>= 0.16.0, < 0.18.0)
-      cucumber (>= 2.4, < 7.0)
+      cucumber (>= 4.0, < 8.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
     async (1.29.2)
@@ -33,68 +27,56 @@ GEM
     builder (3.2.4)
     childprocess (4.1.0)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
     console (1.14.0)
       fiber-local
     contracts (0.17)
-    cucumber (6.1.0)
+    cucumber (7.1.0)
       builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 9.0, >= 9.0.1)
-      cucumber-create-meta (~> 4.0, >= 4.0.0)
-      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
-      cucumber-gherkin (~> 18.1, >= 18.1.0)
-      cucumber-html-formatter (~> 13.0, >= 13.0.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-      cucumber-wire (~> 5.0, >= 5.0.1)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-html-formatter (~> 17.0, >= 17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-wire (~> 6.2, >= 6.2.0)
       diff-lcs (~> 1.4, >= 1.4.4)
       mime-types (~> 3.3, >= 3.3.1)
       multi_test (~> 0.1, >= 0.1.2)
       sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-core (9.0.1)
-      cucumber-gherkin (~> 18.1, >= 18.1.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
-    cucumber-create-meta (4.0.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
+    cucumber-core (10.1.1)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-tag-expressions (~> 4.1, >= 4.1.0)
+    cucumber-create-meta (6.0.4)
+      cucumber-messages (~> 17.1, >= 17.1.1)
       sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-cucumber-expressions (12.1.1)
-    cucumber-gherkin (18.1.1)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-    cucumber-html-formatter (13.0.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-    cucumber-messages (15.0.0)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (3.0.1)
-    cucumber-wire (5.0.1)
-      cucumber-core (~> 9.0, >= 9.0.1)
-      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-    diff-lcs (1.4.4)
-    ecma-re-validator (0.3.0)
-      regexp_parser (~> 2.0)
-    ffi (1.15.3)
+    cucumber-cucumber-expressions (14.0.0)
+    cucumber-gherkin (22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    cucumber-html-formatter (17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.0)
+    cucumber-messages (17.1.1)
+    cucumber-tag-expressions (4.1.0)
+    cucumber-wire (6.2.1)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+    diff-lcs (1.5.0)
+    ecma-re-validator (0.4.0)
+      regexp_parser (~> 2.2)
+    ffi (1.15.5)
     fiber-local (1.0.0)
     hana (1.3.7)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
     json_schemer (0.2.18)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       uri_template (~> 0.7)
-    middleware (0.1.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    minitest (5.14.4)
+    mime-types-data (3.2022.0105)
     multi_test (0.1.2)
     nio4r (2.5.8)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.2.0)
     rsmp_schemer (0.3.2)
       json_schemer (~> 0.2.18)
@@ -104,37 +86,33 @@ GEM
       rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
+    thor (1.2.1)
     timecop (0.9.4)
     timers (4.3.3)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
     uri_template (0.7.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-darwin-20
   x86_64-darwin-21
 
 DEPENDENCIES
-  aruba (~> 1.1.2)
-  bundler (~> 2.2.21)
-  cucumber (~> 6.1.0)
-  rake (~> 13.0.3)
+  aruba (~> 2.0.0)
+  bundler (~> 2.3.6)
+  cucumber (~> 7.1.0)
+  rake (~> 13.0.6)
   rsmp!
   rspec (~> 3.10.0)
-  rspec-expectations (~> 3.10.1)
+  rspec-expectations (~> 3.10.2)
   timecop (~> 0.9.4)
 
 BUNDLED WITH
-   2.2.32
+   2.3.6

data/config/tlc.yaml

@@ -20,17 +20,18 @@ signal_plans:
     dynamic_bands:
       1: 0
       2: 5
-    states:
-      A1: '123efg'
-      A2: '123efg'
-      B1: '123efg'
-      B2: '123efg'
-  2:
     states:
       A1: '111NBB'
       A2: '11NBBB'
       B1: 'BBB11N'
       B2: 'BBB1NB'
+  2:
+    states:
+      A1: 'NNNNBB'
+      A2: 'NNNNBN'
+      B1: 'BBNNNN'
+      B2: 'BNNNNN'
+startup_sequence: 'efg'
 intervals:
   timer: 0.1
   watchdog: 0.1
@@ -48,3 +49,4 @@ log:
   level: false
   debug: true
   json: true
+live_output: tmp/tlc.state

data/documentation/collecting_message.md

@@ -157,7 +157,7 @@ task.wait  # wait for collection task to complete (or time out)
 ```
 
 ### With collection
-If you provide `:collect` options, it will be used to construct a StatusUpdateCollector for collecting the relevant status messages. When collection completes the collector is returned in the `:collector` key:
+If you provide `:collect` options, it will be used to construct a StatusCollector for collecting the relevant status messages. When collection completes the collector is returned in the `:collector` key:
 
 ```ruby
 options = {

data/lib/rsmp/collect/aggregated_status_collector.rb

@@ -2,7 +2,7 @@ module RSMP
   # Class for waiting for an aggregated status response
   class AggregatedStatusCollector < Collector
     def initialize proxy, options={}
-      required = { type: ['AggregatedStatus','MessageNotAck'], title: 'aggregated status' }
+      required = { type: 'AggregatedStatus', title: 'aggregated status' }
       super proxy, options.merge(required)
     end
   end

data/lib/rsmp/collect/collector.rb

@@ -6,8 +6,8 @@ module RSMP
   class Collector < Listener
     attr_reader :condition, :messages, :status, :error, :task
 
-    def initialize proxy, options={}
-      super proxy, options
+    def initialize notifier, options={}
+      super notifier, options
       @options = {
         cancel: {
           schema_error: true,
@@ -18,7 +18,15 @@ module RSMP
       @outgoing = options[:outgoing] == nil ? false : options[:outgoing]
       @condition = Async::Notification.new
       @title = options[:title] || [@options[:type]].flatten.join('/')
-      @task = options[:task]
+      if options[:task]
+        @task = options[:task]
+      else
+         # if notifier is a Proxy, or some other object that implements task(),
+         # then try to get the task that way
+        if notifier.respond_to? 'task'
+          @task = notifier.task
+        end
+      end
       reset
     end
 
@@ -43,12 +51,12 @@ module RSMP
       @status == :collecting
     end
 
-    # Is collection active?
+    # Is collection complete?
     def ok?
       @status == :ok
     end
 
-    # Has collection time out?
+    # Has collection timed out?
     def timeout?
       @status == :timeout
     end
@@ -73,6 +81,13 @@ module RSMP
       @outgoing == true
     end
 
+    # if an errors caused collection to abort, then raise it
+    # return self, so this can be tucked on to calls that return a collector
+    def ok!
+      raise @error if @error
+      self
+    end
+
     # Collect message
     # Will return once all messages have been collected, or timeout is reached
     def collect &block
@@ -86,9 +101,8 @@ module RSMP
     # Collect message
     # Returns the collected messages, or raise an exception in case of a time out.
     def collect! &block
-      if collect(&block) == :timeout
-        raise RSMP::TimeoutError.new describe_progress
-      end
+      collect(&block)
+      ok!
       @messages
     end
 
@@ -104,6 +118,7 @@ module RSMP
       end
       @status
     rescue Async::TimeoutError
+      @error = RSMP::TimeoutError.new describe_progress
       @status = :timeout
     end
 
@@ -112,7 +127,7 @@ module RSMP
     # If timeout is reached, an exceptioin is raised.
     def wait!
       wait
-      raise RSMP::TimeoutError.new(describe_progress) if timeout?
+      raise @error if timeout?
       @messages
     end
 
@@ -192,8 +207,8 @@ module RSMP
       @condition.signal
     end
 
-    # The proxy experienced some error.
-    # Check if this should cause us to cancel.
+    # An error occured upstream.
+    # Check if we should cancel.
     def notify_error error, options={}
       case error
       when RSMP::SchemaError

data/lib/rsmp/collect/command_response_collector.rb

@@ -3,7 +3,7 @@ module RSMP
   class CommandResponseCollector < StateCollector
     def initialize proxy, want, options={}
       super proxy, want, options.merge(
-        type: ['CommandResponse','MessageNotAck'],
+        type: 'CommandResponse',
         title:'command response'
       )
     end

data/lib/rsmp/collect/{status_update_or_response_collector.rb → status_collector.rb}

@@ -1,8 +1,12 @@
 module RSMP
   # Base class for waiting for status updates or responses
-  class StatusUpdateOrResponseCollector < StateCollector
+  class StatusCollector < StateCollector
     def initialize proxy, want, options={}
-      super proxy, want, options.merge(outgoing: false)
+      super proxy, want, options.merge(title: 'status response')
+
+      @options[:type] ||= []
+      @options[:type] << 'StatusUpdate' unless options[:updates] == false
+      @options[:type] << 'StatusResponse' unless options[:reponses] == false
     end
 
     def build_query want

data/lib/rsmp/node.rb

@@ -15,7 +15,6 @@ module RSMP
       @clock = Clock.new
       @error_queue = Async::Queue.new
       @ignore_errors = []
-      options[:collector]
       @collect = options[:collect]
     end
 

data/lib/rsmp/proxy.rb

@@ -52,12 +52,6 @@ module RSMP
       node.clock
     end
 
-    def collect options, &block
-      collector = RSMP::Collector.new self, options.merge(task: @task)
-      collector.collect &block
-      collector
-    end
-
     def run
       start
       @reader.wait if @reader
@@ -578,26 +572,21 @@ module RSMP
       node.site_id
     end
 
-    def wait_for_acknowledgement parent_task, options={}, m_id
-      collect(parent_task,options.merge({
-        type: ['MessageAck','MessageNotAck'],
-        num: 1
-      })) do |message|
-        if message.is_a?(MessageNotAck)
-          if message.attribute('oMId') == m_id
-            # set result to an exception, but don't raise it.
-            # this will be returned by the task and stored as the task result
-            # when the parent task call wait() on the task, the exception
-            # will be raised in the parent task, and caught by rspec.
-            # rspec will then show the error and record the test as failed
-            m_id_short = RSMP::Message.shorten_m_id m_id, 8
-            result = RSMP::MessageRejected.new "Aggregated status request #{m_id_short} was rejected with '#{message.attribute('rea')}'"
-            next true   # done, no more messages wanted
-          end
-        elsif message.is_a?(MessageAck)
-          next true if message.attribute('oMId') == m_id
+    def send_and_optionally_collect message, options, &block
+      collect_options = options[:collect] || options[:collect!]
+      if collect_options
+        task = @task.async do |task|
+          collector = yield collect_options     # call block to create collector
+          collector.collect
+          collector.ok! if options[:collect!]   # raise any errors if the bang version was specified
+          collector
         end
-        false
+
+        send_message message, validate: options[:validate]
+        { sent: message, collector: task.wait }
+      else
+        send_message message, validate: options[:validate]
+        return { sent: message }
       end
     end
   end

data/lib/rsmp/site.rb

@@ -9,9 +9,9 @@ module RSMP
     attr_reader :rsmp_versions, :site_settings, :logger, :proxies
 
     def initialize options={}
+      super options
       initialize_components
       handle_site_settings options
-      super options
       @proxies = []
       @sleep_condition = Async::Notification.new
       @proxies_condition = Async::Notification.new
@@ -95,7 +95,8 @@ module RSMP
         ip: supervisor_settings['ip'],
         port: supervisor_settings['port'],
         logger: @logger,
-        archive: @archive
+        archive: @archive,
+        collect: @collect
       })
       @proxies << proxy
       @proxies_condition.signal

data/lib/rsmp/site_proxy.rb

@@ -101,8 +101,11 @@ module RSMP
           "cId" => component,
           "mId" => m_id
       })
-      send_and_collect_if_needed message, options do |task|
-        collect_aggregated_status task, options[:collect].merge(m_id: m_id, num:1)
+      send_and_optionally_collect message, options do |collect_options|
+        AggregatedStatusCollector.new(
+          self,
+          collect_options.merge(task:@task,m_id: m_id, num:1)
+        )
       end
     end
 
@@ -174,8 +177,12 @@ module RSMP
           "sS" => request_list,
           "mId" => m_id
       })
-      send_and_collect_if_needed message, options do |task|
-        collect_status_responses task, status_list, options[:collect].merge(m_id: m_id)
+      send_and_optionally_collect message, options do |collect_options|
+        StatusCollector.new(
+          self,
+          status_list,
+          collect_options.merge(task:@task,m_id: m_id)
+          )
       end
     end
 
@@ -186,17 +193,6 @@ module RSMP
       acknowledge message
     end
 
-    def send_and_collect_if_needed message, options, &block
-      if options[:collect]
-        task = @task.async { |task| yield task }
-        send_message message, validate: options[:validate]
-        { sent: message, collector: task.wait }
-      else
-        send_message message, validate: options[:validate]
-        return { sent: message }
-      end
-    end
-
     def subscribe_to_status component_id, status_list, options={}
       validate_ready 'subscribe to status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
@@ -215,8 +211,12 @@ module RSMP
           "sS" => subscribe_list,
           'mId' => m_id
       })
-      send_and_collect_if_needed message, options do |task|
-         collect_status_updates task, status_list, options[:collect].merge(m_id: m_id)
+      send_and_optionally_collect message, options do |collect_options|
+        StatusCollector.new(
+          self,
+          status_list,
+          collect_options.merge(task:@task,m_id: m_id)
+        )
       end
     end
 
@@ -261,8 +261,12 @@ module RSMP
           "arg" => command_list,
           "mId" => m_id
       })
-      send_and_collect_if_needed message, options do |task|
-        collect_command_responses task, command_list, options[:collect].merge(m_id: m_id)
+      send_and_optionally_collect message, options do |collect_options|
+        CommandResponseCollector.new(
+          self,
+          command_list,
+          collect_options.merge(task:@task,m_id: m_id)
+          )
       end
     end
 
@@ -339,37 +343,13 @@ module RSMP
       distribute_error e, options
     end
 
-    def collect_alarms parent_task, options={}
-      collect(parent_task,options.merge(type: "Alarm")) do |alarm|
+    def collect_alarms options={}
+      collect(@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")
-        true
+        :keep
       end
     end
-
-    def collect_status_updates task, status_list, options
-      collector = StatusUpdateCollector.new(self, status_list, options.merge(task:task))
-      collector.collect
-      collector
-    end
-
-    def collect_status_responses task, status_list, options
-      collector = StatusResponseCollector.new(self, status_list, options.merge(task:task))
-      collector.collect
-      collector
-    end
-
-    def collect_command_responses task, command_list, options
-      collector = CommandResponseCollector.new(self, command_list, options.merge(task:task))
-      collector.collect
-      collector
-    end
-
-    def collect_aggregated_status task, options
-      collector = AggregatedStatusCollector.new(self, options.merge(task:task))
-      collector.collect
-      collector
-    end
   end
 end

data/lib/rsmp/supervisor_proxy.rb

@@ -138,16 +138,8 @@ module RSMP
         "mId" => m_id,
       })
 
-      if options[:collect]
-        result = nil
-        task = @task.async do |task|
-          wait_for_acknowledgement task, options[:collect], m_id
-        end
-        send_message message, validate: options[:validate]
-        return message, task.wait
-      else
-        send_message message, validate: options[:validate]
-        message
+      send_and_optionally_collect message, options do |collect_options|
+        Collector.new self, collect_options.merge(task:@task, type: 'MessageAck')
       end
     end
 

data/lib/rsmp/tlc/signal_group.rb

@@ -6,25 +6,33 @@ module RSMP
       # plan is a string, with each character representing a signal phase at a particular second in the cycle
       def initialize node:, id:
         super node: node, id: id, grouped: false
-        move 0
       end
 
-      def get_state pos
+      def timer
+        @state = get_state
+      end
+
+      def get_state
+        return 'a' if node.main.dark_mode
+        return 'c' if node.main.yellow_flash
+
+        cycle_counter = node.main.cycle_counter
+
+        if node.main.startup_sequence_active
+          @state = node.main.startup_state || 'a'
+        end
+
         default = 'a'   # phase a means disabled/dark
         plan = node.main.current_plan
         return default unless plan
         return default unless plan.states
         states = plan.states[c_id]
         return default unless states
-        state = states[pos]
+        state = states[cycle_counter]
         return default unless state =~ /[a-hA-G0-9N-P]/  # valid signal group states
         state
       end
 
-      def move pos
-        @state = get_state pos
-      end
-
       def handle_command command_code, arg
         case command_code
         when 'M0010', 'M0011'

data/lib/rsmp/tlc/traffic_controller.rb

@@ -5,9 +5,12 @@ module RSMP
     # and keeps track of signal plans, detector logics, inputs, etc. which do
     # not have dedicated components.
     class TrafficController < Component
-      attr_reader :pos, :cycle_time, :plan
+      attr_reader :pos, :cycle_time, :plan, :cycle_counter,
+        :yellow_flash, :dark_mode,
+        :startup_sequence_active, :startup_sequence, :startup_sequence_pos
 
-      def initialize node:, id:, cycle_time: 10, signal_plans:
+      def initialize node:, id:, cycle_time: 10, signal_plans:,
+          startup_sequence:, live_output:nil
         super node: node, id: id, grouped: true
         @signal_groups = []
         @detector_logics = []
@@ -15,13 +18,15 @@ module RSMP
         @cycle_time = cycle_time
         @num_traffic_situations = 1
         @num_inputs = 8
+        @startup_sequence = startup_sequence
+        @live_output = live_output
         reset
       end
 
       def reset
-        @pos = 0
-        @plan = 0
-        @dark_mode = false
+        @cycle_counter = 0
+        @plan = 1
+        @dark_mode = true
         @yellow_flash = false
         @booting = false
         @control_mode = 'control'
@@ -40,6 +45,12 @@ module RSMP
         @inputs = '0'*@num_inputs
         @input_activations = '0'*@num_inputs
         @input_results = '0'*@num_inputs
+
+        @day_time_table = {}
+        @startup_sequence_active = false
+        @startup_sequence_initiated_at = nil
+        @startup_sequence_pos = 0
+        @time_int = nil
       end
 
       def clock
@@ -64,46 +75,83 @@ module RSMP
       end
 
       def timer now
-        # TODO
-        # We should use a monotone timer, to avoid jumps
-        # in case the user sets the system time
-        pos = Time.now.to_i % @cycle_time
-        if pos != @pos
-          @pos = pos
-          move pos
-        end
+        # TODO use monotone timer, to avoid jumps in case the user sets the system time
+        @signal_groups.each { |group| group.timer }
+        time = Time.now.to_i
+        return if time == @time_int
+        @time_int = time
+        move_cycle_counter
+        move_startup_sequence if @startup_sequence_active
+        output_states
+      end
+
+      def move_cycle_counter
+        counter = Time.now.to_i % @cycle_time
+        @cycle_counter = counter
+      end
+
+      def startup_state
+        return unless @startup_sequence_active
+        return unless @startup_sequence_pos
+        @startup_sequence[ @startup_sequence_pos ]
       end
 
-      def move pos
-        @signal_groups.each do |group|
-          group.move pos
+      def initiate_startup_sequence
+        log "Initiating startup sequence", level: :info
+        @startup_sequence_active = true
+        @startup_sequence_initiated_at = nil
+        @startup_sequence_pos = nil
+      end
+
+      def end_startup_sequence
+        @startup_sequence_active = false
+        @startup_sequence_initiated_at = nil
+        @startup_sequence_pos = nil
+
+        @yellow_flash = false
+        @dark_mode = false
+      end
+
+      def move_startup_sequence
+        was = @startup_sequence_pos
+        if @startup_sequence_initiated_at == nil
+          @startup_sequence_initiated_at = Time.now.to_i + 1
+          @startup_sequence_pos = 0
+        else
+          @startup_sequence_pos = Time.now.to_i - @startup_sequence_initiated_at
+        end
+        if @startup_sequence_pos >= @startup_sequence.size
+          end_startup_sequence
         end
-        #output_states
       end
 
       def output_states
+        return unless @live_output
         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)
-          elsif group.state =~ /^[a]$/
-            s.colorize(color: :black)
+          elsif group.state =~ /^[ae]$/
+            s.colorize(:black)
+          elsif group.state =~ /^[f]$/
+            s.colorize(:yellow)
+          elsif group.state =~ /^[g]$/
+            s.colorize(:red)
           else
             s.colorize(:red)
           end
         end.join ' '
         plan = "P#{@plan}"
-        print "#{plan.rjust(4)} #{pos.to_s.rjust(4)} #{str}\r"
+
+        File.open @live_output, 'w' do |file|
+          file.puts "#{plan.rjust(4)} #{pos.to_s.rjust(4)} #{str}\r"
+        end
       end
 
       def format_signal_group_status
-        if @yellow_flash
-          'c' * @signal_groups.size
-        else
-          @signal_groups.map { |group| group.state }.join
-        end
+        @signal_groups.map { |group| group.state }.join
       end
 
       def handle_command command_code, arg
@@ -214,6 +262,18 @@ module RSMP
 
       def handle_m0017 arg
         @node.verify_security_code 2, arg['securityCode']
+        arg['status'].split(',').each do |item|
+          elems = item.split('-')
+          nr = elems[0].to_i
+          plan = elems[1].to_i
+          hour = elems[2].to_i
+          min = elems[3].to_i
+          if nr<0 || nr>12
+            raise InvalidMessage.new "time table id must be between 0 and 12, got #{nr}"
+          end
+          #p "nr: #{nr}, plan #{plan} at #{hour}:#{min}"
+          @day_time_table[nr] = {plan: plan, hour: hour, min:min}
+        end
       end
 
       def handle_m0018 arg
@@ -276,6 +336,7 @@ module RSMP
         log "Switching to mode #{mode}", level: :info
         case mode
         when 'NormalControl'
+          initiate_startup_sequence if @yellow_flash || @dark_mode
           @yellow_flash = false
           @dark_mode = false
         when 'YellowFlash'
@@ -308,9 +369,9 @@ module RSMP
         when 'signalgroupstatus'
           TrafficControllerSite.make_status format_signal_group_status
         when 'cyclecounter'
-          TrafficControllerSite.make_status @pos.to_s
+          TrafficControllerSite.make_status @cycle_counter.to_s
         when 'basecyclecounter'
-          TrafficControllerSite.make_status @pos.to_s
+          TrafficControllerSite.make_status @cycle_counter.to_s
         when 'stage'
           TrafficControllerSite.make_status 0.to_s
         end
@@ -511,7 +572,10 @@ module RSMP
       def handle_s0027 status_code, status_name=nil
         case status_name
         when 'status'
-          TrafficControllerSite.make_status '00-00-00-00'
+          status = @day_time_table.map do |i,item|
+            "#{i}-#{item[:plan]}-#{item[:hour]}-#{item[:min]}"
+          end.join(',')
+          TrafficControllerSite.make_status status
         end
       end
 

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -5,11 +5,16 @@ module RSMP
       attr_accessor :main, :signal_plans
 
       def initialize options={}
+        # setup options before calling super initializer,
+        # since build of components depend on options
         @sxl = 'traffic_light_controller'
         @security_codes = options[:site_settings]['security_codes']
         @interval = options[:site_settings].dig('intervals','timer') || 1
+        @startup_sequence = options[:site_settings]['startup_sequence'] || 'efg'
         build_plans options[:site_settings].dig('signal_plans')
+
         super options
+
         unless @main
           raise ConfigurationError.new "TLC must have a main component"
         end
@@ -37,7 +42,9 @@ module RSMP
         when 'main'
           @main = TrafficController.new node: self, id: id,
             cycle_time: settings['cycle_time'],
-            signal_plans: @signal_plans
+            startup_sequence: @startup_sequence,
+            signal_plans: @signal_plans,
+            live_output: @site_settings['live_output']
         when 'signal_group'
           group = SignalGroup.new node: self, id: id
           @main.add_signal_group group
@@ -52,6 +59,7 @@ module RSMP
       def start_action
         super
         start_timer
+        @main.initiate_startup_sequence
       end
 
       def start_timer
@@ -134,6 +142,7 @@ module RSMP
         when :restart
           log "Restarting TLC", level: :info
           restart
+          initiate_startup_sequence
         end
       end
     end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.8.2"
+  VERSION = "0.8.6"
 end

data/lib/rsmp.rb

@@ -25,9 +25,7 @@ require 'rsmp/collect/filter'
 require 'rsmp/collect/query'
 require 'rsmp/collect/status_query'
 require 'rsmp/collect/command_query'
-require 'rsmp/collect/status_update_or_response_collector'
-require 'rsmp/collect/status_response_collector'
-require 'rsmp/collect/status_update_collector'
+require 'rsmp/collect/status_collector'
 require 'rsmp/collect/command_response_collector'
 require 'rsmp/collect/aggregated_status_collector'
 require 'rsmp/component'

data/rsmp.gemspec

@@ -31,16 +31,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "async", "~> 1.29.1"
-  spec.add_dependency "async-io", "~> 1.32.1"
+  spec.add_dependency "async-io", "~> 1.32.2"
   spec.add_dependency "colorize", "~> 0.8.1"
-  spec.add_dependency "thor", "~> 1.0.1"
+  spec.add_dependency "thor", "~> 1.2.1"
   spec.add_dependency "rsmp_schemer"
 
-  spec.add_development_dependency "bundler", "~> 2.2.21"
-  spec.add_development_dependency "rake", "~> 13.0.3"
+  spec.add_development_dependency "bundler", "~> 2.3.6"
+  spec.add_development_dependency "rake", "~> 13.0.6"
   spec.add_development_dependency "rspec", "~> 3.10.0"
-  spec.add_development_dependency "rspec-expectations", "~> 3.10.1"
+  spec.add_development_dependency "rspec-expectations", "~> 3.10.2"
   spec.add_development_dependency "timecop", "~> 0.9.4"
-  spec.add_development_dependency "cucumber", "~> 6.1.0"
-  spec.add_development_dependency "aruba" , "~> 1.1.2"
+  spec.add_development_dependency "cucumber", "~> 7.1.0"
+  spec.add_development_dependency "aruba" , "~> 2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.6
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.32.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.32.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rsmp_schemer
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.21
+        version: 2.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.21
+        version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.1
+        version: 3.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.1
+        version: 3.10.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0
 description: Easy RSMP site and supervisor communication.
 email:
 - zf0f@kk.dk
@@ -217,10 +217,8 @@ files:
 - lib/rsmp/collect/notifier.rb
 - lib/rsmp/collect/query.rb
 - lib/rsmp/collect/state_collector.rb
+- lib/rsmp/collect/status_collector.rb
 - lib/rsmp/collect/status_query.rb
-- lib/rsmp/collect/status_response_collector.rb
-- lib/rsmp/collect/status_update_collector.rb
-- lib/rsmp/collect/status_update_or_response_collector.rb
 - lib/rsmp/component.rb
 - lib/rsmp/components.rb
 - lib/rsmp/convert/export/json_schema.rb
@@ -271,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.

data/lib/rsmp/collect/status_response_collector.rb

@@ -1,11 +0,0 @@
-module RSMP
-  # Class for waiting for specific status responses
-  class StatusResponseCollector < StatusUpdateOrResponseCollector
-    def initialize proxy, want, options={}
-      super proxy, want, options.merge(
-        type: ['StatusResponse','MessageNotAck'],
-        title: 'status response'
-      )
-    end
-  end
-end

data/lib/rsmp/collect/status_update_collector.rb

@@ -1,11 +0,0 @@
-module RSMP
-  # Class for waiting for specific status responses
-  class StatusUpdateCollector < StatusUpdateOrResponseCollector
-    def initialize proxy, want, options={}
-      super proxy, want, options.merge(
-        type: ['StatusUpdate','MessageNotAck'],
-        title:'status update'
-      )
-    end
-  end
-end