X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6f0a393ef9191a70d9c5040ed35f6ee4ca33db8b..HEAD:/cookbooks/chef/libraries/subversion.rb

diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index 86597458a..e8717d06e 100644
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -1,13 +1,23 @@
+require "chef/mixin/shell_out"
+
 class Chef
   class Provider
     class Subversion
+      extend Chef::Mixin::ShellOut
+
+      def shell_out!(*args, **options)
+        options = args.pop if options.empty? && args.last.is_a?(Hash)
+
+        super(*args, **options)
+      end
+
       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}", "--ignore-ancestry", 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,31 +27,39 @@ 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"))
-
-        @repo_attrs ||= svn_info.lines.each_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
+        return {} unless ::File.exist?(::File.join(new_resource.destination, ".svn"))
+
+        @repo_attrs ||= svn_info.lines.each_with_object({}) do |line, attrs|
+          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))
+        shell_out!(command, **run_options(:cwd => cwd, :returns => [0, 1])).stdout
+      end
 
-        unless [0, 1].include?(status.exitstatus)
-          handle_command_failures(status, "STDOUT: #{svn_info}\nSTDERR: #{error_message}")
-        end
+      def revision_int
+        @revision_int ||= if new_resource.revision =~ /^\d+$/
+                            new_resource.revision
+                          else
+                            command = scm(:info, new_resource.repository, new_resource.svn_info_args, authentication, "-r#{new_resource.revision}")
+                            svn_info = shell_out!(command, **run_options(:returns => [0, 1])).stdout
 
-        svn_info
+                            extract_revision_info(svn_info)
+                          end
       end
     end
   end