Skip to content

Commit 7e6b8f2

Browse files
pbolingpboling
authored
Merge pull request #695 from ruby-oauth/feat/upgrade-stuffs
Feat/upgrade stuffs
2 parents 5354d13 + 0ee4308 commit 7e6b8f2

30 files changed

Lines changed: 372 additions & 4846 deletions

‎.idea/csv-editor.xml‎

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

‎.rubocop‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--config .rubocop.yml

‎.rubocop.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ plugins: rubocop-on-rbs
99
RBS:
1010
Enabled: true
1111

12+
# This tells RuboCop to add the exclusions in this file
13+
# to the default exclusions (and those from other inherited files),
14+
# rather than overwriting them.
15+
inherit_mode:
16+
merge:
17+
- Exclude
18+
1219
AllCops:
1320
DisplayCopNames: true # Display the name of the failing cops
1421
Exclude:

‎.rubocop_gradual.lock‎

Lines changed: 8 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,27 @@
11
{
2-
"bin/bundle:3976421676": [
3-
[66, 5, 20, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 2485198147],
4-
[78, 5, 74, "Style/InvertibleUnlessCondition: Prefer `if Gem.rubygems_version >= Gem::Version.new(\"2.7.0\")` over `unless Gem.rubygems_version < Gem::Version.new(\"2.7.0\")`.", 2453573257]
2+
"bin/bundle:872096170": [
3+
[66, 5, 20, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 2485198147]
54
],
6-
"lib/oauth2.rb:2435263975": [
7-
[73, 11, 7, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 651502127]
5+
"lib/oauth2.rb:3283430588": [
6+
[57, 7, 7, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 651502127]
87
],
9-
"lib/oauth2/access_token.rb:1962777363": [
10-
[64, 13, 5, "Style/IdenticalConditionalBranches: Move `t_key` out of the conditional.", 183811513],
11-
[70, 13, 5, "Style/IdenticalConditionalBranches: Move `t_key` out of the conditional.", 183811513]
8+
"lib/oauth2/filtered_attributes.rb:3925029601": [
9+
[13, 5, 63, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 2901108034]
1210
],
13-
"lib/oauth2/authenticator.rb:158201238": [
14-
[59, 5, 113, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 734523108]
15-
],
16-
"lib/oauth2/filtered_attributes.rb:321265140": [
17-
[13, 5, 63, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 2901108034],
18-
[24, 9, 25, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 2012823020],
19-
[31, 9, 25, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 2012823020]
20-
],
21-
"lib/oauth2/response.rb:2054901929": [
22-
[53, 5, 204, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 996912427]
23-
],
24-
"spec/oauth2/access_token_spec.rb:3152504592": [
25-
[3, 1, 34, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/access_token*_spec.rb`.", 1972107547],
26-
[854, 13, 25, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 770233088],
27-
[924, 9, 101, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3022740639],
28-
[928, 9, 79, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 2507338967]
29-
],
30-
"spec/oauth2/authenticator_spec.rb:853320290": [
31-
[3, 1, 36, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/authenticator*_spec.rb`.", 819808017],
32-
[51, 15, 20, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 482779785],
33-
[60, 15, 33, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 297534737],
34-
[69, 15, 38, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1480816240],
35-
[79, 13, 23, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 2314399065]
36-
],
37-
"spec/oauth2/client_spec.rb:2143306493": [
38-
[6, 1, 29, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/client*_spec.rb`.", 439549885],
39-
[175, 7, 492, "RSpec/NoExpectationExample: No expectation found in this example.", 1272021224],
40-
[194, 7, 592, "RSpec/NoExpectationExample: No expectation found in this example.", 3428877205],
11+
"spec/oauth2/client_spec.rb:1785648507": [
4112
[207, 15, 20, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 2320605227],
4213
[222, 15, 20, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1276531672],
4314
[237, 15, 43, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1383956904],
4415
[252, 15, 43, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 3376202107],
45-
[839, 5, 360, "RSpec/NoExpectationExample: No expectation found in this example.", 536201463],
46-
[848, 5, 461, "RSpec/NoExpectationExample: No expectation found in this example.", 3392600621],
47-
[859, 5, 340, "RSpec/NoExpectationExample: No expectation found in this example.", 244592251],
48-
[987, 11, 99, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3084776886],
49-
[991, 11, 82, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 1524553529],
50-
[999, 7, 89, "RSpec/NoExpectationExample: No expectation found in this example.", 4609419],
51-
[1087, 11, 99, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3084776886],
52-
[1091, 11, 82, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 1524553529],
53-
[1171, 17, 12, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 664794325]
16+
[1175, 17, 12, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 664794325]
5417
],
5518
"spec/oauth2/error_spec.rb:1692696277": [
56-
[23, 1, 28, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/error*_spec.rb`.", 3385870076],
5719
[93, 11, 460, "RSpec/NoExpectationExample: No expectation found in this example.", 3630511675],
5820
[108, 11, 210, "RSpec/NoExpectationExample: No expectation found in this example.", 3948582233],
5921
[240, 11, 534, "RSpec/NoExpectationExample: No expectation found in this example.", 3347340910],
6022
[256, 11, 210, "RSpec/NoExpectationExample: No expectation found in this example.", 3948582233],
6123
[314, 11, 534, "RSpec/NoExpectationExample: No expectation found in this example.", 3347340910],
6224
[375, 11, 534, "RSpec/NoExpectationExample: No expectation found in this example.", 3347340910],
6325
[391, 11, 210, "RSpec/NoExpectationExample: No expectation found in this example.", 3948582233]
64-
],
65-
"spec/oauth2/response_spec.rb:4032173622": [
66-
[3, 1, 31, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/response*_spec.rb`.", 3190869319]
67-
],
68-
"spec/oauth2/strategy/assertion_spec.rb:3524328522": [
69-
[6, 1, 42, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/strategy/assertion*_spec.rb`.", 3665690869]
70-
],
71-
"spec/oauth2/strategy/auth_code_spec.rb:142083698": [
72-
[4, 1, 41, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/strategy/auth_code*_spec.rb`.", 1553708922]
73-
],
74-
"spec/oauth2/strategy/base_spec.rb:2524881749": [
75-
[3, 1, 37, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/strategy/base*_spec.rb`.", 1951594922]
76-
],
77-
"spec/oauth2/strategy/client_credentials_spec.rb:2609739899": [
78-
[3, 1, 50, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/strategy/client_credentials*_spec.rb`.", 690311422]
79-
],
80-
"spec/oauth2/strategy/implicit_spec.rb:1595799281": [
81-
[3, 1, 41, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/strategy/implicit*_spec.rb`.", 3731171632]
82-
],
83-
"spec/oauth2/strategy/password_spec.rb:331601826": [
84-
[3, 1, 41, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/strategy/password*_spec.rb`.", 3463323840]
85-
],
86-
"spec/oauth2/version_spec.rb:1001406821": [
87-
[3, 1, 30, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/version*_spec.rb`.", 1099517182]
88-
],
89-
"spec/oauth2_spec.rb:4211477230": [
90-
[3, 1, 21, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2*_spec.rb`.", 3359091140]
9126
]
9227
}

‎.rubocop_rspec.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,7 @@ RSpec/MultipleMemoizedHelpers:
3131

3232
RSpec/SpecFilePathFormat:
3333
CustomTransform:
34-
"OAuth": "oauth"
34+
"OAuth2": "oauth2"
35+
36+
RSpec/Output:
37+
Enabled: false

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
direnv 2.32.2
2-
ruby 3.4.7
2+
ruby 4.0.1

0 commit comments

Comments
 (0)