Merge branch 'release/0.5.0'

solectrus · Nov 9, 2024 · af539b5 · af539b5
2 parents 293d505 + f0e99cd
commit af539b5
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 83 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.4
+3.3.6
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.3.4-alpine AS builder
+FROM ruby:3.3.6-alpine AS builder
 RUN apk add --no-cache build-base
 
 WORKDIR /senec-charger
@@ -8,7 +8,7 @@ RUN bundle config --local frozen 1 && \
     bundle install -j4 --retry 3 && \
     bundle clean --force
 
-FROM ruby:3.3.4-alpine
+FROM ruby:3.3.6-alpine
 LABEL maintainer="[email protected]"
 
 # Add tzdata to get correct timezone

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,57 +13,56 @@ GEM
       rexml
     csv (3.3.0)
     docile (1.4.1)
-    dotenv (3.1.2)
-    faraday (2.11.0)
+    dotenv (3.1.4)
+    faraday (2.12.0)
       faraday-net_http (>= 2.0, < 3.4)
+      json
       logger
     faraday-net_http (3.3.0)
       net-http
-    faraday-net_http_persistent (2.1.0)
+    faraday-net_http_persistent (2.3.0)
       faraday (~> 2.5)
-      net-http-persistent (~> 4.0)
+      net-http-persistent (>= 4.0.4, < 5)
     faraday-request-timer (0.2.0)
       faraday (>= 0.9.0)
     hashdiff (1.1.1)
     influxdb-client (3.1.0)
-    json (2.7.2)
+    json (2.8.1)
     language_server-protocol (3.17.0.3)
-    logger (1.6.0)
+    logger (1.6.1)
     minitest (5.25.1)
     minitest-silence (0.2.4)
       minitest (~> 5.12)
-    net-http (0.4.1)
+    net-http (0.5.0)
       uri
-    net-http-persistent (4.0.2)
+    net-http-persistent (4.0.4)
       connection_pool (~> 2.2)
     parallel (1.26.3)
-    parser (3.3.4.2)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     public_suffix (6.0.1)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.3.6)
-      strscan
-    rubocop (1.65.1)
+    rexml (3.3.9)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.1)
+    rubocop-ast (1.34.1)
       parser (>= 3.3.1.0)
-    rubocop-minitest (0.35.1)
+    rubocop-minitest (0.36.0)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
@@ -77,15 +76,14 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.0)
     timecop (0.9.10)
-    unicode-display_width (2.5.0)
-    uri (0.13.1)
+    unicode-display_width (2.6.0)
+    uri (1.0.1)
     vcr (6.3.1)
       base64
-    webmock (3.23.1)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -113,4 +111,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.5.18
+   2.5.23
diff --git a/app/senec_provider.rb b/app/senec_provider.rb
@@ -7,7 +7,10 @@ def initialize(config:)
 
   attr_reader :config
 
-  STAT_STATE_EMPTY = 15
+  STAT_STATE_EMPTY = [
+    15, # BATTERY EMPTY
+    89, # SPARE CAPACITY
+  ].freeze
 
   def bat_fuel_charge
     refresh_request
@@ -20,7 +23,7 @@ def stat_state
   end
 
   def bat_empty?
-    stat_state == STAT_STATE_EMPTY
+    STAT_STATE_EMPTY.include?(stat_state)
   end
 
   def safe_charge_running?

diff --git a/test/cassettes/forecast_setup.yml b/test/cassettes/forecast_setup.yml
diff --git a/test/cassettes/forecast_success.yml b/test/cassettes/forecast_success.yml
diff --git a/test/cassettes/loop_success.yml b/test/cassettes/loop_success.yml
diff --git a/test/cassettes/prices_blank.yml b/test/cassettes/prices_blank.yml
diff --git a/test/cassettes/prices_delete.yml b/test/cassettes/prices_delete.yml
diff --git a/test/cassettes/prices_setup.yml b/test/cassettes/prices_setup.yml
diff --git a/test/cassettes/prices_success.yml b/test/cassettes/prices_success.yml