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

switch to voxpupuli-rubocop; cleanup CI config and gemspec #309

Merged
merged 6 commits into from
May 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
env:
BUNDLE_WITHOUT: release
- name: Build gem
run: gem build *.gemspec
run: gem build --strict --verbose *.gemspec
- name: Publish gem to rubygems.org
run: gem push *.gem
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Run tests
run: bundle exec rake
- name: Build gem
run: gem build *.gemspec
run: gem build --strict --verbose *.gemspec

tests:
needs:
Expand Down
30 changes: 2 additions & 28 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,7 @@
---
inherit_from: .rubocop_todo.yml

require:
- rubocop-minitest
- rubocop-performance
- rubocop-rake
- rubocop-rspec

AllCops:
NewCops: enable
TargetRubyVersion: 2.7

Layout/FirstArrayElementIndentation:
Enabled: false

Style/TrailingCommaInHashLiteral:
Enabled: True
EnforcedStyleForMultiline: consistent_comma

Style/TrailingCommaInArrayLiteral:
Enabled: True
EnforcedStyleForMultiline: consistent_comma

Style/TrailingCommaInArguments:
Enabled: True
EnforcedStyleForMultiline: comma

Gemspec/RequireMFA:
Enabled: false
inherit_gem:
voxpupuli-rubocop: rubocop.yml

Style/GuardClause:
Enabled: False
7 changes: 2 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ gemspec
eval(File.read("#{__FILE__}.local"), binding) if File.exist? "#{__FILE__}.local"

group :release do
gem 'faraday-retry', require: false
gem 'github_changelog_generator', require: false
end

Expand All @@ -14,9 +15,5 @@ group :coverage, optional: ENV['COVERAGE'] != 'yes' do
end

group :rubocop do
gem 'rubocop', '~> 1.50.2'
gem 'rubocop-minitest', '~> 0.30.0'
gem 'rubocop-performance', '~> 1.17.1'
gem 'rubocop-rake', '~> 0.6.0'
gem 'rubocop-rspec', '~> 2.20.0'
gem 'voxpupuli-rubocop', '~> 1.2'
end
8 changes: 2 additions & 6 deletions beaker-hostgenerator.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,11 @@ Gem::Specification.new do |s|

# Testing dependencies
s.add_development_dependency 'fakefs', '>= 0.6', '< 3.0'
s.add_development_dependency 'minitest'
s.add_development_dependency 'minitest', '~> 5.18'
s.add_development_dependency 'pry', '~> 0.10'
s.add_development_dependency 'rake', '~> 13.0'
s.add_development_dependency 'rspec', '~> 3.0'
s.add_development_dependency 'rspec-its'

# Documentation dependencies
s.add_development_dependency 'thin'
s.add_development_dependency 'yard'
s.add_development_dependency 'rspec-its', '~> 1.3'

# Run time dependencies
s.add_runtime_dependency 'deep_merge', '~> 1.0'
Expand Down
12 changes: 6 additions & 6 deletions lib/beaker-hostgenerator/data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,9 @@ def osinfo
docker: {
'image' => 'quay.io/centos/centos:stream8',
'docker_image_commands' => [
'cp /bin/true /sbin/agetty',
'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en hostname',
],
'cp /bin/true /sbin/agetty',
'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en hostname',
],
},
},
'centos9-64' => {
Expand All @@ -260,9 +260,9 @@ def osinfo
docker: {
'image' => 'quay.io/centos/centos:stream9',
'docker_image_commands' => [
'cp /bin/true /sbin/agetty',
'dnf install -y crontabs initscripts iproute openssl wget which glibc-langpack-en hostname',
],
'cp /bin/true /sbin/agetty',
'dnf install -y crontabs initscripts iproute openssl wget which glibc-langpack-en hostname',
],
},
},
'debian10-64' => {
Expand Down
2 changes: 1 addition & 1 deletion test/util/generator_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def generate
'options' => ['--pe_dir', '/opt/hello'],
'spec' => 'centos9-64mdc',
},
].each do |fixture_info|
].each do |fixture_info|
generate_fixture(fixture_info['path'],
fixture_info['options'],
fixture_info['spec'])
Expand Down