Update chef server to 12.9.1

[chef.git] / cookbooks / chef / libraries / subversion.rb

diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index 952037f3fc965b37fe17a63b47e2a414ba89469d..4f2b1cd0093dac58e3ce18040f257ab04eb9f2fc 100644 (file)
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -13,24 +13,22 @@ class Chef
       end
 
       def current_repository
-        @current_repository ||= repo_attrs['URL']
+        @current_repository ||= repo_attrs["URL"]
       end
 
       def current_repository_matches_target_repository?
-        (!current_repository.nil?) && (@new_resource.repository == current_repository)
+        !current_repository.nil? && (@new_resource.repository == current_repository)
       end
 
       def repo_attrs
         return {} unless ::File.exist?(::File.join(@new_resource.destination, ".svn"))
 
-        @repo_attrs ||= svn_info.lines.inject({}) do |attrs, line|
-          if line =~ SVN_INFO_PATTERN
-            property, value = $1, $2
-            attrs[property] = value
-          else
-            raise "Could not parse `svn info` data: #{line}"
-          end
-          attrs
+        @repo_attrs ||= svn_info.lines.each_with_object({}) do |line, attrs|
+          raise "Could not parse `svn info` data: #{line}" unless line =~ SVN_INFO_PATTERN
+
+          property = Regexp.last_match[1]
+          value = Regexp.last_match[2]
+          attrs[property] = value
         end
       end
 
@@ -38,7 +36,7 @@ class Chef
         command = scm(:info)
         status, svn_info, error_message = output_of_command(command, run_options(:cwd => cwd))
 
-        unless [0,1].include?(status.exitstatus)
+        unless [0, 1].include?(status.exitstatus)
           handle_command_failures(status, "STDOUT: #{svn_info}\nSTDERR: #{error_message}")
         end