X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..4f94ccf583d86093b3756f5999de5bfcdff99895:/cookbooks/chef/libraries/subversion.rb diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb index 952037f3f..31b33c92d 100644 --- a/cookbooks/chef/libraries/subversion.rb +++ b/cookbooks/chef/libraries/subversion.rb @@ -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.ech_with_object({}) do |attrs, line| 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 @@ -38,7 +37,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