Skip to content

Commit a233fd3

Browse files
ledermannledermann
committed
Merge branch 'release/0.11.1'
2 parents 35e73f5 + cc89d73 commit a233fd3

15 files changed

Lines changed: 63 additions & 58 deletions

‎.github/workflows/push.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ concurrency:
1717
jobs:
1818
test:
1919
runs-on: ubuntu-latest
20+
timeout-minutes: 15
2021

2122
env:
2223
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
@@ -97,3 +98,5 @@ jobs:
9798
BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
9899
VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
99100
REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
101+
cache-from: type=gha
102+
cache-to: type=gha,mode=max

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.2.3

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.2.2-alpine AS Builder
1+
FROM ruby:3.2.3-alpine AS Builder
22
RUN apk add --no-cache build-base
33

44
WORKDIR /senec-collector
@@ -8,7 +8,7 @@ RUN bundle config --local frozen 1 && \
88
bundle install -j4 --retry 3 && \
99
bundle clean --force
1010

11-
FROM ruby:3.2.2-alpine
11+
FROM ruby:3.2.3-alpine
1212
LABEL maintainer="georg@ledermann.dev"
1313

1414
# Decrease memory usage

‎Gemfile.lock‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,68 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.5)
4+
addressable (2.8.6)
55
public_suffix (>= 2.0.2, < 6.0)
66
ast (2.4.2)
7-
base64 (0.1.1)
7+
bigdecimal (3.1.6)
88
connection_pool (2.4.1)
99
crack (0.4.5)
1010
rexml
1111
docile (1.4.0)
1212
dotenv (2.8.1)
13-
faraday (2.7.11)
14-
base64
15-
faraday-net_http (>= 2.0, < 3.1)
16-
ruby2_keywords (>= 0.0.4)
17-
faraday-net_http (3.0.2)
13+
faraday (2.9.0)
14+
faraday-net_http (>= 2.0, < 3.2)
15+
faraday-net_http (3.1.0)
16+
net-http
1817
faraday-net_http_persistent (2.1.0)
1918
faraday (~> 2.5)
2019
net-http-persistent (~> 4.0)
2120
faraday-request-timer (0.2.0)
2221
faraday (>= 0.9.0)
23-
hashdiff (1.0.1)
24-
influxdb-client (2.9.0)
25-
json (2.6.3)
22+
hashdiff (1.1.0)
23+
influxdb-client (3.0.0)
24+
json (2.7.1)
2625
language_server-protocol (3.17.0.3)
27-
minitest (5.20.0)
26+
minitest (5.21.2)
27+
net-http (0.4.1)
28+
uri
2829
net-http-persistent (4.0.2)
2930
connection_pool (~> 2.2)
30-
oj (3.16.1)
31-
parallel (1.23.0)
32-
parser (3.2.2.3)
31+
oj (3.16.3)
32+
bigdecimal (>= 3.0)
33+
parallel (1.24.0)
34+
parser (3.3.0.5)
3335
ast (~> 2.4.1)
3436
racc
35-
public_suffix (5.0.3)
36-
racc (1.7.1)
37+
public_suffix (5.0.4)
38+
racc (1.7.3)
3739
rainbow (3.1.1)
38-
rake (13.0.6)
39-
regexp_parser (2.8.1)
40+
rake (13.1.0)
41+
regexp_parser (2.9.0)
4042
rexml (3.2.6)
41-
rubocop (1.56.4)
42-
base64 (~> 0.1.1)
43+
rubocop (1.60.1)
4344
json (~> 2.3)
4445
language_server-protocol (>= 3.17.0)
4546
parallel (~> 1.10)
46-
parser (>= 3.2.2.3)
47+
parser (>= 3.3.0.2)
4748
rainbow (>= 2.2.2, < 4.0)
4849
regexp_parser (>= 1.8, < 3.0)
4950
rexml (>= 3.2.5, < 4.0)
50-
rubocop-ast (>= 1.28.1, < 2.0)
51+
rubocop-ast (>= 1.30.0, < 2.0)
5152
ruby-progressbar (~> 1.7)
5253
unicode-display_width (>= 2.4.0, < 3.0)
53-
rubocop-ast (1.29.0)
54+
rubocop-ast (1.30.0)
5455
parser (>= 3.2.1.0)
55-
rubocop-minitest (0.32.2)
56+
rubocop-minitest (0.34.5)
5657
rubocop (>= 1.39, < 2.0)
57-
rubocop-performance (1.19.1)
58-
rubocop (>= 1.7.0, < 2.0)
59-
rubocop-ast (>= 0.4.0)
58+
rubocop-ast (>= 1.30.0, < 2.0)
59+
rubocop-performance (1.20.2)
60+
rubocop (>= 1.48.1, < 2.0)
61+
rubocop-ast (>= 1.30.0, < 2.0)
6062
rubocop-rake (0.6.0)
6163
rubocop (~> 1.0)
6264
ruby-progressbar (1.13.0)
63-
ruby2_keywords (0.0.5)
64-
senec (0.13.0)
65+
senec (0.14.0)
6566
faraday
6667
faraday-net_http_persistent
6768
faraday-request-timer
@@ -71,7 +72,8 @@ GEM
7172
simplecov_json_formatter (~> 0.1)
7273
simplecov-html (0.12.3)
7374
simplecov_json_formatter (0.1.4)
74-
unicode-display_width (2.4.2)
75+
unicode-display_width (2.5.0)
76+
uri (0.13.0)
7577
vcr (6.2.0)
7678
webmock (3.19.1)
7779
addressable (>= 2.8.0)
@@ -97,4 +99,4 @@ DEPENDENCIES
9799
webmock
98100

99101
BUNDLED WITH
100-
2.4.20
102+
2.5.5

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020,2023 Georg Ledermann <georg@ledermann.dev>
3+
Copyright (c) 2020-2024 Georg Ledermann <georg@ledermann.dev>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ docker buildx build --platform linux/arm/v7 -t senec-collector .
4444

4545
## License
4646

47-
Copyright (c) 2020,2023 Georg Ledermann, released under the MIT License
47+
Copyright (c) 2020-2024 Georg Ledermann, released under the MIT License

‎app/config.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def senec_url
3131

3232
def senec_connection
3333
@senec_connection ||=
34-
Senec::Connection.new(host: senec_host, schema: senec_schema)
34+
Senec::Local::Connection.new(host: senec_host, schema: senec_schema)
3535
end
3636

3737
private

‎app/main.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Version #{ENV.fetch('VERSION', '<unknown>')}, " \
1212
"built at #{ENV.fetch('BUILDTIME', '<unknown>')}"
1313
puts 'https://github.com/solectrus/senec-collector'
14-
puts 'Copyright (c) 2020,2023 Georg Ledermann, released under the MIT License'
14+
puts 'Copyright (c) 2020-2024 Georg Ledermann, released under the MIT License'
1515
puts "\n"
1616

1717
config = Config.from_env

‎app/senec_pull.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ def initialize(config:, queue:)
1616

1717
def next
1818
data =
19-
Senec::Request.new connection: config.senec_connection,
20-
state_names: senec_state_names
19+
Senec::Local::Request.new connection: config.senec_connection,
20+
state_names: senec_state_names
2121
return unless data.measure_time
2222

2323
record = SolectrusRecord.new(@count += 1, data)

‎app/senec_state_names.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def initialize(config:)
88
def fetch
99
puts "Getting state names (language: #{config.senec_language}) from SENEC by parsing source code..."
1010
names =
11-
Senec::State.new(connection: config.senec_connection).names(
11+
Senec::Local::State.new(connection: config.senec_connection).names(
1212
language: config.senec_language,
1313
)
1414
puts "OK, got #{names.length} state names"

0 commit comments

Comments
 (0)