From 5daa4d25205b409e05b48242bc8ef38772330650 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 00:06:15 +0000 Subject: [PATCH 01/30] :arrow_up: Bump public_suffix from 6.0.0 to 6.0.1 (#91) Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 6.0.0 to 6.0.1. - [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/main/CHANGELOG.md) - [Commits](https://github.com/weppos/publicsuffix-ruby/compare/v6.0.0...v6.0.1) --- updated-dependencies: - dependency-name: public_suffix dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2e14537..da4176e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,7 +63,7 @@ GEM pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (6.0.0) + public_suffix (6.0.1) racc (1.8.0) rainbow (3.1.1) rake (13.2.1) From 2017af7360d9636a0096186c6f1f6d5d6c94163f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:14:28 +0000 Subject: [PATCH 02/30] :arrow_up: Bump faraday-net_http from 3.1.0 to 3.1.1 (#92) Bumps [faraday-net_http](https://github.com/lostisland/faraday-net_http) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/lostisland/faraday-net_http/releases) - [Commits](https://github.com/lostisland/faraday-net_http/compare/v3.1.0...v3.1.1) --- updated-dependencies: - dependency-name: faraday-net_http dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index da4176e..c513440 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,7 +18,7 @@ GEM faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) logger - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http faraday-request-timer (0.2.0) faraday (>= 0.9.0) From daae3fcd06add50c962172998a80a6840e520d02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 23:58:09 +0000 Subject: [PATCH 03/30] :arrow_up: Bump docile from 1.4.0 to 1.4.1 (#93) Bumps [docile](https://github.com/ms-ati/docile) from 1.4.0 to 1.4.1. - [Changelog](https://github.com/ms-ati/docile/blob/main/HISTORY.md) - [Commits](https://github.com/ms-ati/docile/compare/v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: docile dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c513440..60e5d89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,7 +13,7 @@ GEM rexml csv (3.3.0) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) dotenv (3.1.2) faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) From 069cfdfe785117bbf88c6608eb4e01613d12dc56 Mon Sep 17 00:00:00 2001 From: Georg Ledermann Date: Sat, 27 Jul 2024 08:41:23 +0200 Subject: [PATCH 04/30] Docker: Fix build warnings --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 336c77c..ace9f19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.3.4-alpine AS Builder +FROM ruby:3.3.4-alpine AS builder RUN apk add --no-cache build-base WORKDIR /shelly-collector @@ -15,21 +15,21 @@ LABEL maintainer="georg@ledermann.dev" RUN apk add --no-cache tzdata # Decrease memory usage -ENV MALLOC_ARENA_MAX 2 +ENV MALLOC_ARENA_MAX=2 # Move build arguments to environment variables ARG BUILDTIME -ENV BUILDTIME ${BUILDTIME} +ENV BUILDTIME=${BUILDTIME} ARG VERSION -ENV VERSION ${VERSION} +ENV VERSION=${VERSION} ARG REVISION -ENV REVISION ${REVISION} +ENV REVISION=${REVISION} WORKDIR /shelly-collector -COPY --from=Builder /usr/local/bundle/ /usr/local/bundle/ +COPY --from=builder /usr/local/bundle/ /usr/local/bundle/ COPY . /shelly-collector/ -ENTRYPOINT bundle exec app.rb +ENTRYPOINT ["bundle", "exec", "app.rb"] From d7fc92319ca0eb14395279c1a1780b16bb2f5648 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 23:32:11 +0000 Subject: [PATCH 05/30] :arrow_up: Bump racc from 1.8.0 to 1.8.1 (#94) Bumps [racc](https://github.com/ruby/racc) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/ruby/racc/releases) - [Changelog](https://github.com/ruby/racc/blob/master/ChangeLog) - [Commits](https://github.com/ruby/racc/compare/v1.8.0...v1.8.1) --- updated-dependencies: - dependency-name: racc dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 60e5d89..31a8a7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (6.0.1) - racc (1.8.0) + racc (1.8.1) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) From 0b3bd1ce457ae5cadf0bfdb3e28bf60a946cc04e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 23:31:34 +0000 Subject: [PATCH 06/30] :arrow_up: Bump faraday from 2.10.0 to 2.10.1 (#95) Bumps [faraday](https://github.com/lostisland/faraday) from 2.10.0 to 2.10.1. - [Release notes](https://github.com/lostisland/faraday/releases) - [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md) - [Commits](https://github.com/lostisland/faraday/compare/v2.10.0...v2.10.1) --- updated-dependencies: - dependency-name: faraday dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 31a8a7e..6f608f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,7 +15,7 @@ GEM diff-lcs (1.5.1) docile (1.4.1) dotenv (3.1.2) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger faraday-net_http (3.1.1) From 8e61232df6764114d3ed60c28ed6f687d2dd6ba6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 23:43:03 +0000 Subject: [PATCH 07/30] :arrow_up: Bump rexml from 3.3.2 to 3.3.4 (#96) Bumps [rexml](https://github.com/ruby/rexml) from 3.3.2 to 3.3.4. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.2...v3.3.4) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6f608f5..2cf3d3b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,7 +71,7 @@ GEM rb-inotify (0.11.1) ffi (~> 1.0) regexp_parser (2.9.2) - rexml (3.3.2) + rexml (3.3.4) strscan rspec (3.13.0) rspec-core (~> 3.13.0) From 328197c9769ceaf412ea3308a7e8a496db38aa2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 23:43:31 +0000 Subject: [PATCH 08/30] :arrow_up: Bump rubocop from 1.65.0 to 1.65.1 (#97) Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.65.0 to 1.65.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.65.0...v1.65.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2cf3d3b..baf8b43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) - rubocop (1.65.0) + rubocop (1.65.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) From 33468552b62670326df32355660a5fc8d9e60d2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 4 Aug 2024 23:51:46 +0000 Subject: [PATCH 09/30] :arrow_up: Bump hashdiff from 1.1.0 to 1.1.1 (#98) Bumps [hashdiff](https://github.com/liufengyun/hashdiff) from 1.1.0 to 1.1.1. - [Changelog](https://github.com/liufengyun/hashdiff/blob/master/changelog.md) - [Commits](https://github.com/liufengyun/hashdiff/compare/v1.1.0...v1.1.1) --- updated-dependencies: - dependency-name: hashdiff dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index baf8b43..614ecca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - hashdiff (1.1.0) + hashdiff (1.1.1) influxdb-client (3.1.0) json (2.7.2) language_server-protocol (3.17.0.3) From e392f80647dcf99d205af8f9fefd7c85b7836f01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 23:18:18 +0000 Subject: [PATCH 10/30] :arrow_up: Bump rubocop-rspec from 3.0.3 to 3.0.4 (#99) Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) from 3.0.3 to 3.0.4. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v3.0.3...v3.0.4) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 614ecca..23d4b81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,14 +97,14 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.0) parser (>= 3.3.1.0) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.3) + rubocop-rspec (3.0.4) rubocop (~> 1.61) ruby-progressbar (1.13.0) shellany (0.0.1) From 8ba703192642c999d2f4ca5b6b750f27baae9c70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 23:18:42 +0000 Subject: [PATCH 11/30] :arrow_up: Bump rubocop-ast from 1.31.3 to 1.32.0 (#100) Bumps [rubocop-ast](https://github.com/rubocop/rubocop-ast) from 1.31.3 to 1.32.0. - [Release notes](https://github.com/rubocop/rubocop-ast/releases) - [Changelog](https://github.com/rubocop/rubocop-ast/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-ast/compare/v1.31.3...v1.32.0) --- updated-dependencies: - dependency-name: rubocop-ast dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From 4c07bd0fdafa7c24df5c42c63c8aa770de64f0f9 Mon Sep 17 00:00:00 2001 From: Georg Ledermann Date: Tue, 6 Aug 2024 12:55:40 +0200 Subject: [PATCH 12/30] :arrow_up: Bundler 2.5.17 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 23d4b81..9d74453 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,4 +148,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.5.16 + 2.5.17 From 2b79d7d928814feb48fc5e16ee9de1d61726268d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 00:04:55 +0000 Subject: [PATCH 13/30] :arrow_up: Bump parser from 3.3.4.0 to 3.3.4.1 (#101) Bumps [parser](https://github.com/whitequark/parser) from 3.3.4.0 to 3.3.4.1. - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v3.3.4.0...v3.3.4.1) --- updated-dependencies: - dependency-name: parser dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9d74453..fe6166b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM oj (3.16.4) bigdecimal (>= 3.0) parallel (1.25.1) - parser (3.3.4.0) + parser (3.3.4.1) ast (~> 2.4.1) racc pry (0.14.2) From e848110a1793241b9a63c412a16c0ace8efa25d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 00:05:25 +0000 Subject: [PATCH 14/30] :arrow_up: Bump oj from 3.16.4 to 3.16.5 (#102) Bumps [oj](https://github.com/ohler55/oj) from 3.16.4 to 3.16.5. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.16.4...v3.16.5) --- updated-dependencies: - dependency-name: oj dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe6166b..ad1e66d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,8 +54,10 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - oj (3.16.4) + oj (3.16.5) bigdecimal (>= 3.0) + ostruct (>= 0.2) + ostruct (0.6.0) parallel (1.25.1) parser (3.3.4.1) ast (~> 2.4.1) From b2281441b25482091c927086b3a739e913e1b7bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 23:43:27 +0000 Subject: [PATCH 15/30] :arrow_up: Bump parser from 3.3.4.1 to 3.3.4.2 (#103) Bumps [parser](https://github.com/whitequark/parser) from 3.3.4.1 to 3.3.4.2. - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v3.3.4.1...v3.3.4.2) --- updated-dependencies: - dependency-name: parser dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ad1e66d..224b0a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,7 +59,7 @@ GEM ostruct (>= 0.2) ostruct (0.6.0) parallel (1.25.1) - parser (3.3.4.1) + parser (3.3.4.2) ast (~> 2.4.1) racc pry (0.14.2) From 1234f23c06e5ba3c6c4762e080cf9da6e2070d58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 23:45:08 +0000 Subject: [PATCH 16/30] :arrow_up: Bump parallel from 1.25.1 to 1.26.1 (#104) Bumps [parallel](https://github.com/grosser/parallel) from 1.25.1 to 1.26.1. - [Commits](https://github.com/grosser/parallel/compare/v1.25.1...v1.26.1) --- updated-dependencies: - dependency-name: parallel dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 224b0a9..5dd251e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,7 +58,7 @@ GEM bigdecimal (>= 3.0) ostruct (>= 0.2) ostruct (0.6.0) - parallel (1.25.1) + parallel (1.26.1) parser (3.3.4.2) ast (~> 2.4.1) racc From 11fdec83d6ccb672ed78bb844e453e69be224fcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 11 Aug 2024 23:45:19 +0000 Subject: [PATCH 17/30] :arrow_up: Bump parallel from 1.26.1 to 1.26.2 (#105) Bumps [parallel](https://github.com/grosser/parallel) from 1.26.1 to 1.26.2. - [Commits](https://github.com/grosser/parallel/compare/v1.26.1...v1.26.2) --- updated-dependencies: - dependency-name: parallel dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5dd251e..d5484b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,7 +58,7 @@ GEM bigdecimal (>= 3.0) ostruct (>= 0.2) ostruct (0.6.0) - parallel (1.26.1) + parallel (1.26.2) parser (3.3.4.2) ast (~> 2.4.1) racc From 5c5ccd6bed39f2dd12683534fba7c3646e02321b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 23:40:12 +0000 Subject: [PATCH 18/30] :arrow_up: Bump rexml from 3.3.4 to 3.3.5 (#106) Bumps [rexml](https://github.com/ruby/rexml) from 3.3.4 to 3.3.5. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.4...v3.3.5) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d5484b8..7cc964a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM rb-inotify (0.11.1) ffi (~> 1.0) regexp_parser (2.9.2) - rexml (3.3.4) + rexml (3.3.5) strscan rspec (3.13.0) rspec-core (~> 3.13.0) From 3240be1ae1efd29503ffde03b7c7c72fa81e4aa0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 04:39:22 +0000 Subject: [PATCH 19/30] :arrow_up: Bump parallel from 1.26.2 to 1.26.3 (#107) Bumps [parallel](https://github.com/grosser/parallel) from 1.26.2 to 1.26.3. - [Commits](https://github.com/grosser/parallel/compare/v1.26.2...v1.26.3) --- updated-dependencies: - dependency-name: parallel dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7cc964a..41c9cc1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,7 +58,7 @@ GEM bigdecimal (>= 3.0) ostruct (>= 0.2) ostruct (0.6.0) - parallel (1.26.2) + parallel (1.26.3) parser (3.3.4.2) ast (~> 2.4.1) racc From ac002f46654250904c69dba083ae1225a28b66d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 18 Aug 2024 23:31:10 +0000 Subject: [PATCH 20/30] :arrow_up: Bump rubocop-ast from 1.32.0 to 1.32.1 (#108) Bumps [rubocop-ast](https://github.com/rubocop/rubocop-ast) from 1.32.0 to 1.32.1. - [Release notes](https://github.com/rubocop/rubocop-ast/releases) - [Changelog](https://github.com/rubocop/rubocop-ast/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-ast/compare/v1.32.0...v1.32.1) --- updated-dependencies: - dependency-name: rubocop-ast dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 41c9cc1..5ad93cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.0) + rubocop-ast (1.32.1) parser (>= 3.3.1.0) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) From 2ec3181e9acdd44a13255ce401262e0da5343ae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 23:33:35 +0000 Subject: [PATCH 21/30] :arrow_up: Bump rspec-expectations from 3.13.1 to 3.13.2 (#110) Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.13.1 to 3.13.2. - [Release notes](https://github.com/rspec/rspec-expectations/releases) - [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-expectations/compare/v3.13.1...v3.13.2) --- updated-dependencies: - dependency-name: rspec-expectations dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5ad93cb..5c71765 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-mocks (3.13.1) From 7dd0028400061e0c9cd96b1b9fe0bcd0a08f0040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 23:33:49 +0000 Subject: [PATCH 22/30] :arrow_up: Bump vcr from 6.2.0 to 6.3.1 (#111) Bumps [vcr](https://github.com/vcr/vcr) from 6.2.0 to 6.3.1. - [Release notes](https://github.com/vcr/vcr/releases) - [Changelog](https://github.com/vcr/vcr/blob/master/CHANGELOG.md) - [Commits](https://github.com/vcr/vcr/compare/v6.2.0...v6.3.1) --- updated-dependencies: - dependency-name: vcr dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5c71765..57c516d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,7 +120,8 @@ GEM thor (1.3.1) unicode-display_width (2.5.0) uri (0.13.0) - vcr (6.2.0) + vcr (6.3.1) + base64 webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) From 6030a2c0a064c9cb787098af018c8f5cc07c71f2 Mon Sep 17 00:00:00 2001 From: Georg Ledermann Date: Wed, 21 Aug 2024 07:32:41 +0200 Subject: [PATCH 23/30] VCR: Re-record episodes --- spec/cassettes/influx-success.yml | 14 +++++++------- spec/cassettes/shelly-plug-s.yml | 18 +++++++++--------- spec/cassettes/shelly-pro-3em.yml | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/spec/cassettes/influx-success.yml b/spec/cassettes/influx-success.yml index 8fde01a..17e1510 100644 --- a/spec/cassettes/influx-success.yml +++ b/spec/cassettes/influx-success.yml @@ -5,15 +5,15 @@ http_interactions: uri: http://:8086/api/v2/write?bucket=&org=&precision=s body: encoding: UTF-8 - string: my-shelly-measurement power=704.699,power_a=263.6,power_b=234.2,power_c=207.0,response_duration=44i,temp=48.0 - 1708490963 + string: my-shelly-measurement power=18.505,power_a=13.7,power_b=4.8,power_c=0.0,response_duration=140i,temp=47.0 + 1724218205 headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: - "*/*" User-Agent: - - influxdb-client-ruby/3.0.0 + - influxdb-client-ruby/3.1.0 Authorization: - Token Content-Type: @@ -26,11 +26,11 @@ http_interactions: X-Influxdb-Build: - OSS X-Influxdb-Version: - - v2.7.5 + - v2.7.10 Date: - - Wed, 21 Feb 2024 04:49:24 GMT + - Wed, 21 Aug 2024 05:30:06 GMT body: encoding: UTF-8 string: '' - recorded_at: Wed, 21 Feb 2024 04:49:24 GMT -recorded_with: VCR 6.2.0 + recorded_at: Wed, 21 Aug 2024 05:30:06 GMT +recorded_with: VCR 6.3.1 diff --git a/spec/cassettes/shelly-plug-s.yml b/spec/cassettes/shelly-plug-s.yml index d679985..4a50c90 100644 --- a/spec/cassettes/shelly-plug-s.yml +++ b/spec/cassettes/shelly-plug-s.yml @@ -8,7 +8,7 @@ http_interactions: string: '' headers: User-Agent: - - Faraday v2.9.0 + - Faraday v2.10.1 response: status: code: 200 @@ -17,17 +17,17 @@ http_interactions: content-type: - application/json content-length: - - '689' + - '691' server: - ShellyHTTP/1.0.0 connection: - close body: encoding: UTF-8 - string: '{"ble":{},"cloud":{"connected":true},"mqtt":{"connected":true},"plugs_ui":{},"switch:0":{"id":0, - "source":"init", "output":true, "apower":4.1, "voltage":234.3, "current":0.071, - "aenergy":{"total":4.999,"by_minute":[67.623,67.623,67.623],"minute_ts":1715755620},"temperature":{"tC":43.3, - "tF":109.9}},"sys":{"mac":"FCB467272FA0","restart_required":false,"time":"08:47","unixtime":1715755636,"uptime":4718,"ram_size":246732,"ram_free":142868,"fs_size":458752,"fs_free":139264,"cfg_rev":25,"kvs_rev":0,"schedule_rev":1,"webhook_rev":0,"available_updates":{},"reset_reason":3},"wifi":{"sta_ip":"192.168.178.88","status":"got - ip","ssid":"FRITZ!Box 4060 RX","rssi":-64},"ws":{"connected":false}}' - recorded_at: Wed, 15 May 2024 06:47:17 GMT -recorded_with: VCR 6.2.0 + string: '{"ble":{},"cloud":{"connected":true},"mqtt":{"connected":false},"plugs_ui":{},"switch:0":{"id":0, + "source":"init", "output":true, "apower":0.1, "voltage":236.1, "current":0.000, + "aenergy":{"total":26204.253,"by_minute":[0.000,0.000,0.000],"minute_ts":1724218200},"temperature":{"tC":39.7, + "tF":103.5}},"sys":{"mac":"FCB467272FA0","restart_required":false,"time":"07:30","unixtime":1724218213,"uptime":1492,"ram_size":253812,"ram_free":134940,"fs_size":393216,"fs_free":102400,"cfg_rev":31,"kvs_rev":0,"schedule_rev":1,"webhook_rev":0,"available_updates":{},"reset_reason":3},"wifi":{"sta_ip":"192.168.178.88","status":"got + ip","ssid":"FRITZ!Box 4060 RX","rssi":-74},"ws":{"connected":false}}' + recorded_at: Wed, 21 Aug 2024 05:30:13 GMT +recorded_with: VCR 6.3.1 diff --git a/spec/cassettes/shelly-pro-3em.yml b/spec/cassettes/shelly-pro-3em.yml index 5762f55..cc727b3 100644 --- a/spec/cassettes/shelly-pro-3em.yml +++ b/spec/cassettes/shelly-pro-3em.yml @@ -8,7 +8,7 @@ http_interactions: string: '' headers: User-Agent: - - Faraday v2.9.0 + - Faraday v2.10.1 response: status: code: 200 @@ -17,16 +17,16 @@ http_interactions: content-type: - application/json content-length: - - '1213' + - '1254' server: - ShellyHTTP/1.0.0 connection: - close body: encoding: UTF-8 - string: '{"ble":{},"cloud":{"connected":true},"em:0":{"id":0,"a_current":0.618,"a_voltage":234.0,"a_act_power":13.3,"a_aprt_power":144.6,"a_pf":0.09,"a_freq":50.0,"b_current":0.649,"b_voltage":233.6,"b_act_power":5.1,"b_aprt_power":151.5,"b_pf":0.03,"b_freq":50.0,"c_current":0.620,"c_voltage":233.8,"c_act_power":0.0,"c_aprt_power":144.9,"c_pf":0.00,"c_freq":50.0,"n_current":null,"total_current":1.887,"total_act_power":18.438,"total_aprt_power":440.988, - "user_calibrated_phase":[]},"emdata:0":{"id":0,"a_total_act_energy":256166.36,"a_total_act_ret_energy":0.09,"b_total_act_energy":215649.53,"b_total_act_ret_energy":0.01,"c_total_act_energy":185177.41,"c_total_act_ret_energy":733.03,"total_act":656993.30, - "total_act_ret":733.13},"eth":{"ip":"192.168.178.83"},"modbus":{},"mqtt":{"connected":false},"sys":{"mac":"34987A45A6A0","restart_required":false,"time":"08:47","unixtime":1715755636,"uptime":1085693,"ram_size":241460,"ram_free":134336,"fs_size":524288,"fs_free":184320,"cfg_rev":32,"kvs_rev":2,"schedule_rev":0,"webhook_rev":2,"available_updates":{},"reset_reason":3},"temperature:0":{"id": - 0,"tC":46.3, "tF":115.4},"wifi":{"sta_ip":null,"status":"disconnected","ssid":null,"rssi":0},"ws":{"connected":false}}' - recorded_at: Wed, 15 May 2024 06:47:17 GMT -recorded_with: VCR 6.2.0 + string: '{"ble":{},"bthome":{"errors":["bluetooth_disabled"]},"cloud":{"connected":true},"em:0":{"id":0,"a_current":0.618,"a_voltage":235.0,"a_act_power":13.7,"a_aprt_power":145.1,"a_pf":0.09,"a_freq":50.0,"b_current":0.655,"b_voltage":236.2,"b_act_power":4.8,"b_aprt_power":154.8,"b_pf":0.03,"b_freq":50.0,"c_current":0.622,"c_voltage":235.4,"c_act_power":0.0,"c_aprt_power":146.4,"c_pf":0.00,"c_freq":50.0,"n_current":null,"total_current":1.895,"total_act_power":18.505,"total_aprt_power":446.219, + "user_calibrated_phase":[]},"emdata:0":{"id":0,"a_total_act_energy":336829.73,"a_total_act_ret_energy":0.42,"b_total_act_energy":273976.01,"b_total_act_ret_energy":0.01,"c_total_act_energy":228855.72,"c_total_act_ret_energy":2445.70,"total_act":839661.46, + "total_act_ret":2446.13},"eth":{"ip":"192.168.178.83"},"modbus":{},"mqtt":{"connected":false},"sys":{"mac":"34987A45A6A0","restart_required":false,"time":"07:30","unixtime":1724218205,"uptime":449,"ram_size":247484,"ram_free":130448,"fs_size":524288,"fs_free":180224,"cfg_rev":36,"kvs_rev":2,"schedule_rev":0,"webhook_rev":2,"available_updates":{},"reset_reason":3},"temperature:0":{"id": + 0,"tC":47.0, "tF":116.7},"wifi":{"sta_ip":null,"status":"disconnected","ssid":null,"rssi":0},"ws":{"connected":false}}' + recorded_at: Wed, 21 Aug 2024 05:30:06 GMT +recorded_with: VCR 6.3.1 From 457cadfb787ee88e3331688404c8e199b22e1524 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 05:19:41 +0200 Subject: [PATCH 24/30] :arrow_up: Bump paambaati/codeclimate-action from 8.0.0 to 9.0.0 (#112) Bumps [paambaati/codeclimate-action](https://github.com/paambaati/codeclimate-action) from 8.0.0 to 9.0.0. - [Release notes](https://github.com/paambaati/codeclimate-action/releases) - [Changelog](https://github.com/paambaati/codeclimate-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/paambaati/codeclimate-action/compare/v8.0.0...v9.0.0) --- updated-dependencies: - dependency-name: paambaati/codeclimate-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d9c9f47..dfc694f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -39,7 +39,7 @@ jobs: run: bundle exec rspec - name: Send test coverage to CodeClimate - uses: paambaati/codeclimate-action@v8.0.0 + uses: paambaati/codeclimate-action@v9.0.0 if: ${{ env.CC_TEST_REPORTER_ID }} with: coverageCommand: true From 615fb16d4db79a6411254371a36a33b9478ea780 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 07:17:30 +0000 Subject: [PATCH 25/30] :arrow_up: Bump rexml from 3.3.5 to 3.3.6 (#113) Bumps [rexml](https://github.com/ruby/rexml) from 3.3.5 to 3.3.6. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.5...v3.3.6) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 57c516d..146f097 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM rb-inotify (0.11.1) ffi (~> 1.0) regexp_parser (2.9.2) - rexml (3.3.5) + rexml (3.3.6) strscan rspec (3.13.0) rspec-core (~> 3.13.0) From 8d33512592f3baa58749f1d8b27fe4027c622528 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 14:19:13 +0000 Subject: [PATCH 26/30] :arrow_up: Bump faraday from 2.10.1 to 2.11.0 (#114) Bumps [faraday](https://github.com/lostisland/faraday) from 2.10.1 to 2.11.0. - [Release notes](https://github.com/lostisland/faraday/releases) - [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md) - [Commits](https://github.com/lostisland/faraday/compare/v2.10.1...v2.11.0) --- updated-dependencies: - dependency-name: faraday dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 146f097..55fe6d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,10 +15,10 @@ GEM diff-lcs (1.5.1) docile (1.4.1) dotenv (3.1.2) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger - faraday-net_http (3.1.1) + faraday-net_http (3.3.0) net-http faraday-request-timer (0.2.0) faraday (>= 0.9.0) From 5f1bbaf3420c964ea70755a21949f2fa8276a59a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 14:19:20 +0000 Subject: [PATCH 27/30] :arrow_up: Bump faraday-net_http from 3.1.1 to 3.3.0 (#115) Bumps [faraday-net_http](https://github.com/lostisland/faraday-net_http) from 3.1.1 to 3.3.0. - [Release notes](https://github.com/lostisland/faraday-net_http/releases) - [Commits](https://github.com/lostisland/faraday-net_http/compare/v3.1.1...v3.3.0) --- updated-dependencies: - dependency-name: faraday-net_http dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From ed0c257a714c83d5650fe4028bfc0b417c858f24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 08:08:51 +0000 Subject: [PATCH 28/30] :arrow_up: Bump uri from 0.13.0 to 0.13.1 (#116) Bumps [uri](https://github.com/ruby/uri) from 0.13.0 to 0.13.1. - [Release notes](https://github.com/ruby/uri/releases) - [Commits](https://github.com/ruby/uri/compare/v0.13.0...v0.13.1) --- updated-dependencies: - dependency-name: uri dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 55fe6d0..012869e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,7 @@ GEM strscan (3.1.0) thor (1.3.1) unicode-display_width (2.5.0) - uri (0.13.0) + uri (0.13.1) vcr (6.3.1) base64 webmock (3.23.1) From bb954da51814d07e20eee8c19ade861e6e4e4dd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 23:17:07 +0000 Subject: [PATCH 29/30] :arrow_up: Bump thor from 1.3.1 to 1.3.2 (#117) Bumps [thor](https://github.com/rails/thor) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/rails/thor/releases) - [Commits](https://github.com/rails/thor/compare/v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: thor dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 012869e..4c54fab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -117,7 +117,7 @@ GEM simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) strscan (3.1.0) - thor (1.3.1) + thor (1.3.2) unicode-display_width (2.5.0) uri (0.13.1) vcr (6.3.1) From 2e3da0b591196b8fcc79df9c6e2d1e4435c92395 Mon Sep 17 00:00:00 2001 From: Georg Ledermann Date: Fri, 30 Aug 2024 07:32:45 +0200 Subject: [PATCH 30/30] :arrow_up: Bundler 2.5.18 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4c54fab..99773a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,4 +151,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.5.17 + 2.5.18