rsmp 0.48.4 → 0.51.0

data/lib/rsmp/tlc/supervisor_interface.rb

@@ -6,6 +6,7 @@ module RSMP
       include Proxy::Control
       include Proxy::IO
       include Proxy::Plans
+      include Proxy::PlansBang
       include Proxy::Status
       include Proxy::Detectors
       include Proxy::System
@@ -32,7 +33,8 @@ module RSMP
       end
 
       def subscribe_to_timeplan
-        validate_ready 'subscribe to timeplan'
+        readiness = validate_ready 'subscribe to timeplan'
+        return readiness if readiness.failure?
 
         status_list = [
           { 'sCI' => 'S0014', 'n' => 'status', 'uRt' => '0' },
@@ -45,6 +47,10 @@ module RSMP
         subscribe_to_status status_list, component: main.c_id
       end
 
+      def subscribe_to_timeplan!(...)
+        subscribe_to_timeplan(...).value!
+      end
+
       def process_status_update(message)
         status_values = message.attribute('sS')
         return unless status_values

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -28,9 +28,9 @@ module RSMP
         'TLC'
       end
 
-      def start
+      def start_auxiliary_tasks(parent)
         super
-        start_tlc_timer
+        start_tlc_timer(parent: parent)
         main.initiate_startup_sequence
       end
 
@@ -82,11 +82,11 @@ module RSMP
         end
       end
 
-      def start_tlc_timer
+      def start_tlc_timer(parent:)
         task_name = 'tlc timer'
         log "Starting #{task_name} with interval #{@interval} seconds", level: :debug
 
-        @timer = @task.async do |task|
+        @timer = parent.async do |task|
           task.annotate task_name
           run_tlc_timer task
         end
@@ -96,9 +96,6 @@ module RSMP
         next_time = Time.now.to_f
         loop do
           timer(@clock.now)
-        rescue StandardError => e
-          distribute_error e, level: :internal
-        ensure
           # adjust sleep duration to avoid drift. so wake up always happens on the
           # same fractional second.
           # note that Time.now is not monotonic. If the clock is changed,
@@ -108,7 +105,7 @@ module RSMP
           # if the clock is changed, the wake up would then happen on a different
           # fractional second
           next_time += @interval
-          duration = next_time - Time.now.to_f
+          duration = [next_time - Time.now.to_f, 0].max
           task.sleep duration
         end
       end
@@ -116,7 +113,7 @@ module RSMP
       def stop_tlc_timer
         return unless @timer
 
-        @timer.stop
+        @timer.cancel if @timer.running?
         @timer = nil
       end
 

data/lib/rsmp/validation.rb

@@ -0,0 +1,22 @@
+module RSMP
+  # The result of validating a message against one or more schemas.
+  Validation = Data.define(:violations) do
+    def initialize(violations: [])
+      raise ArgumentError, 'violations must be an Array' unless violations.is_a?(Array)
+
+      super(violations: violations.map { |violation| Array(violation).dup.freeze }.freeze)
+    end
+
+    def valid?
+      violations.empty?
+    end
+
+    def invalid?
+      !valid?
+    end
+
+    def message
+      violations.map { |item| item.reject { |part| part == '' } }.compact.join(', ').strip
+    end
+  end
+end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.48.4'.freeze
+  VERSION = '0.51.0'.freeze
 end

data/lib/rsmp.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'socket'
 require 'time'
+require 'English'
 require 'async'
 require 'io/endpoint'
 require 'io/endpoint/host_endpoint'
@@ -10,16 +11,28 @@ require 'json'
 require 'securerandom'
 require 'json_schemer'
 require 'async/queue'
+require 'async/barrier'
+require 'async/promise'
 require_relative 'rsmp/schema_error'
+require_relative 'rsmp/helpers/clock'
+require_relative 'rsmp/helpers/deep_merge'
+require_relative 'rsmp/helpers/error'
+require_relative 'rsmp/failure'
+require_relative 'rsmp/result'
+require_relative 'rsmp/validation'
+require_relative 'rsmp/event'
+require_relative 'rsmp/event_source'
+require_relative 'rsmp/completion'
+require_relative 'rsmp/termination'
+require_relative 'rsmp/collection'
+require_relative 'rsmp/exchange'
+require_relative 'rsmp/delivery'
 require_relative 'rsmp/schema'
 require_relative 'rsmp/convert/import/yaml'
 require_relative 'rsmp/convert/export/json_schema'
 
 require_relative 'rsmp/status_list'
 require_relative 'rsmp/command_list'
-require_relative 'rsmp/helpers/clock'
-require_relative 'rsmp/helpers/deep_merge'
-require_relative 'rsmp/helpers/error'
 require_relative 'rsmp/log/logging'
 require_relative 'rsmp/log/archive'
 require_relative 'rsmp/log/filtering'
@@ -35,7 +48,6 @@ require_relative 'rsmp/component/component_proxy'
 require_relative 'rsmp/collect/distributor'
 require_relative 'rsmp/collect/receiver'
 require_relative 'rsmp/collect/queue'
-require_relative 'rsmp/collect/collector/status'
 require_relative 'rsmp/collect/collector/reporting'
 require_relative 'rsmp/collect/collector/logging'
 require_relative 'rsmp/collect/collector'
@@ -71,11 +83,13 @@ require_relative 'rsmp/proxy/modules/send'
 require_relative 'rsmp/proxy/modules/receive'
 require_relative 'rsmp/proxy/modules/versions'
 require_relative 'rsmp/proxy/modules/tasks'
+require_relative 'rsmp/proxy/modules/lifecycle'
 require_relative 'rsmp/proxy/proxy'
 require_relative 'rsmp/sxl/interface'
 require_relative 'rsmp/sxl/supervisor_interface'
 require_relative 'rsmp/sxl/site_interface'
 require_relative 'rsmp/sxl/registry'
+require_relative 'rsmp/sxl/processing'
 require_relative 'rsmp/proxy/supervisor/modules/status_updates'
 require_relative 'rsmp/proxy/supervisor/modules/status'
 require_relative 'rsmp/proxy/supervisor/modules/commands'
@@ -108,6 +122,7 @@ require_relative 'rsmp/tlc/proxy/control'
 require_relative 'rsmp/tlc/proxy/detectors'
 require_relative 'rsmp/tlc/proxy/io'
 require_relative 'rsmp/tlc/proxy/plans'
+require_relative 'rsmp/tlc/proxy/plans_bang'
 require_relative 'rsmp/tlc/proxy/status'
 require_relative 'rsmp/tlc/proxy/system'
 require_relative 'rsmp/tlc/supervisor_interface'

data/rsmp.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'async', '~> 2.39'
+  spec.add_dependency 'async', '~> 2.45'
   spec.add_dependency 'colorize', '~> 1.1'
   spec.add_dependency 'io-endpoint', '~> 0.17'
   spec.add_dependency 'io-stream', '~> 0.13'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.48.4
+  version: 0.51.0
 platform: ruby
 authors:
 - Emil Tin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.39'
+        version: '2.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.39'
+        version: '2.45'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,6 @@ files:
 - lib/rsmp/collect/collector.rb
 - lib/rsmp/collect/collector/logging.rb
 - lib/rsmp/collect/collector/reporting.rb
-- lib/rsmp/collect/collector/status.rb
 - lib/rsmp/collect/command_matcher.rb
 - lib/rsmp/collect/command_response_collector.rb
 - lib/rsmp/collect/distributor.rb
@@ -177,7 +176,9 @@ files:
 - lib/rsmp/collect/state_collector.rb
 - lib/rsmp/collect/status_collector.rb
 - lib/rsmp/collect/status_matcher.rb
+- lib/rsmp/collection.rb
 - lib/rsmp/command_list.rb
+- lib/rsmp/completion.rb
 - lib/rsmp/component/alarm_state.rb
 - lib/rsmp/component/component.rb
 - lib/rsmp/component/component_base.rb
@@ -190,6 +191,11 @@ files:
 - lib/rsmp/convert/export/json_schema/outputs.rb
 - lib/rsmp/convert/export/json_schema/values.rb
 - lib/rsmp/convert/import/yaml.rb
+- lib/rsmp/delivery.rb
+- lib/rsmp/event.rb
+- lib/rsmp/event_source.rb
+- lib/rsmp/exchange.rb
+- lib/rsmp/failure.rb
 - lib/rsmp/helpers/clock.rb
 - lib/rsmp/helpers/deep_merge.rb
 - lib/rsmp/helpers/error.rb
@@ -220,6 +226,7 @@ files:
 - lib/rsmp/options/supervisor_options.rb
 - lib/rsmp/options/traffic_controller_site_options.rb
 - lib/rsmp/proxy/modules/acknowledgements.rb
+- lib/rsmp/proxy/modules/lifecycle.rb
 - lib/rsmp/proxy/modules/receive.rb
 - lib/rsmp/proxy/modules/send.rb
 - lib/rsmp/proxy/modules/state.rb
@@ -241,6 +248,7 @@ files:
 - lib/rsmp/proxy/supervisor/modules/status.rb
 - lib/rsmp/proxy/supervisor/modules/status_updates.rb
 - lib/rsmp/proxy/supervisor/supervisor_proxy.rb
+- lib/rsmp/result.rb
 - lib/rsmp/schema.rb
 - lib/rsmp/schema/core_sxl_resolution.rb
 - lib/rsmp/schema/message_resolution.rb
@@ -248,9 +256,20 @@ files:
 - lib/rsmp/schema_error.rb
 - lib/rsmp/status_list.rb
 - lib/rsmp/sxl/interface.rb
+- lib/rsmp/sxl/processing.rb
+- lib/rsmp/sxl/processing/catalogue.rb
+- lib/rsmp/sxl/processing/conflict_checker.rb
+- lib/rsmp/sxl/processing/dependency_graph.rb
+- lib/rsmp/sxl/processing/document.rb
+- lib/rsmp/sxl/processing/error.rb
+- lib/rsmp/sxl/processing/manifest.rb
+- lib/rsmp/sxl/processing/natural_sort.rb
+- lib/rsmp/sxl/processing/resolver.rb
+- lib/rsmp/sxl/processing/version_requirement.rb
 - lib/rsmp/sxl/registry.rb
 - lib/rsmp/sxl/site_interface.rb
 - lib/rsmp/sxl/supervisor_interface.rb
+- lib/rsmp/termination.rb
 - lib/rsmp/tlc.rb
 - lib/rsmp/tlc/detector_logic.rb
 - lib/rsmp/tlc/input_states.rb
@@ -269,6 +288,7 @@ files:
 - lib/rsmp/tlc/proxy/detectors.rb
 - lib/rsmp/tlc/proxy/io.rb
 - lib/rsmp/tlc/proxy/plans.rb
+- lib/rsmp/tlc/proxy/plans_bang.rb
 - lib/rsmp/tlc/proxy/status.rb
 - lib/rsmp/tlc/proxy/system.rb
 - lib/rsmp/tlc/signal_group.rb
@@ -279,6 +299,7 @@ files:
 - lib/rsmp/tlc/supervisor_interface.rb
 - lib/rsmp/tlc/traffic_controller.rb
 - lib/rsmp/tlc/traffic_controller_site.rb
+- lib/rsmp/validation.rb
 - lib/rsmp/version.rb
 - rsmp.gemspec
 - schemas/core/3.1.2/aggregated_status.json

data/lib/rsmp/collect/collector/status.rb

@@ -1,34 +0,0 @@
-module RSMP
-  class Collector
-    # Status predicate methods for collectors
-    module Status
-      def collecting?
-        @status == :collecting
-      end
-
-      def ok?
-        @status == :ok
-      end
-
-      def timeout?
-        @status == :timeout
-      end
-
-      def ready?
-        @status == :ready
-      end
-
-      def cancelled?
-        @status == :cancelled
-      end
-
-      def ingoing?
-        @ingoing == true
-      end
-
-      def outgoing?
-        @outgoing == true
-      end
-    end
-  end
-end