Merge branch 'release/0.8.0'

Author: ledermann

.env.example

@@ -10,4 +10,7 @@ INFLUX_SCHEMA=https
 INFLUX_PORT=443
 INFLUX_TOKEN=my-super-secret-write-token
 INFLUX_ORG=solectrus
+
+# Customize InfluxDB storage
 INFLUX_BUCKET=my-solectrus-bucket
+INFLUX_MEASUREMENT=SENEC

.env.test

@@ -9,3 +9,4 @@ INFLUX_PORT=8086
 INFLUX_TOKEN=my-token
 INFLUX_ORG=my-org
 INFLUX_BUCKET=my-bucket
+INFLUX_MEASUREMENT=my-pv-measurement

.github/workflows/automerge.yml

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

.gitignore

@@ -1 +1,2 @@
 .env
+.env.development.local

Dockerfile

@@ -29,4 +29,4 @@ WORKDIR /senec-collector
 COPY --from=Builder /usr/local/bundle/ /usr/local/bundle/
 COPY . /senec-collector/
 
-ENTRYPOINT bundle exec src/main.rb
+ENTRYPOINT bundle exec app/main.rb

Gemfile

@@ -13,7 +13,7 @@ gem 'senec'
 gem 'oj'
 
 group :development, :test do
-  # minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking (https://github.com/seattlerb/minitest)
+  # minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking (https://github.com/minitest/minitest)
   gem 'minitest'
 
   # Rake is a Make-like program implemented in Ruby (https://github.com/ruby/rake)
@@ -31,7 +31,7 @@ group :development, :test do
   # Automatic performance checking tool for Ruby code. (https://github.com/rubocop/rubocop-performance)
   gem 'rubocop-performance'
 
-  # Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests. (https://relishapp.com/vcr/vcr/docs)
+  # Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests. (https://benoittgt.github.io/vcr)
   gem 'vcr'
 
   # Library for stubbing HTTP requests in Ruby. (https://github.com/bblimke/webmock)

Gemfile.lock

@@ -13,33 +13,37 @@ GEM
       multi_xml (>= 0.5.2)
     influxdb-client (2.9.0)
     json (2.6.3)
+    language_server-protocol (3.17.0.3)
     mini_mime (1.1.2)
-    minitest (5.18.0)
+    minitest (5.18.1)
     multi_xml (0.6.0)
-    oj (3.14.3)
+    oj (3.15.0)
     parallel (1.23.0)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     public_suffix (5.0.1)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.8.0)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
-    rubocop (1.50.2)
+    rubocop (1.54.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.1)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-minitest (0.30.0)
+    rubocop-minitest (0.31.0)
       rubocop (>= 1.39, < 2.0)
-    rubocop-performance (1.17.1)
+    rubocop-performance (1.18.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
@@ -48,7 +52,7 @@ GEM
     senec (0.7.2)
       httparty
     unicode-display_width (2.4.2)
-    vcr (6.1.0)
+    vcr (6.2.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -72,4 +76,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.4.12
+   2.4.15

Rakefile

@@ -5,7 +5,7 @@ require 'dotenv'
 Dotenv.load('.env', '.env.test')
 
 Rake::TestTask.new :test do |t|
-  t.libs << 'test' << 'src'
+  t.libs << 'test' << 'app'
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
 end

src/config.rb app/config.rbsrc/config.rb renamed to app/config.rb

@@ -8,6 +8,7 @@
     :influx_token,
     :influx_org,
     :influx_bucket,
+    :influx_measurement,
     keyword_init: true,
   ) do
     def initialize(*options)
@@ -62,6 +63,7 @@ def self.from_env(options = {})
           influx_token: ENV.fetch('INFLUX_TOKEN'),
           influx_org: ENV.fetch('INFLUX_ORG'),
           influx_bucket: ENV.fetch('INFLUX_BUCKET'),
+          influx_measurement: ENV.fetch('INFLUX_MEASUREMENT', 'SENEC'),
         }.merge(options),
       )
     end

src/flux_writer.rb app/flux_writer.rbsrc/flux_writer.rb renamed to app/flux_writer.rb

@@ -28,7 +28,7 @@ def point(record)
   end
 
   def influx_measurement
-    'SENEC'
+    config.influx_measurement
   end
 
   def influx_client