Skip to content

Commit

Permalink
➕ standard-performance, standard-custom, standard-rubocop-lts, better…
Browse files Browse the repository at this point in the history
…lint, standard-rails, version_gem
  • Loading branch information
pboling committed May 17, 2023
1 parent df331a9 commit 1033b8c
Show file tree
Hide file tree
Showing 25 changed files with 212 additions and 123 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
steps:
- uses: amancevice/setup-code-climate@v0
name: CodeClimate Install
if: matrix.ruby == '3.0' && github.event_name != 'pull_request' && always()
if: ${{ github.event_name != 'pull_request' }}
with:
cc_test_reporter_id: ${{ secrets.CC_TEST_REPORTER_ID }}

Expand All @@ -59,7 +59,7 @@ jobs:

- name: CodeClimate Pre-build Notification
run: cc-test-reporter before-build
if: matrix.ruby == '3.0' && github.event_name != 'pull_request' && always()
if: ${{ github.event_name != 'pull_request' }}
continue-on-error: ${{ matrix.experimental != 'false' }}

- name: Run RSpec tests
Expand All @@ -68,11 +68,12 @@ jobs:
- name: CodeClimate Post-build Notification
run: cc-test-reporter after-build
if: matrix.ruby == '3.0' && github.event_name != 'pull_request' && always()
if: ${{ github.event_name != 'pull_request' }}
continue-on-error: ${{ matrix.experimental != 'false' }}

- name: Code Coverage Summary Report
uses: irongut/CodeCoverageSummary@v1.3.0
if: ${{ github.event_name == 'pull_request' }}
with:
filename: ./coverage/coverage.xml
badge: true
Expand All @@ -87,15 +88,15 @@ jobs:

- name: Add Coverage PR Comment
uses: marocchino/sticky-pull-request-comment@v2
if: matrix.ruby == '3.0' && always()
if: ${{ github.event_name == 'pull_request' }}
with:
recreate: true
path: code-coverage-results.md
continue-on-error: ${{ matrix.experimental != 'false' }}

- name: Coveralls
uses: coverallsapp/github-action@master
if: matrix.ruby == '3.0' && github.event_name != 'pull_request' && always()
if: ${{ github.event_name == 'pull_request' }}
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
continue-on-error: ${{ matrix.experimental != 'false' }}
5 changes: 1 addition & 4 deletions .github/workflows/current.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,11 @@ jobs:
experimental: [false]
gemfile:
- vanilla
- rails7
ruby:
- "3.1"
- "3.2"
- "jruby"
exclude:
# Don't care if Rails can install on jruby
- gemfile: rails7
ruby: "jruby"
# Vanilla + 3.1 is effectively run by coverage workflow
- gemfile: vanilla
ruby: "3.1"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ jobs:
- vanilla
ruby:
- "ruby-head"
# NOTE: jruby-head is still @ Ruby 3.1 compat
- "jruby-head"
# NOTE: truffleruby-head is still @ Ruby 3.1 compat
- "truffleruby-head"

runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
gemfile:
- style
ruby:
- "3.1"
- "3.2"
runs-on: ubuntu-latest
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ default:
image: ruby:3.1.4

before_script:
- gem install bundler -v 2.4.12
- gem install bundler -v 2.4.13
- bundle install

rake_job:
Expand Down
4 changes: 2 additions & 2 deletions .simplecov
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# frozen_string_literal: true

# To get coverage
# On Local, default (HTML) output coverage is turned on with Ruby 2.6+:
# On Local, default (HTML) output coverage is turned on with Ruby 3.1+:
# bundle exec rspec spec
# On Local, all output formats with Ruby 3.0+:
# On Local, all output formats with Ruby 3.1+:
# COVER_ALL=true bundle exec rspec spec
#
# On CI, all output formats, the ENV variables CI is always set,
Expand Down
16 changes: 14 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Removed

## [2.0.0] 2023-04-09
## [2.0.1] 2023-05-17
### Added
- Configs added for:
- standard-performance
- standard-custom
- standard-rubocop-lts
- And optionally, if you are building a Rails app:
- betterlint
- standard-rails
- version_gem

## [2.0.0] 2023-05-09
### Changed
- New/Better configs for:
- rubocop
Expand Down Expand Up @@ -87,7 +98,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
* Initial release

[Unreleased]: https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/compare/v2.0.0...HEAD
[Unreleased]: https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/compare/v2.0.1...HEAD
[2.0.1]: https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/compare/v2.0.0...v2.0.1
[2.0.0]: https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/compare/v1.1.4...v2.0.0
[1.1.4]: https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/compare/v1.1.3...v1.1.4
[1.1.3]: https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/compare/v1.1.2...v1.1.3
Expand Down
15 changes: 8 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ To release a new version:

1. Run `bin/setup && bin/rake` as a tests, coverage, & linting sanity check.
2. update the version number in `version.rb`
3. run `bundle exec rake build:checksum`
4. move the built gem to project root
5. run `bin/checksum` to create the missing SHA256 checksum
6. move the built gem back to `pkg/`
7. commit the changes
8. run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org][rubygems].
3. Run `bin/setup && bin/rake` again as a secondary check, and to update `Gemfile.lock`.
4. run `bundle exec rake build:checksum`
5. move the built gem to project root
6. run `bin/checksum` to create the missing SHA256 checksum
7. move the built gem back to `pkg/`
8. commit the changes
9. run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org][rubygems].

NOTE: You will need to have a public key in `certs/`, and list your cert in the
`gemspec`, in order to sign the new release.
Expand All @@ -30,7 +31,7 @@ See: [https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/graphs/main][🖐contribu

[comment]: <> (Following links are used by README, CONTRIBUTING, Homepage)

[conduct]: https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/blob/main/CODE_OF_CONDUCT.md
[🤝conduct]: https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/blob/main/CODE_OF_CONDUCT.md
[🖐contributors]: https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/graphs/main
[🚎src-main]: https://gitlab.com/rubocop-lts/rubocop-ruby3_1/-/tree/main
[🏘chat]: https://gitter.im/rubocop-lts/community
Expand Down
9 changes: 9 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ if LOCAL_SUPPORTED || IS_CI

# Documentation
eval_gemfile "./gemfiles/contexts/docs.gemfile"

# Debugging
platform :mri do
eval_gemfile "./gemfiles/contexts/mri/debug.gemfile"
end

platform :jruby do
eval_gemfile "./gemfiles/contexts/jruby/debug.gemfile"
end
end

eval_gemfile "./gemfiles/contexts/core.gemfile"
47 changes: 41 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,45 @@ GIT
PATH
remote: .
specs:
rubocop-ruby3_1 (2.0.0)
rubocop-ruby3_1 (2.0.1)
rubocop-gradual (~> 0.3)
rubocop-md (~> 1.2)
rubocop-rake (~> 0.6)
rubocop-rspec (~> 2.22)
rubocop-shopify (~> 2.13)
rubocop-thread_safety (~> 0.5)
standard (~> 1.28, < 2)
standard-rubocop-lts (>= 1.0.1, < 2)
version_gem (>= 1.1.2, < 3)

GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
ast (2.4.2)
betterlint (1.4.6)
rubocop (> 1.0)
rubocop-performance
rubocop-rails
rubocop-rake
rubocop-rspec (>= 2.22)
byebug (11.1.3)
concurrent-ruby (1.2.2)
diff-lcs (1.5.0)
diffy (3.4.2)
docile (1.4.0)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
json (2.6.3)
language_server-protocol (3.17.0.3)
lint_roller (1.0.0)
minitest (5.18.0)
parallel (1.23.0)
parser (3.2.2.1)
ast (~> 2.4.1)
rack (3.0.7)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.0)
Expand Down Expand Up @@ -63,7 +80,7 @@ GEM
parser (>= 3.2.1.0)
rubocop-capybara (2.18.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.22.0)
rubocop-factory_bot (2.23.1)
rubocop (~> 1.33)
rubocop-gradual (0.3.1)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -78,6 +95,10 @@ GEM
rubocop-performance (1.16.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.19.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.22.0)
Expand Down Expand Up @@ -113,7 +134,17 @@ GEM
standard-performance (1.0.1)
lint_roller (~> 1.0)
rubocop-performance (~> 1.16.0)
standard-rails (0.1.0)
lint_roller (~> 1.0)
rubocop-rails (~> 2.19.0)
standard-rubocop-lts (1.0.1)
standard (~> 1.28, < 2)
standard-custom (~> 1.0, < 2)
standard-performance (~> 1.0, < 2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
version_gem (1.1.2)
yard (0.9.34)

PLATFORMS
Expand All @@ -122,6 +153,9 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
betterlint (~> 1.4)
byebug
pry-debugger-jruby
rake (~> 13.0)
rspec (~> 3.8)
rspec-block_is_expected (~> 1.0)
Expand All @@ -138,8 +172,9 @@ DEPENDENCIES
simplecov-json (~> 0.2)
simplecov-lcov (~> 0.8)
simplecov-rcov!
standard (~> 1.28, < 2)
standard-rails (~> 0.1)
standard-rubocop-lts (~> 1.0)
yard (~> 0.9, >= 0.9.34)

BUNDLED WITH
2.4.12
2.4.13
Loading

0 comments on commit 1033b8c

Please sign in to comment.