X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f30f230da23603e3c7598205219ce01e9820c470..005ae5bd819640bdfd31656393df2d2923be1f96:/cookbooks/chef/libraries/subversion.rb?ds=inline diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb index dd2c7ec49..dec188cec 100644 --- a/cookbooks/chef/libraries/subversion.rb +++ b/cookbooks/chef/libraries/subversion.rb @@ -1,13 +1,17 @@ +require "chef/mixin/shell_out" + class Chef class Provider class Subversion + extend Chef::Mixin::ShellOut + def sync_command if current_repository_matches_target_repository? - c = scm :update, @new_resource.svn_arguments, verbose, authentication, "-r#{revision_int}", @new_resource.destination - Chef::Log.debug "#{@new_resource} updated working copy #{@new_resource.destination} to revision #{@new_resource.revision}" + c = scm :update, new_resource.svn_arguments, verbose, authentication, proxy, "-r#{revision_int}", new_resource.destination + Chef::Log.debug "#{new_resource} updated working copy #{new_resource.destination} to revision #{new_resource.revision}" else - c = scm :switch, @new_resource.svn_arguments, verbose, authentication, "-r#{revision_int}", @new_resource.repository, @new_resource.destination - Chef::Log.debug "#{@new_resource} updated working copy #{@new_resource.destination} to #{@new_resource.repository} revision #{@new_resource.revision}" + c = scm :switch, new_resource.svn_arguments, verbose, authentication, proxy, "-r#{revision_int}", new_resource.repository, new_resource.destination + Chef::Log.debug "#{new_resource} updated working copy #{new_resource.destination} to #{new_resource.repository} revision #{new_resource.revision}" end c end @@ -17,30 +21,27 @@ class Chef 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")) + return {} unless ::File.exist?(::File.join(new_resource.destination, ".svn")) @repo_attrs ||= svn_info.lines.each_with_object({}) do |line, attrs| - fail "Could not parse `svn info` data: #{line}" unless line =~ SVN_INFO_PATTERN - + next unless line =~ SVN_INFO_PATTERN property = Regexp.last_match[1] value = Regexp.last_match[2] attrs[property] = value end + + raise "Could not parse `svn info` data: #{svn_info}" if @repo_attrs.empty? + + @repo_attrs end def svn_info command = scm(:info) - status, svn_info, error_message = output_of_command(command, run_options(:cwd => cwd)) - - unless [0, 1].include?(status.exitstatus) - handle_command_failures(status, "STDOUT: #{svn_info}\nSTDERR: #{error_message}") - end - - svn_info + shell_out!(command, run_options(:cwd => cwd, :returns => [0, 1])).stdout end end end