diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index aa3b982..dd13f41 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -97,3 +97,5 @@ jobs: BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }} VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} + cache-from: type=gha + cache-to: type=gha,mode=max diff --git a/.ruby-version b/.ruby-version index be94e6f..b347b11 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.2.3 diff --git a/Dockerfile b/Dockerfile index d24335c..5ac6c5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.2-alpine AS Builder +FROM ruby:3.2.3-alpine AS Builder RUN apk add --no-cache build-base WORKDIR /forecast-collector @@ -8,7 +8,7 @@ RUN bundle config --local frozen 1 && \ bundle install -j4 --retry 3 && \ bundle clean --force -FROM ruby:3.2.2-alpine +FROM ruby:3.2.3-alpine LABEL maintainer="georg@ledermann.dev" # Decrease memory usage diff --git a/Gemfile.lock b/Gemfile.lock index 08cd231..4d59606 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,51 +1,50 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - base64 (0.1.1) climate_control (1.2.0) crack (0.4.5) rexml docile (1.4.0) dotenv (2.8.1) - hashdiff (1.0.1) - influxdb-client (2.9.0) - json (2.6.3) + hashdiff (1.1.0) + influxdb-client (3.0.0) + json (2.7.1) language_server-protocol (3.17.0.3) - minitest (5.20.0) + minitest (5.21.2) minitest-silence (0.2.4) minitest (~> 5.12) - parallel (1.23.0) - parser (3.2.2.3) + parallel (1.24.0) + parser (3.3.0.5) ast (~> 2.4.1) racc - public_suffix (5.0.3) - racc (1.7.1) + public_suffix (5.0.4) + racc (1.7.3) rainbow (3.1.1) - rake (13.0.6) - regexp_parser (2.8.1) + rake (13.1.0) + regexp_parser (2.9.0) rexml (3.2.6) - rubocop (1.56.3) - base64 (~> 0.1.1) + rubocop (1.60.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-minitest (0.32.1) + rubocop-minitest (0.34.5) rubocop (>= 1.39, < 2.0) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-performance (1.20.2) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) ruby-progressbar (1.13.0) @@ -55,7 +54,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) vcr (6.2.0) webmock (3.19.1) addressable (>= 2.8.0) @@ -81,4 +80,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.4.19 + 2.5.5 diff --git a/LICENSE b/LICENSE index a943813..32f7a76 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Georg Ledermann +Copyright (c) 2020-2024 Georg Ledermann Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 78881e3..209a6a5 100644 --- a/README.md +++ b/README.md @@ -28,4 +28,4 @@ https://github.com/solectrus/hosting ## License -Copyright (c) 2020,2023 Georg Ledermann, released under the MIT License +Copyright (c) 2020-2024 Georg Ledermann, released under the MIT License diff --git a/app/main.rb b/app/main.rb index 4876df4..1991f3b 100755 --- a/app/main.rb +++ b/app/main.rb @@ -11,7 +11,7 @@ "Version #{ENV.fetch('VERSION', '')}, " \ "built at #{ENV.fetch('BUILDTIME', '')}" puts 'https://github.com/solectrus/forecast-collector' -puts 'Copyright (c) 2020,2023 Georg Ledermann, released under the MIT License' +puts 'Copyright (c) 2020-2024 Georg Ledermann, released under the MIT License' puts "\n" config = Config.from_env diff --git a/test/forecast_test.rb b/test/forecast_test.rb index 4ba4263..dbe79c1 100644 --- a/test/forecast_test.rb +++ b/test/forecast_test.rb @@ -12,10 +12,10 @@ def test_fetch_data_success VCR.use_cassette('forecast_solar_success') do data = forecast.fetch_data - assert data.is_a?(Hash) + assert_kind_of Hash, data data.each do |key, value| - assert key.is_a?(Integer) - assert value.is_a?(Integer) + assert_kind_of Integer, key + assert_kind_of Integer, value end end end