puma-daemon 0.3.2 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.envrc +4 -0
- data/.github/workflows/license.yml +28 -0
- data/.github/workflows/main.yml +32 -20
- data/.gitignore +2 -1
- data/.rspec +2 -1
- data/.rubocop.yml +14 -1
- data/Dockerfile.build +1 -1
- data/Gemfile.puma-v5 +16 -1
- data/Gemfile.puma-v5.lock +117 -0
- data/Gemfile.puma-v6 +17 -2
- data/Gemfile.puma-v6.lock +117 -0
- data/Makefile +26 -12
- data/README.adoc +39 -6
- data/README.pdf +2969 -2399
- data/bin/setup +2 -2
- data/codecov.yml +33 -3
- data/example/cluster.sh +41 -20
- data/example/colors.sh +11 -0
- data/example/kill-puma.sh +32 -0
- data/example/single.sh +9 -12
- data/lib/puma/daemon/configuration.rb +1 -1
- data/lib/puma/daemon/runner_adapter.rb +4 -3
- data/lib/puma/daemon/version.rb +1 -1
- data/puma-daemon.gemspec +3 -12
- metadata +9 -116
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4c11b296e28e9177d46b8faacb7302ce2e74edba7269a0790b62c2b1cb80543e
|
|
4
|
+
data.tar.gz: 301478b314f96b44449e27cec4a9f467340cf9dbf395193c197fcaebb8391ff8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cd9eaec31009284ea84aceffa2f3f1254b826d6d5236a480da720ca3f49f1888b6681f4b38e2d972204cc827374fd3cf6f1554dfe007c7ae4d3af4916167da3b
|
|
7
|
+
data.tar.gz: 17ed9139a0c91e56ea779a31acb600a8830fefcd2390766fe524cb116bd7aa5d0ff3600b9d498f8ec89930e97e0b3f49fa0d74f88f41e4910bd373b6f4fa531f
|
data/.envrc
CHANGED
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
name: License
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
push: { branches: [master] }
|
|
5
|
+
|
|
6
|
+
jobs:
|
|
7
|
+
fossa-scan:
|
|
8
|
+
runs-on: ubuntu-latest
|
|
9
|
+
steps:
|
|
10
|
+
- uses: actions/checkout@v3
|
|
11
|
+
|
|
12
|
+
- name: Copy Gemfile
|
|
13
|
+
run: |
|
|
14
|
+
cp Gemfile.puma-v6 Gemfile
|
|
15
|
+
|
|
16
|
+
- name: Set up Ruby
|
|
17
|
+
uses: ruby/setup-ruby@v1
|
|
18
|
+
with:
|
|
19
|
+
ruby-version: 3.2.2
|
|
20
|
+
bundler-cache: true # runs 'bun
|
|
21
|
+
|
|
22
|
+
- name: Bundle Install
|
|
23
|
+
run: bundle check || bundle install
|
|
24
|
+
|
|
25
|
+
- uses: fossas/fossa-action@main # Use a specific version if locking is preferred
|
|
26
|
+
with:
|
|
27
|
+
api-key: ${{secrets.FOSSA_API_KEY}}
|
|
28
|
+
run-tests: false
|
data/.github/workflows/main.yml
CHANGED
|
@@ -1,40 +1,52 @@
|
|
|
1
1
|
name: Ruby
|
|
2
2
|
|
|
3
|
-
on:
|
|
3
|
+
on:
|
|
4
|
+
pull_request:
|
|
5
|
+
push: { branches: [master] }
|
|
4
6
|
|
|
5
7
|
jobs:
|
|
6
8
|
build:
|
|
7
9
|
runs-on: ubuntu-latest
|
|
8
10
|
strategy:
|
|
9
11
|
matrix:
|
|
10
|
-
ruby-version: [3.
|
|
11
|
-
|
|
12
|
+
ruby-version: [3.3.5, 3.2.4, 3.1.5, 3.0.7]
|
|
12
13
|
env:
|
|
14
|
+
RUBY_LATEST_VERSION: "3.3.5"
|
|
13
15
|
RUBY_VERSION: ${{ matrix.ruby-version }}
|
|
14
16
|
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
|
|
15
17
|
|
|
16
18
|
steps:
|
|
17
|
-
- uses: actions/checkout@
|
|
19
|
+
- uses: actions/checkout@v4
|
|
18
20
|
|
|
19
21
|
- name: Set up Ruby ${{ matrix.ruby-version }}
|
|
20
22
|
uses: ruby/setup-ruby@v1
|
|
21
23
|
with:
|
|
22
24
|
ruby-version: ${{ matrix.ruby-version }}
|
|
23
|
-
|
|
24
|
-
- name: Run Specs
|
|
25
|
-
run:
|
|
25
|
+
|
|
26
|
+
- name: Run Specs for V5 Puma
|
|
27
|
+
run: |
|
|
28
|
+
set -x; set -e; \
|
|
29
|
+
gem install bundler:2.5.23; \
|
|
30
|
+
export BUNDLE_GEMFILE=Gemfile.puma-v5; \
|
|
31
|
+
bundle install -j 4 && bundle exec rspec 2>/dev/null
|
|
32
|
+
|
|
33
|
+
- name: Run Specs fo V6 Puma
|
|
34
|
+
run: |
|
|
35
|
+
set -x; set -e; \
|
|
36
|
+
gem install bundler:2.5.23; \
|
|
37
|
+
export BUNDLE_GEMFILE=Gemfile.puma-v6; \
|
|
38
|
+
bundle install -j 4 && bundle exec rspec 2>/dev/null
|
|
26
39
|
|
|
27
40
|
- name: Rubocop
|
|
28
|
-
run:
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
+
run: |
|
|
42
|
+
export BUNDLE_GEMFILE=Gemfile.puma-v6; \
|
|
43
|
+
bundle exec rubocop --parallel --format progress
|
|
44
|
+
|
|
45
|
+
- name: Upload to Codecov
|
|
46
|
+
run: |
|
|
47
|
+
# only upload for the latest Ruby Version
|
|
48
|
+
if [[ $(ruby -e 'puts RUBY_VERSION') == "${RUBY_LATEST_VERSION}" ]]; then
|
|
49
|
+
curl -Os https://uploader.codecov.io/latest/linux/codecov
|
|
50
|
+
chmod +x codecov
|
|
51
|
+
./codecov
|
|
52
|
+
fi
|
data/.gitignore
CHANGED
data/.rspec
CHANGED
data/.rubocop.yml
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
|
+
require:
|
|
2
|
+
- rubocop-performance
|
|
3
|
+
- rubocop-rake
|
|
4
|
+
- rubocop-rspec
|
|
5
|
+
|
|
1
6
|
inherit_gem:
|
|
2
7
|
relaxed-rubocop: .rubocop.yml
|
|
3
8
|
|
|
4
9
|
AllCops:
|
|
5
|
-
TargetRubyVersion: 2.4
|
|
6
10
|
NewCops: enable
|
|
11
|
+
SuggestExtensions: true
|
|
12
|
+
TargetRubyVersion: 2.6
|
|
7
13
|
|
|
8
14
|
Style/OptionalBooleanParameter:
|
|
9
15
|
Exclude:
|
|
@@ -24,5 +30,12 @@ Naming/FileName:
|
|
|
24
30
|
Exclude:
|
|
25
31
|
- 'lib/puma-daemon.rb'
|
|
26
32
|
|
|
33
|
+
Rake/Desc:
|
|
34
|
+
Enabled: false
|
|
35
|
+
|
|
36
|
+
RSpec/MultipleMemoizedHelpers:
|
|
37
|
+
Max: 20
|
|
38
|
+
|
|
39
|
+
|
|
27
40
|
# Gemspec/DevelopmentDependencies:
|
|
28
41
|
# Enabled: false
|
data/Dockerfile.build
CHANGED
data/Gemfile.puma-v5
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
# vim: ft=ruby
|
|
4
|
+
|
|
3
5
|
source 'https://rubygems.org'
|
|
4
6
|
|
|
5
7
|
# Specify your gem's dependencies in puma-daemon.gemspec
|
|
@@ -9,8 +11,21 @@ gem 'puma', '~> 5.0'
|
|
|
9
11
|
gem 'rack', '~> 2'
|
|
10
12
|
gem 'rake', '~> 13.0'
|
|
11
13
|
|
|
14
|
+
group :development, :test do
|
|
15
|
+
gem 'asciidoctor'
|
|
16
|
+
gem 'yard'
|
|
17
|
+
end
|
|
18
|
+
|
|
12
19
|
group :test do
|
|
13
20
|
gem 'codecov', require: false
|
|
21
|
+
gem 'httparty'
|
|
22
|
+
gem 'relaxed-rubocop'
|
|
14
23
|
gem 'rspec', '~> 3.0'
|
|
15
|
-
gem '
|
|
24
|
+
gem 'rspec-its'
|
|
25
|
+
gem 'rubocop'
|
|
26
|
+
gem 'rubocop-performance'
|
|
27
|
+
gem 'rubocop-rake'
|
|
28
|
+
gem 'rubocop-rspec'
|
|
29
|
+
gem 'simplecov'
|
|
30
|
+
gem 'simplecov-cobertura', require: false
|
|
16
31
|
end
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
PATH
|
|
2
|
+
remote: .
|
|
3
|
+
specs:
|
|
4
|
+
puma-daemon (0.5.0)
|
|
5
|
+
puma (>= 5.0)
|
|
6
|
+
rack
|
|
7
|
+
|
|
8
|
+
GEM
|
|
9
|
+
remote: https://rubygems.org/
|
|
10
|
+
specs:
|
|
11
|
+
asciidoctor (2.0.23)
|
|
12
|
+
ast (2.4.2)
|
|
13
|
+
bigdecimal (3.1.8)
|
|
14
|
+
codecov (0.2.12)
|
|
15
|
+
json
|
|
16
|
+
simplecov
|
|
17
|
+
csv (3.3.0)
|
|
18
|
+
diff-lcs (1.5.1)
|
|
19
|
+
docile (1.4.1)
|
|
20
|
+
httparty (0.22.0)
|
|
21
|
+
csv
|
|
22
|
+
mini_mime (>= 1.0.0)
|
|
23
|
+
multi_xml (>= 0.5.2)
|
|
24
|
+
json (2.8.2)
|
|
25
|
+
language_server-protocol (3.17.0.3)
|
|
26
|
+
mini_mime (1.1.5)
|
|
27
|
+
multi_xml (0.7.1)
|
|
28
|
+
bigdecimal (~> 3.1)
|
|
29
|
+
nio4r (2.7.4)
|
|
30
|
+
parallel (1.26.3)
|
|
31
|
+
parser (3.3.6.0)
|
|
32
|
+
ast (~> 2.4.1)
|
|
33
|
+
racc
|
|
34
|
+
puma (5.6.9)
|
|
35
|
+
nio4r (~> 2.0)
|
|
36
|
+
racc (1.8.1)
|
|
37
|
+
rack (2.2.10)
|
|
38
|
+
rainbow (3.1.1)
|
|
39
|
+
rake (13.2.1)
|
|
40
|
+
regexp_parser (2.9.3)
|
|
41
|
+
relaxed-rubocop (2.5)
|
|
42
|
+
rexml (3.3.9)
|
|
43
|
+
rspec (3.13.0)
|
|
44
|
+
rspec-core (~> 3.13.0)
|
|
45
|
+
rspec-expectations (~> 3.13.0)
|
|
46
|
+
rspec-mocks (~> 3.13.0)
|
|
47
|
+
rspec-core (3.13.2)
|
|
48
|
+
rspec-support (~> 3.13.0)
|
|
49
|
+
rspec-expectations (3.13.3)
|
|
50
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
51
|
+
rspec-support (~> 3.13.0)
|
|
52
|
+
rspec-its (2.0.0)
|
|
53
|
+
rspec-core (>= 3.13.0)
|
|
54
|
+
rspec-expectations (>= 3.13.0)
|
|
55
|
+
rspec-mocks (3.13.2)
|
|
56
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
57
|
+
rspec-support (~> 3.13.0)
|
|
58
|
+
rspec-support (3.13.1)
|
|
59
|
+
rubocop (1.69.0)
|
|
60
|
+
json (~> 2.3)
|
|
61
|
+
language_server-protocol (>= 3.17.0)
|
|
62
|
+
parallel (~> 1.10)
|
|
63
|
+
parser (>= 3.3.0.2)
|
|
64
|
+
rainbow (>= 2.2.2, < 4.0)
|
|
65
|
+
regexp_parser (>= 2.4, < 3.0)
|
|
66
|
+
rubocop-ast (>= 1.36.1, < 2.0)
|
|
67
|
+
ruby-progressbar (~> 1.7)
|
|
68
|
+
unicode-display_width (>= 2.4.0, < 4.0)
|
|
69
|
+
rubocop-ast (1.36.2)
|
|
70
|
+
parser (>= 3.3.1.0)
|
|
71
|
+
rubocop-performance (1.23.0)
|
|
72
|
+
rubocop (>= 1.48.1, < 2.0)
|
|
73
|
+
rubocop-ast (>= 1.31.1, < 2.0)
|
|
74
|
+
rubocop-rake (0.6.0)
|
|
75
|
+
rubocop (~> 1.0)
|
|
76
|
+
rubocop-rspec (3.2.0)
|
|
77
|
+
rubocop (~> 1.61)
|
|
78
|
+
ruby-progressbar (1.13.0)
|
|
79
|
+
simplecov (0.22.0)
|
|
80
|
+
docile (~> 1.1)
|
|
81
|
+
simplecov-html (~> 0.11)
|
|
82
|
+
simplecov_json_formatter (~> 0.1)
|
|
83
|
+
simplecov-cobertura (2.1.0)
|
|
84
|
+
rexml
|
|
85
|
+
simplecov (~> 0.19)
|
|
86
|
+
simplecov-html (0.13.1)
|
|
87
|
+
simplecov_json_formatter (0.1.4)
|
|
88
|
+
unicode-display_width (3.1.2)
|
|
89
|
+
unicode-emoji (~> 4.0, >= 4.0.4)
|
|
90
|
+
unicode-emoji (4.0.4)
|
|
91
|
+
yard (0.9.37)
|
|
92
|
+
|
|
93
|
+
PLATFORMS
|
|
94
|
+
arm64-darwin-23
|
|
95
|
+
ruby
|
|
96
|
+
|
|
97
|
+
DEPENDENCIES
|
|
98
|
+
asciidoctor
|
|
99
|
+
codecov
|
|
100
|
+
httparty
|
|
101
|
+
puma (~> 5.0)
|
|
102
|
+
puma-daemon!
|
|
103
|
+
rack (~> 2)
|
|
104
|
+
rake (~> 13.0)
|
|
105
|
+
relaxed-rubocop
|
|
106
|
+
rspec (~> 3.0)
|
|
107
|
+
rspec-its
|
|
108
|
+
rubocop
|
|
109
|
+
rubocop-performance
|
|
110
|
+
rubocop-rake
|
|
111
|
+
rubocop-rspec
|
|
112
|
+
simplecov
|
|
113
|
+
simplecov-cobertura
|
|
114
|
+
yard
|
|
115
|
+
|
|
116
|
+
BUNDLED WITH
|
|
117
|
+
2.5.23
|
data/Gemfile.puma-v6
CHANGED
|
@@ -1,16 +1,31 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
# vim: ft=ruby
|
|
4
|
+
|
|
3
5
|
source 'https://rubygems.org'
|
|
4
6
|
|
|
5
7
|
# Specify your gem's dependencies in puma-daemon.gemspec
|
|
6
8
|
gemspec
|
|
7
9
|
|
|
8
|
-
gem 'puma', '~> 6
|
|
10
|
+
gem 'puma', '~> 6'
|
|
9
11
|
gem 'rack', '~> 2'
|
|
10
12
|
gem 'rake', '~> 13.0'
|
|
11
13
|
|
|
14
|
+
group :development, :test do
|
|
15
|
+
gem 'asciidoctor'
|
|
16
|
+
gem 'yard'
|
|
17
|
+
end
|
|
18
|
+
|
|
12
19
|
group :test do
|
|
13
20
|
gem 'codecov', require: false
|
|
21
|
+
gem 'httparty', '~> 0.22'
|
|
22
|
+
gem 'relaxed-rubocop'
|
|
14
23
|
gem 'rspec', '~> 3.0'
|
|
15
|
-
gem '
|
|
24
|
+
gem 'rspec-its'
|
|
25
|
+
gem 'rubocop'
|
|
26
|
+
gem 'rubocop-performance'
|
|
27
|
+
gem 'rubocop-rake'
|
|
28
|
+
gem 'rubocop-rspec'
|
|
29
|
+
gem 'simplecov'
|
|
30
|
+
gem 'simplecov-cobertura', require: false
|
|
16
31
|
end
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
PATH
|
|
2
|
+
remote: .
|
|
3
|
+
specs:
|
|
4
|
+
puma-daemon (0.5.0)
|
|
5
|
+
puma (>= 5.0)
|
|
6
|
+
rack
|
|
7
|
+
|
|
8
|
+
GEM
|
|
9
|
+
remote: https://rubygems.org/
|
|
10
|
+
specs:
|
|
11
|
+
asciidoctor (2.0.23)
|
|
12
|
+
ast (2.4.2)
|
|
13
|
+
bigdecimal (3.1.8)
|
|
14
|
+
codecov (0.2.12)
|
|
15
|
+
json
|
|
16
|
+
simplecov
|
|
17
|
+
csv (3.3.0)
|
|
18
|
+
diff-lcs (1.5.1)
|
|
19
|
+
docile (1.4.1)
|
|
20
|
+
httparty (0.22.0)
|
|
21
|
+
csv
|
|
22
|
+
mini_mime (>= 1.0.0)
|
|
23
|
+
multi_xml (>= 0.5.2)
|
|
24
|
+
json (2.8.2)
|
|
25
|
+
language_server-protocol (3.17.0.3)
|
|
26
|
+
mini_mime (1.1.5)
|
|
27
|
+
multi_xml (0.7.1)
|
|
28
|
+
bigdecimal (~> 3.1)
|
|
29
|
+
nio4r (2.7.4)
|
|
30
|
+
parallel (1.26.3)
|
|
31
|
+
parser (3.3.6.0)
|
|
32
|
+
ast (~> 2.4.1)
|
|
33
|
+
racc
|
|
34
|
+
puma (6.5.0)
|
|
35
|
+
nio4r (~> 2.0)
|
|
36
|
+
racc (1.8.1)
|
|
37
|
+
rack (2.2.10)
|
|
38
|
+
rainbow (3.1.1)
|
|
39
|
+
rake (13.2.1)
|
|
40
|
+
regexp_parser (2.9.3)
|
|
41
|
+
relaxed-rubocop (2.5)
|
|
42
|
+
rexml (3.3.9)
|
|
43
|
+
rspec (3.13.0)
|
|
44
|
+
rspec-core (~> 3.13.0)
|
|
45
|
+
rspec-expectations (~> 3.13.0)
|
|
46
|
+
rspec-mocks (~> 3.13.0)
|
|
47
|
+
rspec-core (3.13.2)
|
|
48
|
+
rspec-support (~> 3.13.0)
|
|
49
|
+
rspec-expectations (3.13.3)
|
|
50
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
51
|
+
rspec-support (~> 3.13.0)
|
|
52
|
+
rspec-its (2.0.0)
|
|
53
|
+
rspec-core (>= 3.13.0)
|
|
54
|
+
rspec-expectations (>= 3.13.0)
|
|
55
|
+
rspec-mocks (3.13.2)
|
|
56
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
57
|
+
rspec-support (~> 3.13.0)
|
|
58
|
+
rspec-support (3.13.1)
|
|
59
|
+
rubocop (1.69.0)
|
|
60
|
+
json (~> 2.3)
|
|
61
|
+
language_server-protocol (>= 3.17.0)
|
|
62
|
+
parallel (~> 1.10)
|
|
63
|
+
parser (>= 3.3.0.2)
|
|
64
|
+
rainbow (>= 2.2.2, < 4.0)
|
|
65
|
+
regexp_parser (>= 2.4, < 3.0)
|
|
66
|
+
rubocop-ast (>= 1.36.1, < 2.0)
|
|
67
|
+
ruby-progressbar (~> 1.7)
|
|
68
|
+
unicode-display_width (>= 2.4.0, < 4.0)
|
|
69
|
+
rubocop-ast (1.36.2)
|
|
70
|
+
parser (>= 3.3.1.0)
|
|
71
|
+
rubocop-performance (1.23.0)
|
|
72
|
+
rubocop (>= 1.48.1, < 2.0)
|
|
73
|
+
rubocop-ast (>= 1.31.1, < 2.0)
|
|
74
|
+
rubocop-rake (0.6.0)
|
|
75
|
+
rubocop (~> 1.0)
|
|
76
|
+
rubocop-rspec (3.2.0)
|
|
77
|
+
rubocop (~> 1.61)
|
|
78
|
+
ruby-progressbar (1.13.0)
|
|
79
|
+
simplecov (0.22.0)
|
|
80
|
+
docile (~> 1.1)
|
|
81
|
+
simplecov-html (~> 0.11)
|
|
82
|
+
simplecov_json_formatter (~> 0.1)
|
|
83
|
+
simplecov-cobertura (2.1.0)
|
|
84
|
+
rexml
|
|
85
|
+
simplecov (~> 0.19)
|
|
86
|
+
simplecov-html (0.13.1)
|
|
87
|
+
simplecov_json_formatter (0.1.4)
|
|
88
|
+
unicode-display_width (3.1.2)
|
|
89
|
+
unicode-emoji (~> 4.0, >= 4.0.4)
|
|
90
|
+
unicode-emoji (4.0.4)
|
|
91
|
+
yard (0.9.37)
|
|
92
|
+
|
|
93
|
+
PLATFORMS
|
|
94
|
+
arm64-darwin-23
|
|
95
|
+
ruby
|
|
96
|
+
|
|
97
|
+
DEPENDENCIES
|
|
98
|
+
asciidoctor
|
|
99
|
+
codecov
|
|
100
|
+
httparty (~> 0.22)
|
|
101
|
+
puma (~> 6)
|
|
102
|
+
puma-daemon!
|
|
103
|
+
rack (~> 2)
|
|
104
|
+
rake (~> 13.0)
|
|
105
|
+
relaxed-rubocop
|
|
106
|
+
rspec (~> 3.0)
|
|
107
|
+
rspec-its
|
|
108
|
+
rubocop
|
|
109
|
+
rubocop-performance
|
|
110
|
+
rubocop-rake
|
|
111
|
+
rubocop-rspec
|
|
112
|
+
simplecov
|
|
113
|
+
simplecov-cobertura
|
|
114
|
+
yard
|
|
115
|
+
|
|
116
|
+
BUNDLED WITH
|
|
117
|
+
2.5.23
|
data/Makefile
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
# vim:
|
|
2
|
-
# vim:
|
|
1
|
+
# vim: ts=8
|
|
2
|
+
# vim: sw=8
|
|
3
3
|
# vim: noexpandtab
|
|
4
4
|
|
|
5
5
|
# grep '^[a-z\-]*:' Makefile | cut -d: -f 1 | tr '\n' ' '
|
|
6
|
-
.PHONY: help docker-build docker-bash
|
|
6
|
+
.PHONY: help docker-build docker-bash puma-v5 puma-v6 test test-all rubocop generate-pdf
|
|
7
7
|
|
|
8
8
|
RUBY_VERSION := $(cat .ruby-version)
|
|
9
9
|
OS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
|
|
@@ -12,20 +12,25 @@ OS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
|
|
|
12
12
|
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
|
|
13
13
|
CURRENT_DIR := $(notdir $(patsubst %/,%,$(dir $(MAKEFILE_PATH))))
|
|
14
14
|
PUMAD_HOME := $(shell dirname $(MAKEFILE_PATH))
|
|
15
|
+
VERSION := $(shell bundle exec ruby -I lib -r puma-daemon.rb -e 'puts Puma::Daemon::VERSION')
|
|
16
|
+
TAG := $(shell echo "v$(VERSION)")
|
|
17
|
+
BRANCH := $(shell git branch --show)
|
|
15
18
|
|
|
16
19
|
help: ## Prints help message auto-generated from the comments.
|
|
17
|
-
@grep -E '^[a-zA-
|
|
20
|
+
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
|
|
18
21
|
|
|
19
22
|
puma-v5: ## Installs puma 5.0.0
|
|
23
|
+
@echo "——————> Building for Puma v5 <—————————"
|
|
20
24
|
@ln -nfs Gemfile.puma-v5 Gemfile
|
|
21
|
-
@bundle install
|
|
25
|
+
@bundle install -j 4
|
|
22
26
|
|
|
23
27
|
puma-v6: ## Installs puma 5.0.0
|
|
28
|
+
@echo "——————> Building for Puma v6 <—————————"
|
|
24
29
|
@ln -nfs Gemfile.puma-v6 Gemfile
|
|
25
|
-
@bundle install
|
|
30
|
+
@bundle install -j 4
|
|
26
31
|
|
|
27
|
-
test:
|
|
28
|
-
@bundle exec rspec
|
|
32
|
+
test:
|
|
33
|
+
@bundle exec rspec --color --format progress
|
|
29
34
|
|
|
30
35
|
test-all: ## Test all supported Puma Versions
|
|
31
36
|
make puma-v5
|
|
@@ -34,10 +39,13 @@ test-all: ## Test all supported Puma Versions
|
|
|
34
39
|
make test
|
|
35
40
|
|
|
36
41
|
rubocop: ## Run rubocop
|
|
37
|
-
@
|
|
38
|
-
@bundle
|
|
42
|
+
@export BUNDLE_GEMFILE=Gemfile.puma-v6
|
|
43
|
+
@bundle check || bundle install -j 3
|
|
44
|
+
@bundle exec rubocop --format=progress --color --parallel
|
|
39
45
|
|
|
46
|
+
ci: test-all rubocop ## Run all checks run on CI
|
|
40
47
|
|
|
48
|
+
|
|
41
49
|
docker-build-ruby: ## Builds the Docker image by compiling ruby 3.0.0
|
|
42
50
|
@docker build -f Dockerfile.build -t puma-daemon:latest .
|
|
43
51
|
|
|
@@ -55,5 +63,11 @@ generate-pdf: ## Regenerates README,pdf from README.adoc
|
|
|
55
63
|
@bash -c "source ~/.bashmatic/init.sh && ~/.bashmatic/bin/adoc2pdf README.adoc"
|
|
56
64
|
|
|
57
65
|
clean: ## Clean-up
|
|
58
|
-
@rm -rf Gemfile Gemfile.lock coverage
|
|
59
|
-
|
|
66
|
+
@rm -rf Gemfile Gemfile.lock coverage
|
|
67
|
+
|
|
68
|
+
tag: ## Tag with the latest .version
|
|
69
|
+
@/usr/bin/env bash -c "git tag | grep -q '$(TAG)' && { echo 'Tag $(TAG) is already assigned.'; exit 1; } || true"
|
|
70
|
+
@/usr/bin/env bash -c "if [[ $(BRANCH) != master ]]; then echo 'Must be on the main branch'; else git tag -f '$(TAG)'; git push --tags --force; fi"
|
|
71
|
+
|
|
72
|
+
tag-update: ## Re-tag latest codebase with the existing version
|
|
73
|
+
@/usr/bin/env bash -c "if [[ $(BRANCH) != master ]]; then echo 'Must be on the main branch'; else git tag -f '$(TAG)'; git push --tags --force; fi"
|
data/README.adoc
CHANGED
|
@@ -10,21 +10,23 @@
|
|
|
10
10
|
|Badge
|
|
11
11
|
|Type
|
|
12
12
|
|
|
13
|
-
|
|
|
14
|
-
|image:https://
|
|
13
|
+
|Sponsor!
|
|
14
|
+
|image:https://img.shields.io/liberapay/goal/kigster.svg?logo=liberapay[link=https://liberapay.com/kigster/donate,width="150"]
|
|
15
15
|
|
|
16
|
+
|Test Suite
|
|
17
|
+
|image:https://github.com/kigster/puma-daemon/actions/workflows/main.yml/badge.svg[link=https://github.com/kigster/puma-daemon/actions?query=workflow%3ARuby,width="150"]
|
|
16
18
|
|
|
17
19
|
|Licensing
|
|
18
|
-
|image:https://app.fossa.com/api/projects/git%2Bgithub.com%2Fkigster%2Fpuma-daemon.svg?type=shield[link=https://app.fossa.com/projects/git%2Bgithub.com%2Fkigster%2Fpuma-daemon?ref=badge_shield,width="
|
|
20
|
+
|image:https://app.fossa.com/api/projects/git%2Bgithub.com%2Fkigster%2Fpuma-daemon.svg?type=shield[link=https://app.fossa.com/projects/git%2Bgithub.com%2Fkigster%2Fpuma-daemon?ref=badge_shield,width="150",height="100"] image:https://app.fossa.io/api/projects/custom%2B19655%2Fgithub.com%2Fkigster%2Fpuma-daemon.svg[FOSSA Status,link=https://app.fossa.io/projects/custom%2B19655%2Fgithub.com%2Fkigster%2Fpuma-daemon?ref=badge_large&issueType=license]
|
|
19
21
|
|
|
20
22
|
|Gem Version
|
|
21
|
-
|image:https://badge.fury.io/rb/puma-daemon.svg["Gem Version",link="https://badge.fury.io/rb/puma-daemon",width="
|
|
23
|
+
|image:https://badge.fury.io/rb/puma-daemon.svg["Gem Version",link="https://badge.fury.io/rb/puma-daemon",width="150",height="50"]
|
|
22
24
|
|
|
23
25
|
|Test Coverage
|
|
24
|
-
|image:https://codecov.io/gh/kigster/puma-daemon/branch/master/graph/badge.svg?token=asxarMSGbz[link=https://codecov.io/gh/kigster/puma-daemon,width="
|
|
26
|
+
|image:https://codecov.io/gh/kigster/puma-daemon/branch/master/graph/badge.svg?token=asxarMSGbz[link=https://codecov.io/gh/kigster/puma-daemon,width="150",height="50"]
|
|
25
27
|
|
|
26
28
|
|Coverage Areas
|
|
27
|
-
|image:https://codecov.io/gh/kigster/puma-daemon/
|
|
29
|
+
|image:https://codecov.io/gh/kigster/puma-daemon/graphs/sunburst.svg?token=asxarMSGbz[coverage-graph,width="200",link=https://codecov.io/gh/kigster/puma-daemon]
|
|
28
30
|
|
|
29
31
|
|===
|
|
30
32
|
|
|
@@ -221,6 +223,37 @@ NOTE: You do need a working `make` utility to use the below commands.
|
|
|
221
223
|
|
|
222
224
|
Bug reports and pull requests are welcome on GitHub at https://github.com/kigster/puma-daemon.
|
|
223
225
|
|
|
226
|
+
== Using the `Makefile`
|
|
227
|
+
|
|
228
|
+
The project has a Makefile to assist in running multi-step commmands.
|
|
229
|
+
|
|
230
|
+
Run `make` without arguments to see available targets:
|
|
231
|
+
|
|
232
|
+
```
|
|
233
|
+
❯ make
|
|
234
|
+
ci Run all checks run on CI
|
|
235
|
+
clean Clean-up
|
|
236
|
+
docker-build-ruby Builds the Docker image by compiling ruby 3.0.0
|
|
237
|
+
docker-build-run Drops you into a BASH session on ubuntu with ruby 3.0.0
|
|
238
|
+
docker-download-ruby Builds the Docker image by downloading ruby 3.0.0 image
|
|
239
|
+
docker-download-run Drops you into a BASH session on ubuntu with ruby 3.0.0
|
|
240
|
+
generate-pdf Regenerates README,pdf from README.adoc
|
|
241
|
+
help Prints help message auto-generated from the comments.
|
|
242
|
+
puma-v5 Installs puma 5.0.0
|
|
243
|
+
puma-v6 Installs puma 5.0.0
|
|
244
|
+
rubocop Run rubocop
|
|
245
|
+
tag-update Re-tag latest codebase with the existing version
|
|
246
|
+
tag Tag with the latest .version
|
|
247
|
+
test-all Test all supported Puma Versions
|
|
248
|
+
```
|
|
249
|
+
|
|
250
|
+
You can experiement with these, but perhaps the most useful you'll find the following:
|
|
251
|
+
|
|
252
|
+
* ci — runs all tests for all puma versions and then runs rubocop
|
|
253
|
+
* generate-pdf — regen PDF from README
|
|
254
|
+
|
|
255
|
+
|
|
256
|
+
|
|
224
257
|
== License
|
|
225
258
|
|
|
226
259
|
The gem is available as open source under the terms of the https://opensource.org/licenses/MIT[MIT License].
|