capistrano-didi 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/capistrano-didi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-didi"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koen Van Winckel"]
-  s.date = "2011-11-24"
+  s.date = "2012-01-04"
   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

@@ -1,6 +1,6 @@
 Capistrano::Configuration.instance.load do
-  
-require 'FileUtils'
+
+#require 'FileUtils'
 
 # =========================================================================
 # These variables MUST be set in the client capfiles. If they are not set,
@@ -15,15 +15,15 @@ _cset(:profile)         { abort "Please specify the Drupal install profile (:pro
 _cset(:site)            { abort "Please specify the Drupal site (:site)." }
 _cset(:sitemail)        { abort "Please specify the Drupal site mail (:sitemail)." }
 _cset(:adminpass)       { abort "Please specify the Drupal admin password (:adminpass)." }
-_cset(:sitesubdir)      { abort "Please specify the Drupal site subdir (:sitemail)." } # FIXME: files folder needs to be symlinked ??
-_cset(:baseline)        { abort "Please specify the Baseline feature (:baseline)." } 
+_cset(:sitesubdir)      { abort "Please specify the Drupal site subdir (:sitesubdir)." } # FIXME: files folder needs to be symlinked ??
+_cset(:baseline)        { abort "Please specify the Baseline feature (:baseline)." }
 
 
 # =========================================================================
 # These variables may be set in the client capfile if their default values
 # are not sufficient.
 # =========================================================================
-set :scm,               :git 
+set :scm,               :git
 set :deploy_via,        :remote_cache
 set :drupal_version,    '7'
 set :keep_releases,     5
@@ -44,13 +44,13 @@ ssh_options[:forward_agent] = true
 # =========================================================================
 _cset :settings,          'settings.php'
 _cset :files,             'files'
-_cset :dbbackups,         'db_backups' 
-_cset :shared_children,   [domain, File.join(domain, files)]        
+_cset :dbbackups,         'db_backups'
+_cset :shared_children,   [domain, File.join(domain, files)]
 
 _cset(:shared_settings) { File.join(shared_path, domain, settings) }
 _cset(:shared_files)    { File.join(shared_path, domain, files) }
 _cset(:dbbackups_path)  { File.join(deploy_to, dbbackups, domain) }
-_cset(:drush)           { "drush -r #{current_path}" + (domain == 'default' ? '' : " -l #{domain}") }
+_cset(:drush)           { "drush -r #{current_path}" + (domain == 'default' ? '' : " -l #{domain}") }  # FIXME: not in use?
 
 _cset(:release_settings)              { File.join(release_path, drupal_path, 'sites', domain, settings) }
 _cset(:release_files)                 { File.join(release_path, drupal_path, 'sites', domain, files) }
@@ -60,12 +60,19 @@ _cset(:previous_release_settings)     { releases.length > 1 ? File.join(previous
 _cset(:previous_release_files)        { releases.length > 1 ? File.join(previous_release, drupal_path, 'sites', domain, files) : nil }
 _cset(:previous_release_domain)       { releases.length > 1 ? File.join(previous_release, drupal_path, 'sites', domain) : nil }
 
+# =========================================================================
+# Extra dependecy checks
+# =========================================================================
+depend :local,  :command, "drush"
+depend :remote, :command, "drush"
+
+
 # =========================================================================
 # Overwrites to the DEPLOY tasks in the capistrano library.
 # =========================================================================
 
 namespace :deploy do
-  
+
   desc <<-DESC
     Deploys your Drupal site. It supposes that the Setup task was already executed.
     This overrides the default Capistrano Deploy task to handle database operations and backups,
@@ -87,15 +94,15 @@ namespace :deploy do
     end
   end
   after "deploy:cold", "drush:si"
-  
+
   desc "Deploys latest code and rebuild the database"
   task :rebuild do
-    update_code    
+    update_code
     symlink
     manage.dbdump_previous
   end
   after "deploy:rebuild", "drush:si"
-  
+
  desc <<-DESC
     Prepares one or more servers for deployment.
     Creates the necessary file structure and the shared Drupal settings file.
@@ -105,7 +112,7 @@ namespace :deploy do
     configuration = drupal_settings(drupal_version)
 
     #Create shared directories
-    dirs = [deploy_to, releases_path, shared_path, dbbackups_path]
+    dirs = [deploy_to, releases_path, shared_path, dbbackups_path, shared_files]
     dirs += shared_children.map { |d| File.join(shared_path, d) }
     run <<-CMD
       mkdir -p #{dirs.join(' ')} &&
@@ -116,7 +123,7 @@ namespace :deploy do
     #create drupal config file
     put configuration, shared_settings
   end
-  
+
   desc "[internal] Rebuild files and settings symlinks"
   task :finalize_update, :except => { :no_release => true } do
     on_rollback do
@@ -127,23 +134,23 @@ namespace :deploy do
       end
     end
 
-    
-    run "if [[ ! -d #{release_domain} ]]; then mkdir #{release_domain}; fi" # in case the default is not versioned
-    
-    run <<-CMD    
+
+    run "if [ ! -d #{release_domain} ]; then mkdir #{release_domain}; fi" # in case the default is not versioned
+
+    run <<-CMD
       ln -nfs #{shared_files} #{release_files} &&
       ln -nfs #{shared_settings} #{release_settings}
     CMD
 
     if previous_release
-      run "if [[ -d #{previous_release_domain} ]]; then chmod 777 #{previous_release_domain}; fi" # if drupal changed the permissions of the folder
+      run "if [ -d #{previous_release_domain} ]; then chmod 777 #{previous_release_domain}; fi" # if drupal changed the permissions of the folder
       run <<-CMD
         rm -f #{previous_release_settings} &&
         rm -f #{previous_release_files}
       CMD
-    end 
+    end
   end
-  
+
   desc <<-DESC
     Removes old releases and corresponding DB backups.
   DESC
@@ -160,9 +167,9 @@ namespace :deploy do
       run "rm -rf #{directories} #{databases}"
     end
   end
-  
-  namespace :rollback do  
-  
+
+  namespace :rollback do
+
     desc <<-DESC
       [internal] Removes the most recently deployed release.
       This is called by the rollback sequence, and should rarely
@@ -172,7 +179,7 @@ namespace :deploy do
       # chmod 777 #{release_settings} #{release_files} &&
       run "if [ `readlink #{current_path}` != #{current_release} ]; then rm -rf #{current_release}; fi"
     end
-  
+
     desc <<-DESC
     [internal] Points the current, files, and settings symlinks at the previous revision.
     DESC
@@ -222,24 +229,24 @@ end
 # Drush namespace tasks
 # =========================
 namespace :drush do
-  
+
   desc "Clear the Drupal site cache"
   task :cc do
     run "cd #{current_path}/#{drupal_path} && drush cache-clear all"
   end
-  
+
   desc "Revert all enabled feature modules on your site"
   task :fra do
     run "cd #{current_path}/#{drupal_path} && drush features-revert-all -y"
   end
-  
+
   desc "Install Drupal along with modules/themes/configuration using the specified install profile"
   task :si do
-    dburl = "#{db_type}://#{db_username}:#{db_password}@localhost/#{db_name}"
-    run "cd #{current_path}/#{drupal_path} && drush site-install #{profile} --db-url=#{dburl} --sites-subdir=default --account-name=admin --account-pass=#{adminpass}  --account-mail=#{sitemail} --site-mail='#{sitemail}' --site-name='#{site}' -y" 
+    dburl = "#{db_type}://#{db_username}:#{db_password}@#{db_host}/#{db_name}"
+    run "cd #{current_path}/#{drupal_path} && drush site-install #{profile} --db-url=#{dburl} --sites-subdir=default --account-name=admin --account-pass=#{adminpass}  --account-mail=#{sitemail} --site-mail='#{sitemail}' --site-name='#{site}' -y"
     bl
   end
-  
+
   desc "[internal] Enable the baseline feature"
   task :bl do
     run "cd #{current_path}/#{drupal_path} && drush pm-enable #{baseline} -y"
@@ -250,12 +257,12 @@ namespace :drush do
     run "cd #{current_path}/#{drupal_path} && drush pm-enable simpletest -y"
     cc
   end
-  
+
   desc "Apply any database updates required (as with running update.php)"
   task :updb do
     run "cd #{current_path}/#{drupal_path} && drush updatedb -y"
   end
-  
+
   desc "Update via drush, runs fra, updb and cc"
   task :update do
     updb
@@ -270,7 +277,7 @@ end
 # =========================
 
 namespace :tests do
-  
+
   desc "Test php lint"
   task :php_lint_test do
     errors = []
@@ -290,9 +297,9 @@ namespace :tests do
 
   desc "Core hack detection"
   task :checksum_core_test do
-    
+
   end
-  
+
   desc 'Runs unit tests for given site'
   task :unit do
     run "mkdir -p #{current_path}/build/simpletest"
@@ -303,13 +310,28 @@ namespace :tests do
         run "cd #{current_path}/#{drupal_path} && php scripts/run-tests.sh --url http://#{site} --xml '../build/simpletest' --file '#{test_file}'" unless test_file.include?('/contrib/')
       end
     end
+
     run "cd #{current_path}/build && tar czf simpletest.tgz simpletest"
-    exec "if [[ ! -d build ]]; then mkdir build; fi" # create build folder locally if needed
+    system "if [ ! -d build ]; then mkdir build; fi" # create build folder locally if needed
     download "#{current_path}/build/simpletest.tgz", "build/", :once => true, :via => :scp
-    exec "tar xzf build/simpletest.tgz -C build"
+    system "tar xzf build/simpletest.tgz -C build"
+
   end
   before "tests:unit", "drush:enst"
-  
+
+  desc 'Runs all unit tests for given site'
+  task :unit_all do
+    run "mkdir -p #{current_path}/build/simpletest"
+    run "cd #{current_path}/#{drupal_path} && php scripts/run-tests.sh --url http://#{site} --xml '../build/simpletest' --all"
+
+    run "cd #{current_path}/build && tar czf simpletest.tgz simpletest"
+    system "if [ ! -d build ]; then mkdir build; fi" # create build folder locally if needed
+    download "#{current_path}/build/simpletest.tgz", "build/", :once => true, :via => :scp
+    system "tar xzf build/simpletest.tgz -C build"
+
+  end
+  before "tests:unit_all", "drush:enst"
+
 end
 
 # =========================
@@ -317,18 +339,34 @@ end
 # =========================
 
 namespace :manage do
-  
+
   task :block_robots do
     put "User-agent: *\nDisallow: /", "#{current_path}/#{drupal_path}/robots.txt"
   end
-  
+
   task :dbdump_previous do
-    #Backup the previous release's database 
+    #Backup the previous release's database
     if previous_release
       run "cd #{current_path}/#{drupal_path} && drush sql-dump > #{ File.join(dbbackups_path, "#{releases[-2]}.sql") }"
     end
   end
-  
+
+  desc 'Dump remote database and restore locally'
+  task :pull_dump do
+    sql_file = File.join(dbbackups_path, "#{releases.last}-pull.sql")
+    # dump & gzip remote file
+    run "cd #{current_path}/#{drupal_path} && drush sql-dump > #{sql_file} && gzip -f #{sql_file}"
+    # copy to local
+    system "if [ ! -d build ]; then mkdir build; fi" # create build folder locally if needed
+    download "#{sql_file}.gz", "build/", :once => true, :via => :scp
+    run "rm #{sql_file}.gz"
+    # extract and restore
+    system "gunzip -f build/#{File.basename(sql_file)}.gz && mysql dotproject_oa_live < build/#{File.basename(sql_file)}"
+  end
+
+  task :push_dump do
+
+  end
 end
 
 
@@ -338,7 +376,7 @@ end
 
 # Builds initial contents of the Drupal website's settings file
 def drupal_settings(version)
-  if version == '6'
+  if version.to_s == '6'
     settings = <<-STRING
 <?php
   $db_url = "#{db_type}://#{db_username}:#{db_password}@#{db_host}/#{db_name}";

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-didi
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Koen Van Winckel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-24 00:00:00 Z
+date: 2012-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement