Skip to content

Commit 040324b

Browse files
renovate[bot]silug
andauthored
Update dependency rubocop to '~> 1.80.0' (#311)
* Update dependency rubocop to '~> 1.80.0' * Cleanup for rubocop * Bump version --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Steven Pritchard <[email protected]>
1 parent fbdd75c commit 040324b

File tree

19 files changed

+25
-22
lines changed

19 files changed

+25
-22
lines changed

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* Mon Sep 22 2025 Steven Pritchard <[email protected]> - 4.14.2
2+
- Clean up for latest rubocop
3+
14
* Wed Sep 17 2025 Steven Pritchard <[email protected]> - 4.14.1
25
- Update dependencies
36

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gem_sources.each { |gem_source| source gem_source }
1313
group :syntax do
1414
gem 'metadata-json-lint'
1515
gem 'puppet-lint-trailing_comma-check', require: false
16-
gem 'rubocop', '~> 1.69.2'
16+
gem 'rubocop', '~> 1.80.0'
1717
gem 'rubocop-performance', '~> 1.23.0'
1818
gem 'rubocop-rake', '~> 0.6.0'
1919
gem 'rubocop-rspec', '~> 3.3.0'

lib/facter/simp_puppet_settings.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
value = values.interpolate(setting_name)
3939
Facter.debug "#{section.to_s.ljust(12, '.')}" \
4040
"#{setting_name.to_s.ljust(32)} = #{value.to_s.ljust(20)}" \
41-
"#{setting.deprecated? ? ' *** DEPRECATED ***' : ''}"
41+
"#{' *** DEPRECATED ***' if setting.deprecated?}"
4242
next if setting.deprecated?
4343
retval[section.to_s][setting_name.to_s] = value.to_s
4444
end

lib/facter/simplib__auditd.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
status['enforcing'] = procs.any? { |x| x =~ %r{\sauditd\Z} }
6262
else
6363
cmdline = Facter.value('cmdline') || {}
64-
status['kernel_enforcing'] = ((cmdline['audit']).to_s == '1')
64+
status['kernel_enforcing'] = (cmdline['audit'].to_s == '1')
6565
end
6666

6767
status

lib/facter/simplib__mountpoints.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
else
115115
[opt_arr[0], opt_arr[1]]
116116
end
117-
end
117+
end,
118118
]
119119
# rubocop:enable Style/MultilineBlockChain
120120

lib/puppet/functions/simplib/module_exist.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
required_param 'String[1]', :module_name
1010
end
1111

12-
def module_exist(module_name)
12+
def module_exist(module_name) # rubocop:disable Naming/PredicateMethod
1313
author, name = module_name.split(%r{/|-})
1414

1515
unless name

lib/puppet/functions/simplib/passgen/simpkv/valid_password_info.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
required_param 'Hash', :password_info
1515
end
1616

17-
def valid_password_info(password_info)
17+
def valid_password_info(password_info) # rubocop:disable Naming/PredicateMethod
1818
password_info['value'].key?('password') &&
1919
password_info['value'].key?('salt') &&
2020
password_info.key?('metadata') &&

lib/puppet/functions/simplib/validate_deep_hash.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def validate_deep_hash(reference, to_check)
9090
raise(err_msg)
9191
end
9292

93-
def valid_value(value)
93+
def valid_value(value) # rubocop:disable Naming/PredicateMethod
9494
[String, TrueClass, FalseClass, Numeric, NilClass].each do |allowed_class|
9595
return true if value.is_a?(allowed_class)
9696
end

lib/puppet/provider/init_ulimit/systemd.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ def exists?
1616
true
1717
end
1818

19-
def create
19+
def create # rubocop:disable Naming/PredicateMethod
2020
# Stub, never called
2121
debug('init_ulimit: If you got here, something very bad happened!')
2222
true
2323
end
2424

25-
def destroy
25+
def destroy # rubocop:disable Naming/PredicateMethod
2626
warning('init_ulimit: ulimits cannot be removed when targeting systemd artifacts')
2727
true
2828
end

lib/puppet/type/prepend_file_line.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
newparam(:path) do
3030
desc 'File to possibly prepend a line to.'
3131
validate do |value|
32-
unless (Puppet.features.posix? && value =~ (%r{^/})) || (Puppet.features.microsoft_windows? && (value =~ (%r{^.:/}) || value =~ (%r{^//[^/]+/[^/]+})))
32+
unless (Puppet.features.posix? && value =~ %r{^/}) || (Puppet.features.microsoft_windows? && (value =~ %r{^.:/} || value =~ %r{^//[^/]+/[^/]+}))
3333
raise(Puppet::Error, "File paths must be fully qualified, not '#{value}'")
3434
end
3535
end

0 commit comments

Comments
 (0)