Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233373
Change subject: Fixed Style/BlockDelimiters RuboCop offense
......................................................................
Fixed Style/BlockDelimiters RuboCop offense
Bug: T106220
Change-Id: If6d61fe57e905fd5678961d782dbdba9bd643fe4
---
M .rubocop_todo.yml
M Vagrantfile
M lib/labs-vagrant.rb
M lib/mediawiki-vagrant/roles/list.rb
4 files changed, 10 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/73/233373/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0762a50..aea4b4f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -23,12 +23,6 @@
Metrics/LineLength:
Max: 129
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods,
FunctionalMethods, IgnoredMethods.
-Style/BlockDelimiters:
- Enabled: false
-
# Offense count: 1
Style/CaseEquality:
Enabled: false
diff --git a/Vagrantfile b/Vagrantfile
index dd120a3..35e8128 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -118,11 +118,11 @@
config.vm.network :forwarded_port,
guest: 80, host: settings[:http_port], id: 'http'
- settings[:forward_ports].each { |guest_port,host_port|
+ settings[:forward_ports].each do |guest_port,host_port|
config.vm.network :forwarded_port,
:host => host_port, :guest => guest_port,
auto_correct: true
- } unless settings[:forward_ports].nil?
+ end unless settings[:forward_ports].nil?
root_share_options = {:id => 'vagrant-root'}
diff --git a/lib/labs-vagrant.rb b/lib/labs-vagrant.rb
index b56c718..2a233ed 100755
--- a/lib/labs-vagrant.rb
+++ b/lib/labs-vagrant.rb
@@ -13,14 +13,14 @@
when 'list-roles'
puts "Available roles:\n\n"
enabled = @mwv.roles_enabled
- roles = @mwv.roles_available.sort.map { |role|
+ roles = @mwv.roles_available.sort.map do |role|
prefix = enabled.include?(role) ? '*' : ' '
"#{prefix} #{role}"
- }
+ end
col, *cols = roles.each_slice((roles.size/3.0).ceil).to_a
- col.zip(*cols) { |a,b,c|
+ col.zip(*cols) do |a,b,c|
puts sprintf("%-26s %-26s %-26s", a, b, c)
- }
+ end
puts "\nRoles marked with '*' are enabled."
puts "Note that roles enabled by dependency are not marked."
puts 'Use "labs-vagrant enable-role" & "labs-vagrant disable-role" to
customize.'
diff --git a/lib/mediawiki-vagrant/roles/list.rb
b/lib/mediawiki-vagrant/roles/list.rb
index e951105..4e34b93 100644
--- a/lib/mediawiki-vagrant/roles/list.rb
+++ b/lib/mediawiki-vagrant/roles/list.rb
@@ -66,10 +66,10 @@
@env.ui.info "Available roles:\n" if opts[:verbose]
enabled = @mwv.roles_enabled
- roles = @mwv.roles_available.sort.map { |role|
+ roles = @mwv.roles_available.sort.map do |role|
prefix = enabled.include?(role) ? '*' : ' '
"#{prefix} #{role}"
- }
+ end
if opts[:single_col]
roles.each { |x| @env.ui.info x }
@@ -89,9 +89,9 @@
def print_cols(roles)
if roles.any?
col, *cols = roles.each_slice((roles.size/3.0).ceil).to_a
- col.zip(*cols) { |a,b,c|
+ col.zip(*cols) do |a,b,c|
@env.ui.info sprintf("%-26s %-26s %-26s", a, b, c)
- }
+ end
end
end
end
--
To view, visit https://gerrit.wikimedia.org/r/233373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6d61fe57e905fd5678961d782dbdba9bd643fe4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
