rsmp 0.1.35 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b70cfe0846c716ed0e04af05ee6d44dafc76fdacf6bd56c2abd5c5f60b5a49d3
-  data.tar.gz: 0b7c1e7e2277db224bfc5be53bc587c8f1252f76730a49356e5268a437d34241
+  metadata.gz: d1feaa7fd1863a9783573d2f8c2c025f06ba53de97a441bd7f8b5da164c813cd
+  data.tar.gz: e34aea14d3949b54d9ed9db3dcc8495cf3d5db8761f77e74b6c162bcf86468d6
 SHA512:
-  metadata.gz: 5364ebe4f16562e35533e3d9992674a1d1a6bd0aeb9b2432c6b5da445bab99356691dbee8ab67d63571233f86fd7702e8b5252d1e58f48370120b5190a3fe204
-  data.tar.gz: 28d03ee56aee3bd68c21f52ca780eb1ee58ea58af669deb140024d3fbd2387fd1124c2db1dc02ee33384bb3b40ecda26a6f57827c268d8799f4ae419edbcf364
+  metadata.gz: 7da97ae66c060644d623f49dc7b8702110ce54a6fd4bfadac56cc74945430612a7a8c5269e98174a17aeedfd83a7551b3eecc9e151f5aea1cff53a88eb43c5c5
+  data.tar.gz: 4d51c29847821378a1e34f2e34f6f5fe779053c18022927ac3041f51b235db55303f45658f7f10ea017f9021bbf1665ebe8383e491e0f9b98017f1c8da7a4dca

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.35)
+    rsmp (0.1.40)
       async (~> 1.28.7)
       async-io (~> 1.30.2)
       colorize (~> 0.8.1)
-      rsmp_schemer (~> 0.2.0)
+      rsmp_schemer
       thor (~> 1.0.1)
 
 GEM
@@ -64,7 +64,7 @@ GEM
     nio4r (2.5.7)
     rake (13.0.1)
     regexp_parser (2.1.1)
-    rsmp_schemer (0.2.1)
+    rsmp_schemer (0.3.1)
       json_schemer (~> 0.2.18)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)

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

@@ -162,6 +162,8 @@ module RSMP
           begin
             now = Clock.now
             timer(now)
+          rescue RSMP::Schemer::Error => e
+            puts "Timer: Schema error: #{e}"
           rescue EOFError => e
             log "Timer: Connection closed: #{e}", level: :warning
           rescue IOError => e
@@ -246,7 +248,7 @@ module RSMP
       # TODO
       # what schema should we use to validate the intial Version and MessageAck messages?
       schemas = { core: '3.1.5' }
-      schemas[sxl] = sxl_version if sxl
+      schemas[sxl] = RSMP::Schemer.sanitize_version(sxl_version) if sxl
       schemas
     end
 
@@ -261,7 +263,7 @@ module RSMP
       log_send message, reason
     rescue EOFError, IOError
       buffer_message message
-    rescue SchemaError => e
+    rescue SchemaError, RSMP::Schemer::Error => e
       str = "Could not send #{message.type} because schema validation failed: #{e.message}"
       log str, message: message, level: :error
       notify_error e.exception("#{str} #{message.json}")
@@ -306,7 +308,7 @@ module RSMP
       log str, message: Malformed.new(attributes), level: :warning
       # cannot send NotAcknowledged for a malformed message since we can't read it, just ignore it
       nil
-    rescue SchemaError => e
+    rescue SchemaError, RSMP::Schemer::Error => e
       str = "Received invalid #{message.type}, schema errors: #{e.message}"
       log str, message: message, level: :warning
       notify_error e.exception("#{str} #{message.json}")

data/lib/rsmp/site.rb

@@ -53,7 +53,7 @@ module RSMP
     def check_sxl_version
       sxl = @site_settings['sxl']
       version = @site_settings['sxl_version']
-      RSMP::Schemer::find_schema! sxl, version
+      RSMP::Schemer::find_schema! sxl, version, lenient: true
     end
 
     def reconnect

data/lib/rsmp/site_proxy.rb

@@ -36,7 +36,8 @@ module RSMP
 
     def connection_complete
       super
-      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{@site_sxl_version}", level: :info
+       sanitized_sxl_version = RSMP::Schemer.sanitize_version(@site_sxl_version)
+      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :info
     end
 
     def process_message message
@@ -308,11 +309,13 @@ module RSMP
       # comes from the Version message send by the site
       type = 'tlc'
       version = message.attribute 'SXL'
-      RSMP::Schemer::find_schema! type, version 
+      RSMP::Schemer::find_schema! type, version, lenient: true
 
       # store sxl version requested by site
       # TODO should check agaist site settings
       @site_sxl_version = message.attribute 'SXL'
+    rescue RSMP::Schemer::UnknownSchemaError => e
+      dont_acknowledge message, "Rejected #{message.type} message,", "#{e}"
     end
 
     def sxl_version
@@ -327,8 +330,6 @@ module RSMP
       check_rsmp_version message
       check_sxl_version message
       version_accepted message
-    rescue RSMP::Schemer::UnknownSchemaError => e
-      dont_acknowledge message, "Rejected #{message.type} message,", "#{e}"
     end
 
     def check_site_ids message

data/lib/rsmp/supervisor.rb

@@ -49,7 +49,6 @@ module RSMP
           raise RSMP::ConfigurationError.new("Configuration for site '#{site_id}' is empty")
         end
         sxl = settings['sxl']
-        sxl = 'tlc' unless sxl    # temporary fix until configs are updated
         unless sxl
           raise RSMP::ConfigurationError.new("Configuration error for site '#{site_id}': No SXL specified")
         end

data/lib/rsmp/supervisor_proxy.rb

@@ -54,7 +54,8 @@ module RSMP
 
     def connection_complete
       super
-      log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sxl_version}", level: :info
+      sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
+      log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
     end
 

data/lib/rsmp/version.rb

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

data/rsmp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   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 "rsmp_schemer", "~> 0.2.0"
+  spec.add_dependency "rsmp_schemer"
 
   spec.add_development_dependency "bundler", "~> 2.2.3"
   spec.add_development_dependency "rake", "~> 13.0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.40
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -70,16 +70,16 @@ dependencies:
   name: rsmp_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement