Skip to content

Commit 8d16c01

Browse files
authored
Merge branch 'master' into login-bang-method
2 parents 585de0f + e3a53e2 commit 8d16c01

File tree

84 files changed

+1038
-787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1038
-787
lines changed

.devcontainer/Dockerfile

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

.devcontainer/devcontainer.json

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,15 @@
11
{
22
"name": "Ruby",
3-
"build": {
4-
"dockerfile": "Dockerfile"
5-
},
3+
"image": "mcr.microsoft.com/devcontainers/ruby",
64

7-
// Configure tool-specific properties.
85
"customizations": {
9-
// Configure properties specific to VS Code.
106
"vscode": {
11-
// Add the IDs of extensions you want installed when the container is created.
127
"extensions": [
13-
"rebornix.Ruby"
8+
"Shopify.ruby-lsp"
149
]
1510
}
1611
},
1712

18-
// Set the environment variables
19-
// "runArgs": ["--env-file",".env"],
20-
21-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
22-
// "forwardPorts": [],
23-
24-
// Use 'postCreateCommand' to run commands after the container is created.
2513
"postCreateCommand": "bash .devcontainer/postcreate.sh",
26-
27-
// Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
2814
"remoteUser": "vscode"
2915
}

.devcontainer/postcreate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22

33
bundle config set path vendor/bundle
4-
bundle install --jobs=1
4+
bundle install

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
Please ensure your pull request includes the following:
22

33
- [ ] Description of changes
4-
- [ ] Update to CHANGELOG.md with short description and link to pull request
54
- [ ] Changes have related RSpec tests that ensure functionality does not break
6-
7-
<!-- For the changelog, please add your entry to the HEAD section. Do not create a new release header. -->

.github/workflows/ruby.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,23 @@ on:
1010

1111
jobs:
1212
test_matrix:
13-
1413
runs-on: ubuntu-latest
15-
1614
strategy:
1715
fail-fast: false
1816
matrix:
1917
ruby:
2018
- '3.2'
2119
- '3.3'
2220
- '3.4'
23-
2421
rails:
2522
- '71'
2623
- '72'
2724
- '80'
25+
- '81'
2826
env:
2927
BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
30-
3128
steps:
32-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
3330
- name: Set up Ruby
3431
uses: ruby/setup-ruby@v1
3532
with:
@@ -38,9 +35,21 @@ jobs:
3835
- name: Run tests
3936
run: bundle exec rake spec
4037

38+
rubocop:
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/checkout@v5
42+
- name: Set up Ruby
43+
uses: ruby/setup-ruby@v1
44+
with:
45+
ruby-version: '3.4'
46+
bundler-cache: true
47+
- name: Run RuboCop
48+
run: bundle exec rubocop .
49+
4150
finish:
4251
runs-on: ubuntu-latest
43-
needs: [ test_matrix ]
52+
needs: [ test_matrix, rubocop ]
4453
steps:
4554
- name: Wait for status checks
4655
run: echo "All Green!"

.rubocop.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
inherit_from: .rubocop_todo.yml
2+
plugins:
3+
- rubocop-performance
4+
- rubocop-rspec
25

36
AllCops:
47
Exclude:
58
- 'lib/generators/sorcery/templates/**/*'
6-
TargetRubyVersion: 2.6
9+
- 'vendor/bundle/**/*'
10+
TargetRubyVersion: 3.2
11+
NewCops: enable
712

813
# See: https://github.com/rubocop-hq/rubocop/issues/3344
914
Style/DoubleNegation:
@@ -21,6 +26,7 @@ Metrics/BlockLength:
2126
Exclude:
2227
- 'lib/**/*'
2328
- 'spec/**/*'
29+
- 'sorcery.gemspec'
2430
Layout/LineLength:
2531
Exclude:
2632
- 'lib/**/*'
@@ -45,11 +51,14 @@ Naming/AccessorMethodName:
4551
Exclude:
4652
- 'lib/**/*'
4753
- 'spec/**/*'
48-
Naming/PredicateName:
54+
Naming/PredicatePrefix:
4955
Exclude:
5056
- 'lib/**/*'
5157
- 'spec/**/*'
5258
Style/Documentation:
5359
Exclude:
5460
- 'lib/**/*'
5561
- 'spec/**/*'
62+
Style/OptionalBooleanParameter:
63+
Exclude:
64+
- 'lib/**/*'

0 commit comments

Comments
 (0)