Layout/ExtraSpacing

This commit enables the Rubocop Layout/ExtraSpacing cop and addresses
all offenses.

Author: mhashizume

.rubocop_todo.yml

@@ -22,11 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
-Layout/ExtraSpacing:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses

ext/windows/service/daemon.rb

@@ -13,7 +13,7 @@
 require 'puppet/util/windows/monkey_patches/process'
 
 class WindowsDaemon < Puppet::Util::Windows::Daemon
-  CREATE_NEW_CONSOLE          = 0x00000010
+  CREATE_NEW_CONSOLE = 0x00000010
 
   @run_thread = nil
   @LOG_TO_FILE = false

lib/hiera/puppet_function.rb

@@ -23,7 +23,7 @@ def self.init_dispatch
       scope_param
       param 'String',:key
       param 'Any',   :default
-      optional_param 'Any',   :override
+      optional_param 'Any', :override
     end
 
     dispatch :hiera_block1 do

lib/puppet/application/apply.rb

@@ -22,7 +22,7 @@ class Puppet::Application::Apply < Puppet::Application
     Puppet[:write_catalog_summary] = arg
   end
 
-  option("--catalog catalog",  "-c catalog") do |arg|
+  option("--catalog catalog", "-c catalog") do |arg|
     options[:catalog] = arg
   end
 
@@ -204,11 +204,13 @@ def apply
   end
 
   def main
+    # rubocop:disable Layout/ExtraSpacing
     manifest          = get_manifest() # Get either a manifest or nil if apply should use content of Puppet[:code]
     splay                              # splay if needed
     facts             = get_facts()    # facts or nil
     node              = get_node()     # node or error
     apply_environment = get_configured_environment(node, manifest)
+    # rubocop:enable Layout/ExtraSpacing
 
     # TRANSLATORS "puppet apply" is a program command and should not be translated
     Puppet.override({:current_environment => apply_environment, :loaders => create_loaders(apply_environment)}, _("For puppet apply")) do

lib/puppet/defaults.rb

@@ -1623,7 +1623,7 @@ def self.initialize_default_settings!(settings)
       :owner => "root",
       :mode => "0640",
       :desc => "The file in which puppet agent stores a list of the resources
-        associated with the retrieved configuration."  },
+        associated with the retrieved configuration." },
     :puppetdlog => {
       :default => "$logdir/puppetd.log",
       :type => :file,

lib/puppet/face/epp.rb

@@ -197,7 +197,7 @@
 
         if !missing_files.empty?
           raise Puppet::Error, _("One or more file(s) specified did not exist:\n%{missing_files_list}") %
-              { missing_files_list:  missing_files.collect { |f| "   #{f}" }.join("\n") }
+              { missing_files_list: missing_files.collect { |f| "   #{f}" }.join("\n") }
         end
       end
       buffer.string

lib/puppet/face/module/list.rb

@@ -93,7 +93,7 @@
                                  :label_unmet => true, :path => path, :label_invalid => false)
         else
           tree = []
-          modules.sort_by { |mod| mod.forge_name or mod.name  }.each do |mod|
+          modules.sort_by { |mod| mod.forge_name or mod.name }.each do |mod|
             tree << list_build_node(mod, path, :label_unmet => false,
                       :path => path, :label_invalid => true)
           end

lib/puppet/ffi/windows/constants.rb

@@ -296,7 +296,7 @@ module Constants
       SERVICE_START_PENDING    => SERVICE_RUNNING,
       SERVICE_STOP_PENDING     => SERVICE_STOPPED
     }
-    SERVICE_STATES           = {
+    SERVICE_STATES = {
       SERVICE_CONTINUE_PENDING => :SERVICE_CONTINUE_PENDING,
       SERVICE_PAUSE_PENDING => :SERVICE_PAUSE_PENDING,
       SERVICE_PAUSED => :SERVICE_PAUSED,

lib/puppet/ffi/windows/structs.rb

@@ -116,7 +116,7 @@ class LUID_AND_ATTRIBUTES < FFI::Struct
     # } TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES;
     class TOKEN_PRIVILEGES < FFI::Struct
       layout :PrivilegeCount, :dword,
-             :Privileges, [LUID_AND_ATTRIBUTES, 1]    # placeholder for offset
+             :Privileges, [LUID_AND_ATTRIBUTES, 1] # placeholder for offset
     end
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/bb530717(v=vs.85).aspx

lib/puppet/file_serving/configuration.rb

@@ -20,7 +20,7 @@ def self.configuration
 
   Mount = Puppet::FileServing::Mount
 
-  private_class_method  :new
+  private_class_method :new
 
   attr_reader :mounts