Skip to content

Commit bfe5be6

Browse files
committed
Use Puma, update CI.
1 parent 716af1b commit bfe5be6

File tree

8 files changed

+27
-35
lines changed

8 files changed

+27
-35
lines changed
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@ name: lint
33
on: [push, pull_request]
44

55
jobs:
6-
lint:
7-
name: RuboCop
6+
RuboCop:
87
runs-on: ubuntu-latest
98
steps:
109
- uses: actions/checkout@v2
11-
- name: Set up Ruby
12-
uses: ruby/setup-ruby@v1
10+
- uses: ruby/setup-ruby@v1
1311
with:
1412
ruby-version: "3.4.6"
1513
bundler-cache: true
16-
- name: Run RuboCop
17-
run: bundle exec rubocop
14+
- run: bundle exec rubocop

.github/workflows/test.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
name: Tests
1+
name: test
2+
23
on: [push, pull_request]
4+
35
jobs:
4-
test:
6+
RSpec:
57
runs-on: ubuntu-latest
68
steps:
7-
- uses: actions/checkout@v2
8-
- uses: ruby/setup-ruby@v1
9-
with:
10-
ruby-version: "3.4.6"
11-
- uses: supercharge/[email protected]
9+
- uses: actions/checkout@v3
10+
- uses: browser-actions/setup-firefox@latest
1211
with:
13-
mongodb-version: "7.0"
12+
firefox-version: '143.0.3'
1413
- uses: browser-actions/setup-geckodriver@latest
1514
with:
16-
geckodriver-version: "0.34.0"
17-
- uses: browser-actions/setup-firefox@v1
15+
geckodriver-version: "0.36.0"
16+
- uses: supercharge/[email protected]
17+
with:
18+
mongodb-version: "8.0"
19+
- uses: ruby/setup-ruby@v1
1820
with:
19-
firefox-version: "129.0.2"
20-
- run: |
21-
bundle install
21+
ruby-version: "3.4.6"
22+
bundler-cache: true
2223
- uses: GabrielBB/xvfb-action@v1
2324
with:
2425
run: |

.rubocop_todo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2025-09-29 13:51:29 UTC using RuboCop version 1.81.1.
3+
# on 2025-10-01 23:31:00 UTC using RuboCop version 1.81.1.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ gem 'kaminari-grape'
77
gem 'mongoid'
88
gem 'mongoid-scroll'
99
gem 'newrelic_rpm'
10+
gem 'puma'
1011
gem 'rack-robotz'
1112
gem 'rack-server-pages'
1213
gem 'slack-ruby-bot-server-events'
1314
gem 'slack-ruby-bot-server-mailchimp'
14-
gem 'unicorn'
1515

1616
group :development, :test do
1717
gem 'foreman'
@@ -20,7 +20,6 @@ group :development, :test do
2020
gem 'rubocop-capybara'
2121
gem 'rubocop-rake'
2222
gem 'rubocop-rspec'
23-
gem 'webrick'
2423
end
2524

2625
group :development do

Gemfile.lock

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ GEM
8181
faraday-net_http (>= 2.0, < 3.5)
8282
json
8383
logger
84-
faraday-follow_redirects (0.3.0)
84+
faraday-follow_redirects (0.4.0)
8585
faraday (>= 1, < 3)
8686
faraday-mashify (1.0.0)
8787
faraday (~> 2.0)
@@ -138,7 +138,6 @@ GEM
138138
kaminari-grape (1.0.1)
139139
grape
140140
kaminari-core (~> 1.0)
141-
kgio (2.11.4)
142141
language_server-protocol (3.17.0.5)
143142
lint_roller (1.1.0)
144143
logger (1.7.0)
@@ -180,6 +179,7 @@ GEM
180179
uri
181180
netrc (0.11.0)
182181
newrelic_rpm (9.21.0)
182+
nio4r (2.7.4)
183183
nokogiri (1.18.10)
184184
mini_portile2 (~> 2.8.2)
185185
racc (~> 1.4)
@@ -196,6 +196,8 @@ GEM
196196
date
197197
stringio
198198
public_suffix (6.0.2)
199+
puma (7.0.4)
200+
nio4r (~> 2.0)
199201
racc (1.8.1)
200202
rack (3.2.1)
201203
rack-cors (3.0.0)
@@ -211,7 +213,6 @@ GEM
211213
rackup (2.2.1)
212214
rack (>= 3)
213215
rainbow (3.1.1)
214-
raindrops (0.20.1)
215216
rake (13.3.0)
216217
rdoc (6.14.2)
217218
erb
@@ -311,17 +312,13 @@ GEM
311312
unicode-display_width (3.2.0)
312313
unicode-emoji (~> 4.1)
313314
unicode-emoji (4.1.0)
314-
unicorn (6.1.0)
315-
kgio (~> 2.6)
316-
raindrops (~> 0.7)
317315
uri (1.0.3)
318316
vcr (6.3.1)
319317
base64
320318
webmock (3.25.1)
321319
addressable (>= 2.8.0)
322320
crack (>= 0.3.2)
323321
hashdiff (>= 0.4.0, < 2.0.0)
324-
webrick (1.9.1)
325322
websocket (1.2.11)
326323
xpath (3.2.0)
327324
nokogiri (~> 1.8)
@@ -344,6 +341,7 @@ DEPENDENCIES
344341
mongoid-scroll
345342
mongoid-shell
346343
newrelic_rpm
344+
puma
347345
rack-robotz
348346
rack-server-pages
349347
rack-test
@@ -357,10 +355,8 @@ DEPENDENCIES
357355
selenium-webdriver
358356
slack-ruby-bot-server-events
359357
slack-ruby-bot-server-mailchimp
360-
unicorn
361358
vcr
362359
webmock
363-
webrick
364360

365361
RUBY VERSION
366362
ruby 3.4.6p54

Procfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web: bundle exec unicorn -p $PORT
1+
web: bundle exec puma -p $PORT

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
[![Add to Slack](https://platform.slack-edge.com/img/add_to_slack.png)](http://shell.playplay.io)
44

5-
[![rubocop](https://github.com/slack-ruby/slack-shellbot/actions/workflows/rubocop.yml/badge.svg)](https://github.com/slack-ruby/slack-shellbot/actions/workflows/rubocop.yml)
5+
[![lint](https://github.com/slack-ruby/slack-shellbot/actions/workflows/lint.yml/badge.svg)](https://github.com/slack-ruby/slack-shellbot/actions/workflows/lint.yml)
66
[![test](https://github.com/slack-ruby/slack-shellbot/actions/workflows/test.yml/badge.svg)](https://github.com/slack-ruby/slack-shellbot/actions/workflows/test.yml)
7-
[![Code Climate](https://codeclimate.com/github/slack-ruby/slack-shellbot/badges/gpa.svg)](https://codeclimate.com/github/slack-ruby/slack-shellbot)
87

98
A shell bot for Slack. A demo is worth a thousand words.
109

spec/support/capybara.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
Capybara.configure do |config|
44
config.app = SlackRubyBotServer::Api::Middleware.instance
55
config.server_port = 9293
6-
config.server = :webrick
6+
config.server = :puma
77
end

0 commit comments

Comments
 (0)