puma-metrics 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca04f9fbdb4d46c6d48039194b6df316412399347e295baa0b7ffa6d58fbf70e
-  data.tar.gz: 169662435570a490c711292deff5f9ae6d475a5a9cb6fd90945949e47ace16b9
+  metadata.gz: 281a221460d65fa0f625f5041e1482541c5048b80e1114e01816941991657391
+  data.tar.gz: 90f40b6fa61d0fa6b624a74673e3aa94aece5da184182c6f64255b4aab58698e
 SHA512:
-  metadata.gz: e1f361d5271ae1906dcf4c9235522b2059716ccce8317bece35de23c7ca41aa68eac9cfeb1af2c0148a386d09e8841b02a0b3f93a9837138cea6d77b62404b38
-  data.tar.gz: 0ee3cce82e4482b9ab79cef06ecec083314e50456138949afb7faa464735a68968943f281d45c38a585f7cbda3ff9612aa10c31e0f1b4e3dc434f4eefecc86fe
+  metadata.gz: c51c282abb10956a44b24445f47cd58632823c0fbee79cc14a291510d5768fc846b5815c8dbaa8b6bd73473e6a027a550649b57f15713190eb55e76602abccab
+  data.tar.gz: d7403ce98b4cbe701b467463f8439b8ed24e2b108a2d34e39987d9c14fc2da7314d1f181ac0b52ef4b6a346cd8472a4222aed45bcb42955df6e34ab2c97dade8

data/.github/workflows/workflow.yml

@@ -1,5 +1,9 @@
 name: steps
-on: [push]
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
 jobs:
   test:
     name: test on ruby ${{ matrix.ruby }}
@@ -19,9 +23,9 @@ jobs:
       run: bundle exec overcommit --run
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1']
+        ruby: ['2.7', '3.0', '3.1']
   deploy:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     name: to rubygems
     needs: test
     runs-on: ubuntu-latest

data/.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Gemspec/RequireMFA:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+## 1.3.0
+
+Changes:
+- Added support for puma 6.0 or newer (#43)
+
+Housekeeping:
+- Drop support for ruby 2.6
+- Update dependencies
+
+## 1.2.5
+
+Changes:
+- Require puma 5.0 or newer as older versions don't support the `on_stopped` introduced in version puma-metrics 1.2.4.
+
+Housekeeping:
+- Update dependencies
+
 ## 1.2.4
 
 Changes:

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    puma-metrics (1.2.3)
+    puma-metrics (1.3.0)
       prometheus-client (>= 0.10)
-      puma (>= 3.0)
+      puma (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -11,35 +11,37 @@ GEM
     ast (2.4.2)
     childprocess (4.1.0)
     iniparse (1.5.0)
-    minitest (5.15.0)
+    json (2.6.2)
+    minitest (5.16.3)
     nio4r (2.5.8)
-    overcommit (0.58.0)
+    overcommit (0.59.1)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
       rexml (~> 3.2)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    prometheus-client (3.0.0)
-    puma (5.6.2)
+    prometheus-client (4.0.0)
+    puma (6.0.0)
       nio4r (~> 2.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
-    rubocop (1.25.1)
+    rubocop (1.37.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   ruby
@@ -53,4 +55,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   2.2.15
+   2.3.24

data/lib/puma/metrics/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Metrics
-    VERSION = '1.2.4'
+    VERSION = '1.3.0'
   end
 end

data/lib/puma/plugin/metrics.rb

@@ -12,13 +12,11 @@ Puma::Plugin.create do
     app = Puma::Metrics::App.new launcher
     uri = URI.parse str
 
-    metrics = Puma::Server.new app, launcher.events
-    metrics.min_threads = 0
-    metrics.max_threads = 1
+    metrics = Puma::Server.new app, launcher.events, min_threads: 0, max_threads: 1
 
     case uri.scheme
     when 'tcp'
-      launcher.events.log "* Starting metrics server on #{str}"
+      launcher.log_writer.log "* Starting metrics server on #{str}"
       metrics.add_tcp_listener uri.host, uri.port
     else
       launcher.events.error "Invalid control URI: #{str}"

data/puma-metrics.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
 
   spec.metadata['rubygems_mfa_required'] = 'false'
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.add_runtime_dependency 'prometheus-client', '>= 0.10'
-  spec.add_runtime_dependency 'puma', '>= 3.0'
+  spec.add_runtime_dependency 'puma', '>= 6.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'minitest'

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-metrics
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Harm-Jan Blok
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Puma plugin to export puma stats as prometheus metrics
-email:
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -130,12 +130,13 @@ files:
 - lib/puma/metrics/version.rb
 - lib/puma/plugin/metrics.rb
 - puma-metrics.gemspec
+- renovate.json
 homepage: https://github.com/harmjanblok/puma-metrics
 licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'false'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -143,15 +144,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: Puma plugin to export puma stats as prometheus metrics
 test_files: []