Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234501
Change subject: Fixed Style/IfUnlessModifier RuboCop offense
......................................................................
Fixed Style/IfUnlessModifier RuboCop offense
Bug: T106220
Change-Id: Ica5b919a4dda2f962b63778ae7938ee68faf1c06
---
M .rubocop_todo.yml
M lib/labs-vagrant.rb
M lib/mediawiki-vagrant/lsb_check/config.rb
M lib/mediawiki-vagrant/roles/root.rb
4 files changed, 3 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/01/234501/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7552611..7907584 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -46,12 +46,6 @@
Style/GuardClause:
Enabled: false
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
- Enabled: false
-
# Offense count: 1
# Cop supports --auto-correct.
Style/LeadingCommentSpace:
diff --git a/lib/labs-vagrant.rb b/lib/labs-vagrant.rb
index 893d683..fd3cba5 100755
--- a/lib/labs-vagrant.rb
+++ b/lib/labs-vagrant.rb
@@ -59,9 +59,7 @@
end
enabled = @mwv.roles_enabled
ARGV.each do |r|
- if not enabled.include? r
- puts "'#{r}' is not enabled."
- end
+ puts "'#{r}' is not enabled." if not enabled.include? r
end
@mwv.update_roles(enabled - ARGV)
puts COMMIT_CHANGES
diff --git a/lib/mediawiki-vagrant/lsb_check/config.rb
b/lib/mediawiki-vagrant/lsb_check/config.rb
index 5248af8..8d563b2 100644
--- a/lib/mediawiki-vagrant/lsb_check/config.rb
+++ b/lib/mediawiki-vagrant/lsb_check/config.rb
@@ -16,9 +16,7 @@
def validate(_machine)
errors = _detected_errors
- if !version
- errors << '`version` must be set.'
- end
+ errors << '`version` must be set.' if !version
{ 'lsb_check provisioner' => errors }
end
end
diff --git a/lib/mediawiki-vagrant/roles/root.rb
b/lib/mediawiki-vagrant/roles/root.rb
index 51be6d7..5e36b58 100644
--- a/lib/mediawiki-vagrant/roles/root.rb
+++ b/lib/mediawiki-vagrant/roles/root.rb
@@ -37,9 +37,7 @@
end
def execute
- if @args.include?('-h') || @args.include?('--help')
- return help
- end
+ return help if @args.include?('-h') || @args.include?('--help')
command_class = @subcommands.get(@command.to_sym) if @command
return help if !command_class || !@command
--
To view, visit https://gerrit.wikimedia.org/r/234501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica5b919a4dda2f962b63778ae7938ee68faf1c06
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
