rsmp 0.1.37 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20b2e46548b2ebcdc9e3148168fafb7062113d171d88bef186900b0c8fe98a9
-  data.tar.gz: 436e96144e55742c3c9df9f549ca345c21137deb579c10d10fcefdaad1d94a39
+  metadata.gz: 43f928133404e5dbc56e1a45eba044b20783bd2decfd1631a0ae2b66e731e5e2
+  data.tar.gz: ad786c056a21aa65a65406edfe3200229a5b02a104871e63e656d4dae4c6910c
 SHA512:
-  metadata.gz: d2e07fc806b798e15af70789085d6c5ecf582b46dfe9ff7e5ed2cd48f8e8b2d7d74eddb66ed488150dee047d1fc3886b8d84edf7dc85976db570e89544f29160
-  data.tar.gz: 8baba395982e5c105a7e04d3a0c01c91a89ae82fb21cfd180c3fe6adf436cc4b70a437206c1f499f5c5cbfe476746d7cebd1c0b38f1354a467ff4e0f80b6904d
+  metadata.gz: 453a4f85fbd4985dc300fd6321c2c534723b251410e6a7c577aff53175197aa1e8898234a1086b1d747fe4e093a67007b6ffd426e15a1b0d3a6ebaa489791f2a
+  data.tar.gz: 7c443d27d2dbc108b5b34af6faf15fa03e145193f83584c465ae685f74de4203db0cd37d06fdee4525a06077cd0a208020e7f9a635b021d20eb92050eeaaa8d5

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.37)
-      async (~> 1.28.7)
-      async-io (~> 1.30.2)
+    rsmp (0.2.1)
+      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.1)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-io (1.30.2)
+    async-io (1.32.1)
       async (~> 1.14)
-    backports (3.17.0)
     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)
+    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)
+    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/collector.rb

@@ -45,9 +45,11 @@ module RSMP
       @options[:timeout] = options[:timeout] if options[:timeout]
       @block = block
 
-      listen do
-        task.with_timeout(@options[:timeout]) do
-          @condition.wait
+      unless @done
+        listen do
+          task.with_timeout(@options[:timeout]) do
+            @condition.wait
+          end
         end
       end
 

data/lib/rsmp/logger.rb

@@ -7,6 +7,7 @@ module RSMP
       defaults = {
         'active'=>false,
         'path'=>nil,
+        'stream'=>nil,
         'author'=>false,
         'color'=>true,
         'site_id'=>true,
@@ -33,7 +34,9 @@ module RSMP
     end
 
     def setup_output_destination
-      if @settings['path']
+      if @settings['stream']
+        @stream = @settings['stream']
+      elsif @settings['path']
         @stream = File.open(@settings['path'],'a')  # appending
       else
         @stream = $stdout
@@ -85,20 +88,19 @@ module RSMP
     def colorize level, str
       if @settings["color"] == false || @settings["color"] == nil
         str
-      elsif @settings["color"] == true
-        case level
-        when  :error
-          str.colorize(:red)
-        when :warning
-          str.colorize(:light_yellow)
-        when :not_acknowledged
-          str.colorize(:cyan)
-        when :log
-          str.colorize(:light_blue)
-        when :statistics
-          str.colorize(:light_black)
-        when :test
-          str.colorize(:light_magenta)
+      elsif @settings["color"] == true || @settings["color"].is_a?(Hash)
+        colors = {
+          'info' => 'white',
+          'log' => 'light_blue',
+          'test' => 'light_magenta',
+          'statistics' => 'light_black',
+          'not_acknowledged' => 'cyan',
+          'warning' => 'light_yellow',
+          'error' => 'red'
+        }
+        colors.merge! @settings["color"] if @settings["color"].is_a?(Hash)
+        if colors[level.to_s]
+          str.colorize colors[level.to_s].to_sym
         else
           str
         end
@@ -111,7 +113,7 @@ module RSMP
       end
     end
 
-    def log item, force:false 
+    def log item, force:false
       if output?(item, force)
         output item[:level], build_output(item) 
       end

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/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/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.37"
+  VERSION = "0.2.1"
 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.37
+  version: 0.2.1
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-07-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.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.15
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.