balboa_worldwide_app 2.1.3 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b565e8ea9c2ff56e086777b75f0678440c67a045cec5a5677458dc5686545b
-  data.tar.gz: 8003b1fe9a607b5b03cbdf22b69591e78fbfb86c29c826744b19a3a09dea5d25
+  metadata.gz: 9291a65b48f5bfa7f66ccb5d84723a788227feb4ad5749ecaa712b4a42b2a21d
+  data.tar.gz: 4f384f1b892663b5925adca3f2b9945dcfbaf776ed8f5fe944daebba5bd67a4c
 SHA512:
-  metadata.gz: fb74d4743d735f663e945f8070bda4b71ac49311b2462c273d933d91ca2a186ad2f0a0ff735c26ba548ac438427eb08a531ed67fddd0c9cc48ae530e81fda199
-  data.tar.gz: 5c84e5f528eaf1c248dc007bee5c44baafe6a659f270040a3aed9b3f6514ece48c9f252c28723187c2a09e96dd092121e3796e926da5a5fe154d26050ccc10b1
+  metadata.gz: 1bc17d4129c715c783b3f9f6374807458d8d970c0cf5e9cf5609190411ac3d0362d17eeeaaf20a78d3eee519d4754299777c35950c20381db90f8890418235cf
+  data.tar.gz: 25f1d5f39fb8eb34456107d607e25126ccf77763bc007ee8da8ed180115cef92035aa4f62654cbbff6a18e7880f87548f2125542899ec1f09158bfe22e01fe43

data/exe/bwa_mqtt_bridge

@@ -115,7 +115,7 @@ class MQTTBridge
           next if speeds.zero?
 
           property = @homie["spa"]["pump#{i + 1}"]
-          property.value = speeds == 1 ? @bwa.pumps[i] != 0 : @bwa.pumps[i]
+          property.value = (speeds == 1) ? @bwa.pumps[i] != 0 : @bwa.pumps[i]
         end
         @bwa.configuration.lights.each_with_index do |exists, i|
           next unless exists
@@ -172,7 +172,10 @@ class MQTTBridge
         @bwa.hold = value
       end
       spa.property("priming", "Priming", :boolean, @bwa.priming, hass: { binary_sensor: { icon: "mdi:fast-forward" } })
-      spa.property("notification", "Notification", :enum, @bwa.notification || "none",
+      spa.property("notification",
+                   "Notification",
+                   :enum,
+                   @bwa.notification || "none",
                    format: BWA::Messages::Status::NOTIFICATIONS.values.compact + ["none"])
       spa.property("heating-mode",
                    "Heating Mode",

data/lib/bwa/client.rb

@@ -42,7 +42,9 @@ module BWA
         @io = TCPSocket.new(uri.host, uri.port || 4257)
       when "telnet", "rfc2217"
         require "net/telnet/rfc2217"
-        @io = Net::Telnet::RFC2217.new("Host" => uri.host, "Port" => uri.port || 23, "baud" => 115_200)
+        @io = Net::Telnet::RFC2217.new(uri.host,
+                                       port: uri.port || 23,
+                                       baud: 115_200)
         @queue = []
       else
         require "ccutrer-serialport"
@@ -168,12 +170,12 @@ module BWA
 
       desired = 0 if desired == false
       max_pump_speed = configuration.pumps[index]
+      desired = max_pump_speed if desired == true
+      desired = [desired, max_pump_speed].min
 
       # turn all pumps off with a single command
       return toggle_item(:soak) if desired.zero? && configuration.pumps.length == 1 && max_pump_speed != 1
 
-      desired = max_pump_speed if desired == true
-      desired = [desired, max_pump_speed].min
       current_pump_speed = [status.pumps[index], max_pump_speed].min
       times = (desired - current_pump_speed) % (max_pump_speed + 1)
       times.times do |i|

data/lib/bwa/message.rb

@@ -64,7 +64,7 @@ module BWA
         BWA.logger.debug "discarding invalid data prior to message #{BWA.raw2str(data[0...offset])}" unless offset.zero?
 
         src = data[offset + 2].ord
-        klass = @messages.find { |k| k::MESSAGE_TYPE == message_type }
+        klass = @messages.find { |k| message_type == k::MESSAGE_TYPE }
 
         if klass
           valid_length = if klass::MESSAGE_LENGTH.respond_to?(:include?)
@@ -102,7 +102,7 @@ module BWA
         else
           print_hour = hour % 12
           print_hour = 12 if print_hour.zero?
-          format("%d:%02d%s", print_hour, minute, hour >= 12 ? "PM" : "AM")
+          format("%d:%02d%s", print_hour, minute, (hour >= 12) ? "PM" : "AM")
         end
       end
 

data/lib/bwa/messages/filter_cycles.rb

@@ -3,8 +3,13 @@
 module BWA
   module Messages
     class FilterCycles < Message
-      attr_accessor :cycle1_start_hour, :cycle1_start_minute, :cycle1_duration,
-                    :cycle2_enabled, :cycle2_start_hour, :cycle2_start_minute, :cycle2_duration
+      attr_accessor :cycle1_start_hour,
+                    :cycle1_start_minute,
+                    :cycle1_duration,
+                    :cycle2_enabled,
+                    :cycle2_start_hour,
+                    :cycle2_start_minute,
+                    :cycle2_duration
       alias_method :cycle2_enabled?, :cycle2_enabled
 
       MESSAGE_TYPE = "\xbf\x23".b

data/lib/bwa/messages/set_temperature_scale.rb

@@ -19,7 +19,7 @@ module BWA
 
       def serialize
         data = +"\x01\x00"
-        data[1] = (scale == :fahrenheit ? 0x00 : 0x01).chr
+        data[1] = ((scale == :fahrenheit) ? 0x00 : 0x01).chr
         super(data)
       end
 

data/lib/bwa/messages/status.rb

@@ -11,7 +11,8 @@ module BWA
                     :filter_cycles,
                     :heating,
                     :temperature_range,
-                    :hour, :minute,
+                    :hour,
+                    :minute,
                     :circulation_pump,
                     :blower,
                     :pumps,

data/lib/bwa/server.rb

@@ -43,7 +43,7 @@ module BWA
             when Messages::ConfigurationRequest
               send_configuration(socket)
             when Messages::ControlConfigurationRequest
-              message.type == 1 ? send_control_configuration(socket) : send_control_configuration2(socket)
+              (message.type == 1) ? send_control_configuration(socket) : send_control_configuration2(socket)
             when Messages::SetTargetTemperature
               temperature = message.temperature
               temperature /= 2.0 if @status.temperature_scale == :celsius
@@ -53,9 +53,9 @@ module BWA
             when Messages::ToggleItem
               case message.item
               when :heating_mode
-                @status.heating_mode = (@status.heating_mode == :rest ? :ready : :rest)
+                @status.heating_mode = ((@status.heating_mode == :rest) ? :ready : :rest)
               when :temperature_range
-                @status.temperature_range = (@status.temperature_range == :low ? :high : :low)
+                @status.temperature_range = ((@status.temperature_range == :low) ? :high : :low)
               when :pump1
                 @status.pump1 = (@status.pump1 + 1) % 3
               when :pump2

data/lib/bwa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BWA
-  VERSION = "2.1.3"
+  VERSION = "2.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.5
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: digest-crc
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +47,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,21 +57,21 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sd_notify
   requirement: !ruby/object:Gem::Requirement
@@ -115,33 +115,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-inst
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Library for communication with Balboa Water Group's WiFi module or RS-485