[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix more whitespace-related RuboCop across the tree

2018-01-09 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359478 )

Change subject: Fix more whitespace-related RuboCop across the tree
..


Fix more whitespace-related RuboCop across the tree

- Layout/LeadingCommentSpace
- Layout/SpaceAroundEqualsInParameterDefault
- Layout/SpaceInsideBrackets
- Layout/DotPosition

Change-Id: Idd4fd19daa55ba01dbe96b0f913bc9e48103
---
M .rubocop_todo.yml
M modules/bacula/spec/defines/fileset_spec.rb
M modules/base/spec/defines/service_unit_spec.rb
M modules/postgresql/spec/classes/postgresql_master_spec.rb
M modules/postgresql/spec/classes/postgresql_slave_spec.rb
M modules/raid/lib/facter/raid.rb
M modules/scap/lib/puppet/provider/package/scap3.rb
M modules/scap/spec/types/package/scap3_spec.rb
M modules/wmflib/lib/hiera/backend/proxy_backend.rb
M modules/wmflib/lib/puppet/parser/functions/array_concat.rb
M modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
M modules/wmflib/lib/puppet/parser/functions/hash_deselect_re.rb
M modules/wmflib/lib/puppet/parser/functions/hash_select_re.rb
M modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
M rake_modules/taskgen.rb
M utils/expanderb.rb
M utils/hiera_lookup
17 files changed, 51 insertions(+), 68 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 56f72db..681b2a0 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -16,9 +16,6 @@
   Exclude:
 - 'modules/labstore/lib/puppet/parser/functions/mount_nfs_volume.rb'
 
-Layout/DotPosition:
-  Enabled: false
-
 Style/EmptyLiteral:
   Exclude:
 - 'modules/admin/lib/puppet/parser/functions/unique_users.rb'
@@ -40,10 +37,6 @@
 
 Layout/IndentationWidth:
   Enabled: false
-
-Layout/LeadingCommentSpace:
-  Exclude:
-- 'modules/base/spec/defines/service_unit_spec.rb'
 
 Style/MethodCallWithoutArgsParentheses:
   Exclude:
@@ -67,18 +60,8 @@
   Exclude:
 - 'modules/wmflib/lib/puppet/parser/functions/require_package.rb'
 
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: false
-
-Layout/SpaceInsideBrackets:
-  Enabled: false
-
 Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
-
-Layout/SpaceInsideParens:
-  Exclude:
-- 'utils/expanderb.rb'
 
 Style/SpecialGlobalVars:
   Exclude:
diff --git a/modules/bacula/spec/defines/fileset_spec.rb 
b/modules/bacula/spec/defines/fileset_spec.rb
index c069c27..7bea6cd 100644
--- a/modules/bacula/spec/defines/fileset_spec.rb
+++ b/modules/bacula/spec/defines/fileset_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'bacula::director::fileset', :type => :define do
 let(:title) { 'something' }
-let(:params) { { :includes => [ "/", "/var", ], } }
+let(:params) { { :includes => ["/", "/var",], } }
 
 it 'should create /etc/bacula/conf.d/fileset-something.conf' do
 should contain_file('/etc/bacula/conf.d/fileset-something.conf').with({
@@ -23,8 +23,8 @@
 
 context 'with excludes' do
 let(:params) { {
-:includes=> [ "/", "/var",],
-:excludes=> [ "/tmp", ],
+:includes=> ["/", "/var",],
+:excludes=> ["/tmp",],
 }
 }
 it 'should create valid content for 
/etc/bacula/conf.d/fileset-something.conf' do
diff --git a/modules/base/spec/defines/service_unit_spec.rb 
b/modules/base/spec/defines/service_unit_spec.rb
index 0800e9c..2c79374 100644
--- a/modules/base/spec/defines/service_unit_spec.rb
+++ b/modules/base/spec/defines/service_unit_spec.rb
@@ -85,6 +85,6 @@
   end
 end
 
-#MARK
+# MARK
   end
 end
diff --git a/modules/postgresql/spec/classes/postgresql_master_spec.rb 
b/modules/postgresql/spec/classes/postgresql_master_spec.rb
index 6b693e3..06ba903 100644
--- a/modules/postgresql/spec/classes/postgresql_master_spec.rb
+++ b/modules/postgresql/spec/classes/postgresql_master_spec.rb
@@ -11,16 +11,16 @@
 context 'ensure present' do
 it { should contain_class('postgresql::server') }
 it do
-should contain_file('/etc/postgresql/9.4/main/postgresql.conf').
-with_ensure('present').
-with_content(/include 'master.conf'/)
+should contain_file('/etc/postgresql/9.4/main/postgresql.conf')
+.with_ensure('present')
+.with_content(/include 'master.conf'/)
 end
 it do
-should contain_file('/etc/postgresql/9.4/main/master.conf').
-with_ensure('present').
-with_content(/max_wal_senders = 5/).
-with_content(/checkpoint_segments = 64/).
-with_content(/wal_keep_segments = 128/)
+should contain_file('/etc/postgresql/9.4/main/master.conf')
+.with_ensure('present')
+.with_content(/max_wal_senders = 5/)
+.with_content(/checkpoint_segments = 64/)

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix more whitespace-related Rubocop across the tree

2017-06-16 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359478 )

Change subject: Fix more whitespace-related Rubocop across the tree
..

Fix more whitespace-related Rubocop across the tree

- Layout/LeadingCommentSpace
- Layout/SpaceAroundEqualsInParameterDefault
- Layout/SpaceInsideBrackets
- Layout/DotPosition

Change-Id: Idd4fd19daa55ba01dbe96b0f913bc9e48103
---
M .rubocop_todo.yml
M Rakefile
M modules/bacula/spec/defines/fileset_spec.rb
M modules/base/spec/defines/service_unit_spec.rb
M modules/elasticsearch/spec/classes/ship_logs_to_logstash_rspec.rb
M modules/postgresql/spec/classes/postgresql_master_spec.rb
M modules/postgresql/spec/classes/postgresql_slave_spec.rb
M modules/raid/lib/facter/raid.rb
M modules/scap/lib/puppet/provider/package/scap3.rb
M modules/scap/spec/types/package/scap3_spec.rb
M modules/wmflib/lib/hiera/backend/proxy_backend.rb
M modules/wmflib/lib/puppet/parser/functions/array_concat.rb
M modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
M modules/wmflib/lib/puppet/parser/functions/hash_deselect_re.rb
M modules/wmflib/lib/puppet/parser/functions/hash_select_re.rb
M modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
M utils/expanderb.rb
M utils/hiera_lookup
18 files changed, 51 insertions(+), 72 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/359478/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 9663ac1..0d21e87 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -17,9 +17,6 @@
   Exclude:
 - 'modules/labstore/lib/puppet/parser/functions/mount_nfs_volume.rb'
 
-Layout/DotPosition:
-  Enabled: false
-
 Style/EmptyLiteral:
   Exclude:
 - 'modules/admin/lib/puppet/parser/functions/unique_users.rb'
@@ -41,10 +38,6 @@
 
 Layout/IndentationWidth:
   Enabled: false
-
-Layout/LeadingCommentSpace:
-  Exclude:
-- 'modules/base/spec/defines/service_unit_spec.rb'
 
 Style/MethodCallWithoutArgsParentheses:
   Exclude:
@@ -72,22 +65,8 @@
   Exclude:
 - 'modules/wmflib/lib/puppet/parser/functions/require_package.rb'
 
-Layout/SpaceAfterComma:
-  Exclude:
-- 'modules/base/lib/facter/labsproject.rb'
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: false
-
-Layout/SpaceInsideBrackets:
-  Enabled: false
-
 Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
-
-Layout/SpaceInsideParens:
-  Exclude:
-- 'utils/expanderb.rb'
 
 Style/SpecialGlobalVars:
   Exclude:
diff --git a/Rakefile b/Rakefile
index 880c896..b6d7bea 100644
--- a/Rakefile
+++ b/Rakefile
@@ -42,7 +42,7 @@
 end
 
 # Find files modified in HEAD
-def git_changed_in_head(file_exts=[])
+def git_changed_in_head(file_exts = [])
 g = Git.open('.')
 diff = g.diff('HEAD^')
 files = diff.name_status.select { |_, status| 'ACM'.include? status}.keys
diff --git a/modules/bacula/spec/defines/fileset_spec.rb 
b/modules/bacula/spec/defines/fileset_spec.rb
index c069c27..7bea6cd 100644
--- a/modules/bacula/spec/defines/fileset_spec.rb
+++ b/modules/bacula/spec/defines/fileset_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'bacula::director::fileset', :type => :define do
 let(:title) { 'something' }
-let(:params) { { :includes => [ "/", "/var", ], } }
+let(:params) { { :includes => ["/", "/var",], } }
 
 it 'should create /etc/bacula/conf.d/fileset-something.conf' do
 should contain_file('/etc/bacula/conf.d/fileset-something.conf').with({
@@ -23,8 +23,8 @@
 
 context 'with excludes' do
 let(:params) { {
-:includes=> [ "/", "/var",],
-:excludes=> [ "/tmp", ],
+:includes=> ["/", "/var",],
+:excludes=> ["/tmp",],
 }
 }
 it 'should create valid content for 
/etc/bacula/conf.d/fileset-something.conf' do
diff --git a/modules/base/spec/defines/service_unit_spec.rb 
b/modules/base/spec/defines/service_unit_spec.rb
index 5d89853..6342f35 100644
--- a/modules/base/spec/defines/service_unit_spec.rb
+++ b/modules/base/spec/defines/service_unit_spec.rb
@@ -82,6 +82,6 @@
   end
 end
 
-#MARK
+# MARK
   end
 end
diff --git a/modules/elasticsearch/spec/classes/ship_logs_to_logstash_rspec.rb 
b/modules/elasticsearch/spec/classes/ship_logs_to_logstash_rspec.rb
index 277729c..f301d76 100644
--- a/modules/elasticsearch/spec/classes/ship_logs_to_logstash_rspec.rb
+++ b/modules/elasticsearch/spec/classes/ship_logs_to_logstash_rspec.rb
@@ -12,7 +12,7 @@
 
   describe 'when sending logs to logstash' do
 let(:params) { { :cluster_name  => 'my_cluster_name',
- :graylog_hosts => [ 'logstash.example.net', 'other' ] } }
+ :graylog_hosts => ['logstash.example.net', 'other'] } }
 let(:facts) { { :lsbdistrelease => 'ubuntu',
 :lsbdistid  => 'trusty'
 } }
diff --git a/modules/postgresql/spec/classes/postgresql_master_spec.rb