Skip to content

Commit a5b108d

Browse files
committed
(PUP-11993) Style/NegatedIf
This commit enables the Style/NegatedIf cop and fixes 152 autocorrectable offenses.
1 parent ce909ae commit a5b108d

File tree

98 files changed

+151
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+151
-157
lines changed

.rubocop_todo.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -629,12 +629,6 @@ Style/MultipleComparison:
629629
Style/MutableConstant:
630630
Enabled: false
631631

632-
# This cop supports safe auto-correction (--auto-correct).
633-
# Configuration parameters: EnforcedStyle.
634-
# SupportedStyles: both, prefix, postfix
635-
Style/NegatedIf:
636-
Enabled: false
637-
638632
# This cop supports safe auto-correction (--auto-correct).
639633
Style/NegatedWhile:
640634
Exclude:

ext/windows/service/daemon.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def report_windows_event(type, id, message)
153153
rescue Exception
154154
# Ignore all errors
155155
ensure
156-
if (!eventlog.nil?)
156+
unless (eventlog.nil?)
157157
eventlog.close
158158
end
159159
end

lib/puppet/agent/disabler.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def enable
2626
def disable(msg = nil)
2727
data = {}
2828
Puppet.notice _("Disabling Puppet.")
29-
if (!msg.nil?)
29+
unless (msg.nil?)
3030
data[DISABLED_MESSAGE_JSON_KEY] = msg
3131
end
3232
disable_lockfile.lock(data)

lib/puppet/application.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ def setup
452452
# @return [void]
453453
# @api public
454454
def setup_logs
455-
handle_logdest_arg(Puppet[:logdest]) if !options[:setdest]
455+
handle_logdest_arg(Puppet[:logdest]) unless options[:setdest]
456456

457457
unless options[:setdest]
458458
if options[:debug] || options[:verbose]

lib/puppet/application/ssl.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def main
160160

161161
clean(certname)
162162
when 'bootstrap'
163-
if !Puppet::Util::Log.sendlevel?(:info)
163+
unless Puppet::Util::Log.sendlevel?(:info)
164164
Puppet::Util::Log.level = :info
165165
end
166166
@machine.ensure_client_certificate

lib/puppet/configurer.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ def retrieve_catalog(facts, query_options)
8383
else
8484
result = retrieve_new_catalog(facts, query_options)
8585

86-
if !result
87-
if !Puppet[:usecacheonfailure]
86+
unless result
87+
unless Puppet[:usecacheonfailure]
8888
Puppet.warning _("Not using cache on failed catalog")
8989
return nil
9090
end

lib/puppet/configurer/downloader.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def default_arguments
7777
:noop => false,
7878
:max_files => -1
7979
}
80-
if !Puppet::Util::Platform.windows?
80+
unless Puppet::Util::Platform.windows?
8181
defargs[:owner] = Process.uid
8282
defargs[:group] = Process.gid
8383
end

lib/puppet/confine.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def self.test(name)
3131
Puppet.warning("Could not load confine test '#{name}': #{detail}")
3232
end
3333
# Could not find file
34-
if !Puppet[:always_retry_plugins]
34+
unless Puppet[:always_retry_plugins]
3535
@tests[name] = nil
3636
end
3737
end

lib/puppet/daemon.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def set_signal_traps
115115
end
116116

117117
# extended signals not supported under windows
118-
if !Puppet::Util::Platform.windows?
118+
unless Puppet::Util::Platform.windows?
119119
signals = { :HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }
120120
signals.each do |signal, method|
121121
Signal.trap(signal) do

lib/puppet/defaults.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def self.initialize_default_settings!(settings)
166166
values = munge(value)
167167
valid = %w[deprecations undefined_variables undefined_resources]
168168
invalid = values - (values & valid)
169-
if not invalid.empty?
169+
unless invalid.empty?
170170
raise ArgumentError, _("Cannot disable unrecognized warning types '%{invalid}'.") % { invalid: invalid.join(',') } +
171171
' ' + _("Valid values are '%{values}'.") % { values: valid.join(', ') }
172172
end
@@ -1104,7 +1104,7 @@ def self.initialize_default_settings!(settings)
11041104
values = munge(value)
11051105

11061106
invalid = values - Puppet.valid_file_checksum_types
1107-
if not invalid.empty?
1107+
unless invalid.empty?
11081108
raise ArgumentError, _("Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'") % {
11091109
value: invalid.first, name: @name, allowed_values: Puppet.valid_file_checksum_types.join("', '")
11101110
}

0 commit comments

Comments
 (0)