rsmp 0.14.2 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38e231d49b1f3b8bf84cd427c830817f1f029aad140feb5a41a254b3085e03cc
-  data.tar.gz: 3d7c432f63819f3fd76c9476fb8aee6ee3160c791031270124ef60e5c34921dd
+  metadata.gz: 5bc8c1358c2384e82da85e53b6332604fd92904376ddb33bbea713a490f327b5
+  data.tar.gz: 03713be97106faeac939889d921967d24f7857ebf80c2dabb1c3c1ed861409a6
 SHA512:
-  metadata.gz: 371f226083bca88553ca127e8228442cde2917c54995b57a472fa423339144806aaa3d6271d7f7d5c774f3b3c566ef842866806cce7e3633ed566a8b8a6f0f6f
-  data.tar.gz: f27787a527fc41626dd6903542bd03eb5fb12debee2bfa5e87d1635a965e27c4333d814b179ba937849c6f172b3dd7d0ae6d9e50fed62ef6e51131fc717cf4fc
+  metadata.gz: 646773a660c80b3f5fa6bc3627181c803435f9969b0c5c342212ada28e959efdf0690737f8adea59fa4e9966fa0c18f440751a14f9744f29305400ea51ba20ae
+  data.tar.gz: 875271f96982e6833861c14686ad03167bcf15cd85a6bcee97cdd2fc4c95f16de4561d7fa9b9b5c078a3b07460ec063b105d5c8e0aaaffa5af665c3be2bcc293

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.14.2)
+    rsmp (0.14.5)
       async (~> 1.30.3)
       async-io (~> 1.33.0)
       colorize (~> 0.8.1)
-      rsmp_schema (~> 0.1.0)
+      rsmp_schema (~> 0.2.2)
       thor (~> 1.2.1)
 
 GEM
@@ -80,7 +80,7 @@ GEM
     nio4r (2.5.8)
     rake (13.0.6)
     regexp_parser (2.5.0)
-    rsmp_schema (0.1.1)
+    rsmp_schema (0.2.2)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)
     rspec (3.10.0)

data/lib/rsmp/message.rb

@@ -61,21 +61,21 @@ module RSMP
 
     def self.build_alarm attributes
       case attributes["aSp"]
-      when /Issue/i
+      when /^Issue$/i
         AlarmIssue.new attributes
-      when /Request/i
+      when /^Request$/i
         AlarmRequest.new attributes
-      when /Acknowledge/i
+      when /^Acknowledge$/i
         AlarmAcknowledged.new attributes
-      when /Suspend/i
-        if attributes['sS'] =~ /suspended/i
+      when /^Suspend$/i
+        if attributes['sS'] =~ /^suspended$/i
           AlarmSuspended.new attributes
-        elsif attributes['sS'] =~ /notSuspended/i
+        elsif attributes['sS'] =~ /^notSuspended$/i
           AlarmResumed.new attributes
         else
           AlarmSuspend.new attributes
         end
-      when /Resume/i
+      when /^Resume$/i
         AlarmResume.new attributes
       else
         Alarm.new attributes

data/lib/rsmp/proxy.rb

@@ -313,12 +313,29 @@ module RSMP
       super str, options.merge(ip: @ip, port: @port, site_id: @site_id)
     end
 
+    def self.latest_core_version
+      RSMP::Schema.schemas[:core].keys.last
+    end
+
+    def self.all_core_versions
+      RSMP::Schema.schemas[:core].keys
+    end
+
+    def self.latest_sxl_tlc_version
+      RSMP::Schema.schemas[:tlc].keys.last
+    end
+
+    def self.all_sxl_tlc_versions
+      RSMP::Schema.schemas[:tlc].keys
+    end
+
     def get_schemas
       # normally we have an sxl, but during connection, it hasn't been established yet
       # at these times we only validate against the core schema
       # TODO
-      # what schema should we use to validate the intial Version and MessageAck messages?
-      schemas = { core: '3.1.5' }
+      # what schema should we use to validate the initial Version and MessageAck messages?
+      schemas = { core: latest_core_version } # use latest core
+      p schemas
       schemas[sxl] = RSMP::Schema.sanitize_version(sxl_version) if sxl && sxl_version
       schemas
     end
@@ -458,8 +475,8 @@ module RSMP
     end
 
     def rsmp_versions
-      return ['3.1.5'] if @site_settings["rsmp_versions"] == 'latest'
-      return ['3.1.1','3.1.2','3.1.3','3.1.4','3.1.5'] if @site_settings["rsmp_versions"] == 'all'
+      return [latest_core_version] if @site_settings["rsmp_versions"] == 'latest'
+      return all_core_versions if @site_settings["rsmp_versions"] == 'all'
       @site_settings["rsmp_versions"]
     end
 
@@ -510,9 +527,9 @@ module RSMP
 
     def send_version site_id, rsmp_versions
       if rsmp_versions=='latest'
-        versions = ['3.1.5']
+        versions = [latest_core_version]
       elsif rsmp_versions=='all'
-        versions = ['3.1.1','3.1.2','3.1.3','3.1.4','3.1.5']
+        versions = all_core_versions
       else
         versions = [rsmp_versions].flatten
       end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.14.2"
+  VERSION = "0.14.5"
 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_schema", "~> 0.1.0"
+  spec.add_dependency "rsmp_schema", "~> 0.2.2"
 
   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.2
+  version: 0.14.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement