Skip to content

Bump rubocop-packs #79

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.

Sign up for GitHub

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

Merged
alexevanczuk merged 3 commits into from
Mar 30, 2023
Merged

Bump rubocop-packs #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d383d8e
bump rubocop-packs
Mar 30, 2023
d677baa
fix typo
Mar 30, 2023
fcca971
fix tests
Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ GEM
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.21.0)
parser (>= 3.1.1.0)
rubocop-packs (0.0.34)
rubocop-packs (0.0.36)
activesupport
packs
parse_packwerk
Expand Down
7 changes: 3 additions & 4 deletions sorbet/rbi/gems/rubocop-packs@0.0.33.rbi → sorbet/rbi/gems/rubocop-packs@0.0.36.rbi
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 23 additions & 23 deletions spec/use_packs_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,18 +535,18 @@ def write_codeownership_config
end
end

context 'origin pack has a pack-level package_rubocop_todo.yml, destination pack does not' do
it 'modifies packs/*pack_package_rubocop_todo.yml, correctly' do
write_file('packs/foo/package_rubocop_todo.yml', <<~CONTENTS)
context 'origin pack has a pack-level .rubocop_todo.yml, destination pack does not' do
it 'modifies packs/*/.rubocop_todo.yml, correctly' do
write_file('packs/foo/.rubocop_todo.yml', <<~CONTENTS)
---
Layout/BeginEndAlignment:
Exclude:
- packs/foo/app/services/foo.rb
CONTENTS

before_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/package_rubocop_todo.yml'))
before_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/.rubocop_todo.yml'))
expect(before_rubocop_todo_foo).to eq({ 'Layout/BeginEndAlignment' => { 'Exclude' => ['packs/foo/app/services/foo.rb'] } })
expect(Pathname.new('packs/barpack_package_rubocop_todo.yml')).to_not exist
expect(Pathname.new('packs/barpack_.rubocop_todo.yml')).to_not exist

write_file('packs/foo/app/services/foo.rb')
UsePacks.create_pack!(pack_name: 'packs/bar')
Expand All @@ -558,32 +558,32 @@ def write_codeownership_config
per_file_processors: [UsePacks::RubocopPostProcessor.new]
)

after_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/package_rubocop_todo.yml'))
after_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/.rubocop_todo.yml'))
expect(after_rubocop_todo_foo).to eq({ 'Layout/BeginEndAlignment' => { 'Exclude' => [] } })
after_rubocop_todo_bar = YAML.load_file(Pathname.new('packs/bar/package_rubocop_todo.yml'))
after_rubocop_todo_bar = YAML.load_file(Pathname.new('packs/bar/.rubocop_todo.yml'))
expect(after_rubocop_todo_bar).to eq({ 'Layout/BeginEndAlignment' => { 'Exclude' => ['packs/bar/app/services/foo.rb'] } })
end
end

context 'origin and destination pack both have .rubocop_todo.yml' do
it 'modifies packs/*/package_rubocop_todo.yml, correctly' do
write_file('packs/foo/package_rubocop_todo.yml', <<~CONTENTS)
it 'modifies packs/*/.rubocop_todo.yml, correctly' do
write_file('packs/foo/.rubocop_todo.yml', <<~CONTENTS)
---
Layout/BeginEndAlignment:
Exclude:
- packs/foo/app/services/foo.rb
CONTENTS

write_file('packs/bar/package_rubocop_todo.yml', <<~CONTENTS)
write_file('packs/bar/.rubocop_todo.yml', <<~CONTENTS)
---
Layout/BeginEndAlignment:
Exclude:
- packs/bar/app/services/bar.rb
CONTENTS

before_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/package_rubocop_todo.yml'))
before_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/.rubocop_todo.yml'))
expect(before_rubocop_todo_foo).to eq({ 'Layout/BeginEndAlignment' => { 'Exclude' => ['packs/foo/app/services/foo.rb'] } })
before_rubocop_todo_bar = YAML.load_file(Pathname.new('packs/bar/package_rubocop_todo.yml'))
before_rubocop_todo_bar = YAML.load_file(Pathname.new('packs/bar/.rubocop_todo.yml'))
expect(before_rubocop_todo_bar).to eq({ 'Layout/BeginEndAlignment' => { 'Exclude' => ['packs/bar/app/services/bar.rb'] } })

write_file('packs/foo/app/services/foo.rb')
Expand All @@ -596,32 +596,32 @@ def write_codeownership_config
per_file_processors: [UsePacks::RubocopPostProcessor.new]
)

after_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/package_rubocop_todo.yml'))
after_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/.rubocop_todo.yml'))
expect(after_rubocop_todo_foo).to eq({ 'Layout/BeginEndAlignment' => { 'Exclude' => [] } })
after_rubocop_todo_bar = YAML.load_file(Pathname.new('packs/bar/package_rubocop_todo.yml'))
after_rubocop_todo_bar = YAML.load_file(Pathname.new('packs/bar/.rubocop_todo.yml'))
expect(after_rubocop_todo_bar).to eq({ 'Layout/BeginEndAlignment' => { 'Exclude' => ['packs/bar/app/services/bar.rb', 'packs/bar/app/services/foo.rb'] } })
end
end

context 'destination pack does not have same key in .rubocop_todo.yml' do
it 'modifies packs/*/package_rubocop_todo.yml, correctly' do
write_file('packs/foo/package_rubocop_todo.yml', <<~CONTENTS)
it 'modifies packs/*/.rubocop_todo.yml, correctly' do
write_file('packs/foo/.rubocop_todo.yml', <<~CONTENTS)
---
Layout/BeginEndAlignment:
Exclude:
- packs/foo/app/services/foo.rb
CONTENTS

write_file('packs/bar/package_rubocop_todo.yml', <<~CONTENTS)
write_file('packs/bar/.rubocop_todo.yml', <<~CONTENTS)
---
Layout/OtherCop:
Exclude:
- packs/bar/app/services/bar.rb
CONTENTS

before_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/package_rubocop_todo.yml'))
before_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/.rubocop_todo.yml'))
expect(before_rubocop_todo_foo).to eq({ 'Layout/BeginEndAlignment' => { 'Exclude' => ['packs/foo/app/services/foo.rb'] } })
before_rubocop_todo_bar = YAML.load_file(Pathname.new('packs/bar/package_rubocop_todo.yml'))
before_rubocop_todo_bar = YAML.load_file(Pathname.new('packs/bar/.rubocop_todo.yml'))
expect(before_rubocop_todo_bar).to eq({ 'Layout/OtherCop' => { 'Exclude' => ['packs/bar/app/services/bar.rb'] } })

write_file('packs/foo/app/services/foo.rb')
Expand All @@ -634,9 +634,9 @@ def write_codeownership_config
per_file_processors: [UsePacks::RubocopPostProcessor.new]
)

after_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/package_rubocop_todo.yml'))
after_rubocop_todo_foo = YAML.load_file(Pathname.new('packs/foo/.rubocop_todo.yml'))
expect(after_rubocop_todo_foo).to eq({ 'Layout/BeginEndAlignment' => { 'Exclude' => [] } })
after_rubocop_todo_bar = YAML.load_file(Pathname.new('packs/bar/package_rubocop_todo.yml'))
after_rubocop_todo_bar = YAML.load_file(Pathname.new('packs/bar/.rubocop_todo.yml'))
expect(after_rubocop_todo_bar).to eq({
'Layout/BeginEndAlignment' => { 'Exclude' => ['packs/bar/app/services/foo.rb'] },
'Layout/OtherCop' => { 'Exclude' => ['packs/bar/app/services/bar.rb'] }
Expand Down Expand Up @@ -1029,7 +1029,7 @@ def write_codeownership_config
it 'replaces the file in the pack-specific .rubocop_todo.yml' do
write_package_yml('packs/organisms')

write_file('packs/organisms/package_rubocop_todo.yml', <<~CONTENTS)
write_file('packs/organisms/.rubocop_todo.yml', <<~CONTENTS)
---
Layout/BeginEndAlignment:
Exclude:
Expand All @@ -1039,7 +1039,7 @@ def write_codeownership_config
write_file('packs/organisms/app/services/other_bird.rb')
write_file('packs/organisms/spec/services/other_bird_spec.rb')

rubocop_todo = Pathname.new('packs/organisms/package_rubocop_todo.yml')
rubocop_todo = Pathname.new('packs/organisms/.rubocop_todo.yml')

expect(rubocop_todo.read).to include 'packs/organisms/app/services/other_bird.rb'
expect(rubocop_todo.read).to_not include 'packs/organisms/app/public/other_bird.rb'
Expand Down