Layout/BlockAlignment

This commit enables the Rubocop Layout/BlockAlignment cop.

Author: mhashizume

.rubocop_todo.yml

@@ -69,18 +69,6 @@ Layout/AssignmentIndentation:
     - 'lib/puppet/util.rb'
     - 'lib/puppet/util/windows/daemon.rb'
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'lib/puppet/defaults.rb'
-    - 'lib/puppet/node/environment.rb'
-    - 'lib/puppet/parser/functions/lookup.rb'
-    - 'lib/puppet/provider/package/dnfmodule.rb'
-    - 'lib/puppet/type/file.rb'
-    - 'lib/puppet/util/windows/principal.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
 # SupportedStyles: case, end

lib/puppet/defaults.rb

@@ -493,10 +493,10 @@ def self.initialize_default_settings!(settings)
           currently cannot daemonize).",
         :short    => "D",
         :hook     => proc do |value|
-          if value and Puppet::Util::Platform.windows?
-            raise "Cannot daemonize on Windows"
-          end
-      end
+                       if value and Puppet::Util::Platform.windows?
+                         raise "Cannot daemonize on Windows"
+                       end
+                     end
     },
     :maximum_uid => {
         :default  => 4294967290,

lib/puppet/node/environment.rb

@@ -597,7 +597,7 @@ def perform_initial_import
         parse_results = Puppet::FileSystem::PathPattern.absolute(File.join(file, '**/*')).glob.select {|globbed_file| globbed_file.end_with?('.pp')}.sort.map do | file_to_parse |
                           parser.file = file_to_parse
                           parser.parse
-                        end
+        end
         # Use a parser type specific merger to concatenate the results
         Puppet::Parser::AST::Hostclass.new('', :code => Puppet::Parser::ParserFactory.code_merger.concatenate(parse_results))
       else

lib/puppet/parser/functions/lookup.rb

@@ -129,5 +129,5 @@ module Puppet::Parser::Functions
 
 ENDHEREDOC
   Error.is4x('lookup')
-end
+  end
 end

lib/puppet/provider/package/dnfmodule.rb

@@ -64,7 +64,7 @@ def self.instances
   def query
     pkg = self.class.instances.find do |package|
             @resource[:name] == package.name
-          end
+    end
     pkg ? pkg.properties : nil
   end
 

lib/puppet/type/file.rb

@@ -665,7 +665,7 @@ def self.remove_less_specific_files(files, parent_path, existing_files, &block)
     files.reject { |file|
       path = (yield file).split(::File::Separator)
       other_paths.any? { |p| path[0,p.length] == p }
-      }
+    }
   end
 
   # A simple method for determining whether we should be recursing.

lib/puppet/util/windows/principal.rb

@@ -81,7 +81,7 @@ def self.lookup_account_name(system_name = nil, sanitize = true, account_name)
                   return lookup_account_sid(
                     system_name,
                     sid_ptr.read_bytes(sid_length_ptr.read_dword).unpack('C*'))
-                  end
+                end
                 end
               end
             end