puma-metrics 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6bfb3829a8b3f020867676ad2d06696602f9b3e9cdba9677c9d0cd96516d952
-  data.tar.gz: 9b22b853444c9f8eb9945582e6debd9676c0ac83487178fe056840c8cb438b96
+  metadata.gz: 7c27f15c1dd3aff32b53bfa540b7ba9b8f8f2d019e3142caf1eac4e80c451f69
+  data.tar.gz: 5cd3ea68ac8bf3c641c7d235a75425b9fa7c701c4b65f6b39a68a5a4dc71c293
 SHA512:
-  metadata.gz: 79d9e90b3dc95a9508622a6142a044dd682b072dcfd3971a2bfa06b5651ba414b2dd1667be0896779ae9a08be677d9607db2e0f6e3ba2f7417581c59e4be0b37
-  data.tar.gz: 38a134598cb7f50faded591f745832423aedcc9b4c7589a796ff25a67479104348675bc2e6dea82e2f08b440ba54616fc1d81951038aa6a6195cd922d84313e7
+  metadata.gz: b413c77b97c65017fe216e5b55d73671c13b8fa5b8d94a11e9d7514d0828b0d3f61c489f7d185d225e44048d1001ed0cf58f0e108b86bef7f3ff5c0ec0064a62
+  data.tar.gz: 2c496212669c58fbcdc90688e8c852dba1375bd89a956466ca8c882addffaaa1613fadc3632dd2e42b3cf7ce9240a6147366482774fe8a7a1fdfda41b10844c2

data/.github/workflows/workflow.yml

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

data/.rubocop.yml

@@ -5,16 +5,17 @@ Naming/FileName:
   Exclude:
     - puma-metrics.gemspec
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
+Lint/MissingSuper:
+  Exclude:
+    - lib/puma/metrics/parser.rb
+
 Style/Documentation:
   Enabled: false
 Style/NumericPredicate:
   Enabled: false
-Style/MethodMissingSuper:
-  Exclude:
-    - lib/puma/metrics/parser.rb
 Style/MissingRespondToMissing:
   Exclude:
     - lib/puma/metrics/parser.rb

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## 1.2.1
+
+Changes:
+- Drop support for ruby 2.5
+
+Housekeeping:
+- Update dependencies
+- Updates for Puma 5
+
 ## 1.2.0
 
 Changes:

data/Gemfile.lock

@@ -8,37 +8,37 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    childprocess (3.0.0)
+    ast (2.4.2)
+    childprocess (4.0.0)
     iniparse (1.5.0)
-    minitest (5.14.1)
-    nio4r (2.5.2)
-    overcommit (0.53.0)
-      childprocess (>= 0.6.3, < 4)
+    minitest (5.14.3)
+    nio4r (2.5.5)
+    overcommit (0.57.0)
+      childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
-    prometheus-client (2.0.0)
-    puma (4.3.5)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    prometheus-client (2.1.0)
+    puma (5.2.1)
       nio4r (~> 2.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.1)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
-    rubocop (0.85.1)
+    rubocop (1.10.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.7.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
@@ -52,4 +52,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   2.1.2
+   2.2.3

data/Rakefile

@@ -13,7 +13,7 @@ task :server do
   require 'puma'
   require 'puma/configuration'
   require 'puma/events'
-  require 'puma/plugin/metrics.rb'
+  require 'puma/plugin/metrics'
 
   configuration = Puma::Configuration.new do |config|
     config.bind 'tcp://127.0.0.1:0'
@@ -25,7 +25,7 @@ task :server do
     end
   end
 
-  events = Puma::Events.new STDOUT, STDERR
+  events = Puma::Events.new $stdout, $stderr
   launcher = Puma::Launcher.new(configuration, events: events)
   launcher.run
 end

data/lib/puma/metrics/app.rb

@@ -10,7 +10,7 @@ module Puma
       def initialize(launcher)
         @launcher = launcher
         clustered = (@launcher.options[:workers] || 0) > 0
-        @parser = Parser.new clustered
+        @parser = Parser.new(clustered: clustered)
       end
 
       def call(_env)

data/lib/puma/metrics/parser.rb

@@ -5,7 +5,7 @@ require 'prometheus/client'
 module Puma
   module Metrics
     class Parser
-      def initialize(clustered = false)
+      def initialize(clustered: false)
         register_default_metrics
         register_clustered_metrics if clustered
       end

data/lib/puma/metrics/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Metrics
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/lib/puma/plugin/metrics.rb

@@ -26,7 +26,9 @@ Puma::Plugin.create do
 
     launcher.events.register(:state) do |state|
       if %i[halt restart stop].include?(state)
+        # rubocop:disable Style/SoleNestedConditional
         metrics.stop(true) unless metrics.shutting_down?
+        # rubocop:enable Style/SoleNestedConditional
       end
     end
 

data/puma-metrics.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
+  spec.required_ruby_version = '>= 2.6'
+
   spec.add_runtime_dependency 'prometheus-client', '>= 0.10'
   spec.add_runtime_dependency 'puma', '>= 3.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-metrics
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Harm-Jan Blok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client
@@ -142,14 +142,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Puma plugin to export puma stats as prometheus metrics