capistrano-didi 0.4.3 → 0.4.4

data/CHANGELOG.txt

@@ -1,17 +1,23 @@
-## 0.4.3 16 Aug 2012
+## 0.4.4 / 19 Oct 2012
+
+* fixed issue where wrong previous releases folder was used during cleanup_shared_symlinks
+  this could result in deploy:cleanup failing
+* allow local env to override settings by creating a local.settings.php. (by c31ck)
+
+## 0.4.3 / 16 Aug 2012
 
 * fixed issue where deploy would fail on cleanup because file permissions (thx sara)
 * added drush task: drush:fd to display feature diffs remotely
 * added drush task: drush:fraforce to force-revert all features (by c31ck)
 * the :baseline setting can now be an array so multiple features can be enabled (by c31ck)
 
-## 0.4.2 19 June 2012
+## 0.4.2 / 19 June 2012
 
 * fixed issue in deploy:setup where "chown" was created as a folder
 * added support for cleaning up sql dump in manage:pull_dump
 * added new task: manage:push_dump to copy local database to remote
 
-## 0.4.1 22 May 2012
+## 0.4.1 / 22 May 2012
 
 * fix compatibility with capistrano 2.12.0
 * you need to uninstall capistrano-ext (included in 2.12.0)
@@ -19,24 +25,24 @@
 * fixed cleanup and dbbackup tasks in multisite config
 * minor code and docs cleanup
 
-## 0.4.0 / May 3 2012
+## 0.4.0 / 3 May 2012
 
 * added multisite support (see wiki)
 * added manage:pull_dump
 * extra config options (no_disable:true, local_database:nil, backup_database:true)
 
-## 0.3.2 / Mar 23 2012
+## 0.3.2 / 23 Mar 2012
 
 * added config option: enable_robots, default to false 
 * added config option: drush_path, on remote server 
 * added default php settings in settings.php file
 * put site in maintenance mode during deploy
 
-## 0.3.1 / Jan 4 2012
+## 0.3.1 / 4 Jan 2012
 
 * added tests:unit_all + bugfixes
 
-## 0.3.0 / Nov 24 2011
+## 0.3.0 / 24 Nov 2011
 
 * fix symlinks on rollback
 * added manage:dbdump_previous task

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/capistrano-didi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-didi"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koen Van Winckel"]
-  s.date = "2012-08-16"
+  s.date = "2012-10-19"
   s.description = "didi is a collection of recipes for capistrano that allow drupal to be deployed, tested and used in a CI environment"
   s.email = "koenvw@gmail.com"
   s.executables = ["didify", "didi"]

data/lib/didi/recipes/didi.rb

@@ -56,6 +56,19 @@ _cset(:shared_files)    { domain.to_a.map { |d| File.join(shared_path, d, files)
 _cset(:dbbackups_path)  { domain.to_a.map { |d| File.join(deploy_to, dbbackups, d) } }
 _cset(:drush)           { "drush -r #{current_path}" + (domain == 'default' ? '' : " -l #{domain}") }  # FIXME: not in use?
 
+# these variables are still in rails-less deploy gem
+# but have been updated in the latest capistrano gem
+# we use set to override them instead of _cset
+# see https://github.com/capistrano/capistrano/commit/92941e855d70a5778eb094a972fdf43c70802b95#lib/capistrano/recipes/deploy.rb
+# and https://github.com/capistrano/capistrano/commit/8638f2278ebe484ebcb1a1950e157c30c2d70960#lib/capistrano/recipes/deploy.rb
+# for background
+set(:releases)          { capture("ls -x #{releases_path}", :except => { :no_release => true }).split.sort }
+
+set(:current_revision)  { capture("cat #{current_path}/REVISION",     :except => { :no_release => true }).chomp }
+set(:latest_revision)   { capture("cat #{current_release}/REVISION",  :except => { :no_release => true }).chomp }
+set(:previous_revision) { capture("cat #{previous_release}/REVISION", :except => { :no_release => true }).chomp if previous_release }
+# end fix
+
 _cset(:release_settings)              { domain.to_a.map { |d| File.join(release_path, drupal_path, 'sites', d, settings) } }
 _cset(:release_files)                 { domain.to_a.map { |d| File.join(release_path, drupal_path, 'sites', d, files) } }
 _cset(:release_domain)                { domain.to_a.map { |d| File.join(release_path, drupal_path, 'sites', d) } }
@@ -159,8 +172,6 @@ namespace :deploy do
   desc "[internal] cleanup old symlinks, must run after deploy:symlink"
   task :cleanup_shared_symlinks, :except => { :no_release => true } do
     if previous_release
-      # FIXME: executes on initial deploy:cold?
-      # FIXME: this breaks the current site until deploy:symlink is executed ?
       previous_release_domain.each_with_index do |prd, i|
         run "if [ -d #{prd} ]; then chmod 777 #{prd}; fi" # if drupal changed the permissions of the folder
         run <<-CMD
@@ -485,7 +496,6 @@ namespace :manage do
       run "gunzip -f #{File.join(dbbackups_path, "#{sql_file}.gz")} && cd #{current_path}/#{drupal_path} && #{drush_path}drush sql-cli < #{File.join(dbbackups_path, "#{sql_file}")}"
       run "rm  #{File.join(dbbackups_path, "#{sql_file}")}"
     end
-  
   end
 end
 
@@ -531,6 +541,14 @@ ini_set('session.gc_probability', 1);
 ini_set('session.gc_divisor', 100);
 ini_set('session.gc_maxlifetime', 200000);
 ini_set('session.cookie_lifetime', 2000000);
+
+// Allow local env to override settings by creating a local.settings.php.
+$path = str_replace('settings.php', 'local.settings.php', __FILE__);
+
+if (file_exists($path)) {
+  include_once($path);
+}
+
     STRING
   else
     abort "Unsupported Drupal version #{version}."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-didi
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Koen Van Winckel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-16 00:00:00 Z
+date: 2012-10-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement