gems: update rubocop-rspec requirement from ~> 3.6.0 to ~> 3.7.0

Updates the requirements on [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) to permit the latest version.
- [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.6.0...v3.7.0)

---
updated-dependencies:
- dependency-name: rubocop-rspec
  dependency-version: 3.7.0
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -0,0 +1,13 @@
+---
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "gems"
+    labels: ["dependabot"]
+    open-pull-requests-limit: 10
+    pull-request-branch-name:
+      separator: "-"

.github/renovate.json5

@@ -0,0 +1,42 @@
+{
+  extends: [
+    "config:recommended",
+    ":dependencyDashboard",
+    ":prHourlyLimitNone",
+    ":prConcurrentLimitNone",
+    ":label(dependency-upgrade)",
+  ],
+  schedule: ["before 8am on thursday"],
+  branchPrefix: "renovate-",
+  dependencyDashboardHeader: "View repository job log [here](https://app.renovatebot.com/dashboard#github/cmur2/dyndnsd).",
+  separateMinorPatch: true,
+  commitMessagePrefix: "project: ",
+  commitMessageAction: "update",
+  commitMessageTopic: "{{depName}}",
+  commitMessageExtra: "to {{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}",
+  packageRules: [
+    // Ruby dependencies are managed by dependabot (previously depfu, until PR creation failed)
+    {
+      matchManagers: ["bundler"],
+      enabled: false,
+    },
+    // Commit message formats
+    {
+      matchDatasources: ["docker"],
+      commitMessagePrefix: "docker: ",
+    },
+    {
+      matchManagers: ["github-actions"],
+      commitMessagePrefix: "ci: ",
+    },
+  ],
+  customManagers: [
+    {
+      customType: "regex",
+      fileMatch: ["\.rb$", "^Rakefile$"],
+      matchStrings: [
+        "renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s.*_version = '(?<currentValue>.*)'\\s"
+      ]
+    },
+  ],
+}

.github/workflows/ci.yml

@@ -14,15 +14,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby-version:
-        - '2.5'
-        - '2.6'
-        - '2.7'
         - '3.0'
         - '3.1'
+        - '3.2'
+        - '3.3'
+        - '3.4'
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@v1
       with:

.rubocop.yml

@@ -1,11 +1,14 @@
-require:
+plugins:
 - rubocop-rake
 - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: '2.5'
+  TargetRubyVersion: 3.0'
   NewCops: enable
 
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
+
 Gemspec/RequireMFA:
   Enabled: false
 
@@ -97,7 +100,10 @@ Style/SymbolArray:
 RSpec/ExampleLength:
   Max: 10
 
-RSpec/FilePath:
+#RSpec/FilePath:
+#  Enabled: false
+
+RSpec/SpecFilePathFormat:
   CustomTransform:
     OpenVPNStatusWeb: openvpn-status-web
 

README.md

@@ -1,6 +1,6 @@
 # openvpn-status-web
 
-![ci](https://github.com/cmur2/openvpn-status-web/workflows/ci/badge.svg) [![Depfu](https://badges.depfu.com/badges/c264e2f70f2a19c43f880ddcb4a12ba8/overview.svg)](https://depfu.com/github/cmur2/openvpn-status-web?project_id=6194)
+![ci](https://github.com/cmur2/openvpn-status-web/workflows/ci/badge.svg)
 
 ## Description
 
@@ -61,7 +61,31 @@ If the information exposed is important to you serve it via the VPN or use a web
 
 There is a [Dockerfile](docs/Dockerfile) that can be used to build a Docker image for running openvpn-status-web.
 
-The [Debian 6 init script](docs/debian-init-openvpn-status-web) assumes that openvpn-status-web is installed into the system ruby (no RVM support) and the config.yaml is at `/opt/openvpn-status-web/config.yaml`. Modify to your needs.
+This can for example be used with `docker-compose` via:
+
+```yaml
+version: "2.4"
+services:
+  openvpn-status-web:
+    image: your-selfbuilt-docker-image
+    user: root  # needed since the default status files are chmod 600
+    volumes:
+    - /path/to/host/config.yml:/etc/openvpn-status-web/config.yml:ro
+    - /run/openvpn-server:/run/openvpn-server
+    ports:
+    - "8080:8080"
+```
+
+The `/path/to/host/config.yml` could be:
+
+```yaml
+host: "0.0.0.0"
+port: "8080"
+vpns:
+  my-cool-vpn:  # the following depends on your setup
+    version: 2
+    status_file: "/run/openvpn-server/status-my-cool-vpn.log"
+```
 
 ## License
 

Rakefile

@@ -3,11 +3,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
-require 'bundler/audit/task'
 
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
-Bundler::Audit::Task.new
 
 desc 'Run experimental solargraph type checker'
 task :solargraph do
@@ -21,7 +19,14 @@ namespace :solargraph do
   end
 end
 
-task default: [:rubocop, :spec, 'bundle:audit', :solargraph]
+namespace :bundle do
+  desc 'Check for vulnerabilities with bundler-audit'
+  task :audit do
+    sh 'bundler-audit check --ignore GHSA-vvfq-8hwr-qm4m' if !RUBY_VERSION.start_with?('3.0')
+  end
+end
+
+task default: [:rubocop, :spec, 'bundle:audit']
 
 desc 'Run all tasks desired for CI'
 task ci: ['solargraph:init', :default]

docs/Dockerfile

@@ -1,8 +1,8 @@
-FROM alpine:3.13
+FROM alpine:3.22
 
 EXPOSE 8080
 
-ENV VERSION=3.2.1
+ENV VERSION=3.4.0
 
 RUN apk --no-cache add openssl ca-certificates && \
     apk --no-cache add ruby ruby-etc ruby-webrick && \

lib/openvpn-status-web.rb

@@ -7,9 +7,10 @@ require 'logger'
 require 'ipaddr'
 require 'yaml'
 require 'rack'
+require 'rackup'
 require 'erb'
 require 'metriks'
-require 'better_errors' if ENV['RACK_ENV'] == 'development'
+require 'better_errors' if ENV.fetch('RACK_ENV', nil) == 'development'
 
 require 'openvpn-status-web/status'
 require 'openvpn-status-web/parser/v1'
@@ -128,21 +129,21 @@ module OpenVPNStatusWeb
 
       # configure rack
       app = Daemon.new(config['vpns'])
-      if ENV['RACK_ENV'] == 'development'
+      if ENV.fetch('RACK_ENV', nil) == 'development'
         app = BetterErrors::Middleware.new(app)
         BetterErrors.application_root = File.expand_path(__dir__)
       end
 
       Signal.trap('INT') do
         OpenVPNStatusWeb.logger.info 'Quitting...'
-        Rack::Handler::WEBrick.shutdown
+        Rackup::Handler::WEBrick.shutdown
       end
       Signal.trap('TERM') do
         OpenVPNStatusWeb.logger.info 'Quitting...'
-        Rack::Handler::WEBrick.shutdown
+        Rackup::Handler::WEBrick.shutdown
       end
 
-      Rack::Handler::WEBrick.run app, Host: config['host'], Port: config['port']
+      Rackup::Handler::WEBrick.run app, Host: config['host'], Port: config['port']
     end
   end
 end

lib/openvpn-status-web/parser/modern_stateless.rb

@@ -13,10 +13,10 @@ module OpenVPNStatusWeb
 
         text.lines.each do |line|
           parts = line.strip.split(sep)
-          status.client_list_headers = parts[2..-1] if parts[0] == 'HEADER' && parts[1] == 'CLIENT_LIST'
-          status.client_list << parse_client(parts[1..-1], status.client_list_headers) if parts[0] == 'CLIENT_LIST'
-          status.routing_table_headers = parts[2..-1] if parts[0] == 'HEADER' && parts[1] == 'ROUTING_TABLE'
-          status.routing_table << parse_route(parts[1..-1], status.routing_table_headers) if parts[0] == 'ROUTING_TABLE'
+          status.client_list_headers = parts[2..] if parts[0] == 'HEADER' && parts[1] == 'CLIENT_LIST'
+          status.client_list << parse_client(parts[1..], status.client_list_headers) if parts[0] == 'CLIENT_LIST'
+          status.routing_table_headers = parts[2..] if parts[0] == 'HEADER' && parts[1] == 'ROUTING_TABLE'
+          status.routing_table << parse_route(parts[1..], status.routing_table_headers) if parts[0] == 'ROUTING_TABLE'
           status.global_stats << parse_global(parts[1..2]) if parts[0] == 'GLOBAL_STATS'
         end
 

lib/openvpn-status-web/parser/v1.rb

@@ -27,9 +27,9 @@ module OpenVPNStatusWeb
 
         status = Status.new
         status.client_list_headers = ['Common Name', 'Real Address', 'Data Received', 'Data Sent', 'Connected Since']
-        status.client_list = client_list[2..-1].map { |client| parse_client(client) }
+        status.client_list = client_list[2..].map { |client| parse_client(client) }
         status.routing_table_headers = ['Virtual Address', 'Common Name', 'Real Address', 'Last Ref']
-        status.routing_table = routing_table[1..-1].map { |route| parse_route(route) }
+        status.routing_table = routing_table[1..].map { |route| parse_route(route) }
         status.global_stats = global_stats.map { |global| parse_global(global) }
         status
       end

lib/openvpn-status-web/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenVPNStatusWeb
-  VERSION = '3.2.1'
+  VERSION = '3.4.0'
 end

openvpn-status-web.gemspec

@@ -24,11 +24,12 @@ Gem::Specification.new do |s|
   s.executables = ['openvpn-status-web']
   s.extra_rdoc_files = Dir['README.md', 'LICENSE']
 
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 3.0'
 
-  s.add_runtime_dependency 'metriks'
-  s.add_runtime_dependency 'rack', '~> 2.0'
-  s.add_runtime_dependency 'webrick', '>= 1.6.1'
+  s.add_dependency 'metriks'
+  s.add_dependency 'rack', '~> 3.0'
+  s.add_dependency 'rackup', '~> 2'
+  s.add_dependency 'webrick', '>= 1.6.1'
 
   s.add_development_dependency 'better_errors'
   s.add_development_dependency 'binding_of_caller'
@@ -37,8 +38,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop', '~> 1.24.0'
-  s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 2.7.0'
-  s.add_development_dependency 'solargraph', '~> 0.44.0'
+  s.add_development_dependency 'rubocop', '~> 1.80.0'
+  s.add_development_dependency 'rubocop-rake', '~> 0.7.1'
+  s.add_development_dependency 'rubocop-rspec', '~> 3.7.0'
+  s.add_development_dependency 'solargraph', '~> 0.50.0'
 end

spec/openvpn-status-web/parser/modern_stateless_spec.rb

@@ -7,7 +7,7 @@ describe OpenVPNStatusWeb::Parser::ModernStateless do
     2 => status_v2,
     3 => status_v3
   }.each do |version, status|
-    context "for status-version #{version}" do
+    context "when status-version #{version}" do
       context 'with client list' do
         it 'parses common names' do
           expect(status.client_list.map { |client| client[0] }).to eq(%w[foo bar])