Fix SVN latest with empty target dir

Author: Michael Knox

lib/puppet/provider/vcsrepo/svn.rb

@@ -19,17 +19,47 @@ def create
     end
   end
 
-  def exists?
+  def working_copy_exists?
     File.directory?(File.join(@resource.value(:path), '.svn'))
   end
 
+  def exists?
+    working_copy_exists?
+  end
+
   def destroy
     FileUtils.rm_rf(@resource.value(:path))
   end
+
+  def latest?
+    at_path do
+      if self.exists? then
+        return false
+      elsif self.revision < self.latest then
+        return false
+      else
+        return true
+      end
+    end
+  end
+
+  def latest
+    at_path do
+      if self.exists? then
+        svn('info', '-r', 'HEAD')[/^Revision:\s+(\d+)/m, 1]
+      else
+        return nil
+      end
+    end
+  end
 
   def revision
     at_path do
-      svn('info')[/^Revision:\s+(\d+)/m, 1]
+      if self.exists? then
+        return svn('info')[/^Revision:\s+(\d+)/m, 1]
+      else
+        return nil
+      end
     end
   end
 

lib/puppet/type/vcsrepo.rb

@@ -19,7 +19,30 @@
            over time (eg, some VCS tags and branch names)"
 
   ensurable do
-
+    attr_accessor :latest
+    
+    def insync?(is)
+      @should ||= []
+
+      case should
+        when :present
+          return true unless [:absent, :purged, :held].include?(is)
+        when :latest
+          if is == :latest
+            return true
+          else
+            if provider.respond_to?(:latest?)
+              self.debug "%s repo revision is %s, latest is %s" %
+                [@resource.name, provider.revision, provider.latest]
+            else
+              self.debug "%s repo revision is %s" %
+                [@resource.name, provider.revision]
+            end
+            return false
+          end
+      end
+    end     
+              
     newvalue :present do
       provider.create
     end
@@ -37,7 +60,11 @@
         if provider.respond_to?(:update_references)
           provider.update_references
         end
-        reference = resource.value(:revision) || provider.revision
+        if provider.respond_to?(:latest?)
+            reference = provider.latest || provider.revision
+        else
+          reference = resource.value(:revision) || provider.revision
+        end
         notice "Updating to latest '#{reference}' revision"
         provider.revision = reference
       else
@@ -48,16 +75,12 @@
     def retrieve
       prov = @resource.provider
       if prov
-        if prov.class.feature?(:bare_repositories)
-          if prov.working_copy_exists?
-            :present
-          elsif prov.bare_exists?
-            :bare
-          else
-            :absent
-          end
+        if prov.exists?
+          prov.latest? ? :latest : :present
+        elsif prov.class.feature?(:bare_repositories) and prov.bare_exists?
+          :bare
         else
-          prov.exists? ? :present : :absent
+          :absent
         end
       else
         raise Puppet::Error, "Could not find provider"