Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234504
Change subject: Fixed Style/NegatedIf RuboCop offense
......................................................................
Fixed Style/NegatedIf RuboCop offense
Bug: T106220
Change-Id: I4928a434860a987b5aa1e1291853a267592d66a9
---
M .rubocop_todo.yml
M Vagrantfile
M lib/labs-vagrant.rb
M lib/mediawiki-vagrant/config.rb
M lib/mediawiki-vagrant/forward_port.rb
M lib/mediawiki-vagrant/hiera.rb
M lib/mediawiki-vagrant/lsb_check/config.rb
M lib/mediawiki-vagrant/roles/change.rb
M lib/mediawiki-vagrant/roles/info.rb
M lib/mediawiki-vagrant/roles/reset.rb
10 files changed, 10 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/04/234504/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3cc7ab9..fcb2ee3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -46,11 +46,6 @@
Style/GuardClause:
Enabled: false
-# Offense count: 12
-# Cop supports --auto-correct.
-Style/NegatedIf:
- Enabled: false
-
# Offense count: 2
# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
Style/Next:
diff --git a/Vagrantfile b/Vagrantfile
index b56b8a7..36766a7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -140,7 +140,7 @@
config.vm.synced_folder '.', '/vagrant', root_share_options
- if !settings[:nfs_shares]
+ unless settings[:nfs_shares]
# www-data needs to write to the logs, but doesn't need write
# access for all of /vagrant
#
diff --git a/lib/labs-vagrant.rb b/lib/labs-vagrant.rb
index fd3cba5..679d4db 100755
--- a/lib/labs-vagrant.rb
+++ b/lib/labs-vagrant.rb
@@ -43,7 +43,7 @@
end
avail = @mwv.roles_available
ARGV.each do |r|
- if not avail.include? r
+ unless avail.include? r
puts "'#{r}' is not a valid role."
return 1
end
@@ -59,7 +59,7 @@
end
enabled = @mwv.roles_enabled
ARGV.each do |r|
- puts "'#{r}' is not enabled." if not enabled.include? r
+ puts "'#{r}' is not enabled." unless enabled.include? r
end
@mwv.update_roles(enabled - ARGV)
puts COMMIT_CHANGES
diff --git a/lib/mediawiki-vagrant/config.rb b/lib/mediawiki-vagrant/config.rb
index 4fe3212..1c33124 100644
--- a/lib/mediawiki-vagrant/config.rb
+++ b/lib/mediawiki-vagrant/config.rb
@@ -53,7 +53,7 @@
end
argv = parse_options(opts)
- return if !argv
+ return unless argv
if options[:list]
list_settings
diff --git a/lib/mediawiki-vagrant/forward_port.rb
b/lib/mediawiki-vagrant/forward_port.rb
index 29fc44e..92ce219 100644
--- a/lib/mediawiki-vagrant/forward_port.rb
+++ b/lib/mediawiki-vagrant/forward_port.rb
@@ -36,7 +36,7 @@
end
argv = parse_options(opts)
- return if !argv
+ return unless argv
if options[:list]
list
diff --git a/lib/mediawiki-vagrant/hiera.rb b/lib/mediawiki-vagrant/hiera.rb
index 6316d4f..65fb773 100644
--- a/lib/mediawiki-vagrant/hiera.rb
+++ b/lib/mediawiki-vagrant/hiera.rb
@@ -28,7 +28,7 @@
end
argv = parse_options(opts)
- return if !argv
+ return unless argv
if options[:unset].any?
unset_key(options[:unset])
diff --git a/lib/mediawiki-vagrant/lsb_check/config.rb
b/lib/mediawiki-vagrant/lsb_check/config.rb
index 8d563b2..3f4313c 100644
--- a/lib/mediawiki-vagrant/lsb_check/config.rb
+++ b/lib/mediawiki-vagrant/lsb_check/config.rb
@@ -16,7 +16,7 @@
def validate(_machine)
errors = _detected_errors
- errors << '`version` must be set.' if !version
+ errors << '`version` must be set.' unless version
{ 'lsb_check provisioner' => errors }
end
end
diff --git a/lib/mediawiki-vagrant/roles/change.rb
b/lib/mediawiki-vagrant/roles/change.rb
index 277fa4b..c3626f6 100644
--- a/lib/mediawiki-vagrant/roles/change.rb
+++ b/lib/mediawiki-vagrant/roles/change.rb
@@ -35,7 +35,7 @@
end
argv = parse_options(opts)
- return if !argv
+ return unless argv
raise Vagrant::Errors::CLIInvalidUsage, help: opts.help.chomp if
argv.length < 1
possible = possible_roles
diff --git a/lib/mediawiki-vagrant/roles/info.rb
b/lib/mediawiki-vagrant/roles/info.rb
index 7e81df0..6477fd3 100644
--- a/lib/mediawiki-vagrant/roles/info.rb
+++ b/lib/mediawiki-vagrant/roles/info.rb
@@ -22,7 +22,7 @@
end
argv = parse_options(opts)
- return if !argv
+ return unless argv
if argv.any?
roles = argv.map(&:downcase)
diff --git a/lib/mediawiki-vagrant/roles/reset.rb
b/lib/mediawiki-vagrant/roles/reset.rb
index c40c35b..1363fcd 100644
--- a/lib/mediawiki-vagrant/roles/reset.rb
+++ b/lib/mediawiki-vagrant/roles/reset.rb
@@ -18,7 +18,7 @@
end
argv = parse_options(opts)
- return if !argv
+ return unless argv
@mwv.update_roles []
@env.ui.warn 'All roles were disabled.'
--
To view, visit https://gerrit.wikimedia.org/r/234504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4928a434860a987b5aa1e1291853a267592d66a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
