Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump rubocop from 1.17.0 to 1.18.0 in /Library/Homebrew #11626

Closed

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 29, 2021

Bumps rubocop from 1.17.0 to 1.18.0.

Release notes

Sourced from rubocop's releases.

RuboCop 1.18

New features

Bug fixes

  • #9803: Fix Bundler/GemVersion cop not respecting git tags. (@​tejasbubane, @​timlkelly)
  • #9882: Fix an incorrect auto-correct for Layout/LineLength when using heredoc as the first method argument and omitting parentheses. (@​koic)
  • #7592: Add cop Layout/LineEndStringConcatenationIndentation. (@​jonas054)
  • #9880: Fix a false positive for Style/RegexpLiteral when using a regexp starts with a blank as a method argument. (@​koic)
  • #9888: Fix a false positive for Layout/ClosingParenthesisIndentation when using keyword arguemnts. (@​koic)
  • #9886: Fix indentation in Style/ClassAndModuleChildren. (@​markburns)

Changes

  • #9144: Add aggressive and conservative modes of operation for Style/StringConcatenation cop. (@​tejasbubane)
Changelog

Sourced from rubocop's changelog.

1.18.0 (2021-06-29)

New features

Bug fixes

  • #9803: Fix Bundler/GemVersion cop not respecting git tags. ([@​tejasbubane][], [@​timlkelly][])
  • #9882: Fix an incorrect auto-correct for Layout/LineLength when using heredoc as the first method argument and omitting parentheses. ([@​koic][])
  • #7592: Add cop Layout/LineEndStringConcatenationIndentation. ([@​jonas054][])
  • #9880: Fix a false positive for Style/RegexpLiteral when using a regexp starts with a blank as a method argument. ([@​koic][])
  • #9888: Fix a false positive for Layout/ClosingParenthesisIndentation when using keyword arguemnts. ([@​koic][])
  • #9886: Fix indentation in Style/ClassAndModuleChildren. ([@​markburns][])

Changes

  • #9144: Add aggressive and conservative modes of operation for Style/StringConcatenation cop. ([@​tejasbubane][])
Commits
  • f1f6414 Cut 1.18
  • 8f3bde2 Update Changelog
  • 9b5402d [Fixes #9144] Add aggressive and conservative modes for `Style/StringConc...
  • 0170f53 Fix a typo
  • 89463f6 Fix a false positive for Layout/ClosingParenthesisIndentation
  • 8ff511c Update changelog/fix_gem_version_not_respecting_tags.md
  • 19390ca Update Bundler/GemVersion to check for branch, ref, and tag
  • 4326083 [Fix #9803] Fix Bundler/GemVersion cop not respecting git tags
  • 356b22c Fix indentation in Style/ClassAndModuleChildren
  • aadf475 Fix a build error
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies Bumping Gemfile dependencies ruby Pull requests that update Ruby code labels Jun 29, 2021
Comment on lines 44 to 52
Naming/InclusiveLanguage:
FlaggedTerms:
whitelist:
# For an option passed to `srb` in dev-cmd/typecheck.rb
AllowedRegex: "--error-white-list"
# TODO: If possible, make this stricter. Some instances may be unavoidable,
# such as sqlite_master in unpack_strategy/fossil.rb but these can be
# handled using AllowedRegex.
master:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RuboCop added a new Naming/InclusiveLanguage cop in this release, which is enabled by default. Our codebase has many references to the master branch which is used as a fallback in many cases, or to refer to the HEAD/default branch of our official taps, which happen to be named master.

For the time being, I've replaced potentially problematic instances which can be safely replaced without breaking public API, but enabling the cop for the word "master" does not seem possible at this moment.

brew style gives me 39 offenses without disabling the check for "master", of which one seems to be a false positive (and I've mentioned this in the TODO comment).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, this is a nice middle-ground between reducing our use of the term but also allowing us to use this cop for other terms with our Git-heavy internal language.

Library/Homebrew/cmd/install.rb Outdated Show resolved Hide resolved
Comment on lines 44 to 52
Naming/InclusiveLanguage:
FlaggedTerms:
whitelist:
# For an option passed to `srb` in dev-cmd/typecheck.rb
AllowedRegex: "--error-white-list"
# TODO: If possible, make this stricter. Some instances may be unavoidable,
# such as sqlite_master in unpack_strategy/fossil.rb but these can be
# handled using AllowedRegex.
master:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, this is a nice middle-ground between reducing our use of the term but also allowing us to use this cop for other terms with our Git-heavy internal language.

@MikeMcQuaid
Copy link
Member

@nandahkrishna This will need rebased to pass CI 😭

@nandahkrishna
Copy link
Member

I think it's failing because of syntax issues in homebrew/core too (and not just the Repology test) – working on a PR for that now 🙂.

@nandahkrishna nandahkrishna force-pushed the dependabot/bundler/Library/Homebrew/rubocop-1.18.0 branch from 1a13851 to 4a19843 Compare June 30, 2021 15:15
@nandahkrishna
Copy link
Member

I've opened Homebrew/homebrew-core#80302 to fix style issues in formulae. I had to move the RuboCop changes to the common .rubocop.yml file to account for the presence of terms we can't change yet in formulae.

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jun 30, 2021

A newer version of rubocop exists, but since this PR has been edited by someone other than Dependabot I haven't updated it. You'll get a PR for the updated version as normal once this PR is merged.

@nandahkrishna
Copy link
Member

@dependabot recreate

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jul 2, 2021

Superseded by #11642.

@dependabot dependabot bot closed this Jul 2, 2021
@dependabot dependabot bot deleted the dependabot/bundler/Library/Homebrew/rubocop-1.18.0 branch July 2, 2021 17:52
@github-actions github-actions bot added the outdated PR was locked due to age label Aug 2, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
dependencies Bumping Gemfile dependencies outdated PR was locked due to age ruby Pull requests that update Ruby code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants