Merge branch 'release/0.3.9'

solectrus · Apr 26, 2024 · 57835bf · 57835bf
2 parents 60b2b81 + 3b81ae8
commit 57835bf
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 43 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,8 +1,17 @@
+.dockerignore
+.env
+.env.*
 .git
 .github
 .gitignore
-.env.*
-.env
-spec
-Rakefile
+.rspec
+.rubocop.yml
+.ruby-lsp
+.vscode
+**/.DS_Store
+compose.yml
+coverage
 Dockerfile
+Guardfile
+Rakefile
+spec
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.1.0
         with:
           github-token: '${{ secrets.PAT }}'
 

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -91,6 +91,7 @@ jobs:
         with:
           context: .
           platforms: linux/amd64,linux/arm64,linux/arm/v7
+          provenance: false
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -3,7 +3,7 @@ require:
   - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: 3.3
   Exclude:
     - Gemfile
     - spec/spec_helper.rb

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.3
+3.3.1
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.2.3-alpine AS Builder
+FROM ruby:3.3.1-alpine AS Builder
 RUN apk add --no-cache build-base
 
 WORKDIR /csv-importer
@@ -9,7 +9,7 @@ RUN bundle config --local frozen 1 && \
     bundle install -j4 --retry 3 && \
     bundle clean --force
 
-FROM ruby:3.2.3-alpine
+FROM ruby:3.3.1-alpine
 LABEL maintainer="georg@ledermann.dev"
 
 # Decrease memory usage

diff --git a/Gemfile b/Gemfile
@@ -12,8 +12,11 @@ gem 'activesupport'
 # Timezone Data for TZInfo (https://tzinfo.github.io)
 gem 'tzinfo-data'
 
+# CSV Reading and Writing (https://github.com/ruby/csv)
+gem 'csv'
+
 group :development, :test do
-  # rspec-3.12.0 (http://github.com/rspec)
+  # rspec-3.13.0 (http://github.com/rspec)
   gem 'rspec'
 
   # Rake is a Make-like program implemented in Ruby (https://github.com/ruby/rake)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -15,72 +15,75 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    diff-lcs (1.5.0)
+    csv (3.3.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    dotenv (2.8.1)
-    drb (2.2.0)
-      ruby2_keywords
+    dotenv (3.1.0)
+    drb (2.2.1)
     hashdiff (1.1.0)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    influxdb-client (3.0.0)
-    json (2.7.1)
+    influxdb-client (3.1.0)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    minitest (5.21.2)
+    minitest (5.22.3)
     mutex_m (0.2.0)
     parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     regexp_parser (2.9.0)
     rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.60.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.63.3)
       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 (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.26.1)
+    rubocop-rspec (2.29.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -89,11 +92,11 @@ GEM
     simplecov_json_formatter (0.1.4)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.4)
+    tzinfo-data (1.2024.1)
       tzinfo (>= 1.0.0)
     unicode-display_width (2.5.0)
     vcr (6.2.0)
-    webmock (3.19.1)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -103,6 +106,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
+  csv
   dotenv
   influxdb-client
   rake
@@ -116,4 +120,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.5.5
+   2.5.7