capistrano-didi 0.4.2 → 0.4.3

data/CHANGELOG.txt

@@ -1,3 +1,10 @@
+## 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
 
 * fixed issue in deploy:setup where "chown" was created as a folder

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/capistrano-didi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-didi"
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koen Van Winckel"]
-  s.date = "2012-06-19"
+  s.date = "2012-08-16"
   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

@@ -67,7 +67,7 @@ _cset(:previous_release_domain)       { releases.length > 1 ? domain.to_a.map {
 _cset(:is_multisite)                  { domain.to_a.size > 1 }
 
 # =========================================================================
-# Extra dependecy checks
+# Extra dependency checks
 # =========================================================================
 depend :local,  :command, "drush"
 depend :remote, :command, "#{drush_path}drush"
@@ -144,7 +144,6 @@ namespace :deploy do
       end
     end
 
-
     release_domain.each do |rd|
       run "if [ ! -d #{rd} ]; then mkdir #{rd}; fi" # in case the default folder is not versioned
     end
@@ -155,7 +154,10 @@ namespace :deploy do
         ln -nfs #{shared_settings[i]} #{release_settings[i]}
         CMD
     end
+  end
 
+  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 ?
@@ -168,6 +170,7 @@ namespace :deploy do
       end
     end
   end
+  after "deploy:symlink", "deploy:cleanup_shared_symlinks"
 
   desc <<-DESC
     Removes old releases and corresponding DB backups.
@@ -270,6 +273,13 @@ namespace :drush do
     end
   end
 
+  desc "Show features diff status"
+  task :fd do
+    domain.each do |d|
+      run "cd #{current_path}/#{drupal_path} && #{drush_path}drush" + (d == 'default' ? '' : " -l #{d}") + " features-diff"
+    end
+  end
+
   desc "Revert all enabled feature modules on your site"
   task :fra do
     domain.each do |d|
@@ -277,6 +287,13 @@ namespace :drush do
     end
   end
 
+  desc "Force revert all enabled feature modules on your site"
+  task :fraforce do
+    domain.each do |d|
+      run "cd #{current_path}/#{drupal_path} && #{drush_path}drush" + (d == 'default' ? '' : " -l #{d}") + " features-revert-all --force -y"
+    end
+  end
+
   desc "Install Drupal along with modules/themes/configuration using the specified install profile"
   task :si do
     domain.each do |d|
@@ -289,7 +306,9 @@ namespace :drush do
   desc "[internal] Enable the baseline feature"
   task :bl do
     domain.each do |d|
-      run "cd #{current_path}/#{drupal_path} && #{drush_path}drush" + (d == 'default' ? '' : " -l #{d}") + " pm-enable #{baseline.gsub("%domain", d)} -y"
+      baseline.to_a.each do |bl_item|
+        run "cd #{current_path}/#{drupal_path} && #{drush_path}drush" + (d == 'default' ? '' : " -l #{d}") + " pm-enable #{bl_item.gsub("%domain", d)} -y"
+      end
     end
     cc
   end
@@ -426,7 +445,7 @@ namespace :manage do
   desc 'Dump remote database and restore locally'
   task :pull_dump do
     abort("ERROR: multisite not supported") if is_multisite
-    abort("NO LOCAL DATABASE FOUND, set :local_database in the config file..") if local_database.nil?
+    abort("NO LOCAL DATABASE FOUND, set :local_database in the config file..") unless local_database
 
     set(:runit, Capistrano::CLI.ui.ask("WARNING!! will overwrite this local database: '#{local_database}', type 'yes' to continue: "))
     if runit == 'yes'
@@ -447,10 +466,11 @@ namespace :manage do
     end
   end
 
+  desc 'Dump local database and restore remote'
   task :push_dump do
     abort("ERROR: multisite not supported") if is_multisite
-    abort("NO LOCAL DATABASE FOUND, set :local_database in the config file..") if local_database.nil?
-    abort("THIS STAGE: #{stage} DOES NOT SUPPORT manage:push_dump") if push_dump_enabled.nil?
+    abort("NO LOCAL DATABASE FOUND, set :local_database in the config file..") unless local_database
+    abort("THIS STAGE: #{stage} DOES NOT SUPPORT manage:push_dump") unless push_dump_enabled
 
     set(:runit, Capistrano::CLI.ui.ask("WARNING!! will overwrite this REMOTE database: '#{db_name}', type 'yes' to continue: "))
     if runit == 'yes'

metadata

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