rsmp 0.1.17 → 0.1.30

data/lib/rsmp/version.rb

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

data/lib/rsmp/wait.rb

@@ -1,17 +1,16 @@
-# Helper for waiting for an Async condition using a block
-
 module RSMP
-  class Wait
-
-    def self.wait_for task, condition, timeout, &block
-      task.with_timeout(timeout) do
-        while task.running? do
+  module Wait
+    # wait for an async condition to signal, then yield to block
+    # if block returns true we're done. otherwise, wait again
+    def wait_for condition, timeout, &block
+      raise RuntimeError.new("Can't wait for condition because task is not running") unless @task.running?
+      @task.with_timeout(timeout) do
+        while @task.running? do
           value = condition.wait
           result = yield value 
           return result if result   # return result of check, if not nil
         end
       end
     end   
-
   end
 end

data/rsmp.gemspec

@@ -26,28 +26,17 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
-  # Add schema files in rsmp_schema submodule
-  gem_dir = Pathname.new(__dir__).expand_path
-  submodule_path = File.expand_path 'lib/rsmp_schema/schema'
-  Dir.chdir(submodule_path) do
-    submodule_relative_path = Pathname.new(submodule_path).relative_path_from(gem_dir)
-    `git ls-files`.split($\).each do |filename|
-      # for each git file, prepend relative submodule path and add to spec
-      spec.files << submodule_relative_path.join(filename).to_s
-    end
-  end
-
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "async", "~> 1.23.0"
-  spec.add_dependency "async-io", "~> 1.27.4"
+  spec.add_dependency "async", "~> 1.28.7"
+  spec.add_dependency "async-io", "~> 1.30.2"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.0.1"
-  spec.add_dependency "json_schemer", "~> 0.2.11"
+  spec.add_dependency "rsmp_schemer", "~> 0.2.0"
 
-  spec.add_development_dependency "bundler", "~> 2.1.4"
+  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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.30
 platform: ruby
 authors:
 - Emil Tin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.28.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.28.7
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.4
+        version: 1.30.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.4
+        version: 1.30.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: json_schemer
+  name: rsmp_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -197,130 +197,39 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- config/site.yaml
 - config/supervisor.yaml
 - config/tlc.yaml
+- documentation/classes_and_modules.md
+- documentation/message_distribution.md
 - exe/rsmp
 - lib/rsmp.rb
 - lib/rsmp/alarm.rb
 - lib/rsmp/archive.rb
-- lib/rsmp/base.rb
 - lib/rsmp/cli.rb
+- lib/rsmp/collector.rb
 - lib/rsmp/component.rb
+- lib/rsmp/components.rb
+- lib/rsmp/convert/export/json_schema.rb
+- lib/rsmp/convert/import/yaml.rb
+- lib/rsmp/deep_merge.rb
 - lib/rsmp/error.rb
+- lib/rsmp/inspect.rb
+- lib/rsmp/listener.rb
 - lib/rsmp/logger.rb
+- lib/rsmp/logging.rb
 - lib/rsmp/message.rb
 - lib/rsmp/node.rb
-- lib/rsmp/probe.rb
-- lib/rsmp/probe_collection.rb
+- lib/rsmp/notifier.rb
 - lib/rsmp/proxy.rb
 - lib/rsmp/rsmp.rb
 - lib/rsmp/site.rb
-- lib/rsmp/site_base.rb
 - lib/rsmp/site_proxy.rb
+- lib/rsmp/site_proxy_wait.rb
 - lib/rsmp/supervisor.rb
-- lib/rsmp/supervisor_base.rb
 - lib/rsmp/supervisor_proxy.rb
 - lib/rsmp/tlc.rb
 - lib/rsmp/version.rb
 - lib/rsmp/wait.rb
-- lib/rsmp_schema/schema/core/aggregated_status.json
-- lib/rsmp_schema/schema/core/alarm.json
-- lib/rsmp_schema/schema/core/command_request.json
-- lib/rsmp_schema/schema/core/command_response.json
-- lib/rsmp_schema/schema/core/core.json
-- lib/rsmp_schema/schema/core/definitions.json
-- lib/rsmp_schema/schema/core/message_ack.json
-- lib/rsmp_schema/schema/core/message_not_ack.json
-- lib/rsmp_schema/schema/core/rsmp.json
-- lib/rsmp_schema/schema/core/status.json
-- lib/rsmp_schema/schema/core/status_request.json
-- lib/rsmp_schema/schema/core/status_response.json
-- lib/rsmp_schema/schema/core/status_subscribe.json
-- lib/rsmp_schema/schema/core/status_unsubscribe.json
-- lib/rsmp_schema/schema/core/status_update.json
-- lib/rsmp_schema/schema/core/version.json
-- lib/rsmp_schema/schema/core/watchdog.json
-- lib/rsmp_schema/schema/tlc/alarms/A0001.json
-- lib/rsmp_schema/schema/tlc/alarms/A0002.json
-- lib/rsmp_schema/schema/tlc/alarms/A0003.json
-- lib/rsmp_schema/schema/tlc/alarms/A0004.json
-- lib/rsmp_schema/schema/tlc/alarms/A0005.json
-- lib/rsmp_schema/schema/tlc/alarms/A0006.json
-- lib/rsmp_schema/schema/tlc/alarms/A0007.json
-- lib/rsmp_schema/schema/tlc/alarms/A0008.json
-- lib/rsmp_schema/schema/tlc/alarms/A0009.json
-- lib/rsmp_schema/schema/tlc/alarms/A0101.json
-- lib/rsmp_schema/schema/tlc/alarms/A0201.json
-- lib/rsmp_schema/schema/tlc/alarms/A0202.json
-- lib/rsmp_schema/schema/tlc/alarms/A0301.json
-- lib/rsmp_schema/schema/tlc/alarms/A0302.json
-- lib/rsmp_schema/schema/tlc/alarms/alarms.json
-- lib/rsmp_schema/schema/tlc/commands/M0001.json
-- lib/rsmp_schema/schema/tlc/commands/M0002.json
-- lib/rsmp_schema/schema/tlc/commands/M0003.json
-- lib/rsmp_schema/schema/tlc/commands/M0004.json
-- lib/rsmp_schema/schema/tlc/commands/M0005.json
-- lib/rsmp_schema/schema/tlc/commands/M0006.json
-- lib/rsmp_schema/schema/tlc/commands/M0007.json
-- lib/rsmp_schema/schema/tlc/commands/M0008.json
-- lib/rsmp_schema/schema/tlc/commands/M0010.json
-- lib/rsmp_schema/schema/tlc/commands/M0011.json
-- lib/rsmp_schema/schema/tlc/commands/M0012.json
-- lib/rsmp_schema/schema/tlc/commands/M0013.json
-- lib/rsmp_schema/schema/tlc/commands/M0014.json
-- lib/rsmp_schema/schema/tlc/commands/M0015.json
-- lib/rsmp_schema/schema/tlc/commands/M0016.json
-- lib/rsmp_schema/schema/tlc/commands/M0017.json
-- lib/rsmp_schema/schema/tlc/commands/M0018.json
-- lib/rsmp_schema/schema/tlc/commands/M0019.json
-- lib/rsmp_schema/schema/tlc/commands/M0103.json
-- lib/rsmp_schema/schema/tlc/commands/command_requests.json
-- lib/rsmp_schema/schema/tlc/commands/command_responses.json
-- lib/rsmp_schema/schema/tlc/commands/commands.json
-- lib/rsmp_schema/schema/tlc/statuses/S0001.json
-- lib/rsmp_schema/schema/tlc/statuses/S0002.json
-- lib/rsmp_schema/schema/tlc/statuses/S0003.json
-- lib/rsmp_schema/schema/tlc/statuses/S0004.json
-- lib/rsmp_schema/schema/tlc/statuses/S0005.json
-- lib/rsmp_schema/schema/tlc/statuses/S0006.json
-- lib/rsmp_schema/schema/tlc/statuses/S0007.json
-- lib/rsmp_schema/schema/tlc/statuses/S0008.json
-- lib/rsmp_schema/schema/tlc/statuses/S0009.json
-- lib/rsmp_schema/schema/tlc/statuses/S0010.json
-- lib/rsmp_schema/schema/tlc/statuses/S0011.json
-- lib/rsmp_schema/schema/tlc/statuses/S0012.json
-- lib/rsmp_schema/schema/tlc/statuses/S0013.json
-- lib/rsmp_schema/schema/tlc/statuses/S0014.json
-- lib/rsmp_schema/schema/tlc/statuses/S0015.json
-- lib/rsmp_schema/schema/tlc/statuses/S0016.json
-- lib/rsmp_schema/schema/tlc/statuses/S0017.json
-- lib/rsmp_schema/schema/tlc/statuses/S0018.json
-- lib/rsmp_schema/schema/tlc/statuses/S0019.json
-- lib/rsmp_schema/schema/tlc/statuses/S0020.json
-- lib/rsmp_schema/schema/tlc/statuses/S0021.json
-- lib/rsmp_schema/schema/tlc/statuses/S0022.json
-- lib/rsmp_schema/schema/tlc/statuses/S0023.json
-- lib/rsmp_schema/schema/tlc/statuses/S0024.json
-- lib/rsmp_schema/schema/tlc/statuses/S0025.json
-- lib/rsmp_schema/schema/tlc/statuses/S0026.json
-- lib/rsmp_schema/schema/tlc/statuses/S0027.json
-- lib/rsmp_schema/schema/tlc/statuses/S0028.json
-- lib/rsmp_schema/schema/tlc/statuses/S0029.json
-- lib/rsmp_schema/schema/tlc/statuses/S0091.json
-- lib/rsmp_schema/schema/tlc/statuses/S0092.json
-- lib/rsmp_schema/schema/tlc/statuses/S0095.json
-- lib/rsmp_schema/schema/tlc/statuses/S0096.json
-- lib/rsmp_schema/schema/tlc/statuses/S0201.json
-- lib/rsmp_schema/schema/tlc/statuses/S0202.json
-- lib/rsmp_schema/schema/tlc/statuses/S0203.json
-- lib/rsmp_schema/schema/tlc/statuses/S0204.json
-- lib/rsmp_schema/schema/tlc/statuses/S0205.json
-- lib/rsmp_schema/schema/tlc/statuses/S0206.json
-- lib/rsmp_schema/schema/tlc/statuses/S0207.json
-- lib/rsmp_schema/schema/tlc/statuses/S0208.json
-- lib/rsmp_schema/schema/tlc/statuses/statuses.json
-- lib/rsmp_schema/schema/tlc/sxl.json
 - rsmp.gemspec
 homepage: https://github.com/rsmp-nordic/rsmp
 licenses:
@@ -330,7 +239,7 @@ metadata:
   source_code_uri: https://github.com/rsmp-nordic/rsmp
   changelog_uri: https://github.com/rsmp-nordic/rsmp/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/rsmp-nordic/rsmp/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -345,8 +254,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.
 test_files: []

data/config/site.yaml

@@ -1,40 +0,0 @@
-site_id: RN+SI0001
-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:
-  main:
-    C1:
-
-watchdog_interval: 1
-watchdog_timeout: 2
-acknowledgement_timeout: 1
-command_response_timeout: 1
-status_response_timeout: 1
-status_update_timeout: 1
-reconnect_interval: 0.1
-
-log:
-  active: true
-  color: true
-  timestamp: true
-  id: true
-  component: true
-  ip: false
-  site_id: true
-  level: false
-  text: true
-  direction: true
-  json: true
-  acknowledgements: false
-  watchdogs: false
-

data/lib/rsmp/probe.rb

@@ -1,114 +0,0 @@
-# A probe checks incoming messages and store matches
-# Once it has collected what it needs, it triggers a condition variable
-# and the client wakes up.
-
-module RSMP
-  class Probe
-    attr_reader :condition, :items, :done
-
-    # block should send a message and return message just sent
-    def self.collect_response proxy, options={}, &block
-      from = proxy.archive.current_index
-      sent = yield
-      raise RuntimeError unless sent && sent[:message].is_a?(RSMP::Message)
-      item = proxy.archive.capture(options.merge(from: from+1, num: 1, with_message: true)) do |item|
-        ["CommandResponse","StatusResponse","MessageNotAck"].include?(item[:message].type)
-      end
-      if item
-        item[:message] 
-      else
-        nil
-      end
-    end
-
-
-    def initialize archive
-      raise ArgumentError.new("Archive expected") unless archive.is_a? Archive
-      @archive = archive
-      @items = []
-      @condition = Async::Notification.new
-    end
-
-    def capture task, options={}, &block
-      @options = options
-      @block = block
-      @num = options[:num]
-
-      if options[:earliest]
-        from = find_timestamp_index options[:earliest]
-        backscan from
-      elsif options[:from]
-        backscan options[:from]
-      end
-
-      # if backscan didn't find enough items, then
-      # insert ourself as probe and sleep until enough items are captured
-      if @items.size < @num
-        begin
-          @archive.probes.add self
-          task.with_timeout(options[:timeout]) do
-            @condition.wait
-          end
-        ensure
-          @archive.probes.remove self
-        end
-      end
-
-      if @num == 1
-        @items.first        # if one item was requested, return item instead of array
-      else
-        @items[0..@num-1]   # return array, but ensure we never return more than requested
-      end
-    end
-
-    def find_timestamp_index earliest
-      (0..@archive.items.size).bsearch do |i|        # use binary search to find item index
-        @archive.items[i][:timestamp] >= earliest
-      end
-    end
-
-    def backscan from
-      from.upto(@archive.items.size-1) do |i|
-        return if process @archive.items[i]
-      end
-    end
-
-    def reset
-      @items.clear
-      @done = false
-    end
-
-    def process item
-      raise ArgumentError unless item
-      return true if @done
-      if matches? item
-        @items << item
-        if @num && @items.size >= @num
-          @done = true
-          @condition.signal
-          return true
-        end
-      end
-      false
-    end
-
-    def matches? item
-      raise ArgumentError unless item
-
-      if @options[:type]
-        return false if item[:message] == nil
-        if @options[:type].is_a? Array
-          return false unless @options[:type].include? item[:message].type
-        else
-          return false unless item[:message].type == @options[:type]
-        end
-      end
-      return if @options[:level] && item[:level] != @options[:level]
-      return false if @options[:with_message] && !(item[:direction] && item[:message])
-      if @block
-        return false if @block.call(item) == false
-      end
-      true
-    end
-  end
-end