Merge branch 'release/0.6.0'

Author: ledermann

.github/workflows/automerge.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.3.0
+        uses: dependabot/fetch-metadata@v2.4.0
         with:
           github-token: '${{ secrets.PAT }}'
 

.github/workflows/push.yml

@@ -19,7 +19,6 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
       CI: true
 
     steps:
@@ -37,11 +36,10 @@ jobs:
       - name: Run tests
         run: bundle exec rake test
 
-      - name: Send test coverage to CodeClimate
-        uses: paambaati/codeclimate-action@v9.0.0
-        if: ${{ env.CC_TEST_REPORTER_ID }}
+      - uses: qltysh/qlty-action/coverage@v1
         with:
-          coverageCommand: true
+          token: ${{ secrets.QLTY_COVERAGE_TOKEN }}
+          files: coverage/.resultset.json
 
   build:
     runs-on: ubuntu-latest

.ruby-version

@@ -1 +1 @@
-3.4.3
+3.4.5

Dockerfile

@@ -1,21 +1,34 @@
-FROM ruby:3.4.3-alpine AS builder
+FROM ruby:3.4.5-alpine AS builder
 RUN apk add --no-cache build-base
 
 WORKDIR /forecast-collector
 COPY Gemfile* /forecast-collector/
-RUN bundle config --local frozen 1 && \
-    bundle config --local without 'development test' && \
-    bundle install -j4 --retry 3 && \
-    bundle clean --force
-
-FROM ruby:3.4.3-alpine
+RUN bundle config set path /usr/local/bundle && \
+    bundle config set without 'development test' && \
+    bundle install --jobs $(nproc) --retry 3 && \
+    bundle clean --force && \
+    # Remove unneeded files from installed gems (cache, .git, *.o, *.c)
+    rm -rf /usr/local/bundle/ruby/*/cache && \
+    rm -rf /usr/local/bundle/ruby/*/gems/*/.git && \
+    find /usr/local/bundle -type f \( \
+    -name '*.c' -o \
+    -name '*.o' -o \
+    -name '*.log' -o \
+    -name 'gem_make.out' \
+    \) -delete && \
+    find /usr/local/bundle -name '*.so' -exec strip --strip-unneeded {} +
+
+FROM ruby:3.4.5-alpine
 LABEL maintainer="georg@ledermann.dev"
 
 # Add tzdata to get correct timezone
 RUN apk add --no-cache tzdata
 
-# Decrease memory usage
-ENV MALLOC_ARENA_MAX=2
+ENV \
+    # Decrease memory usage
+    MALLOC_ARENA_MAX=2 \
+    # Enable YJIT
+    RUBYOPT=--yjit
 
 # Move build arguments to environment variables
 ARG BUILDTIME

Gemfile.lock

@@ -4,51 +4,51 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.3)
-    base64 (0.2.0)
-    bigdecimal (3.1.9)
+    base64 (0.3.0)
+    bigdecimal (3.2.2)
     climate_control (1.2.0)
     crack (1.0.0)
       bigdecimal
       rexml
-    csv (3.3.4)
+    csv (3.3.5)
     docile (1.4.1)
     dotenv (3.1.8)
-    hashdiff (1.1.2)
+    hashdiff (1.2.0)
     influxdb-client (3.2.0)
       csv
-    json (2.10.2)
-    language_server-protocol (3.17.0.4)
+    json (2.13.2)
+    language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
     minitest (5.25.5)
     minitest-silence (0.2.4)
       minitest (~> 5.12)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     prism (1.4.0)
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
     regexp_parser (2.10.0)
     rexml (3.4.1)
-    rubocop (1.75.2)
+    rubocop (1.79.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
-    rubocop-minitest (0.38.0)
+    rubocop-minitest (0.38.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
@@ -64,7 +64,7 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
@@ -98,4 +98,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.6.8
+   2.7.1

README.md

@@ -1,7 +1,7 @@
 [![Continuous integration](https://github.com/solectrus/forecast-collector/actions/workflows/push.yml/badge.svg)](https://github.com/solectrus/forecast-collector/actions/workflows/push.yml)
-[![Maintainability](https://api.codeclimate.com/v1/badges/7c9a88a5ce7dacfa8781/maintainability)](https://codeclimate.com/github/solectrus/forecast-collector/maintainability)
+[![Maintainability](https://qlty.sh/gh/solectrus/projects/forecast-collector/maintainability.svg)](https://qlty.sh/gh/solectrus/projects/forecast-collector)
 [![wakatime](https://wakatime.com/badge/user/697af4f5-617a-446d-ba58-407e7f3e0243/project/40d80ef4-7f52-4e68-a361-ed42d887c5e2.svg)](https://wakatime.com/badge/user/697af4f5-617a-446d-ba58-407e7f3e0243/project/40d80ef4-7f52-4e68-a361-ed42d887c5e2)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/7c9a88a5ce7dacfa8781/test_coverage)](https://codeclimate.com/github/solectrus/forecast-collector/test_coverage)
+[![Code Coverage](https://qlty.sh/gh/solectrus/projects/forecast-collector/coverage.svg)](https://qlty.sh/gh/solectrus/projects/forecast-collector)
 
 # Forecast collector
 

app/flux_writer.rb

@@ -7,10 +7,6 @@ def initialize(config:)
 
   attr_reader :config
 
-  def self.push(config:, data:)
-    new(config:).push(data)
-  end
-
   def push(data)
     return unless data
 
@@ -32,6 +28,10 @@ def push(data)
     )
   end
 
+  def ready?
+    influx_client.ping.status == 'ok'
+  end
+
   private
 
   def influx_measurement

app/loop.rb

@@ -13,11 +13,13 @@ def initialize(config:)
 
   attr_reader :config
 
-  def self.start(config:, max_count: nil)
-    new(config:).start(max_count)
+  def self.start(config:, max_count: nil, max_wait: 12)
+    new(config:).start(max_count:, max_wait:)
   end
 
-  def start(max_count)
+  def start(max_count: nil, max_wait: nil)
+    return unless influx_ready?(max_wait)
+
     self.count = 0
     forecast = make_forecast
     loop do
@@ -38,11 +40,31 @@ def start(max_count)
 
   attr_accessor :count
 
+  def influx_ready?(max_wait)
+    print 'Wait until InfluxDB is ready ...'
+
+    count = 0
+    until (ready = flux_writer.ready?) || (max_wait && count >= max_wait)
+      print '.'
+      count += 1
+      sleep 5
+    end
+
+    if ready
+      puts ' OK'
+      puts
+      true
+    else
+      puts "\nInfluxDB not ready after #{count * 5} seconds - aborting."
+      false
+    end
+  end
+
   def push_to_influx(data)
     return unless data
 
     print '  Pushing forecast to InfluxDB ... '
-    FluxWriter.push(config:, data:)
+    flux_writer.push(data)
     puts 'OK'
   end
 
@@ -54,4 +76,8 @@ def make_forecast
       Solcast.new(config:)
     end
   end
+
+  def flux_writer
+    @flux_writer ||= FluxWriter.new(config:)
+  end
 end