Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252678
Change subject: Fixed Style/TrailingComma RuboCop offense
......................................................................
Fixed Style/TrailingComma RuboCop offense
RuboCop used to mess up when autocorrecting this offense, looks like it
works fine now.
Bug: T106220
Change-Id: I3ed226be8fd780638e22ad01217e52455559d97c
---
M .rubocop.yml
M .rubocop_todo.yml
M Vagrantfile
M features/support/hooks.rb
M lib/mediawiki-vagrant/forward_port.rb
M lib/mediawiki-vagrant/hiera.rb
M lib/mediawiki-vagrant/roles/change.rb
M spec/mediawiki_vagrant/environment_spec.rb
M spec/mediawiki_vagrant/settings_spec.rb
M support/packager/package.rb
10 files changed, 13 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/78/252678/1
diff --git a/.rubocop.yml b/.rubocop.yml
index 7ef65f0..aef0124 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -43,6 +43,9 @@
Style/StringLiterals:
EnforcedStyle: single_quotes
+Style/TrailingComma:
+ EnforcedStyleForMultiline: comma
+
Style/TrivialAccessors:
ExactNameMatch: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ec446ba..a6b51b6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -69,13 +69,3 @@
Style/SingleLineBlockParams:
Exclude:
- 'lib/mediawiki-vagrant/environment.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
- Exclude:
- - 'Vagrantfile'
- - 'lib/mediawiki-vagrant/config.rb'
- - 'lib/mediawiki-vagrant/hiera.rb'
- - 'lib/mediawiki-vagrant/roles/change.rb'
diff --git a/Vagrantfile b/Vagrantfile
index dd61e50..3e32f64 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -206,7 +206,7 @@
'--logdest', "/vagrant/logs/puppet/puppet.#{mwv.commit ||
'unknown'}.log",
'--logdest', 'console',
'--write-catalog-summary',
- '--detailed-exitcodes',
+ '--detailed-exitcodes'
]
# For more output, uncomment the following line:
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
index c2503fa..8a48987 100644
--- a/features/support/hooks.rb
+++ b/features/support/hooks.rb
@@ -39,7 +39,7 @@
ui_class: Vagrant::UI::Colored,
cwd: @mwv.path.to_s,
home_path: @home_path.to_s,
- vagrantfile_name: @mwv.path('Vagrantfile').to_s
+ vagrantfile_name: @mwv.path('Vagrantfile').to_s,
)
# Clear settings and role state before each scenario
diff --git a/lib/mediawiki-vagrant/forward_port.rb
b/lib/mediawiki-vagrant/forward_port.rb
index 24efc7c..f3c56dd 100644
--- a/lib/mediawiki-vagrant/forward_port.rb
+++ b/lib/mediawiki-vagrant/forward_port.rb
@@ -17,7 +17,7 @@
def execute
options = {
list: false,
- remove: []
+ remove: [],
}
opts = OptionParser.new do |o|
diff --git a/lib/mediawiki-vagrant/hiera.rb b/lib/mediawiki-vagrant/hiera.rb
index f61f4aa..4bd0853 100644
--- a/lib/mediawiki-vagrant/hiera.rb
+++ b/lib/mediawiki-vagrant/hiera.rb
@@ -13,7 +13,7 @@
def execute
options = {
- unset: [],
+ unset: []
}
opts = OptionParser.new do |o|
diff --git a/lib/mediawiki-vagrant/roles/change.rb
b/lib/mediawiki-vagrant/roles/change.rb
index 0a372a8..57ba092 100644
--- a/lib/mediawiki-vagrant/roles/change.rb
+++ b/lib/mediawiki-vagrant/roles/change.rb
@@ -15,7 +15,7 @@
def execute
options = {
- provision: false,
+ provision: false
}
opts = OptionParser.new do |o|
diff --git a/spec/mediawiki_vagrant/environment_spec.rb
b/spec/mediawiki_vagrant/environment_spec.rb
index f48d922..bc34bdd 100644
--- a/spec/mediawiki_vagrant/environment_spec.rb
+++ b/spec/mediawiki_vagrant/environment_spec.rb
@@ -189,7 +189,7 @@
'settings.d/multiwiki/foo.php',
'settings.d/wikis/foo/bar.php',
'vagrant.d/foo.yaml',
- 'mediawiki/LocalSettings.php'
+ 'mediawiki/LocalSettings.php',
)
end
@@ -247,7 +247,7 @@
'foo.pp' => 'class role::foo {}',
'bar.pp' => 'class role::bar {}',
'baz.pp' => 'class role::bar {}',
- 'blek.pp' => 'class blek {}'
+ 'blek.pp' => 'class blek {}',
)
end
@@ -364,7 +364,7 @@
it 'returns settings for the given roles' do
expect(subject).to eq(
'foo' => { 'vagrant_ram' => 200 },
- 'bar' => { 'vagrant_ram' => 50 }
+ 'bar' => { 'vagrant_ram' => 50 },
)
end
end
diff --git a/spec/mediawiki_vagrant/settings_spec.rb
b/spec/mediawiki_vagrant/settings_spec.rb
index 171ebea..534defc 100644
--- a/spec/mediawiki_vagrant/settings_spec.rb
+++ b/spec/mediawiki_vagrant/settings_spec.rb
@@ -133,7 +133,7 @@
mock_files_in(
path_or_io,
'settings1.yaml' => 'foo: y',
- 'settings2.yaml' => 'bar: z'
+ 'settings2.yaml' => 'bar: z',
)
end
diff --git a/support/packager/package.rb b/support/packager/package.rb
index d34a6f9..0bdf31c 100755
--- a/support/packager/package.rb
+++ b/support/packager/package.rb
@@ -63,7 +63,7 @@
Net::HTTP.start(
uri.host,
uri.port,
- use_ssl: uri.scheme == 'https'
+ use_ssl: uri.scheme == 'https',
) do |http|
request = Net::HTTP::Get.new uri.request_uri
--
To view, visit https://gerrit.wikimedia.org/r/252678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ed226be8fd780638e22ad01217e52455559d97c
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
