rsmp 0.14.0 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff38488f573505ba26ab81c6f586c341a40bc6d00999b33fb97226c48d989dc1
-  data.tar.gz: 5c9d199fcbd87090a65d2148efe02a2521d726a272c0b20a0756570961439c6f
+  metadata.gz: 9c07e65e3ac7d42b90156c102853bcc8032fff95f11f6022ee14e3357244e6d3
+  data.tar.gz: '0999a7324481ab082047399b959d62afea347952eca6ec3f589292ba90eb62d1'
 SHA512:
-  metadata.gz: 9f5dd8a06e3d7684eed3653b0b6b810e2d75f9447078dc93504a2aebd30bdb5b2ede91a7d8b5c3e30e4e2687e0e3c3faf1b5fc625c1b5c197f9a58b77a49f009
-  data.tar.gz: 503e4e15aec9293d4c1b0d057e57f79ed67680db3321ea7c6d513b4290c231da38c3d531f8ac32cf1bc4da649631c54c5374c6a388e90f1646ce3251e40dfd4d
+  metadata.gz: 8de8c0d2a6e43612d78a9546d2de3d7da8130a6901f5d84d7d9b5ba1336bef99960bd4b27e1cb345dd5fe3ec2e5e15f1622f241ab66501adac18b23987a00350
+  data.tar.gz: 37324e18e9440e1727dbf7313dbc8bdd9c02c2ad256f09fab416ec49dda90b808f56270f332365ece5b15ab50c1b638d7583d1e5b8b73915d91bba38c3c32d02

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.14.0)
+    rsmp (0.14.3)
       async (~> 1.30.3)
       async-io (~> 1.33.0)
       colorize (~> 0.8.1)
-      rsmp_schemer
+      rsmp_schema (~> 0.2.0)
       thor (~> 1.2.1)
 
 GEM
@@ -80,8 +80,9 @@ GEM
     nio4r (2.5.8)
     rake (13.0.6)
     regexp_parser (2.5.0)
-    rsmp_schemer (0.5.0)
+    rsmp_schema (0.2.0)
       json_schemer (~> 0.2.21)
+      thor (~> 1.2.1)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)

data/lib/rsmp/cli.rb

@@ -74,9 +74,9 @@ module RSMP
       end
     rescue Interrupt
       # cntr-c
-    rescue RSMP::Schemer::UnknownSchemaTypeError => e
+    rescue RSMP::Schema::UnknownSchemaTypeError => e
       puts "Cannot start site: #{e}"
-    rescue RSMP::Schemer::UnknownSchemaVersionError => e
+    rescue RSMP::Schema::UnknownSchemaVersionError => e
       puts "Cannot start site: #{e}"
     rescue Psych::SyntaxError => e
       puts "Cannot read config file #{e}"

data/lib/rsmp/message.rb

@@ -1,4 +1,4 @@
-require 'rsmp_schemer'
+require 'rsmp_schema'
 
 # rsmp messages
 module RSMP
@@ -146,7 +146,7 @@ module RSMP
     end
 
     def validate schemas
-      errors = RSMP::Schemer.validate attributes, schemas
+      errors = RSMP::Schema.validate attributes, schemas
       if errors
         error_string = errors.map {|item| item.reject {|e| e=='' } }.compact.join(', ').strip
         raise SchemaError.new error_string

data/lib/rsmp/proxy.rb

@@ -230,7 +230,7 @@ module RSMP
         begin
           now = Clock.now
           timer(now)
-        rescue RSMP::Schemer::Error => e
+        rescue RSMP::Schema::Error => e
           log "Timer: Schema error: #{e}", level: :warning
         rescue EOFError => e
           log "Timer: Connection closed: #{e}", level: :warning
@@ -319,7 +319,7 @@ module RSMP
       # TODO
       # what schema should we use to validate the intial Version and MessageAck messages?
       schemas = { core: '3.1.5' }
-      schemas[sxl] = RSMP::Schemer.sanitize_version(sxl_version) if sxl && sxl_version
+      schemas[sxl] = RSMP::Schema.sanitize_version(sxl_version) if sxl && sxl_version
       schemas
     end
 
@@ -335,7 +335,7 @@ module RSMP
       log_send message, reason
     rescue EOFError, IOError
       buffer_message message
-    rescue SchemaError, RSMP::Schemer::Error => e
+    rescue SchemaError, RSMP::Schema::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}")
@@ -398,7 +398,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, RSMP::Schemer::Error => e
+    rescue SchemaError, RSMP::Schema::Error => e
       reason = "schema errors: #{e.message}"
       str = "Received invalid #{message.type}, #{reason}"
       log str, message: message, level: :warning

data/lib/rsmp/site.rb

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

data/lib/rsmp/site_proxy.rb

@@ -47,7 +47,7 @@ module RSMP
 
     def handshake_complete
       super
-      sanitized_sxl_version = RSMP::Schemer.sanitize_version(@site_sxl_version)
+      sanitized_sxl_version = RSMP::Schema.sanitize_version(@site_sxl_version)
       log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :log
       start_watchdog
     end
@@ -314,12 +314,12 @@ module RSMP
       # comes from the Version message send by the site
       type = 'tlc'
       version = message.attribute 'SXL'
-      RSMP::Schemer::find_schema! type, version, lenient: true
+      RSMP::Schema::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
+    rescue RSMP::Schema::UnknownSchemaError => e
       dont_acknowledge message, "Rejected #{message.type} message,", "#{e}"
     end
 

data/lib/rsmp/supervisor.rb

@@ -52,8 +52,8 @@ module RSMP
         unless sxl
           raise RSMP::ConfigurationError.new("Configuration error for site '#{site_id}': No SXL specified")
         end
-        RSMP::Schemer.find_schemas! sxl if sxl
-      rescue RSMP::Schemer::UnknownSchemaError => e
+        RSMP::Schema.find_schemas! sxl if sxl
+      rescue RSMP::Schema::UnknownSchemaError => e
         raise RSMP::ConfigurationError.new("Configuration error for site '#{site_id}': #{e}")
       end
     end

data/lib/rsmp/supervisor_proxy.rb

@@ -82,7 +82,7 @@ module RSMP
     end
 
     def handshake_complete
-      sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
+      sanitized_sxl_version = RSMP::Schema.sanitize_version(sxl_version)
       log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
       if @site_settings['send_after_connect']

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.14.0"
+  VERSION = "0.14.3"
 end

data/rsmp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "async-io", "~> 1.33.0"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.2.1"
-  spec.add_dependency "rsmp_schemer"
+  spec.add_dependency "rsmp_schema", "~> 0.2.0"
 
   spec.add_development_dependency "bundler", "~> 2.3.7"
   spec.add_development_dependency "rake", "~> 13.0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.3
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: rsmp_schemer
+  name: rsmp_schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement