balboa_worldwide_app 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9b3fdfbe671f421950413e8d6d2372b4b2c1c5f2c0cf547bdb1cf581d9e2692
-  data.tar.gz: 0eac860bd7b7e7deec183ca7570faaff4bc7c5c604c69f71cc88851fb15e8c2c
+  metadata.gz: fd56f77e48e5a961a32734d10885b194c9caa7fd82f4533b436fda1e4018e731
+  data.tar.gz: 6ff96728945e155dbef1e8663b781d6003bf9b70a0242e810db5125b9d797c0f
 SHA512:
-  metadata.gz: f149d04ea30080c44d68b672fbda301056a4591992558cac9f459227825fc4faa86528011d06bb39acab5e0bd55d17b66f29cb9bf8c1b02a611f03b5d22a3943
-  data.tar.gz: c2bb4668491f0a67ec6021001f960051565dfa7b45b9a540903e4ae7707b91891fb5bfc2f3a6f69d2d004310647956f1da0f3aed90e773468b145c40a8369dae
+  metadata.gz: 4054df0eb006e81079253932e82f6e9f3063d2b3f31914349ba194786e232c36c3d6a19a1c7e7e924805cc8f3a2a1b8845f8c59f2c7a7e1160cc31fef5de0b67
+  data.tar.gz: e9cdbab73f7fad4f6a21d20816271ab3f88bb91d7bd85e87b9fab4804e77356a290645fbf7c2fb77281d3bb9a394a5d65f4db5de85f8e1fcdc110e314e4fe79d

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,14 +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
-      if desired == 0 && configuration.pumps.length == 1 && max_pump_speed != 1
-        return toggle_item(:soak)
-      end
+      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

@@ -18,8 +18,8 @@ module BWA
       end
 
       def serialize
-        data = "\x01\x00"
-        data[1] = (scale == :fahrenheit ? 0x00 : 0x01).chr
+        data = +"\x01\x00"
+        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.2"
+  VERSION = "2.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2023-05-20 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
@@ -64,14 +64,14 @@ dependencies:
     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