Skip to content

Commit 76e1903

Browse files
authored
Merge pull request #3 from bmedenwald/LIB-122/puma-5
LIB-122: Version 1.0.0 (Allow for Puma 5.x)
2 parents ff6f1bd + 95ae7e6 commit 76e1903

File tree

11 files changed

+81
-38
lines changed

11 files changed

+81
-38
lines changed

.github/workflows/tests.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: tests
2+
on: [pull_request]
3+
jobs:
4+
tests:
5+
runs-on: ubuntu-latest
6+
strategy:
7+
fail-fast: false
8+
matrix:
9+
ruby: [2.7.6, 3.0.4, 3.1.2]
10+
env:
11+
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
12+
RAILS_ENV: test
13+
steps:
14+
- uses: actions/checkout@v2
15+
- uses: ruby/setup-ruby@v1
16+
with:
17+
ruby-version: ${{ matrix.ruby }}
18+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
19+
20+
- name: Install Code Climate
21+
run: |
22+
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
23+
chmod +x ./cc-test-reporter
24+
./cc-test-reporter before-build
25+
26+
- name: Appraisal Install
27+
run: bundle exec appraisal install
28+
29+
- name: Rubocop
30+
run: bundle exec rubocop
31+
32+
- name: Rspec
33+
run: bundle exec appraisal rspec
34+
35+
- name: Code Climate
36+
run: ./cc-test-reporter after-build --exit-code $?

.rubocop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
AllCops:
22
NewCops: enable
3+
TargetRubyVersion: 2.7
34

45
Bundler/OrderedGems:
56
Exclude:

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ruby-3.0.3

.travis.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

Appraisals

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,20 @@ appraise "rails-5" do
66
end
77

88
appraise "rails-6" do
9-
gem "rails", "~> 6.0"
9+
gem "rails", "~> 6.0.0"
1010
gem "puma", "~> 4.0"
1111
end
1212

13+
appraise "rails-6-1" do
14+
gem "rails", "~> 6.1.0"
15+
gem "puma", "~> 5.0"
16+
end
17+
18+
appraise "rails-7-0" do
19+
gem "rails", "~> 7.0.0"
20+
gem "puma", "~> 5.0"
21+
end
22+
1323
appraise "latest" do
1424
gem "rails"
1525
gem "puma"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Puma Pool Usage
22

3-
[![Build Status](https://travis-ci.org/simplymadeapps/puma-pool-usage.svg?branch=master)](https://travis-ci.org/simplymadeapps/puma-pool-usage)
3+
![Tests](https://github.com/simplymadeapps/puma-pool-usage/actions/workflows/tests.yml/badge.svg)
44
[![Code Climate](https://codeclimate.com/github/simplymadeapps/puma-pool-usage/badges/gpa.svg)](https://codeclimate.com/github/simplymadeapps/puma-pool-usage)
55
[![Test Coverage](https://codeclimate.com/github/simplymadeapps/puma-pool-usage/badges/coverage.svg)](https://codeclimate.com/github/simplymadeapps/puma-pool-usage/coverage)
66

@@ -38,7 +38,7 @@ In your Puma configuration file (config/puma.rb), add the following line:
3838
plugin :pool_usage
3939
```
4040

41-
Restart your server and you're all set.
41+
Restart your server and you're all set.
4242

4343
## Configuration
4444

gemfiles/rails_6.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "~> 6.0"
5+
gem "rails", "~> 6.0.0"
66
gem "puma", "~> 4.0"
77

88
gemspec path: "../"

gemfiles/rails_6_1.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 6.1.0"
6+
gem "puma", "~> 5.0"
7+
8+
gemspec path: "../"

gemfiles/rails_7_0.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 7.0.0"
6+
gem "puma", "~> 5.0"
7+
8+
gemspec path: "../"

puma-pool-usage.gemspec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gem::Specification.new do |spec|
44
spec.name = "puma-pool-usage"
5-
spec.version = "0.1.0"
5+
spec.version = "1.0.0"
66
spec.authors = ["Brandon Medenwald"]
77
spec.email = ["brandon@simplymadeapps.com"]
88

@@ -11,9 +11,12 @@ Gem::Specification.new do |spec|
1111
spec.homepage = "https://www.github.com/simplymadeapps/puma-pool-usage"
1212
spec.license = "MIT"
1313

14+
spec.required_ruby_version = ">= 2.7.0"
15+
1416
spec.metadata["homepage_uri"] = spec.homepage
1517
spec.metadata["source_code_uri"] = spec.homepage
1618
spec.metadata["changelog_uri"] = "https://www.github.com/simplymadeapps/puma-pool-usage/CHANGELOG.md"
19+
spec.metadata["rubygems_mfa_required"] = "true"
1720

1821
# Specify which files should be added to the gem when it is released.
1922
# 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|
2225
end
2326
spec.require_paths = ["lib"]
2427

25-
spec.add_runtime_dependency "puma", ">= 3.12", "< 5.0"
28+
spec.add_runtime_dependency "puma", ">= 3.12", "< 6.0"
2629
spec.add_runtime_dependency "rails", ">= 5.0"
2730

2831
spec.add_development_dependency "appraisal"
2932
spec.add_development_dependency "bundler", "~> 2.0"
3033
spec.add_development_dependency "rake", ">= 12.3.3"
3134
spec.add_development_dependency "rspec", "~> 3.0"
32-
spec.add_development_dependency "rubocop", "~> 0.83.0"
35+
spec.add_development_dependency "rubocop", "~> 1.28"
3336
spec.add_development_dependency "simplecov", "< 0.18" # https://github.com/codeclimate/test-reporter/issues/413
3437
spec.add_development_dependency "simplecov-rcov"
3538
end

0 commit comments

Comments
 (0)