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

Merge rubygems and bundler rubocop rules #6487

Merged
merged 14 commits into from
Mar 16, 2023
Merged

Merge rubygems and bundler rubocop rules #6487

merged 14 commits into from
Mar 16, 2023

Conversation

hsbt
Copy link
Member

@hsbt hsbt commented Mar 15, 2023

What was the end-user or developer problem that led to this PR?

We have two rubocop rules between rubygems and bundler. We should move to merge them.

What is your fix for the problem, implemented in this PR?

I merge .rubocop_bundler.yml into .rubocop.yml only non-effect cops at first in this PR. After that, I'll triage rubocop_bundler.yml cops and modify rubygems or bundler files step by step.

@deivid-rodriguez @simi Do you have any concerns about this merger plan?

Make sure the following tasks are checked

@hsbt
Copy link
Member Author

hsbt commented Mar 15, 2023

Layout/CaseIndentation and Layout/SpaceAroundOperators are conflicts on rubygems/bundler. I aligned their cops in this time.

@deivid-rodriguez
Copy link
Member

No concerns, and I like your plan.

@hsbt
Copy link
Member Author

hsbt commented Mar 15, 2023

Thanks to quick response. I'll work Layout, Style, Naming and other cops.

@simi
Copy link
Member

simi commented Mar 15, 2023

💪 getting rubygems and bundler closer one step at the time 💪

Btw. I have still plan to add Naming/MemoizedInstanceVariableName, I'll postpone my PR until this is finished.

@hsbt
Copy link
Member Author

hsbt commented Mar 15, 2023

I confirmed rule differences with the following way:

>> master = (Psych.load_file(".rubocop.yml").keys + Psych.load_file(".rubocop_bundler.yml").keys).uniq
# swith to this branch
>> merge = (Psych.load_file(".rubocop.yml").keys + Psych.load_file(".rubocop_bundler.yml").keys).uniq
>> merge - master
=> ["inherit_from"]
>> master - merge
=> []

There is no missing cops with this PR.

@hsbt hsbt marked this pull request as ready for review March 15, 2023 23:43
@hsbt hsbt added this pull request to the merge queue Mar 15, 2023
Merged via the queue into master with commit 7f3d8e8 Mar 16, 2023
@hsbt hsbt deleted the merge-rubocop-rules branch March 16, 2023 01:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants