X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..2d43acf0477a2dbf2efaed7480d0d73454d8196e:/cookbooks/chef/libraries/subversion.rb diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb index 50b207ff8..787f64b3d 100644 --- a/cookbooks/chef/libraries/subversion.rb +++ b/cookbooks/chef/libraries/subversion.rb @@ -13,7 +13,7 @@ class Chef end def current_repository - @current_repository ||= repo_attrs['URL'] + @current_repository ||= repo_attrs["URL"] 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")) - @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 - property, value = $1, $2 + property, value = Regexp.last_match[1], Regexp.last_match[2] attrs[property] = value else - raise "Could not parse `svn info` data: #{line}" + fail "Could not parse `svn info` data: #{line}" end - attrs end end