From a056de0d2f86e81ea5ef057d9e92bfa4abf6f7ae Mon Sep 17 00:00:00 2001
From: Faidon Liambotis <faidon@wikimedia.org>
Date: Wed, 7 Jun 2017 22:42:17 +0300
Subject: [PATCH] Fix whitespace-related Rubocop warnings across the tree

Fix:
- Extra empty line detected at block body beginning.
- Extra blank line detected.
- Inconsistent indentation detected.
- Operator => should be surrounded by a single space.
...across all Ruby files in the tree. Noop.

Change-Id: I8bff4a836f98ce82a4f855333ce77d44287279ea
---
 Rakefile                                               |  9 ++-------
 modules/aptrepo/spec/classes/aptrepo_spec.rb           |  1 -
 modules/aptrepo/spec/classes/distribution_spec.rb      |  2 --
 modules/bacula/spec/defines/fileset_spec.rb            |  3 +--
 modules/base/Rakefile                                  |  1 -
 modules/base/files/monitoring/check_puppetrun          |  1 -
 modules/base/lib/facter/initsystem.rb                  |  1 -
 .../lib/puppet/parser/functions/pick_initscript.rb     |  2 +-
 modules/base/spec/defines/expose_puppet_certs_spec.rb  |  1 -
 modules/base/spec/defines/service_unit_spec.rb         |  2 --
 modules/base/spec/spec_helper.rb                       |  1 -
 modules/conftool/files/pooler_loop.rb                  |  2 --
 .../elasticsearch/spec/classes/elasticsearch_rspec.rb  |  1 -
 modules/elasticsearch/spec/classes/https_rspec.rb      |  1 -
 .../spec/classes/ship_logs_to_logstash_rspec.rb        |  1 -
 modules/etcd/lib/puppet/type/etcd_role.rb              |  1 -
 .../parser/functions/ganglia_aggregator_config.rb      |  1 -
 modules/git/spec/defines/user_spec.rb                  |  2 --
 .../spec/functions/configparser_format_spec.rb         |  2 --
 modules/graphite/spec/spec_helper.rb                   |  1 -
 .../spec/classes/install_server_dhcp_server_spec.rb    |  1 -
 .../spec/classes/install_server_preseed_server_spec.rb |  1 -
 .../spec/classes/install_server_tftp_server_spec.rb    | 10 ++++------
 .../spec/classes/install_server_web_server_spec.rb     |  1 -
 modules/mirrors/spec/classes/mirrors_debian_spec.rb    |  1 -
 modules/mirrors/spec/classes/mirrors_spec.rb           |  1 -
 modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb    |  1 -
 modules/nrpe/spec/defines/check_spec.rb                |  1 -
 modules/osm/spec/defines/osm_planet_sync_spec.rb       |  1 -
 modules/postgresql/spec/classes/postgresql_ganglia.rb  |  4 ++--
 .../postgresql/spec/classes/postgresql_slave_spec.rb   |  2 +-
 modules/puppet_statsd/lib/puppet/reports/statsd.rb     |  1 -
 modules/puppetmaster/files/puppet_ecdsacert.rb         |  3 ---
 modules/scap/spec/types/scap_source_spec.rb            |  1 -
 modules/service/spec/defines/service_node_spec.rb      |  2 --
 modules/strongswan/Rakefile                            |  1 -
 modules/tilerator/spec/classes/ui_spec.rb              |  2 --
 modules/wdqs/spec/classes/monitor_blazegraph_spec.rb   |  3 ---
 modules/wdqs/spec/classes/wdqs_service_spec.rb         |  4 ----
 modules/wdqs/spec/classes/wdqs_spec.rb                 |  2 --
 modules/wmflib/lib/hiera/backend/nuyaml_backend.rb     |  1 -
 modules/wmflib/lib/hiera/mwcache.rb                    |  1 -
 .../lib/puppet/parser/functions/ensure_mounted.rb      |  1 -
 modules/wmflib/lib/puppet/parser/functions/htpasswd.rb |  4 ----
 .../wmflib/lib/puppet/parser/functions/ipresolve.rb    |  1 -
 .../lib/puppet/parser/functions/shell_exports.rb       |  2 +-
 modules/wmflib/spec/functions/conftool_spec.rb         |  1 -
 modules/wmflib/spec/functions/ensure_mounted_spec.rb   |  1 -
 modules/wmflib/spec/functions/ipresolve_spec.rb        |  2 +-
 modules/wmflib/spec/functions/os_version_spec.rb       |  2 --
 modules/wmflib/spec/functions/role_spec.rb             |  1 -
 modules/wmflib/spec/hiera/proxy_backend_spec.rb        |  1 -
 modules/wmflib/spec/hiera/role_backend_spec.rb         |  1 -
 utils/expanderb.rb                                     |  5 +----
 utils/hiera_lookup                                     |  2 +-
 55 files changed, 15 insertions(+), 90 deletions(-)

diff --git a/Rakefile b/Rakefile
index 3319dc2d40..880c896bc1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -76,7 +76,6 @@ namespace :syntax do
         'syntax:hiera',
         'syntax:templates',
     ]
-
 end
 
 RuboCop::RakeTask.new(:rubocop)
@@ -93,7 +92,6 @@ PuppetLint::RakeTask.new :puppetlint_head do |config|
     config.pattern = git_changed_in_head ['.pp']
 end
 
-
 task :default => [:help]
 
 desc 'Run all build/tests commands (CI entry point)'
@@ -105,7 +103,6 @@ task lint: [:typos, :rubocop, :syntax, :puppetlint]
 desc 'Run all linting commands against HEAD'
 task lint_head: [:typos, :rubocop, :"syntax:head", :puppetlint_head]
 
-
 desc 'Show the help'
 task :help do
     puts "Puppet helper for operations/puppet.git
@@ -121,8 +118,8 @@ Welcome #{ENV['USER']} to WMFs wonderful rake helper to play with puppet.
     # Show our tasks list.
     system "rake -T"
 
-puts "-----------------------------------------------------------------------"
-puts "
+    puts "-----------------------------------------------------------------------"
+    puts "
 Examples:
 
 Validate syntax for all puppet manifests:
@@ -134,7 +131,6 @@ Validate manifests/nfs.pp and manifests/apaches.pp
 Run puppet-lint style checker:
   rake puppetlint
 "
-
 end
 
 desc "Build documentation"
@@ -170,7 +166,6 @@ end
 
 desc "Run spec tests found in modules"
 task :spec do
-
     # Hold a list of modules not passing tests.
     failed_modules = []
     ignored_modules = ['mysql', 'osm', 'puppetdbquery', 'stdlib', 'wdqs']
diff --git a/modules/aptrepo/spec/classes/aptrepo_spec.rb b/modules/aptrepo/spec/classes/aptrepo_spec.rb
index 443403b2c8..a95f73534b 100644
--- a/modules/aptrepo/spec/classes/aptrepo_spec.rb
+++ b/modules/aptrepo/spec/classes/aptrepo_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'aptrepo', :type => :class do
-
     let(:params) {{ :basedir => '/srv/wikimedia' }}
 
     it { should compile }
diff --git a/modules/aptrepo/spec/classes/distribution_spec.rb b/modules/aptrepo/spec/classes/distribution_spec.rb
index 041225abb5..ef70eca80f 100644
--- a/modules/aptrepo/spec/classes/distribution_spec.rb
+++ b/modules/aptrepo/spec/classes/distribution_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'aptrepo::distribution', :type => :class do
-
     let(:params) {{
         :basedir => '/srv/wikimedia',
         :settings => {
@@ -21,5 +20,4 @@
             'group'  => 'root',
         })
     end
-
 end
diff --git a/modules/bacula/spec/defines/fileset_spec.rb b/modules/bacula/spec/defines/fileset_spec.rb
index f494abed44..c069c27bdf 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({
@@ -34,5 +34,4 @@
             .with_content(/File = \/tmp/)
         end
     end
-
 end
diff --git a/modules/base/Rakefile b/modules/base/Rakefile
index 165b5325bb..42f6ed439f 100644
--- a/modules/base/Rakefile
+++ b/modules/base/Rakefile
@@ -14,7 +14,6 @@ symlinks = { 'spec/fixtures/modules/%s/files' % modulename => '../../../../files
   'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
 }
 
-
 task :setup do
   FileUtils.mkdir_p('spec/fixtures/modules/%s' % modulename)
   extra_modules.each do |x|
diff --git a/modules/base/files/monitoring/check_puppetrun b/modules/base/files/monitoring/check_puppetrun
index 2d5d054f69..455f99eaaa 100755
--- a/modules/base/files/monitoring/check_puppetrun
+++ b/modules/base/files/monitoring/check_puppetrun
@@ -111,7 +111,6 @@ def time_ago(s)
   "Indeterminate amount of time (see time_ago)"
 end
 
-
 if failcount == :failed
     puts "CRITICAL: Catalog fetch fail. Either compilation failed or puppetmaster has issues"
     exit 2
diff --git a/modules/base/lib/facter/initsystem.rb b/modules/base/lib/facter/initsystem.rb
index 4e9b34b548..48afe718ad 100644
--- a/modules/base/lib/facter/initsystem.rb
+++ b/modules/base/lib/facter/initsystem.rb
@@ -13,7 +13,6 @@
   confine :kernel => %w{Linux FreeBSD OpenBSD SunOS Darwin GNU/kFreeBSD}
 
   setcode do
-
     if FileTest.exists?("/run/systemd/system")
       # also see sd_booted(3)
       result = "systemd"
diff --git a/modules/base/lib/puppet/parser/functions/pick_initscript.rb b/modules/base/lib/puppet/parser/functions/pick_initscript.rb
index 02db0521cf..6636ee8497 100644
--- a/modules/base/lib/puppet/parser/functions/pick_initscript.rb
+++ b/modules/base/lib/puppet/parser/functions/pick_initscript.rb
@@ -8,7 +8,7 @@
 available init scripts, and returns the chosen one.
 HEREDOC
 ) do |vals|
-  name, init_system, has_systemd, has_systemd_override, has_upstart, has_sysvinit, strict  = vals
+  name, init_system, has_systemd, has_systemd_override, has_upstart, has_sysvinit, strict = vals
   has_custom = (has_systemd || has_upstart || has_sysvinit)
   # if we don't have custom scripts, we use the system defaults
   return false unless has_custom
diff --git a/modules/base/spec/defines/expose_puppet_certs_spec.rb b/modules/base/spec/defines/expose_puppet_certs_spec.rb
index d4536a3404..0d12490498 100644
--- a/modules/base/spec/defines/expose_puppet_certs_spec.rb
+++ b/modules/base/spec/defines/expose_puppet_certs_spec.rb
@@ -41,5 +41,4 @@
     it { should contain_file('/my/ssl/dir/ssl/cert.pem').with({ 'ensure' => 'absent' }) }
     it { should contain_file('/my/ssl/dir/ssl/server.key').with({ 'ensure' => 'absent' }) }
   end
-
 end
diff --git a/modules/base/spec/defines/service_unit_spec.rb b/modules/base/spec/defines/service_unit_spec.rb
index cb526652ff..5d89853c16 100644
--- a/modules/base/spec/defines/service_unit_spec.rb
+++ b/modules/base/spec/defines/service_unit_spec.rb
@@ -33,7 +33,6 @@
         should contain_file('/etc/init.d/nginx').that_notifies('Exec[systemd reload for nginx]').that_notifies('Service[nginx]')
         should contain_exec('systemd reload for nginx').that_comes_before('Service[nginx]')
       end
-
     end
   end
   context 'with refresh false' do
@@ -54,7 +53,6 @@
     it 'should refresh service' do
         should contain_file('/etc/init.d/nginx').that_notifies('Service[nginx]')
     end
-
   end
   context 'with upstart as init' do
     let(:facts) { {:initsystem => 'upstart'} }
diff --git a/modules/base/spec/spec_helper.rb b/modules/base/spec/spec_helper.rb
index 04f93118b5..4d0580f4b0 100644
--- a/modules/base/spec/spec_helper.rb
+++ b/modules/base/spec/spec_helper.rb
@@ -2,7 +2,6 @@
 
 fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
 
-
 RSpec.configure do |c|
   c.module_path = File.expand_path("../..", File.dirname(__FILE__))
   c.manifest_dir = File.join(fixture_path, 'manifests')
diff --git a/modules/conftool/files/pooler_loop.rb b/modules/conftool/files/pooler_loop.rb
index f5dedc37b4..a6eae0988c 100755
--- a/modules/conftool/files/pooler_loop.rb
+++ b/modules/conftool/files/pooler_loop.rb
@@ -4,7 +4,6 @@
 require 'net/http'
 require 'facter'
 
-
 PATH_ROOT = '/usr/local/bin/'
 
 # default values
@@ -107,7 +106,6 @@ def check_pooled_state(ip, port, pool, host, want_pooled)
   end
 end
 
-
 # do the whole procedure args[:cycles] times
 (1..args[:cycles]).each do
   # try to (de)pool the host we are on
diff --git a/modules/elasticsearch/spec/classes/elasticsearch_rspec.rb b/modules/elasticsearch/spec/classes/elasticsearch_rspec.rb
index 035043a2ed..c2a850381e 100644
--- a/modules/elasticsearch/spec/classes/elasticsearch_rspec.rb
+++ b/modules/elasticsearch/spec/classes/elasticsearch_rspec.rb
@@ -16,5 +16,4 @@
             .with_content(/-XX:\+PrintGCDateStamps$/)
     }
   end
-
 end
diff --git a/modules/elasticsearch/spec/classes/https_rspec.rb b/modules/elasticsearch/spec/classes/https_rspec.rb
index 1d066e5920..02193f882f 100644
--- a/modules/elasticsearch/spec/classes/https_rspec.rb
+++ b/modules/elasticsearch/spec/classes/https_rspec.rb
@@ -29,5 +29,4 @@
       should contain_package('nginx-full').with({ 'ensure' => 'absent' })
     end
   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 d7e3d768df..277729cf52 100644
--- a/modules/elasticsearch/spec/classes/ship_logs_to_logstash_rspec.rb
+++ b/modules/elasticsearch/spec/classes/ship_logs_to_logstash_rspec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'elasticsearch', :type => :class do
-
   describe 'when NOT sending logs to logstash' do
     let(:params) { { :cluster_name  => 'my_cluster_name' } }
     let(:facts) { { :lsbdistrelease => 'ubuntu',
diff --git a/modules/etcd/lib/puppet/type/etcd_role.rb b/modules/etcd/lib/puppet/type/etcd_role.rb
index 33c2ac3dde..e9c51a1888 100644
--- a/modules/etcd/lib/puppet/type/etcd_role.rb
+++ b/modules/etcd/lib/puppet/type/etcd_role.rb
@@ -14,5 +14,4 @@ def insync?(is)
       is == should
     end
   end
-
 end
diff --git a/modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb b/modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb
index 73f2c72631..736746c546 100644
--- a/modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb
+++ b/modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb
@@ -7,7 +7,6 @@ def calc_url(aggregator, ip_octet)
   format('%s:%d', url, port)
 end
 
-
 module Puppet::Parser::Functions
   newfunction(:ganglia_aggregator_config, :type => :rvalue) do |_|
     config = {}
diff --git a/modules/git/spec/defines/user_spec.rb b/modules/git/spec/defines/user_spec.rb
index 1bdd2fa54c..8b7344981a 100644
--- a/modules/git/spec/defines/user_spec.rb
+++ b/modules/git/spec/defines/user_spec.rb
@@ -7,7 +7,6 @@
 require 'spec_helper'
 
 describe 'git::userconfig', :type => :define do
-
   let(:title) { 'gitconfig' }
 
   context "Setting up user name and email" do
@@ -26,5 +25,4 @@
       .with_content(/email = hashar@free.fr\n/)
     }
   end
-
 end
diff --git a/modules/graphite/spec/functions/configparser_format_spec.rb b/modules/graphite/spec/functions/configparser_format_spec.rb
index 9ad87cf4fa..251603e8c0 100644
--- a/modules/graphite/spec/functions/configparser_format_spec.rb
+++ b/modules/graphite/spec/functions/configparser_format_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'configparser_format' do
-
   it 'should format hash into ini format' do
     run.with_params({:section => {:param1 => 'value1', :param2 => 'value2'}})
                           .and_return(
@@ -37,5 +36,4 @@
             "param1 = item1,item2\n"\
         )
   end
-
 end
diff --git a/modules/graphite/spec/spec_helper.rb b/modules/graphite/spec/spec_helper.rb
index 04f93118b5..4d0580f4b0 100644
--- a/modules/graphite/spec/spec_helper.rb
+++ b/modules/graphite/spec/spec_helper.rb
@@ -2,7 +2,6 @@
 
 fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
 
-
 RSpec.configure do |c|
   c.module_path = File.expand_path("../..", File.dirname(__FILE__))
   c.manifest_dir = File.join(fixture_path, 'manifests')
diff --git a/modules/install_server/spec/classes/install_server_dhcp_server_spec.rb b/modules/install_server/spec/classes/install_server_dhcp_server_spec.rb
index 690d201c75..4daf72b9c9 100644
--- a/modules/install_server/spec/classes/install_server_dhcp_server_spec.rb
+++ b/modules/install_server/spec/classes/install_server_dhcp_server_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'install_server::dhcp_server', :type => :class do
-
     it { should compile }
 
     it 'should have isc-dhcp-server' do
diff --git a/modules/install_server/spec/classes/install_server_preseed_server_spec.rb b/modules/install_server/spec/classes/install_server_preseed_server_spec.rb
index cc5296aa6e..77f0d8a103 100644
--- a/modules/install_server/spec/classes/install_server_preseed_server_spec.rb
+++ b/modules/install_server/spec/classes/install_server_preseed_server_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'install_server::preseed_server', :type => :class do
-
     it { should compile }
 
     it do
diff --git a/modules/install_server/spec/classes/install_server_tftp_server_spec.rb b/modules/install_server/spec/classes/install_server_tftp_server_spec.rb
index 9904361c98..cafa47d6b3 100644
--- a/modules/install_server/spec/classes/install_server_tftp_server_spec.rb
+++ b/modules/install_server/spec/classes/install_server_tftp_server_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'install_server::tftp_server', :type => :class do
-
     it { should compile }
-
     it { should contain_package('atftpd').with_ensure('present') }
 
     it do
@@ -16,10 +14,10 @@
 
     it do
         should contain_file('/srv/tftpboot').with({
-            'mode'   => '0444',
-            'owner'  => 'root',
-            'group'  => 'root',
-            'recurse'  => 'remote',
+            'mode'    => '0444',
+            'owner'   => 'root',
+            'group'   => 'root',
+            'recurse' => 'remote',
         })
     end
 end
diff --git a/modules/install_server/spec/classes/install_server_web_server_spec.rb b/modules/install_server/spec/classes/install_server_web_server_spec.rb
index 5764f414b2..aad82b86ad 100644
--- a/modules/install_server/spec/classes/install_server_web_server_spec.rb
+++ b/modules/install_server/spec/classes/install_server_web_server_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'install_server::web_server', :type => :class do
-
     # Please wmflib.os_version()
     let(:facts) { {
         :lsbdistrelease => '8.5',
diff --git a/modules/mirrors/spec/classes/mirrors_debian_spec.rb b/modules/mirrors/spec/classes/mirrors_debian_spec.rb
index 94183e154d..88d7159b4f 100644
--- a/modules/mirrors/spec/classes/mirrors_debian_spec.rb
+++ b/modules/mirrors/spec/classes/mirrors_debian_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'mirrors::debian', :type => :class do
-
     it do
         should contain_file('/srv/mirrors/debian').with({
             'ensure' => 'directory',
diff --git a/modules/mirrors/spec/classes/mirrors_spec.rb b/modules/mirrors/spec/classes/mirrors_spec.rb
index c9a55bed26..a5bb644e1a 100644
--- a/modules/mirrors/spec/classes/mirrors_spec.rb
+++ b/modules/mirrors/spec/classes/mirrors_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'mirrors', :type => :class do
-
     it { should contain_user('mirror') }
     it { should contain_group('mirror') }
     it { should contain_file('/srv/mirrors') }
diff --git a/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb b/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
index f20c6e0251..3c72d734dc 100644
--- a/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
+++ b/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'mirrors::ubuntu', :type => :class do
-
     it do
         should contain_file('/srv/mirrors/ubuntu/').with({
             'ensure' => 'directory',
diff --git a/modules/nrpe/spec/defines/check_spec.rb b/modules/nrpe/spec/defines/check_spec.rb
index 3e73ced19b..9832446f3f 100644
--- a/modules/nrpe/spec/defines/check_spec.rb
+++ b/modules/nrpe/spec/defines/check_spec.rb
@@ -23,5 +23,4 @@
             should_not contain_file('/etc/nagios/nrpe.d/something.cfg')
         end
     end
-
 end
diff --git a/modules/osm/spec/defines/osm_planet_sync_spec.rb b/modules/osm/spec/defines/osm_planet_sync_spec.rb
index b5badb20a0..6ea4ad95fd 100644
--- a/modules/osm/spec/defines/osm_planet_sync_spec.rb
+++ b/modules/osm/spec/defines/osm_planet_sync_spec.rb
@@ -31,5 +31,4 @@
             it { should contain_file('/usr/local/bin/replicate-osm').with_content(/--input-reader xml/) }
         end
     end
-
 end
diff --git a/modules/postgresql/spec/classes/postgresql_ganglia.rb b/modules/postgresql/spec/classes/postgresql_ganglia.rb
index 9f26c30bb2..d85d26eb4a 100644
--- a/modules/postgresql/spec/classes/postgresql_ganglia.rb
+++ b/modules/postgresql/spec/classes/postgresql_ganglia.rb
@@ -2,7 +2,7 @@
 
 describe 'postgresql::ganglia', :type => :class do
     let(:params) { {
-        :ensure           => 'present',
+        :ensure => 'present',
         }
     }
 
@@ -14,7 +14,7 @@
 
 describe 'postgresql::slave', :type => :class do
     let(:params) { {
-        :ensure           => 'absent',
+        :ensure => 'absent',
         }
     }
 
diff --git a/modules/postgresql/spec/classes/postgresql_slave_spec.rb b/modules/postgresql/spec/classes/postgresql_slave_spec.rb
index f7fd45160e..8fa865a4ea 100644
--- a/modules/postgresql/spec/classes/postgresql_slave_spec.rb
+++ b/modules/postgresql/spec/classes/postgresql_slave_spec.rb
@@ -31,7 +31,7 @@
         :ensure           => 'present',
         :master_server    => 'test',
         :replication_pass => 'pass',
-        :root_dir          => '/srv/postgres',
+        :root_dir         => '/srv/postgres',
         }
     }
     let(:facts) { { :lsbdistcodename => 'jessie' } }
diff --git a/modules/puppet_statsd/lib/puppet/reports/statsd.rb b/modules/puppet_statsd/lib/puppet/reports/statsd.rb
index bd0d65dcd2..becf69d399 100644
--- a/modules/puppet_statsd/lib/puppet/reports/statsd.rb
+++ b/modules/puppet_statsd/lib/puppet/reports/statsd.rb
@@ -7,7 +7,6 @@
 Puppet::Reports.register_report(:statsd) do
     desc = 'Send Puppet metrics to StatsD'
 
-
     def load_config
         config_file = File.join Puppet.settings[:confdir], 'statsd.yaml'
         raise Puppet::ParseError, "#{config_file} is missing" unless File.exists? config_file
diff --git a/modules/puppetmaster/files/puppet_ecdsacert.rb b/modules/puppetmaster/files/puppet_ecdsacert.rb
index 4e8188aa88..dbed479eaa 100755
--- a/modules/puppetmaster/files/puppet_ecdsacert.rb
+++ b/modules/puppetmaster/files/puppet_ecdsacert.rb
@@ -30,7 +30,6 @@ class PuppetECDSAGenError < StandardError
   asn1_oid: 'prime256v1'
 }
 
-
 Log = Logger.new(STDOUT)
 
 Log.level = Logger::INFO
@@ -39,7 +38,6 @@ class PuppetECDSAGenError < StandardError
   format("%s %-5s (puppet-ecdsacert): %s\n", date_format, severity, msg)
 end
 
-
 # Ecdsa certificates generator class
 # Generates the cert, the CSR, and sends the signing request to the puppetmaster
 class PuppetECDSAGen
@@ -179,7 +177,6 @@ class CertificateAuthority
   end
 end
 
-
 OptionParser.new do |opts|
   opts.banner = "Usage: puppetecdsamanager [-c configfile] [-a SAN1,SAN2] common-name "
   opts.on('-c', '--configfile CONF', 'Location of the config file') do |conf|
diff --git a/modules/scap/spec/types/scap_source_spec.rb b/modules/scap/spec/types/scap_source_spec.rb
index de4fcba91c..e992a5a994 100644
--- a/modules/scap/spec/types/scap_source_spec.rb
+++ b/modules/scap/spec/types/scap_source_spec.rb
@@ -16,7 +16,6 @@
     end
   end
 
-
   context "Default values" do
     subject do
       resource_class.new(:name => 'test/deploy')
diff --git a/modules/service/spec/defines/service_node_spec.rb b/modules/service/spec/defines/service_node_spec.rb
index 1e856f269a..24e7712558 100644
--- a/modules/service/spec/defines/service_node_spec.rb
+++ b/modules/service/spec/defines/service_node_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'service::node', :type => :define do
-
   let(:title) { 'my_service_name' }
   let(:facts) { { :initsystem => 'systemd' } }
 
@@ -16,5 +15,4 @@
                          .with_content(/name: my_service_name/)
     end
   end
-
 end
diff --git a/modules/strongswan/Rakefile b/modules/strongswan/Rakefile
index a0c3b79a02..401ca3da00 100644
--- a/modules/strongswan/Rakefile
+++ b/modules/strongswan/Rakefile
@@ -10,7 +10,6 @@ symlinks = { 'spec/fixtures/modules/%s/files' % modulename => '../../../../files
              'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
            }
 
-
 task :setup do
   FileUtils.mkdir_p('spec/fixtures/modules/%s' % modulename)
   symlinks.each do |x|
diff --git a/modules/tilerator/spec/classes/ui_spec.rb b/modules/tilerator/spec/classes/ui_spec.rb
index d08a5c4991..dbf55bff64 100644
--- a/modules/tilerator/spec/classes/ui_spec.rb
+++ b/modules/tilerator/spec/classes/ui_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'tilerator::ui', :type => :class do
-
   context 'with default parameters' do
     # there is an issue with secret() that is a transitive dependency of service::node
     # not sure how to fix it...
@@ -20,5 +19,4 @@
                             .without_content(/-j.deleteEmpty/)
     }
   end
-
 end
diff --git a/modules/wdqs/spec/classes/monitor_blazegraph_spec.rb b/modules/wdqs/spec/classes/monitor_blazegraph_spec.rb
index 480234012d..2e4ca870b2 100644
--- a/modules/wdqs/spec/classes/monitor_blazegraph_spec.rb
+++ b/modules/wdqs/spec/classes/monitor_blazegraph_spec.rb
@@ -1,16 +1,13 @@
 require 'spec_helper'
 
 describe 'wdqs::monitor::blazegraph', :type => :class do
-
   let(:facts) { { :lsbdistrelease => 'debian',
                   :lsbdistid      => 'jessie',
                   :initsystem     => 'systemd',
                   :fqdn           => 'my.example.net',
   } }
 
-
   it { is_expected.to contain_monitoring__graphite_threshold('wdqs-response-time')
                           .with_metric('varnish.eqiad.backends.be_my_example_net.GET.p99')
   }
-
 end
diff --git a/modules/wdqs/spec/classes/wdqs_service_spec.rb b/modules/wdqs/spec/classes/wdqs_service_spec.rb
index ebf078af26..73067ee600 100644
--- a/modules/wdqs/spec/classes/wdqs_service_spec.rb
+++ b/modules/wdqs/spec/classes/wdqs_service_spec.rb
@@ -1,13 +1,11 @@
 require 'spec_helper'
 
 describe 'wdqs::service', :type => :class do
-
   context 'with systemd' do
     let(:facts) { { :initsystem => 'systemd' } }
 
     it { is_expected.to contain_file('/lib/systemd/system/wdqs-blazegraph.service')
       .with_content(/runBlazegraph.sh -f RWStore.properties/)
-
     }
   end
 
@@ -16,8 +14,6 @@
 
     it { is_expected.to contain_file('/etc/init/wdqs-blazegraph.conf')
                             .with_content(/runBlazegraph.sh -f RWStore.properties/)
-
     }
   end
-
 end
diff --git a/modules/wdqs/spec/classes/wdqs_spec.rb b/modules/wdqs/spec/classes/wdqs_spec.rb
index 78751b7dc2..82b9dcd8c1 100644
--- a/modules/wdqs/spec/classes/wdqs_spec.rb
+++ b/modules/wdqs/spec/classes/wdqs_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'wdqs', :type => :class do
-
   context 'using git to deploy' do
     let(:facts) { { :initsystem => 'systemd' } }
 
@@ -20,5 +19,4 @@
                             .with_group('root')
     }
   end
-
 end
diff --git a/modules/wmflib/lib/hiera/backend/nuyaml_backend.rb b/modules/wmflib/lib/hiera/backend/nuyaml_backend.rb
index ad01bf9fae..54a477181d 100644
--- a/modules/wmflib/lib/hiera/backend/nuyaml_backend.rb
+++ b/modules/wmflib/lib/hiera/backend/nuyaml_backend.rb
@@ -67,7 +67,6 @@
 class Hiera
   module Backend
     class Nuyaml_backend
-
       def initialize(cache=nil)
         require 'yaml'
         @cache = cache || Filecache.new
diff --git a/modules/wmflib/lib/hiera/mwcache.rb b/modules/wmflib/lib/hiera/mwcache.rb
index 191eedb1d3..c03adf5231 100644
--- a/modules/wmflib/lib/hiera/mwcache.rb
+++ b/modules/wmflib/lib/hiera/mwcache.rb
@@ -96,7 +96,6 @@ def path_metadata(path)
       return {:ts => now, :revision => revision}
     end
 
-
     def get_from_mediawiki(path,want_content)
       what = want_content ? 'content' : 'ids'
       query_string = "action=query&prop=revisions&format=json&rvprop=#{what}&titles=Hiera:#{path}"
diff --git a/modules/wmflib/lib/puppet/parser/functions/ensure_mounted.rb b/modules/wmflib/lib/puppet/parser/functions/ensure_mounted.rb
index 7a5e321188..a069948bdf 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ensure_mounted.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ensure_mounted.rb
@@ -24,7 +24,6 @@
 #
 module Puppet::Parser::Functions
   newfunction(:ensure_mounted, :type => :rvalue, :arity => 1) do |args|
-
     ensure_param = args.first
     case ensure_param
     when 'present', 'true', true then 'mounted'
diff --git a/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb b/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
index e6d9335ecd..8cf810ed8d 100644
--- a/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
@@ -12,7 +12,6 @@
 # Original code Copyright (c) 2008 Jeremy Hinegardner
 # Modifications Copyright (c) 2017 Giuseppe Lavagetto, Wikimedia Foundation, Inc.
 class Apr1Md5
-
   DIGEST_LENGTH = 16
 
   def initialize(salt)
@@ -35,7 +34,6 @@ def to_64(number, rounds)
     r.string
   end
 
-
   # this algorithm pulled straight from apr_md5_encode() and converted to ruby syntax
   def encode(password)
     primary = ::Digest::MD5.new
@@ -78,7 +76,6 @@ def encode(password)
       pd = ctx.digest
     end
 
-
     pd = pd.bytes.to_a
 
     l = (pd[0] << 16) | (pd[6] << 8) | pd[12]
@@ -101,7 +98,6 @@ def encode(password)
   end
 end
 
-
 module Puppet::Parser::Functions
   newfunction(:htpasswd, :type => :rvalue, :arity => 2) do |args|
     generator = Apr1Md5.new args[1]
diff --git a/modules/wmflib/lib/puppet/parser/functions/ipresolve.rb b/modules/wmflib/lib/puppet/parser/functions/ipresolve.rb
index 02afde3640..9ed35a3b11 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ipresolve.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ipresolve.rb
@@ -110,7 +110,6 @@ def get_resource(name, type, nameserver)
   end
 end
 
-
 module Puppet::Parser::Functions
   dns = DNSCached.new
   newfunction(:ipresolve, :type => :rvalue, :arity => -1) do |args|
diff --git a/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb b/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
index 233ef3bc55..577adabce9 100644
--- a/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
@@ -22,7 +22,7 @@
 #  export APACHE_PID_FILE="/var/run/apache2/apache2.pid"
 #
 module Puppet::Parser::Functions
-  newfunction(:shell_exports, :type  => :rvalue, :arity => 1) do |args|
+  newfunction(:shell_exports, :type => :rvalue, :arity => 1) do |args|
     vars, uppercase_keys = args
     fail(ArgumentError, 'validate_ensure(): hash argument required') unless vars.is_a?(Hash)
     vars = Hash[vars.map { |k, v| [k.upcase, v] }] unless uppercase_keys == false
diff --git a/modules/wmflib/spec/functions/conftool_spec.rb b/modules/wmflib/spec/functions/conftool_spec.rb
index 888c51b7df..c6a660cf51 100644
--- a/modules/wmflib/spec/functions/conftool_spec.rb
+++ b/modules/wmflib/spec/functions/conftool_spec.rb
@@ -3,7 +3,6 @@
 require 'json'
 
 describe 'conftool' do
-
   def gen_conftool_call(selector)
     ['/usr/bin/conftool', '--object-type', 'node', 'select', selector, 'get']
   end
diff --git a/modules/wmflib/spec/functions/ensure_mounted_spec.rb b/modules/wmflib/spec/functions/ensure_mounted_spec.rb
index 09238936df..72da1f42ae 100644
--- a/modules/wmflib/spec/functions/ensure_mounted_spec.rb
+++ b/modules/wmflib/spec/functions/ensure_mounted_spec.rb
@@ -32,5 +32,4 @@
   it "should return 'false' for param 'false'" do
     expect(scope.function_ensure_mounted([false])).to eq(false)
   end
-
 end
diff --git a/modules/wmflib/spec/functions/ipresolve_spec.rb b/modules/wmflib/spec/functions/ipresolve_spec.rb
index 070dc012da..dc74589f52 100644
--- a/modules/wmflib/spec/functions/ipresolve_spec.rb
+++ b/modules/wmflib/spec/functions/ipresolve_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
-describe 'ipresolve' do
 
+describe 'ipresolve' do
   it "should resolve ipv4 addresses by default" do
     should run.with_params('install1002.wikimedia.org').and_return('208.80.154.86')
   end
diff --git a/modules/wmflib/spec/functions/os_version_spec.rb b/modules/wmflib/spec/functions/os_version_spec.rb
index b1d1beead2..f422356dee 100644
--- a/modules/wmflib/spec/functions/os_version_spec.rb
+++ b/modules/wmflib/spec/functions/os_version_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'os_version' do
-
   it 'should be defined' do
     expect(subject).to_not be_nil
   end
@@ -53,5 +52,4 @@
       expect(subject).to run.with_params('Debian < stretch').and_return(true)
     end
   end
-
 end
diff --git a/modules/wmflib/spec/functions/role_spec.rb b/modules/wmflib/spec/functions/role_spec.rb
index fd9a3b5143..15d86ac3c8 100644
--- a/modules/wmflib/spec/functions/role_spec.rb
+++ b/modules/wmflib/spec/functions/role_spec.rb
@@ -1,6 +1,5 @@
 require 'spec_helper'
 describe 'role' do
-
   before :each do
     @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("foo"))
     @scope = Puppet::Parser::Scope.new(@compiler)
diff --git a/modules/wmflib/spec/hiera/proxy_backend_spec.rb b/modules/wmflib/spec/hiera/proxy_backend_spec.rb
index 9b0574e2d3..512f15ee4f 100644
--- a/modules/wmflib/spec/hiera/proxy_backend_spec.rb
+++ b/modules/wmflib/spec/hiera/proxy_backend_spec.rb
@@ -48,5 +48,4 @@
     @scope.function_role(['test'])
     expect(@backend.lookup('admin::groups', @topscope, nil, :array)).to eq([['go-spurs'],['FooBar']])
   end
-
 end
diff --git a/modules/wmflib/spec/hiera/role_backend_spec.rb b/modules/wmflib/spec/hiera/role_backend_spec.rb
index 19c436a5d5..1e80718d08 100644
--- a/modules/wmflib/spec/hiera/role_backend_spec.rb
+++ b/modules/wmflib/spec/hiera/role_backend_spec.rb
@@ -4,7 +4,6 @@
 
 describe 'role_backend' do
   before :each do
-
     @hiera = Hiera.new({:config => 'spec/fixtures/hiera.yaml'})
     Hiera::Config.load('spec/fixtures/hiera.yaml')
     @backend = Hiera::Backend::Role_backend.new()
diff --git a/utils/expanderb.rb b/utils/expanderb.rb
index 3911f9a249..fccc4a9c48 100755
--- a/utils/expanderb.rb
+++ b/utils/expanderb.rb
@@ -18,7 +18,6 @@
 
 # Parsing the options
 optparse = OptionParser.new do |opts|
-
   opts.banner = "Usage: expanderb.rb -f FILENAME [key=val [key2=val]]"
 
   opts.on( '-f', '--filename FILENAME', 'ERB filename to expand') do |f|
@@ -36,7 +35,7 @@
   # -f is mandatory
   optparse.parse!
   if $filename.nil?
-     puts "You must specify an ERB filename."
+    puts "You must specify an ERB filename."
     puts optparse
     exit
   end
@@ -54,8 +53,6 @@
 end
 p template_values
 
-
-
 def render_erb(template, locals)
   # Make sure we can render templates with -%> closing tags.
   # Note that this does not actually remove newlines after -%>, it just
diff --git a/utils/hiera_lookup b/utils/hiera_lookup
index b6e6c94ece..dff65efbba 100755
--- a/utils/hiera_lookup
+++ b/utils/hiera_lookup
@@ -30,7 +30,7 @@ Examples:
 
 
 end
-    msg << error
+  msg << error
 end
 
 begin