capistrano-didi 0.4.3 → 0.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG.txt CHANGED
@@ -1,17 +1,23 @@
1
- ## 0.4.3 16 Aug 2012
1
+ ## 0.4.4 / 19 Oct 2012
2
+
3
+ * fixed issue where wrong previous releases folder was used during cleanup_shared_symlinks
4
+ this could result in deploy:cleanup failing
5
+ * allow local env to override settings by creating a local.settings.php. (by c31ck)
6
+
7
+ ## 0.4.3 / 16 Aug 2012
2
8
 
3
9
  * fixed issue where deploy would fail on cleanup because file permissions (thx sara)
4
10
  * added drush task: drush:fd to display feature diffs remotely
5
11
  * added drush task: drush:fraforce to force-revert all features (by c31ck)
6
12
  * the :baseline setting can now be an array so multiple features can be enabled (by c31ck)
7
13
 
8
- ## 0.4.2 19 June 2012
14
+ ## 0.4.2 / 19 June 2012
9
15
 
10
16
  * fixed issue in deploy:setup where "chown" was created as a folder
11
17
  * added support for cleaning up sql dump in manage:pull_dump
12
18
  * added new task: manage:push_dump to copy local database to remote
13
19
 
14
- ## 0.4.1 22 May 2012
20
+ ## 0.4.1 / 22 May 2012
15
21
 
16
22
  * fix compatibility with capistrano 2.12.0
17
23
  * you need to uninstall capistrano-ext (included in 2.12.0)
@@ -19,24 +25,24 @@
19
25
  * fixed cleanup and dbbackup tasks in multisite config
20
26
  * minor code and docs cleanup
21
27
 
22
- ## 0.4.0 / May 3 2012
28
+ ## 0.4.0 / 3 May 2012
23
29
 
24
30
  * added multisite support (see wiki)
25
31
  * added manage:pull_dump
26
32
  * extra config options (no_disable:true, local_database:nil, backup_database:true)
27
33
 
28
- ## 0.3.2 / Mar 23 2012
34
+ ## 0.3.2 / 23 Mar 2012
29
35
 
30
36
  * added config option: enable_robots, default to false
31
37
  * added config option: drush_path, on remote server
32
38
  * added default php settings in settings.php file
33
39
  * put site in maintenance mode during deploy
34
40
 
35
- ## 0.3.1 / Jan 4 2012
41
+ ## 0.3.1 / 4 Jan 2012
36
42
 
37
43
  * added tests:unit_all + bugfixes
38
44
 
39
- ## 0.3.0 / Nov 24 2011
45
+ ## 0.3.0 / 24 Nov 2011
40
46
 
41
47
  * fix symlinks on rollback
42
48
  * added manage:dbdump_previous task
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.3
1
+ 0.4.4
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "capistrano-didi"
8
- s.version = "0.4.3"
8
+ s.version = "0.4.4"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Koen Van Winckel"]
12
- s.date = "2012-08-16"
12
+ s.date = "2012-10-19"
13
13
  s.description = "didi is a collection of recipes for capistrano that allow drupal to be deployed, tested and used in a CI environment"
14
14
  s.email = "koenvw@gmail.com"
15
15
  s.executables = ["didify", "didi"]
@@ -56,6 +56,19 @@ _cset(:shared_files) { domain.to_a.map { |d| File.join(shared_path, d, files)
56
56
  _cset(:dbbackups_path) { domain.to_a.map { |d| File.join(deploy_to, dbbackups, d) } }
57
57
  _cset(:drush) { "drush -r #{current_path}" + (domain == 'default' ? '' : " -l #{domain}") } # FIXME: not in use?
58
58
 
59
+ # these variables are still in rails-less deploy gem
60
+ # but have been updated in the latest capistrano gem
61
+ # we use set to override them instead of _cset
62
+ # see https://github.com/capistrano/capistrano/commit/92941e855d70a5778eb094a972fdf43c70802b95#lib/capistrano/recipes/deploy.rb
63
+ # and https://github.com/capistrano/capistrano/commit/8638f2278ebe484ebcb1a1950e157c30c2d70960#lib/capistrano/recipes/deploy.rb
64
+ # for background
65
+ set(:releases) { capture("ls -x #{releases_path}", :except => { :no_release => true }).split.sort }
66
+
67
+ set(:current_revision) { capture("cat #{current_path}/REVISION", :except => { :no_release => true }).chomp }
68
+ set(:latest_revision) { capture("cat #{current_release}/REVISION", :except => { :no_release => true }).chomp }
69
+ set(:previous_revision) { capture("cat #{previous_release}/REVISION", :except => { :no_release => true }).chomp if previous_release }
70
+ # end fix
71
+
59
72
  _cset(:release_settings) { domain.to_a.map { |d| File.join(release_path, drupal_path, 'sites', d, settings) } }
60
73
  _cset(:release_files) { domain.to_a.map { |d| File.join(release_path, drupal_path, 'sites', d, files) } }
61
74
  _cset(:release_domain) { domain.to_a.map { |d| File.join(release_path, drupal_path, 'sites', d) } }
@@ -159,8 +172,6 @@ namespace :deploy do
159
172
  desc "[internal] cleanup old symlinks, must run after deploy:symlink"
160
173
  task :cleanup_shared_symlinks, :except => { :no_release => true } do
161
174
  if previous_release
162
- # FIXME: executes on initial deploy:cold?
163
- # FIXME: this breaks the current site until deploy:symlink is executed ?
164
175
  previous_release_domain.each_with_index do |prd, i|
165
176
  run "if [ -d #{prd} ]; then chmod 777 #{prd}; fi" # if drupal changed the permissions of the folder
166
177
  run <<-CMD
@@ -485,7 +496,6 @@ namespace :manage do
485
496
  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}")}"
486
497
  run "rm #{File.join(dbbackups_path, "#{sql_file}")}"
487
498
  end
488
-
489
499
  end
490
500
  end
491
501
 
@@ -531,6 +541,14 @@ ini_set('session.gc_probability', 1);
531
541
  ini_set('session.gc_divisor', 100);
532
542
  ini_set('session.gc_maxlifetime', 200000);
533
543
  ini_set('session.cookie_lifetime', 2000000);
544
+
545
+ // Allow local env to override settings by creating a local.settings.php.
546
+ $path = str_replace('settings.php', 'local.settings.php', __FILE__);
547
+
548
+ if (file_exists($path)) {
549
+ include_once($path);
550
+ }
551
+
534
552
  STRING
535
553
  else
536
554
  abort "Unsupported Drupal version #{version}."
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano-didi
3
3
  version: !ruby/object:Gem::Version
4
- hash: 9
4
+ hash: 7
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 4
9
- - 3
10
- version: 0.4.3
9
+ - 4
10
+ version: 0.4.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - Koen Van Winckel
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-08-16 00:00:00 Z
18
+ date: 2012-10-19 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  requirement: &id001 !ruby/object:Gem::Requirement