Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/240661
Change subject: Fixed Style/WordArray RuboCop offense
......................................................................
Fixed Style/WordArray RuboCop offense
Bug: T106220
Change-Id: I34cd2f96f270cb10ed7824ac4c9b32acdef88fce
---
M .rubocop_todo.yml
M Vagrantfile
M lib/mediawiki-vagrant/environment.rb
M spec/mediawiki_vagrant/environment_spec.rb
M support/completion.rb
5 files changed, 10 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/61/240661/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c650861..278bfb5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -169,9 +169,3 @@
- 'lib/mediawiki-vagrant/config.rb'
- 'lib/mediawiki-vagrant/hiera.rb'
- 'lib/mediawiki-vagrant/roles/change.rb'
-
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
-Style/WordArray:
- MinSize: 5
diff --git a/Vagrantfile b/Vagrantfile
index 88f7856..e5ae0f7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -246,7 +246,7 @@
# Migrate {apt,composer}-cache to cache/{apt,composer}
-['apt', 'composer'].each do |type|
+%w(apt composer).each do |type|
src = mwv.path("#{type}-cache")
if src.directory?
diff --git a/lib/mediawiki-vagrant/environment.rb
b/lib/mediawiki-vagrant/environment.rb
index 74d1a8e..717cd41 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -151,7 +151,7 @@
def roles_available
manifests = Dir[module_path('role/manifests/*.pp')]
manifests.map! { |file| File.read(file).match(/^class\s*role::(\w+)/) {
|m| m[1] } }
- manifests.compact.sort.uniq - ['generic', 'mediawiki',
'labs_initial_content']
+ manifests.compact.sort.uniq - %w(generic mediawiki labs_initial_content)
end
# Returns enabled Puppet roles.
diff --git a/spec/mediawiki_vagrant/environment_spec.rb
b/spec/mediawiki_vagrant/environment_spec.rb
index f48d922..754d8e6 100644
--- a/spec/mediawiki_vagrant/environment_spec.rb
+++ b/spec/mediawiki_vagrant/environment_spec.rb
@@ -171,8 +171,8 @@
subject { environment.prune_roles }
it 'removes any configuration for enabled roles that are no longer
available' do
- expect(environment).to receive(:roles_available).and_return(['foo',
'bar'])
- expect(environment).to receive(:roles_enabled).and_return(['foo',
'baz'])
+ expect(environment).to receive(:roles_available).and_return(%w(foo
bar))
+ expect(environment).to receive(:roles_enabled).and_return(%w(foo baz))
expect(environment).to receive(:update_roles).with(['foo'])
subject
end
@@ -252,7 +252,7 @@
end
it 'should be a sorted array of unique and properly defined roles' do
- expect(subject).to eq(['bar', 'foo'])
+ expect(subject).to eq(%w(bar foo))
end
end
@@ -269,7 +269,7 @@
end
it 'should be a sorted array of available roles' do
- expect(subject).to eq(['bar', 'foo'])
+ expect(subject).to eq(%w(bar foo))
end
context 'when a legacy roles file exists' do
@@ -283,7 +283,7 @@
end
it 'migrates the legacy settings' do
- expect(subject).to eq(['baz', 'qux'])
+ expect(subject).to eq(%w(baz qux))
end
it 'removes the legacy file' do
@@ -359,7 +359,7 @@
end
context 'given roles' do
- let(:roles) { ['foo', 'bar'] }
+ let(:roles) { %w(foo bar) }
it 'returns settings for the given roles' do
expect(subject).to eq(
@@ -385,7 +385,7 @@
describe '#update_roles', :fakefs do
subject { environment.update_roles(roles) }
- let(:roles) { ['foo', 'bar'] }
+ let(:roles) { %w(foo bar) }
before do
mock_file(hiera_path, content: align(<<-end))
diff --git a/support/completion.rb b/support/completion.rb
index 471c4ed..07da2e0 100644
--- a/support/completion.rb
+++ b/support/completion.rb
@@ -16,7 +16,7 @@
when 'roles'
case ARGV.shift
when nil
- ['disable', 'enable', 'info', 'list', 'reset']
+ %w(disable enable info list reset)
when 'enable', 'info'
mwv.roles_available
when 'disable'
--
To view, visit https://gerrit.wikimedia.org/r/240661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34cd2f96f270cb10ed7824ac4c9b32acdef88fce
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
