Skip to content

Commit

Permalink
(.rubocop.yml) set target ruby version to 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jhoblitt committed Sep 13, 2024
1 parent 2ef1bc5 commit b535cd8
Show file tree
Hide file tree
Showing 63 changed files with 203 additions and 201 deletions.
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ inherit_gem:
require:
- rubocop-rspec
- rubocop-rake
AllCops:
TargetRubyVersion: '3.2'
Layout/DotPosition:
EnforcedStyle: leading
Style/CommentedKeyword:
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/ccs/graphical_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

it { is_expected.to compile.with_all_deps }

include_examples 'x2go packages', os_facts: os_facts
include_examples('x2go packages', os_facts:)

if os_facts[:os]['release']['major'] == '7'
it do
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/core/bash_completion_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

it { is_expected.to compile.with_all_deps }

include_examples 'bash_completion', os_facts: os_facts
include_examples 'bash_completion', os_facts:
end
end
end
2 changes: 1 addition & 1 deletion spec/classes/core/gpio_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

it { is_expected.to compile.with_all_deps }

include_examples 'gpio', os_facts: os_facts
include_examples 'gpio', os_facts:
end
end
end
2 changes: 1 addition & 1 deletion spec/classes/core/i2c_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

it { is_expected.to compile.with_all_deps }

include_examples 'i2c', os_facts: os_facts
include_examples 'i2c', os_facts:
end
end
end
2 changes: 1 addition & 1 deletion spec/classes/core/krb5_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
context 'with no params' do
it { is_expected.to compile.with_all_deps }

include_examples 'krb5.conf.d files', os_facts: os_facts
include_examples 'krb5.conf.d files', os_facts:
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/core/perfsonar_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

it { is_expected.to compile.with_all_deps }

include_examples 'generic perfsonar', os_facts: os_facts
include_examples('generic perfsonar', os_facts:)

context 'with version param' do
context 'with 5.0.0' do
Expand All @@ -22,7 +22,7 @@
}
end

include_examples 'generic perfsonar', os_facts: os_facts
include_examples 'generic perfsonar', os_facts:
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/core/x2go_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
context 'with no parameters' do
it { is_expected.to compile.with_all_deps }

include_examples 'x2go packages', os_facts: os_facts
include_examples('x2go packages', os_facts:)

it do
is_expected.to contain_file('/etc/sudoers.d/x2goserver')
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/nfs/v2_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
context "on #{os}" do
let(:facts) { os_facts }

include_examples 'nfsv2 enabled', os_facts: os_facts
include_examples 'nfsv2 enabled', os_facts:
end
end
end
2 changes: 1 addition & 1 deletion spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
let(:interface) { slave }

it_behaves_like 'nm enabled interface'
it_behaves_like 'nm bridge slave interface', master: master
it_behaves_like 'nm bridge slave interface', master:
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
let(:interface) { slave }

it_behaves_like 'nm enabled interface'
it_behaves_like 'nm bridge slave interface', master: master
it_behaves_like 'nm bridge slave interface', master:
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
let(:interface) { slave }

it_behaves_like 'nm enabled interface'
it_behaves_like 'nm bridge slave interface', master: master
it_behaves_like 'nm bridge slave interface', master:
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
let(:interface) { slave }

it_behaves_like 'nm enabled interface'
it_behaves_like 'nm bridge slave interface', master: master
it_behaves_like 'nm bridge slave interface', master:
end
end

Expand Down
6 changes: 3 additions & 3 deletions spec/hosts/roles/allsky_cam_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
}
end
let(:facts) do
Expand All @@ -29,7 +29,7 @@

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples('common', os_facts:, site:)
it { is_expected.to contain_package('libgphoto2') }
end # host
end # lsst_sites
Expand Down
6 changes: 3 additions & 3 deletions spec/hosts/roles/amor_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
cluster: role,
}
end
let(:facts) { lsst_override_facts(os_facts) }

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples('common', os_facts:, site:)
include_examples 'docker'
include_examples 'dco'

Expand Down
8 changes: 4 additions & 4 deletions spec/hosts/roles/atsccs_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
cluster: 'auxtel-ccs',
}
end
let(:facts) { lsst_override_facts(os_facts) }

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples 'ccs common', os_facts: os_facts
include_examples('common', os_facts:, site:)
include_examples('ccs common', os_facts:)
include_examples 'lhn sysctls'
it { is_expected.to contain_class('ccs_sal') }
end # host
Expand Down
8 changes: 4 additions & 4 deletions spec/hosts/roles/atsdaq_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
cluster: 'auxtel-ccs',
}
end
let(:facts) { lsst_override_facts(os_facts) }

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples 'ccs common', os_facts: os_facts
include_examples('common', os_facts:, site:)
include_examples('ccs common', os_facts:)
include_examples 'lsst-daq sysctls'
end # host
end # lsst_sites
Expand Down
12 changes: 6 additions & 6 deletions spec/hosts/roles/atshcu_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
}
end
let(:facts) { lsst_override_facts(os_facts) }

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples 'ccs common', os_facts: os_facts
include_examples 'x2go packages', os_facts: os_facts
include_examples 'gpio', os_facts: os_facts
include_examples('common', os_facts:, site:)
include_examples('ccs common', os_facts:)
include_examples('x2go packages', os_facts:)
include_examples('gpio', os_facts:)
it { is_expected.to contain_class('ccs_hcu') }
end # host
end # lsst_sites
Expand Down
6 changes: 3 additions & 3 deletions spec/hosts/roles/auxtel_archiver_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
}
end
let(:facts) { lsst_override_facts(os_facts) }

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples('common', os_facts:, site:)
include_examples 'archiver'
include_examples 'archive data auxtel'

Expand Down
10 changes: 5 additions & 5 deletions spec/hosts/roles/auxtel_vent_gate_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
}
end
let(:facts) do
Expand All @@ -31,10 +31,10 @@

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples('common', os_facts:, site:)
include_examples 'docker'
include_examples 'gpio', os_facts: os_facts
include_examples 'i2c', os_facts: os_facts
include_examples('gpio', os_facts:)
include_examples('i2c', os_facts:)
include_examples 'darkmode'
include_examples 'ftdi'
include_examples 'pigpio'
Expand Down
8 changes: 4 additions & 4 deletions spec/hosts/roles/bastion_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
}
end
let(:facts) { lsst_override_facts(os_facts) }

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples 'x2go packages', os_facts: os_facts
include_examples('common', os_facts:, site:)
include_examples('x2go packages', os_facts:)
it { is_expected.to contain_class('mate') }

%w[
Expand Down
6 changes: 3 additions & 3 deletions spec/hosts/roles/catchall_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ def roles_without_spec
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
}
end
let(:facts) { lsst_override_facts(os_facts) }

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples 'common', os_facts:, site:
end # host
end # site
end # on os
Expand Down
10 changes: 5 additions & 5 deletions spec/hosts/roles/ccs_dc_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
cluster: 'comcam-ccs',
}
end
let(:facts) { lsst_override_facts(os_facts) }

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples 'ccs common', os_facts: os_facts
include_examples 'x2go packages', os_facts: os_facts
include_examples('common', os_facts:, site:)
include_examples('ccs common', os_facts:)
include_examples('x2go packages', os_facts:)
include_examples 'lhn sysctls'

%w[
Expand Down
10 changes: 5 additions & 5 deletions spec/hosts/roles/ccs_desktop_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
}
end
let(:facts) { lsst_override_facts(os_facts) }

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples 'ccs common', os_facts: os_facts
include_examples 'x2go packages', os_facts: os_facts
include_examples('common', os_facts:, site:)
include_examples('ccs common', os_facts:)
include_examples 'x2go packages', os_facts:
end # host
end # lsst_sites
end # on os
Expand Down
10 changes: 5 additions & 5 deletions spec/hosts/roles/ccs_hcu_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
describe "#{role}.#{site}.lsst.org", :sitepp do
let(:node_params) do
{
role: role,
site: site,
role:,
site:,
}
end
let(:facts) { lsst_override_facts(os_facts) }

it { is_expected.to compile.with_all_deps }

include_examples 'common', os_facts: os_facts, site: site
include_examples 'ccs common', os_facts: os_facts
include_examples 'x2go packages', os_facts: os_facts
include_examples('common', os_facts:, site:)
include_examples('ccs common', os_facts:)
include_examples('x2go packages', os_facts:)
it { is_expected.to contain_class('ccs_hcu') }
end # host
end # lsst_sites
Expand Down
Loading

0 comments on commit b535cd8

Please sign in to comment.