balboa_worldwide_app 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e24d4fa8787d36a34d66af9993561f237ecfdf7876e121176870ba93fdd4f67
-  data.tar.gz: f223828f21309f8742616ab27ee925ddc02eab02304220418a015f25b79802a2
+  metadata.gz: 922f748aeb8f4141c3a97285929a57fa96d1b675872739ffbd060acc8b59dc7b
+  data.tar.gz: 67841aa0fa3026839d3edc743a0b2f58a21b0c5c8d57a833ade09d87e52c8dfe
 SHA512:
-  metadata.gz: 2c12165571d6d619af2019fa30d85bee8af5d6758ffd9829363614b4ddab16993706dde33e91b0d5bc76578734a053f12fdad73290018317ec618ef04a6e6beb
-  data.tar.gz: 8256ecee88d74681ed4b1f25d1b5d75b7f9d20ff3681b973f8ef9f1d80de08ca63c7c622cc60d0ec3394c2323e5013e8a5b073d23dce80dec08c25f7fb4c25f4
+  metadata.gz: b8cb0c05f23d5a01b826e99bc0a0e77bc85ce7ad210c955c5b46b6981f8fc7eb22281b25936ffd489f3c01001a74c2fb37233fde87e1a79b68378af762cc59d0
+  data.tar.gz: 5ce90e735133a9419d440a0919c5e18ca8e4fe419a826129b21d79960620ca416ba43e7e8e39c84b011c407c4a0b0c62a87c6538a905ef3ef42ce9f322150eee

data/lib/bwa/client.rb

@@ -14,8 +14,8 @@ module BWA
         @io = Net::Telnet::RFC2217.new("Host" => uri.host, "Port" => uri.port || 23, "baud" => 115200)
         @queue = []
       else
-        require 'rubyserial'
-        @io = Serial.new(uri.path, 115200)
+        require 'ccutrer-serialport'
+        @io = CCutrer::SerialPort.new(uri.path, baud: 115200)
         @queue = []
       end
       @buffer = ""
@@ -30,7 +30,7 @@ module BWA
         method = @io.respond_to?(:readpartial) ? :readpartial : :read
         unless message
           begin
-            @buffer.concat(@io.send(method, 64 * 1024))
+            @buffer.concat(@io.__send__(method, 64 * 1024))
           rescue EOFError
             @io.wait_readable
             retry

data/lib/bwa/message.rb

@@ -56,7 +56,12 @@ module BWA
                       "\xbf\x07".force_encoding(Encoding::ASCII_8BIT)].include?(message_type)
 
         if klass
-          raise InvalidMessage.new("Unrecognized data length (#{length}) for message #{klass}", data) unless length - 5 == klass::MESSAGE_LENGTH
+          valid_length = if klass::MESSAGE_LENGTH.respond_to?(:include?)
+            klass::MESSAGE_LENGTH.include?(length - 5)
+          else
+            length - 5 == klass::MESSAGE_LENGTH
+          end
+          raise InvalidMessage.new("Unrecognized data length (#{length}) for message #{klass}", data) unless valid_length
         else
           klass = Unrecognized
         end

data/lib/bwa/messages/status.rb

@@ -18,7 +18,8 @@ module BWA
                     :current_temperature, :set_temperature
 
       MESSAGE_TYPE = "\xaf\x13".force_encoding(Encoding::ASCII_8BIT)
-      MESSAGE_LENGTH = 24
+      # additional features have been added in later versions
+      MESSAGE_LENGTH = 24..28
 
       def initialize
         @src = 0xff

data/lib/bwa/version.rb

@@ -1,3 +1,3 @@
 module BWA
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-crc
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: rubyserial
+  name: ccutrer-serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Library for communication with Balboa Water Group's WiFi module or RS-485