(PUP-11767) Fix LineEndConcatenation violations and remove from todo list

Author: tvpartytonight

.rubocop_todo.yml

@@ -534,16 +534,6 @@ Style/InverseMethods:
     - 'lib/puppet/reference/providers.rb'
     - 'lib/puppet/type/file.rb'
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/LineEndConcatenation:
-  Exclude:
-    - 'lib/puppet/functions.rb'
-    - 'lib/puppet/module.rb'
-    - 'lib/puppet/network/http/api.rb'
-    - 'lib/puppet/provider/user/directoryservice.rb'
-    - 'lib/puppet/util/windows/file.rb'
-    - 'lib/puppet/util/windows/process.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: IgnoredMethods.
 Style/MethodCallWithoutArgsParentheses:

lib/puppet/functions.rb

@@ -635,20 +635,20 @@ def type(assignment_string)
         rb_location = rb_location.gsub(/:in.*$/, '')
         # Create a meaningful location for parse errors - show both what went wrong with the parsing
         # and in which ruby file it was found.
-        raise ArgumentError, _("Parsing of 'type \"%{assignment_string}\"' failed with message: <%{message}>.\n" +
-          "Called from <%{ruby_file_location}>") % {
-            assignment_string: assignment_string,
-            message: e.message,
-            ruby_file_location: rb_location
-          }
+        raise ArgumentError, _("Parsing of 'type \"%{assignment_string}\"' failed with message: <%{message}>.\n" \
+                               "Called from <%{ruby_file_location}>") % {
+                                 assignment_string: assignment_string,
+                                 message: e.message,
+                                 ruby_file_location: rb_location
+                               }
       end
       unless result.body.is_a?(Puppet::Pops::Model::TypeAlias)
         rb_location = rb_location.gsub(/:in.*$/, '')
-        raise ArgumentError, _("Expected a type alias assignment on the form 'AliasType = T', got '%{assignment_string}'.\n" +
-        "Called from <%{ruby_file_location}>") % {
-          assignment_string: assignment_string,
-          ruby_file_location: rb_location
-        }
+        raise ArgumentError, _("Expected a type alias assignment on the form 'AliasType = T', got '%{assignment_string}'.\n" \
+                               "Called from <%{ruby_file_location}>") % {
+                                 assignment_string: assignment_string,
+                                 ruby_file_location: rb_location
+                               }
       end
       @local_types << result.body
     end

lib/puppet/module.rb

@@ -465,7 +465,7 @@ def wanted_manifests_from(pattern)
       relative_pattern = Puppet::FileSystem::PathPattern.relative(extended)
     rescue Puppet::FileSystem::PathPattern::InvalidPattern => error
       raise Puppet::Module::InvalidFilePattern.new(
-        "The pattern \"#{pattern}\" to find manifests in the module \"#{name}\" " +
+        "The pattern \"#{pattern}\" to find manifests in the module \"#{name}\" " \
         "is invalid and potentially unsafe.", error
       )
     end

lib/puppet/network/http/api.rb

@@ -15,14 +15,14 @@ def self.not_found_upgrade
     Puppet::Network::HTTP::Route
       .path(/.*/)
       .any(lambda do |_req, _res|
-        raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Error: Invalid URL - Puppet expects requests that conform to the " +
-                                                                      "/puppet and /puppet-ca APIs.\n\n" +
-                                                                      "Note that Puppet 3 agents aren't compatible with this version; if you're " +
-                                                                      "running Puppet 3, you must either upgrade your agents to match the server " +
-                                                                      "or point them to a server running Puppet 3.\n\n" +
-                                                                      "Server Info:\n" +
-                                                                      "  Puppet version: #{Puppet.version}\n" +
-                                                                      "  Supported /puppet API versions: #{Puppet::Network::HTTP::SERVER_URL_VERSIONS}\n",
+        raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Error: Invalid URL - Puppet expects requests that conform to the " \
+                                                                  "/puppet and /puppet-ca APIs.\n\n" \
+                                                                  "Note that Puppet 3 agents aren't compatible with this version; if you're " \
+                                                                  "running Puppet 3, you must either upgrade your agents to match the server " \
+                                                                  "or point them to a server running Puppet 3.\n\n" \
+                                                                  "Server Info:\n" \
+                                                                  "  Puppet version: #{Puppet.version}\n" \
+                                                                  "  Supported /puppet API versions: #{Puppet::Network::HTTP::SERVER_URL_VERSIONS}\n",
                                                                   Puppet::Network::HTTP::Issues::HANDLER_NOT_FOUND)
       end)
   end

lib/puppet/provider/user/directoryservice.rb

@@ -458,14 +458,14 @@ def salt=(value)
         begin
           dscl '.', '-change', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], @property_hash[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
-          raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " +
+          raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " \
                                "#{@resource.name} due to the following error: #{e.inspect}", e.backtrace
         end
       else
         begin
           dscl '.', '-create', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
-          raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " +
+          raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " \
                                "#{@resource.name} due to the following error: #{e.inspect}", e.backtrace
         end
       end

lib/puppet/util/windows/file.rb

@@ -138,9 +138,9 @@ def self.create_file(file_name, desired_access, share_mode, security_attributes,
     return result unless result == INVALID_HANDLE_VALUE
 
     raise Puppet::Util::Windows::Error.new(
-      "CreateFile(#{file_name}, #{desired_access.to_s(8)}, #{share_mode.to_s(8)}, " +
-        "#{security_attributes}, #{creation_disposition.to_s(8)}, " +
-        "#{flags_and_attributes.to_s(8)}, #{template_file_handle})"
+      "CreateFile(#{file_name}, #{desired_access.to_s(8)}, #{share_mode.to_s(8)}, " \
+      "#{security_attributes}, #{creation_disposition.to_s(8)}, " \
+      "#{flags_and_attributes.to_s(8)}, #{template_file_handle})"
     )
   end
 
@@ -158,8 +158,8 @@ def self.get_reparse_point_data(handle, &block)
                     when IO_REPARSE_TAG_NFS
                       raise Puppet::Util::Windows::Error.new("Retrieving NFS reparse point data is unsupported")
                     else
-                      raise Puppet::Util::Windows::Error.new("DeviceIoControl(#{handle}, " +
-                        "FSCTL_GET_REPARSE_POINT) returned unknown tag 0x#{reparse_tag.to_s(16).upcase}")
+                      raise Puppet::Util::Windows::Error.new("DeviceIoControl(#{handle}, " \
+                                                             "FSCTL_GET_REPARSE_POINT) returned unknown tag 0x#{reparse_tag.to_s(16).upcase}")
                     end
 
       yield buffer_type.new(reparse_data_buffer_ptr)
@@ -200,8 +200,8 @@ def self.device_io_control(handle, io_control_code, in_buffer = nil, out_buffer
 
       if result == FFI::WIN32_FALSE
         raise Puppet::Util::Windows::Error.new(
-          "DeviceIoControl(#{handle}, #{io_control_code}, " +
-          "#{in_buffer}, #{in_buffer ? in_buffer.size : ''}, " +
+          "DeviceIoControl(#{handle}, #{io_control_code}, " \
+          "#{in_buffer}, #{in_buffer ? in_buffer.size : ''}, " \
           "#{out_buffer}, #{out_buffer ? out_buffer.size : ''}"
         )
       end

lib/puppet/util/windows/process.rb

@@ -138,7 +138,7 @@ def get_process_image_name_by_pid(pid)
             result = QueryFullProcessImageNameW(phandle, use_win32_path_format, exe_name_ptr, exe_name_length_ptr)
             if result == FFI::WIN32_FALSE
               raise Puppet::Util::Windows::Error.new(
-                "QueryFullProcessImageNameW(phandle, #{use_win32_path_format}, " +
+                "QueryFullProcessImageNameW(phandle, #{use_win32_path_format}, " \
                 "exe_name_ptr, #{max_chars}"
               )
             end
@@ -193,8 +193,8 @@ def get_token_information(token_handle, token_information, &block)
 
         if result == FFI::WIN32_FALSE
           raise Puppet::Util::Windows::Error.new(
-            "GetTokenInformation(#{token_handle}, #{token_information}, #{token_information_buf}, " +
-              "#{return_length}, #{return_length_ptr})"
+            "GetTokenInformation(#{token_handle}, #{token_information}, #{token_information_buf}, " \
+            "#{return_length}, #{return_length_ptr})"
           )
         end