cevian-chef-deploy 0.2.4 → 0.2.5

data/lib/chef-deploy/cached_deploy.rb

@@ -11,7 +11,12 @@ class CachedDeploy
     if @configuration[:revision] == ''
        @configuration[:revision] = source.query_revision(@configuration[:branch]) {|cmd| run_with_result "#{cmd}"}
     end
-    
+   
+    if check_current_revision_and_noop_if_same @configuration[:revision]
+      Chef::Log.info "skipping deploy, no updates"
+      return false
+    end
+
     Chef::Log.info "ensuring proper ownership"
     chef_run("chown -R #{user}:#{group} #{@configuration[:deploy_to]}")    
     

data/lib/chef-deploy/cached_deploy_symfony.rb

@@ -1,5 +1,3 @@
-require 'cached_deploy'
-
 class ChefDeploySymfonyFailure < ChefDeployFailure
 end
 

data/lib/chef-deploy/git.rb

@@ -14,7 +14,7 @@ class Git
   
   def git
     res = configuration[:git_ssh_wrapper] ? "GIT_SSH=#{configuration[:git_ssh_wrapper]} git" : 'git'
-    res = "sudo -u #{configuration[:user]} #{res}" if configuration[:user]
+    res = "sudo -u #{configuration[:git_user]} #{res}" if configuration[:git_user]
     res
   end
   

data/lib/chef-deploy.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), 'chef-deploy/subversion')
 require File.join(File.dirname(__FILE__), 'chef-deploy/git')
 require File.join(File.dirname(__FILE__), 'chef-deploy/cached_deploy')
+require File.join(File.dirname(__FILE__), 'chef-deploy/cached_deploy_symfony')
 
 # deploy "/data/#{app}" do
 #   repo "git://github.com/engineyard/rack-app.git"
@@ -82,6 +83,14 @@ class Chef
         )
       end
       
+      def git_user(arg=nil)
+        set_or_return(
+          :git_user,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
       def group(arg=nil)
         set_or_return(
           :group,
@@ -214,7 +223,8 @@ class Chef
                                 :scm                   => @new_resource.scm || 'git',
                                 :node                  => @node,
                                 :new_resource          => @new_resource,
-                                :git_ssh_wrapper       => @git_ssh_wrapper
+                                :git_ssh_wrapper       => @git_ssh_wrapper,
+                                :git_user              => @new_resource.git_user || @new_resource.user
       end
       
       def action_deploy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cevian-chef-deploy
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz