lib/poolparty/plugins/git.rb in auser-poolparty-0.2.9 vs lib/poolparty/plugins/git.rb in auser-poolparty-0.2.15

@@ -1,34 +1,43 @@
 module PoolParty    
   class Git
         
     virtual_resource(:git) do
       
-      def loaded(opts={})
+      def loaded(opts={}, parent=self)
         install_git
-        has_git_repos
       end
       
       def install_git
-        has_package(:name => "git-core")
+        has_package(:name => "git-core") do
+          has_git_repos
+        end
       end
       
       def has_git_repos
-        with_options(:requires => 'Package["git-core"]') do
-          # has_directory(:name => "#{path}")
-                    
-          exec({:name => "git-#{name}"}) do
-            command @parent.user ? "git clone #{@parent.user}@#{@parent.source} #{@parent.path}" : "git clone #{@parent.source} #{@parent.path}"
-            cwd "#{::File.dirname(@parent.path) if @parent.path}"
-            creates "#{@parent.path}/.git"
-          end
-
-          exec(:name => "git-update-#{name}", :cwd => "#{path}") do
+        exec({:name => "git-#{name}"}) do
+          command @parent.user ? "git clone #{@parent.user}@#{@parent.source} #{@parent.path}" : "git clone #{@parent.source} #{@parent.to ? @parent.to : ""}"
+          cwd "#{@parent.cwd if @parent.cwd}"
+          creates "#{::File.join( (@parent.cwd ? @parent.cwd : cwd), ::File.basename(@parent.source, ::File.extname(@parent.source)) )}/.git"
+          
+          exec(:name => "update-#{name}") do
+            cwd ::File.dirname(@parent.creates)
             command "git pull"
-            requires "Exec['git-#{@parent.name}']"
           end
-
+          
         end
+      end
+      
+      # Since git is not a native type, we have to say which core resource
+      # it is using to be able to require it
+      def class_type_name
+        "exec"
+      end
+      
+      # Because we are requiring an exec, instead of a built-in package of the git, we have to overload
+      # the to_s method and prepend it with the same name as above
+      def key
+        "git-#{name}"
       end
       
     end
     
   end
\ No newline at end of file