rsmp 0.1.40 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1feaa7fd1863a9783573d2f8c2c025f06ba53de97a441bd7f8b5da164c813cd
-  data.tar.gz: e34aea14d3949b54d9ed9db3dcc8495cf3d5db8761f77e74b6c162bcf86468d6
+  metadata.gz: a57d963e9f3f6f4dccdfbfaf7bc2d4c09fcbae56d1ec886ed699faa373e054ed
+  data.tar.gz: 4035d49f738d335f94d4df8c9dd33a3744d258740e51df55be9da5998ce3e538
 SHA512:
-  metadata.gz: 7da97ae66c060644d623f49dc7b8702110ce54a6fd4bfadac56cc74945430612a7a8c5269e98174a17aeedfd83a7551b3eecc9e151f5aea1cff53a88eb43c5c5
-  data.tar.gz: 4d51c29847821378a1e34f2e34f6f5fe779053c18022927ac3041f51b235db55303f45658f7f10ea017f9021bbf1665ebe8383e491e0f9b98017f1c8da7a4dca
+  metadata.gz: 94e7df5ad072745c960726053e0630b8b9efefc87c746a0f96afb53c32c4ff7450a553d3576a9ad9cd430640355e8ff329862cb4fd24da8338780e500f3c0245
+  data.tar.gz: 70b0a93eb41dca5cfabe62cacfb08f675fe2f359886bc4038aa647a95d873553b04056277ee08bac16476c441c7b6f646300179567fe2b33f58aa83121456b37

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.40)
-      async (~> 1.28.7)
-      async-io (~> 1.30.2)
+    rsmp (0.2.3)
+      async (~> 1.29.1)
+      async-io (~> 1.32.1)
       colorize (~> 0.8.1)
       rsmp_schemer
       thor (~> 1.0.1)
@@ -11,91 +11,129 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (1.0.0)
-      childprocess (~> 3.0)
-      contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 4.0)
-      ffi (~> 1.9)
+    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)
+      bundler (>= 1.17, < 3.0)
+      childprocess (>= 2.0, < 5.0)
+      contracts (>= 0.16.0, < 0.18.0)
+      cucumber (>= 2.4, < 7.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    async (1.28.9)
+    async (1.29.2)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-io (1.30.2)
-      async (~> 1.14)
-    backports (3.17.0)
+    async-io (1.32.2)
+      async
     builder (3.2.4)
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     colorize (0.8.1)
+    concurrent-ruby (1.1.9)
     console (1.13.1)
       fiber-local
-    contracts (0.16.0)
-    cucumber (3.1.2)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.2.0)
-      cucumber-expressions (~> 6.0.1)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.1.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.2.1)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (~> 5.0)
-    cucumber-expressions (6.0.1)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    diff-lcs (1.3)
+    contracts (0.17)
+    cucumber (6.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)
+      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)
+      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.12.2)
+    ffi (1.15.3)
     fiber-local (1.0.0)
-    gherkin (5.1.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)
-    multi_json (1.14.1)
+    middleware (0.1.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0225)
+    minitest (5.14.4)
     multi_test (0.1.2)
-    nio4r (2.5.7)
-    rake (13.0.1)
+    nio4r (2.5.8)
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
+    rake (13.0.3)
     regexp_parser (2.1.1)
     rsmp_schemer (0.3.1)
       json_schemer (~> 0.2.18)
-    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)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
     thor (1.0.1)
-    timecop (0.9.1)
+    thread_safe (0.3.6)
+    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
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
-  aruba (~> 1.0.0)
-  bundler (~> 2.2.3)
-  cucumber (~> 3.1.2)
-  rake (~> 13.0.1)
+  aruba (~> 1.1.2)
+  bundler (~> 2.2.21)
+  cucumber (~> 6.1.0)
+  rake (~> 13.0.3)
   rsmp!
-  rspec (~> 3.9.0)
-  rspec-expectations (~> 3.9.1)
-  timecop (~> 0.9.1)
+  rspec (~> 3.10.0)
+  rspec-expectations (~> 3.10.1)
+  timecop (~> 0.9.4)
 
 BUNDLED WITH
-   2.2.3
+   2.2.21

data/lib/rsmp/logger.rb

@@ -96,7 +96,8 @@ module RSMP
           'statistics' => 'light_black',
           'not_acknowledged' => 'cyan',
           'warning' => 'light_yellow',
-          'error' => 'red'
+          'error' => 'red',
+          'debug' => 'light_black'
         }
         colors.merge! @settings["color"] if @settings["color"].is_a?(Hash)
         if colors[level.to_s]

data/lib/rsmp/node.rb

@@ -6,21 +6,21 @@ module RSMP
     include Wait
     include Inspect
 
-    attr_reader :archive, :logger, :task, :deferred, :error_condition, :clock
+    attr_reader :archive, :logger, :task, :deferred, :error_queue, :clock
 
     def initialize options
       initialize_logging options
       @task = options[:task]
       @deferred = []
       @clock = Clock.new
-      @error_condition = Async::Notification.new
+      @error_queue = Async::Queue.new
     end
 
     def notify_error e, options={}
       if options[:level] == :internal
         log ["#{e.to_s} in task: #{Async::Task.current.to_s}",e.backtrace].flatten.join("\n"), level: :error
       end
-      @error_condition.signal e
+      @error_queue.enqueue e
     end
 
     def defer item

data/lib/rsmp/proxy.rb

@@ -11,22 +11,32 @@ module RSMP
     include Notifier
     include Inspect
 
-    attr_reader :state, :archive, :connection_info, :sxl, :task, :collector
+    attr_reader :state, :archive, :connection_info, :sxl, :task, :collector, :ip, :port
 
     def initialize options
       initialize_logging options
+      setup options
+      initialize_distributor
+      prepare_collection @settings['collect']
+      clear
+    end
+
+    def revive options
+      setup options
+    end
+
+    def setup options
       @settings = options[:settings]
       @task = options[:task]
       @socket = options[:socket]
+      @stream = options[:stream]
+      @protocol = options[:protocol]
       @ip = options[:ip]
       @port = options[:port]
       @connection_info = options[:info]
       @sxl = nil
       @site_settings = nil  # can't pick until we know the site id
-      initialize_distributor
-
-      prepare_collection @settings['collect']
-      clear
+      @state = :stopped
     end
 
     def inspect
@@ -105,8 +115,8 @@ module RSMP
     def start_reader  
       @reader = @task.async do |task|
         task.annotate "reader"
-        @stream = Async::IO::Stream.new(@socket)
-        @protocol = Async::IO::Protocol::Line.new(@stream,WRAPPING_DELIMITER) # rsmp messages are json terminated with a form-feed
+        @stream ||= Async::IO::Stream.new(@socket)
+        @protocol ||= Async::IO::Protocol::Line.new(@stream,WRAPPING_DELIMITER) # rsmp messages are json terminated with a form-feed
 
         while json = @protocol.read_line
           beginning = Time.now

data/lib/rsmp/site_proxy.rb

@@ -15,6 +15,13 @@ module RSMP
       @site_id = nil
     end
 
+    def revive options
+      super options
+      @supervisor = options[:supervisor]
+      @settings = @supervisor.supervisor_settings.clone
+    end
+
+
     def inspect
       "#<#{self.class.name}:#{self.object_id}, #{inspector(
         :@acknowledgements,:@settings,:@site_settings,:@components
@@ -82,8 +89,12 @@ module RSMP
 
     end
 
+    def validate_ready action
+      raise NotReady.new("Can't #{action} because connection is not ready. (Currently #{@state})") unless ready?
+    end
+
     def request_aggregated_status component, options={}
-      raise NotReady unless ready?
+      validate_ready 'request aggregated status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
 
       message = RSMP::AggregatedStatusRequest.new({
@@ -163,7 +174,7 @@ module RSMP
     end
 
     def request_status component, status_list, options={}
-      raise NotReady unless ready?
+      validate_ready 'request status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
 
       # additional items can be used when verifying the response,
@@ -203,7 +214,7 @@ module RSMP
     end
 
     def subscribe_to_status component, status_list, options={}
-      raise NotReady unless ready?
+      validate_ready 'subscribe to status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
       
       # additional items can be used when verifying the response,
@@ -238,7 +249,7 @@ module RSMP
     end
 
     def unsubscribe_to_status component, status_list, options={}
-      raise NotReady unless ready?
+      validate_ready 'unsubscribe to status'
       message = RSMP::StatusUnsubscribe.new({
           "ntsOId" => '',
           "xNId" => '',
@@ -269,7 +280,7 @@ module RSMP
     end
 
     def send_command component, command_list, options={}
-      raise NotReady unless ready?
+      validate_ready 'send command'
       m_id = options[:m_id] || RSMP::Message.make_m_id
       message = RSMP::CommandRequest.new({
           "ntsOId" => '',

data/lib/rsmp/site_proxy_wait.rb

@@ -2,6 +2,113 @@
 module RSMP
   module SiteProxyWait
 
+    class Matcher
+      attr_reader :result, :messages
+
+      # Initialize with a list a wanted statuses
+      def initialize want, options={}
+        @want = want.clone
+        @result = {}
+        @messages = []
+        @m_id = options[:m_id]
+      end
+
+      # Check if a messages is wanted.
+      # Returns true when we found all that we want.
+      def process message
+        ack_status = check_not_ack message
+        return ack_status if ack_status != nil
+
+        add = false
+        @want.each_with_index do |query,i|          # look through wanted
+          get_items(message).each do |input|  # look through status items in message
+            matching = match? query, input
+            if matching == true
+              @result[query] = input
+              add = true
+            elsif matching == false
+              @result.delete query
+            end
+          end
+        end
+        @messages << message if add
+        @result.size == @want.size      # queries left to match?
+      end
+
+      # Check for MessageNotAck
+      # If the original request identified by @m_id is rejected, we abort
+      def check_not_ack 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 async 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("#{type_str} #{m_id_short} was rejected: #{message.attribute('rea')}")
+            @messages = [message]
+            return true
+          end
+          return false
+        end
+      end
+    end
+
+    class CommandResponseMatcher < RSMP::SiteProxyWait::Matcher
+      def initialize want, options={}
+        super
+      end
+
+      def type_str
+        "Command request"
+      end
+
+      def get_items message
+        message.attributes['rvs']
+      end
+
+      def match? query, item
+        return nil if query['cCI'] && query['cCI'] != item['cCI']
+        return nil if query['n'] && query['n'] != item['n']
+        if query['v'].is_a? Regexp
+          return false if query['v'] && item['v'] !~ query['v']
+        else
+          return false if query['v'] && item['v'] != query['v']
+        end
+        true
+      end
+    end
+
+    # Class for matching incoming messaging against a list of wanted statuses,
+    # and flagging when everything has been matched.
+    class StatusResponseMatcher < RSMP::SiteProxyWait::Matcher
+      def initialize want, options={}
+        super
+      end
+
+      def type_str
+        "Status request"
+      end
+
+      def get_items message
+        message.attributes['sS']
+      end
+
+      # Match an item against a query
+      def match? query, item
+        return nil if query['sCI'] && query['sCI'] != item['sCI']
+        return nil if query['n'] && query['n'] != item['n']
+        return false if query['q'] && query['q'] != item['q']
+        if query['s'].is_a? Regexp
+          return false if query['s'] && item['s'] !~ query['s']
+        else
+          return false if query['s'] && item['s'] != query['s']
+        end
+        true
+      end
+    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|
@@ -29,120 +136,26 @@ module RSMP
 
     def collect_command_responses parent_task, options, m_id
       task.annotate "wait for command response"
-      want = options[:command_list].clone
-      result = {}
-      messages = []
-      collect(parent_task,options.merge({
-        type: ['CommandResponse','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 "Command request #{m_id_short} was rejected: #{message.attribute('rea')}"
-            next true   # done, no more messages wanted
-          else
-            false
-          end
-        else
-          add = false
-          # look through querues
-          want.each_with_index do |query,i|
-            # look through items in message
-            message.attributes['rvs'].each do |input|
-              matching = command_match? query, input
-              if matching == true
-                result[query] = input
-                add = true
-              elsif matching == false
-                result.delete query
-              end
-            end
-          end
-          messages << message if add
-          result.size == want.size # any queries left to match?
-        end
+      matcher = CommandResponseMatcher.new options[:command_list], m_id: m_id
+      collect(parent_task,options.merge(type: ['CommandResponse','MessageNotAck'], num: 1)) do |message|
+        matcher.process message   # returns true when done (all queries matched)
       end
-      return result, messages
+      return matcher.result, matcher.messages
     rescue Async::TimeoutError
       raise RSMP::TimeoutError.new "Did not receive correct command response to #{m_id} within #{options[:timeout]}s"
     end
 
     def collect_status_updates_or_responses task, type, options, m_id
-      want = options[:status_list].clone
-      result = {}
-      messages = []
-      # wait for a status update
-      collect(task,options.merge({
-        type: [type,'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 "Status request #{m_id_short} was rejected: #{message.attribute('rea')}"
-            next true   # done, no more messages wanted
-          end
-          false
-        else
-          found = []
-          add = false
-          # look through querues
-          want.each_with_index do |query,i|
-            # look through status items in message
-            message.attributes['sS'].each do |input|
-              matching = status_match? query, input
-              if matching == true
-                result[query] = input
-                add = true
-              elsif matching == false
-                result.delete query
-              end
-            end
-          end
-          messages << message if add
-          result.size == want.size # any queries left to match?
-        end
+      matcher = StatusResponseMatcher.new options[:status_list], m_id: m_id
+      collect(task,options.merge( type: [type,'MessageNotAck'], num: 1 )) do |message|
+        matcher.process message   # returns true when done (all queries matched)
       end
-      return result, messages
+      return matcher.result, matcher.messages
     rescue Async::TimeoutError
       type_str = {'StatusUpdate'=>'update', 'StatusResponse'=>'response'}[type]
       raise RSMP::TimeoutError.new "Did not received correct status #{type_str} in reply to #{m_id} within #{options[:timeout]}s"
     end
 
-    def status_match? query, item
-      return nil if query['sCI'] && query['sCI'] != item['sCI']
-      return nil if query['n'] && query['n'] != item['n']
-      return false if query['q'] && query['q'] != item['q']
-      if query['s'].is_a? Regexp
-        return false if query['s'] && item['s'] !~ query['s']
-      else
-        return false if query['s'] && item['s'] != query['s']
-      end
-      true
-    end
-
-    def command_match? query, item
-      return nil if query['cCI'] && query['cCI'] != item['cCI']
-      return nil if query['n'] && query['n'] != item['n']
-      if query['v'].is_a? Regexp
-        return false if query['v'] && item['v'] !~ query['v']
-      else
-        return false if query['v'] && item['v'] != query['v']
-      end
-      true
-    end
-
     def wait_for_aggregated_status parent_task, options, m_id
       collect(parent_task,options.merge({
         type: ['AggregatedStatus','MessageNotAck'],
@@ -168,4 +181,4 @@ module RSMP
     end
 
   end
-end
+end

data/lib/rsmp/supervisor.rb

@@ -136,6 +136,13 @@ module RSMP
       end
     end
 
+    def peek_version_message protocol
+      json = protocol.peek_line
+      attributes = Message.parse_attributes json
+      message = Message.build attributes, json
+      message.attribute('siteId').first['sId']
+    end
+
     def connect socket, info
       log "Site connected from #{format_ip_and_port(info)}",
           ip: info[:ip],
@@ -144,25 +151,36 @@ module RSMP
           timestamp: Clock.now
 
       authorize_ip info[:ip]
-      check_max_sites
 
-      proxy = build_proxy({
+      stream = Async::IO::Stream.new socket
+      protocol = Async::IO::Protocol::Line.new stream, Proxy::WRAPPING_DELIMITER
+
+      settings = {
         supervisor: self,
         ip: info[:ip],
         port: info[:port],
         task: @task,
         settings: {'collect'=>@supervisor_settings['collect']},
         socket: socket,
+        stream: stream,
+        protocol: protocol,
         info: info,
         logger: @logger,
         archive: @archive
-      })
-      @proxies.push proxy
+      }
+
+      id = peek_version_message protocol
+      proxy = find_site id
+      if proxy
+        proxy.revive settings
+      else
+        check_max_sites
+        proxy = build_proxy settings
+        @proxies.push proxy
+      end
       proxy.run     # will run until the site disconnects
     ensure
-      @proxies.delete proxy
       site_ids_changed
-
       stop if @supervisor_settings['one_shot']
     end
 
@@ -188,7 +206,14 @@ module RSMP
       return find_site(site_id) != nil
     end
 
-    def find_site site_id
+    def find_site_from_ip_port ip, port
+      @proxies.each do |site|
+        return site if site.ip == ip && site.port == port
+      end
+      nil
+    end
+
+   def find_site site_id
       @proxies.each do |site|
         return site if site_id == :any || site.site_id == site_id
       end
@@ -210,12 +235,13 @@ module RSMP
     end
 
     def check_site_id site_id
-      check_site_already_connected site_id
+      #check_site_already_connected site_id
       return site_id_to_site_setting site_id
     end
 
     def check_site_already_connected site_id
-      raise FatalError.new "Site '#{site_id}' already connected" if find_site(site_id)
+      site = find_site(site_id)
+      raise FatalError.new "Site '#{site_id}' already connected" if site != nil && site != self
     end
 
     def site_id_to_site_setting site_id

data/lib/rsmp/supervisor_proxy.rb

@@ -132,7 +132,7 @@ module RSMP
         "fP" => 'NormalControl',
         "fS" => nil,
         "se" => component.aggregated_status_bools,
-        "mId" => m_id
+        "mId" => m_id,
       })
 
       if options[:collect]

data/lib/rsmp/tlc.rb

@@ -798,7 +798,7 @@ module RSMP
       super options
       @sxl = 'traffic_light_controller'
       @security_codes = options[:site_settings]['security_codes']
-      @interval = options[:site_settings]['intervals']['timer'] || 1
+      @interval = options[:site_settings].dig('intervals','timer') || 1
       unless @main
         raise ConfigurationError.new "TLC must have a main component"
       end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.40"
+  VERSION = "0.2.3"
 end

data/rsmp.gemspec

@@ -30,17 +30,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "async", "~> 1.28.7"
-  spec.add_dependency "async-io", "~> 1.30.2"
+  spec.add_dependency "async", "~> 1.29.1"
+  spec.add_dependency "async-io", "~> 1.32.1"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.0.1"
   spec.add_dependency "rsmp_schemer"
 
-  spec.add_development_dependency "bundler", "~> 2.2.3"
-  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", "~> 1.0.0"
+  spec.add_development_dependency "bundler", "~> 2.2.21"
+  spec.add_development_dependency "rake", "~> 13.0.3"
+  spec.add_development_dependency "rspec", "~> 3.10.0"
+  spec.add_development_dependency "rspec-expectations", "~> 3.10.1"
+  spec.add_development_dependency "timecop", "~> 0.9.4"
+  spec.add_development_dependency "cucumber", "~> 6.1.0"
+  spec.add_development_dependency "aruba" , "~> 1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.2.3
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.7
+        version: 1.29.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.7
+        version: 1.29.1
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.2
+        version: 1.32.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.2
+        version: 1.32.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -86,98 +86,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.21
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.1
+        version: 3.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.1
+        version: 3.10.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
 description: Easy RSMP site and supervisor communication.
 email:
 - zf0f@kk.dk
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.