kali-chef-deploy 0.2.2.1 → 0.2.5.1

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "chef-deploy"
-GEM_VERSION = "0.2.2.1"
+GEM_VERSION = "0.2.5.2"
 AUTHOR = "Ezra Zygmuntowicz"
 EMAIL = "Your Email"
 HOMEPAGE = "http://example.com"

data/lib/chef-deploy/cached_deploy.rb

@@ -12,14 +12,7 @@ class CachedDeploy
        @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 "Revision is already deployed, running migrations if there are any"
-      callback(:before_migrate)
-      migrate
-      callback(:before_symlink)
-      symlink
-      return
-    end
+    return if check_current_revision_and_noop_if_same_and_deployed(@configuration[:revision])
     
     Chef::Log.info "ensuring proper ownership"
     chef_run(fix_ownership_command(user, group, @configuration[:deploy_to]))
@@ -30,6 +23,7 @@ class CachedDeploy
     Chef::Log.info "copying the cached version to #{release_path}"
     chef_run(copy_repository_cache)
     install_gems
+    prepare_directories
     
     chef_run(fix_ownership_command(user, group, @configuration[:deploy_to]))
     
@@ -41,17 +35,22 @@ class CachedDeploy
     restart
     callback(:after_restart)
     cleanup
+
+    mark_deployed
+    @configuration[:new_resource].updated = true
   end
   
   def restart
     unless @configuration[:restart_command].empty?
       Chef::Log.info "restarting app: #{latest_release}"
-      chef_run("cd #{current_path} && sudo -u #{user} RAILS_ENV=#{@configuration[:environment]} RACK_ENV=#{@configuration[:environment]} MERB_ENV=#{@configuration[:environment]} #{@configuration[:restart_command]}")
+      chef_run("cd #{current_path} && sudo -u #{user} INLINEDIR=/tmp RAILS_ENV=#{@configuration[:environment]} RACK_ENV=#{@configuration[:environment]} MERB_ENV=#{@configuration[:environment]} #{@configuration[:restart_command]}")
     end
   end
   
-  def check_current_revision_and_noop_if_same(newrev)
-    IO.read("#{latest_release}/REVISION").chomp == newrev
+  def check_current_revision_and_noop_if_same_and_deployed(newrev)
+    IO.read("#{latest_release}/REVISION").chomp == newrev &&
+    IO.read("#{shared_path}/DEPLOYED_REVISION").chomp == newrev
+      
   rescue
     false
   end
@@ -96,6 +95,8 @@ class CachedDeploy
     FileUtils.rm_rf latest_release
     Chef::Log.info "restarting with previous release"
     restart
+
+    @configuration[:new_resource].updated = true
   end
 
   def fix_ownership_command(user, group, path)
@@ -105,6 +106,7 @@ class CachedDeploy
   def migrate
     if @configuration[:migrate]
       chef_run "ln -nfs #{shared_path}/config/database.yml #{latest_release}/config/database.yml"
+      chef_run "ln -nfs #{shared_path}/log #{latest_release}/log"
       Chef::Log.info "Migrating: cd #{latest_release} && sudo -u #{user} RAILS_ENV=#{@configuration[:environment]} RACK_ENV=#{@configuration[:environment]} MERB_ENV=#{@configuration[:environment]} #{@configuration[:migration_command]}"
       chef_run(fix_ownership_command(user, group, latest_release))
       chef_run("cd #{latest_release} && sudo -u #{user} RAILS_ENV=#{@configuration[:environment]} RACK_ENV=#{@configuration[:environment]} MERB_ENV=#{@configuration[:environment]} #{@configuration[:migration_command]}")
@@ -218,7 +220,7 @@ class CachedDeploy
           next if has_gem?(g[:name], g[:version])
           r = Chef::Resource::GemPackage.new(g[:name], nil, @configuration[:node])
           r.version g[:version]
-          r.source "http://gems.github.com"
+          r.source(g.has_key?(:source) ? g[:source] : "http://gems.github.com")
           resources << r
         end
         resources.each do |r|
@@ -231,6 +233,25 @@ class CachedDeploy
         end
       end
     end
+
+    def prepare_directories
+      resources = []
+      %w( log system pids config ).each do |shared_subdir|
+        r = Chef::Resource::Directory.new("#{shared_path}/#{shared_subdir}", nil, @configuration[:node])
+        r.owner user
+        r.group group
+        r.mode 0775
+        resources << r
+      end
+      resources.each do |r|
+        begin
+          r.run_action(:create)
+        rescue Chef::Exception::Exec => e
+          Chef::Log.info("Error creating directory #{r.path}")
+          raise e
+        end
+      end
+    end
     
     def has_gem?(name, version=nil)
       if !$GEM_LIST_DEPLOY
@@ -259,7 +280,8 @@ class CachedDeploy
     end
 
     def update_repository_cache
-      command = "if [ -d #{repository_cache} ]; then " +
+      command = "if [ -d #{repository_cache} ] &&" +
+        "git --git-dir #{repository_cache}/.git/ remote -v | grep -q #{configuration[:repository]}; then " +
         "#{source.sync(revision, repository_cache)}; " +
         "else #{source.checkout(revision, repository_cache)}; fi"
       command
@@ -281,6 +303,10 @@ class CachedDeploy
     def mark
       "(echo #{revision} > #{release_path}/REVISION)"
     end
+
+    def mark_deployed
+      chef_run("echo #{revision} > #{shared_path}/DEPLOYED_REVISION")
+    end
     
     def copy_exclude
       @copy_exclude ||= Array(configuration.fetch(:copy_exclude, []))

data/lib/chef-deploy/git.rb

@@ -32,6 +32,9 @@ class Git
     end
 
     execute = []
+
+    execute << "rm -rf #{destination}"
+
     if args.empty?
       execute << "#{git} clone #{verbose} #{configuration[:repository]} #{destination}"
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kali-chef-deploy
 version: !ruby/object:Gem::Version 
-  version: 0.2.2.1
+  version: 0.2.5.1
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire: chef-deploy
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 -07:00
+date: 2009-07-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,14 +28,14 @@ files:
 - README.rdoc
 - Rakefile
 - TODO
-- lib/chef-deploy
 - lib/chef-deploy/cached_deploy.rb
 - lib/chef-deploy/git.rb
 - lib/chef-deploy/subversion.rb
 - lib/chef-deploy.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://example.com
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: A gem that provides...