Skip to content

Commit ee88689

Browse files
committed
Merge branch 'main' into joss
2 parents b847f26 + c399b83 commit ee88689

File tree

14 files changed

+49
-49
lines changed

14 files changed

+49
-49
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ jobs:
77
continue-on-error: ${{ matrix.failure-allowed }}
88
strategy:
99
matrix:
10-
ruby-version: ['3.2.7', '3.3.7', '3.4.2']
10+
ruby-version: ['3.2', '3.3', '3.4']
1111
failure-allowed: [false]
1212
include:
13-
- ruby-version: 'truffleruby'
13+
- ruby-version: '4.0'
1414
failure-allowed: true
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717
- name: Set up Ruby
1818
uses: ruby/setup-ruby@v1
1919
with:

Gemfile.lock

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.7)
5-
public_suffix (>= 2.0.2, < 7.0)
4+
addressable (2.8.8)
5+
public_suffix (>= 2.0.2, < 8.0)
66
base64 (0.3.0)
77
bibtex-ruby (6.2.0)
88
latex-decode (~> 0.0)
99
logger (~> 1.7)
1010
racc (~> 1.7)
11-
bigdecimal (3.3.1)
12-
cgi (0.5.0)
11+
bigdecimal (4.0.1)
12+
cgi (0.5.1)
1313
charlock_holmes (0.7.9)
1414
chronic (0.10.2)
15-
connection_pool (2.5.4)
15+
connection_pool (3.0.2)
1616
crack (1.0.1)
1717
bigdecimal
1818
rexml
1919
diff-lcs (1.6.2)
20-
dotenv (3.1.8)
20+
dotenv (3.2.0)
2121
faraday (2.14.0)
2222
faraday-net_http (>= 2.0, < 3.5)
2323
json
@@ -26,9 +26,9 @@ GEM
2626
faraday (>= 1, < 3)
2727
faraday-net_http (3.4.2)
2828
net-http (~> 0.5)
29-
faraday-retry (2.3.2)
29+
faraday-retry (2.4.0)
3030
faraday (~> 2.0)
31-
github-linguist (9.3.0)
31+
github-linguist (9.4.0)
3232
cgi
3333
charlock_holmes (~> 0.7.7)
3434
mini_mime (~> 1.0)
@@ -37,8 +37,8 @@ GEM
3737
issue (1.0.2)
3838
openssl (~> 3.2)
3939
rack (~> 3.1)
40-
json (2.16.0)
41-
latex-decode (0.4.0)
40+
json (2.18.0)
41+
latex-decode (0.4.2)
4242
licensee (9.18.0)
4343
dotenv (>= 2, < 4)
4444
octokit (>= 4.20, < 10.0)
@@ -48,13 +48,13 @@ GEM
4848
logger (1.7.0)
4949
mini_mime (1.1.5)
5050
mini_portile2 (2.8.9)
51-
multi_json (1.17.0)
51+
multi_json (1.19.1)
5252
mustermann (3.0.4)
5353
ruby2_keywords (~> 0.0.1)
54-
net-http (0.8.0)
54+
net-http (0.9.1)
5555
uri (>= 0.11.1)
5656
nio4r (2.7.5)
57-
nokogiri (1.18.10)
57+
nokogiri (1.19.0)
5858
mini_portile2 (~> 2.8.2)
5959
racc (~> 1.4)
6060
octokit (9.2.0)
@@ -63,8 +63,8 @@ GEM
6363
ojra (1.1.1)
6464
faraday (~> 2.9)
6565
openssl (3.3.2)
66-
public_suffix (6.0.2)
67-
puma (7.1.0)
66+
public_suffix (7.0.2)
67+
puma (7.2.0)
6868
nio4r (~> 2.0)
6969
racc (1.8.1)
7070
rack (3.2.4)
@@ -77,9 +77,9 @@ GEM
7777
rack (>= 3.0.0)
7878
rack-test (2.2.0)
7979
rack (>= 1.3)
80-
redis-client (0.26.1)
80+
redis-client (0.26.3)
8181
connection_pool
82-
reverse_markdown (3.0.0)
82+
reverse_markdown (3.0.2)
8383
nokogiri
8484
rexml (3.4.4)
8585
rspec (3.13.2)
@@ -106,12 +106,12 @@ GEM
106106
multi_json (~> 1.15)
107107
rexml (~> 3.2, >= 3.2.5)
108108
thor (~> 1.2, >= 1.2.1)
109-
sidekiq (8.0.9)
110-
connection_pool (>= 2.5.0)
111-
json (>= 2.9.0)
112-
logger (>= 1.6.2)
113-
rack (>= 3.1.0)
114-
redis-client (>= 0.23.2)
109+
sidekiq (8.1.0)
110+
connection_pool (>= 3.0.0)
111+
json (>= 2.16.0)
112+
logger (>= 1.7.0)
113+
rack (>= 3.2.0)
114+
redis-client (>= 0.26.0)
115115
sinatra (4.2.1)
116116
logger (>= 1.6.0)
117117
mustermann (~> 3.0)
@@ -125,8 +125,8 @@ GEM
125125
rack-protection (= 4.2.1)
126126
sinatra (= 4.2.1)
127127
tilt (~> 2.0)
128-
thor (1.4.0)
129-
tilt (2.6.1)
128+
thor (1.5.0)
129+
tilt (2.7.0)
130130
uri (1.1.1)
131131
webmock (3.26.1)
132132
addressable (>= 2.8.0)

app/lib/defaults.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module Defaults
44

55
# Default value for needed env settings.
6-
# Can be overriden from the config/settings YAML file.
6+
# Can be overridden from the config/settings YAML file.
77
def default_settings
88
@defaults ||= Sinatra::IndifferentHash[
99
bot_github_user: ENV['BUFFY_BOT_GH_USER'],

app/lib/responder.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,14 +295,14 @@ def process_reverse_labeling
295295

296296
# Finds the value of the url of the target-repository in the body of the issue
297297
# by default reads the field called "target-repository"
298-
# unless a diferent name is set using param :url_field
298+
# unless a different name is set using param :url_field
299299
def target_repo_value
300300
@target_repo_url ||= value_of_or_default(params[:url_field], "target-repository")
301301
end
302302

303303
# Finds the name of the branch in the body of the issue
304304
# by default reads the field called "branch"
305-
# unless a diferent name is set using param :branch_field
305+
# unless a different name is set using param :branch_field
306306
# or if it comes in the match_data in the specified position
307307
def branch_name_value(branch_index=1)
308308
if @match_data.nil? || @match_data[branch_index].nil?
@@ -317,12 +317,12 @@ def hidden?
317317
params[:hidden] == true
318318
end
319319

320-
# Default description can be overriden by config param
320+
# Default description can be overridden by config param
321321
def description
322322
params[:description] || default_description
323323
end
324324

325-
# Default example_invocation can be overriden by config param
325+
# Default example_invocation can be overridden by config param
326326
def example_invocation
327327
params[:example_invocation] || default_example_invocation
328328
end

docs/configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ The _env_ section is used to declare general key/value settings. For security re
172172
<dd>This setting is used to impose conditions on the responder. It can include several options:
173173

174174
```eval_rst
175-
:title: *<String>* or *<Regular Expresion>* Responder will run only if issue' title matches this.
176-
:body: *<String>* or *<Regular Expresion>* Responder will run only if the body of the issue matches this.
175+
:title: *<String>* or *<Regular Expression>* Responder will run only if issue' title matches this.
176+
:body: *<String>* or *<Regular Expression>* Responder will run only if the body of the issue matches this.
177177
:value_exists: *<String>* Responder will run only if there is a not empty value for this in the issue (marked with HTML comments).
178178
:value_matches: *<Hash>* Responder will run only if the param values (marked with HTML comments) in the body of the issue matches the ones specified here.
179179
:role_assigned: *<String>* Responder will be run only if there is a username assigned for the specified value.

docs/custom_responder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ When an event is sent from the reviews repository to Buffy, only responders that
7474
#### Event regex
7575
The _@event_regex_ variable is where the syntax of every specific command is declared. If it is `nil` the responder will respond to every event that matches _@event_action_.
7676

77-
Inside this method you have available the name of the bot in the `@botname` instace variable and all the parameters for this responder from the config file in the `@params` instance variable.
77+
Inside this method you have available the name of the bot in the `@botname` instance variable and all the parameters for this responder from the config file in the `@params` instance variable.
7878

7979
For our example, we will be listening to comments and we want the command to be "what time is it?":
8080
```ruby

docs/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This will be the "user" responding to the commands issued from a reviews reposit
3636
Some applications and services must be available to use by Buffy:
3737

3838
- **[Redis](https://redis.io/)**: To process background jobs Buffy needs `redis` installed.
39-
- **[cloc](https://github.com/AlDanial/cloc)**: The *Respository Checks Responder* can analyze source code, to run this check `cloc` is used.
39+
- **[cloc](https://github.com/AlDanial/cloc)**: The *Repository Checks Responder* can analyze source code, to run this check `cloc` is used.
4040

4141
#### Deployment
4242

docs/labeling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Responders allowing labeling will accept in their settings two keys:
2424
- pending-review
2525
...
2626
```
27-
If the example responder is successfull the `review-finished` and `recommend publication` labels will be added and the `pending-review` label will be removed from the issue.
27+
If the example responder is successful the `review-finished` and `recommend publication` labels will be added and the `pending-review` label will be removed from the issue.
2828

2929
## Responders listening to Add/Remove actions
3030

docs/responders/external_service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Later, a POST request will be sent to https://dummy-external-service.herokuapp.c
116116
"secret": "A1234567890Z", # declared in the query_params setting
117117
"target-repo":"...", # the value is extracted from the body of the issue
118118
"id":"...", # the value corresponds to issue_id, it has been mapped to id
119-
"repo":"...", # the origin repo where the invocation happend
119+
"repo":"...", # the origin repo where the invocation happened
120120
"sender":"...", # the user invoking the command
121121
"bot_name":"...", # the bot user name that will be responding
122122
}

docs/responders/goodbye.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To reply with a template file:
4141

4242
Calling an external service:
4343
```eval_rst
44-
:external_service: All the configuration for the service is nested under this param. Posible options are:
44+
:external_service: All the configuration for the service is nested under this param. Possible options are:
4545
4646
:name: *Required*. The name for this service.
4747
:url: *Required*. The url to call.
@@ -105,7 +105,7 @@ When a new issue is closed the responder will send a POST request to https://dum
105105
"secret": "A1234567890Z", # declared in the query_params setting
106106
"target-repo":"...", # the value is extracted from the body of the issue
107107
"id":"...", # the value corresponds to issue_id, it has been mapped to id
108-
"repo":"...", # the origin repo where the invocation happend
108+
"repo":"...", # the origin repo where the invocation happened
109109
"sender":"...", # the user invoking the command
110110
"bot_name":"...", # the bot user name that will be responding
111111
}

0 commit comments

Comments
 (0)