Merge pull request #3 from bmedenwald/LIB-122/puma-5

LIB-122: Version 1.0.0 (Allow for Puma 5.x)

.github/workflows/tests.yml

@@ -0,0 +1,36 @@
+name: tests
+on: [pull_request]
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.7.6, 3.0.4, 3.1.2]
+    env:
+      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      RAILS_ENV: test
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - name: Install Code Climate
+        run: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+          ./cc-test-reporter before-build
+
+      - name: Appraisal Install
+        run: bundle exec appraisal install
+
+      - name: Rubocop
+        run: bundle exec rubocop
+
+      - name: Rspec
+        run: bundle exec appraisal rspec
+
+      - name: Code Climate
+        run: ./cc-test-reporter after-build --exit-code $?

.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   NewCops: enable
+  TargetRubyVersion: 2.7
 
 Bundler/OrderedGems:
   Exclude:

.ruby-version

@@ -0,0 +1 @@
+ruby-3.0.3

Appraisals

@@ -6,10 +6,20 @@ appraise "rails-5" do
 end
 
 appraise "rails-6" do
-  gem "rails", "~> 6.0"
+  gem "rails", "~> 6.0.0"
   gem "puma", "~> 4.0"
 end
 
+appraise "rails-6-1" do
+  gem "rails", "~> 6.1.0"
+  gem "puma", "~> 5.0"
+end
+
+appraise "rails-7-0" do
+  gem "rails", "~> 7.0.0"
+  gem "puma", "~> 5.0"
+end
+
 appraise "latest" do
   gem "rails"
   gem "puma"

README.md

@@ -1,6 +1,6 @@
 # Puma Pool Usage
 
-[![Build Status](https://travis-ci.org/simplymadeapps/puma-pool-usage.svg?branch=master)](https://travis-ci.org/simplymadeapps/puma-pool-usage)
+![Tests](https://github.com/simplymadeapps/puma-pool-usage/actions/workflows/tests.yml/badge.svg)
 [![Code Climate](https://codeclimate.com/github/simplymadeapps/puma-pool-usage/badges/gpa.svg)](https://codeclimate.com/github/simplymadeapps/puma-pool-usage)
 [![Test Coverage](https://codeclimate.com/github/simplymadeapps/puma-pool-usage/badges/coverage.svg)](https://codeclimate.com/github/simplymadeapps/puma-pool-usage/coverage)
 
@@ -38,7 +38,7 @@ In your Puma configuration file (config/puma.rb), add the following line:
 plugin :pool_usage
 ```
 
-Restart your server and you're all set. 
+Restart your server and you're all set.
 
 ## Configuration
 

gemfiles/rails_6.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0"
+gem "rails", "~> 6.0.0"
 gem "puma", "~> 4.0"
 
 gemspec path: "../"

gemfiles/rails_6_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "puma", "~> 5.0"
+
+gemspec path: "../"

gemfiles/rails_7_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.0"
+gem "puma", "~> 5.0"
+
+gemspec path: "../"

puma-pool-usage.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "puma-pool-usage"
-  spec.version       = "0.1.0"
+  spec.version       = "1.0.0"
   spec.authors       = ["Brandon Medenwald"]
   spec.email         = ["brandon@simplymadeapps.com"]
 
@@ -11,9 +11,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://www.github.com/simplymadeapps/puma-pool-usage"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 2.7.0"
+
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "https://www.github.com/simplymadeapps/puma-pool-usage/CHANGELOG.md"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -22,14 +25,14 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "puma", ">= 3.12", "< 5.0"
+  spec.add_runtime_dependency "puma", ">= 3.12", "< 6.0"
   spec.add_runtime_dependency "rails", ">= 5.0"
 
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "~> 0.83.0"
+  spec.add_development_dependency "rubocop", "~> 1.28"
   spec.add_development_dependency "simplecov", "< 0.18" # https://github.com/codeclimate/test-reporter/issues/413
   spec.add_development_dependency "simplecov-rcov"
 end

spec/puma/plugin/pool_usage_spec.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
 RSpec.describe "Puma Pool Usage" do
-  subject { Puma::Plugins.find("pool_usage").new(Puma::Plugin) }
+  subject do
+    # starting in Puma 5.x, the new method no longer takes any arguments
+    Puma::Plugins.find("pool_usage").new
+  rescue ArgumentError
+    Puma::Plugins.find("pool_usage").new(Puma::Plugin)
+  end
 
   before do
-    Rails.logger = Logger.new(STDOUT)
+    Rails.logger = Logger.new($stdout)
   end
 
   describe "Registration" do