X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace..3175024da99372ccd3fccd44f1160c5d43213b6e:/cookbooks/chef/libraries/subversion.rb diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb index 31b33c92d..dd2c7ec49 100644 --- a/cookbooks/chef/libraries/subversion.rb +++ b/cookbooks/chef/libraries/subversion.rb @@ -13,23 +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.ech_with_object({}) do |attrs, line| - if line =~ SVN_INFO_PATTERN - property, value = Regexp.last_match[1], Regexp.last_match[2] - attrs[property] = value - else - fail "Could not parse `svn info` data: #{line}" - end + @repo_attrs ||= svn_info.lines.each_with_object({}) do |line, attrs| + fail "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