puma-metrics 1.2.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d94599f1e1f6122a9c32299fbd2de2fd78ae83a8c18dbb829dad0d7f218accc
-  data.tar.gz: 52225951970b80e56d434618aa2485271c8338647e6365406b0997a0f7af8f28
+  metadata.gz: 62e3de86b6315055d1bbf4e7c53515bd87e47833aca338097fa0c2a8783bd0c8
+  data.tar.gz: c1048475d72f6c3941fa461c64de585b45a1c91e7b8834445682a406ef7f0fe5
 SHA512:
-  metadata.gz: 9988478439070835936df32285974dcbc220f3ae66ef6806e19a225e4a768612c89064386db463ac054b592f16362055737cd5cf6c9ec4a1620120064fbf0b55
-  data.tar.gz: a20b275c9eea062d0a4a06b22fc0569c23a9a32ce5c6a754873d8d611e79839d9cbc41a73b11e22e0dd493c33660b0201440dd6676083952476725fab1dd018c
+  metadata.gz: 0cddd5ba2b38e1e8c19d50b1a9b6b8a99ead6c5eeb23a6a44937a5513ce3229a3b15440132cd32014114cc7cc76d010382dde9e9ab4d7fae2c5e710612e4f005
+  data.tar.gz: d798de78c1177fb7018fe80d8fa1cc721782ef526c522c6122b2065391399a710b66ff4b6ef10e495db59263ef9ba1c317801e6ddc0dae018e364d05fe8cb630

data/.github/workflows/workflow.yml

@@ -23,7 +23,7 @@ jobs:
       run: bundle exec overcommit --run
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1']
+        ruby: ['3.0', '3.1', '3.2', '3.3']
   deploy:
     if: github.ref == 'refs/heads/main'
     name: to rubygems
@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@master
     - uses: ruby/setup-ruby@master
       with:
-        ruby-version: 3.1
+        ruby-version: 3.3
     - env:
         RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
       run: |

data/.rubocop.yml

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

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## Unreleased
 
+## 1.4.0
+
+Housekeeping:
+- Drop support for ruby 2.7
+- Add support for ruby 3.3
+- Update dependencies
+
+## 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:

data/Gemfile

@@ -2,3 +2,9 @@
 
 source 'https://rubygems.org'
 gemspec
+
+gem 'bundler', '>= 2.0.0'
+gem 'minitest'
+gem 'overcommit'
+gem 'rake'
+gem 'rubocop'

data/Gemfile.lock

@@ -1,51 +1,57 @@
 PATH
   remote: .
   specs:
-    puma-metrics (1.2.5)
+    puma-metrics (1.4.0)
       prometheus-client (>= 0.10)
-      puma (>= 3.0)
+      puma (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    childprocess (4.1.0)
+    childprocess (5.0.0)
     iniparse (1.5.0)
-    minitest (5.15.0)
-    nio4r (2.5.8)
-    overcommit (0.59.1)
-      childprocess (>= 0.6.3, < 5)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    minitest (5.22.2)
+    nio4r (2.7.0)
+    overcommit (0.62.0)
+      childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (~> 3.2)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
-    prometheus-client (4.0.0)
-    puma (5.6.4)
+      racc
+    prometheus-client (4.2.2)
+    puma (6.4.2)
       nio4r (~> 2.0)
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rubocop (1.30.0)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rubocop (1.60.2)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      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.18.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
+  bundler (>= 2.0.0)
   minitest
   overcommit
   puma-metrics!
@@ -53,4 +59,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   2.2.15
+   2.5.6

data/README.md

@@ -1,6 +1,6 @@
 # puma-metrics
 
-[![Build Status](https://travis-ci.org/harmjanblok/puma-metrics.svg?branch=master)](https://travis-ci.org/harmjanblok/puma-metrics)
+[![Release](https://github.com/harmjanblok/puma-metrics/actions/workflows/workflow.yml/badge.svg)](https://github.com/harmjanblok/puma-metrics/actions/workflows/workflow.yml)
 
 A puma plugin to export Puma's internal statistics as Prometheus metrics.
 

data/lib/puma/metrics/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Metrics
-    VERSION = '1.2.5'
+    VERSION = '1.4.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,14 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.metadata['rubygems_mfa_required'] = 'false'
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.add_runtime_dependency 'prometheus-client', '>= 0.10'
-  spec.add_runtime_dependency 'puma', '>= 5.0'
-
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'overcommit'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rubocop'
+  spec.add_runtime_dependency 'puma', '>= 6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-metrics
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Harm-Jan Blok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client
@@ -30,84 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: overcommit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 description: Puma plugin to export puma stats as prometheus metrics
 email: 
 executables: []
@@ -144,14 +74,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Puma plugin to export puma stats as prometheus metrics