Revert "Take thorn-03 out of production"

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

diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index 50b207ff8286e93e3e57bd3d769c7a94910ae787..787f64b3dc77b883d44840627cfe5c4e273e8aa8 100644 (file)
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -13,7 +13,7 @@ class Chef
       end
 
       def current_repository
       end
 
       def current_repository

-        @current_repository ||= repo_attrs['URL']
+        @current_repository ||= repo_attrs["URL"]

       end
 
       def current_repository_matches_target_repository?
       end
 
       def current_repository_matches_target_repository?


@@ -23,14 +23,13 @@ class Chef
       def repo_attrs
         return {} unless ::File.exist?(::File.join(@new_resource.destination, ".svn"))
 
       def repo_attrs
         return {} unless ::File.exist?(::File.join(@new_resource.destination, ".svn"))
 

-        @repo_attrs ||= svn_info.lines.inject({}) do |attrs, line|
+        @repo_attrs ||= svn_info.lines.each_with_object({}) do |line, attrs|

           if line =~ SVN_INFO_PATTERN
           if line =~ SVN_INFO_PATTERN

-            property, value = $1, $2
+            property, value = Regexp.last_match[1], Regexp.last_match[2]

             attrs[property] = value
           else
             attrs[property] = value
           else

-            raise "Could not parse `svn info` data: #{line}"
+            fail "Could not parse `svn info` data: #{line}"

           end
           end

-          attrs

         end
       end
 
         end
       end