capistrano-didi 0.4.1 → 0.4.2

data/CHANGELOG.txt

@@ -1,3 +1,9 @@
+## 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
 
 * fix compatibility with capistrano 2.12.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = didi
 
-Didi is an collection of capistrano recipes that enable automated deployment and continuous integration of drupal websites. Once you have configured different hosting environments you can use the "didi" command to interact with them.
+Didi is an collection of capistrano recipes that enables automated deployment and continuous integration of drupal websites. Once you have configured different hosting environments you can use the "didi" command to interact with them.
 
 == What can didi do you for?
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/bin/didify

@@ -67,7 +67,85 @@ set :sitemail, "drupal_site_email_address"
 set :adminpass, "drupal_admin_pass"
 
 set :baseline, "drupal_feature_to_activate_after_fresh_install"
-'}
+',
+"config/sql/staging.sql" => <<scrub
+-- 
+-- Scrub important information from a Drupal database.
+-- 
+
+-- Remove all email addresses.
+UPDATE users SET mail=CONCAT('user', uid, '@example.com'), init=CONCAT('user', uid, '@example.com') WHERE uid != 0;
+
+-- Example: Disable a module by setting its system.status value to 0.
+-- UPDATE system SET status = 0 WHERE name = 'securepages';
+
+-- Example: Update or delete variables via the variable table.
+-- DELETE FROM variable WHERE name='secret_key';
+-- Note that to update variables the value must be a properly serialized php array.
+-- UPDATE variable SET value='s:24:"http://test.gateway.com/";' WHERE name='payment_gateway';
+
+-- IMPORTANT: If you change the variable table, clear the variables cache.
+-- DELETE FROM cache WHERE cid = 'variables';
+
+-- Scrub url aliases for non-admins since these also reveal names
+-- Add the IGNORE keyword, since a user may have multiple aliases, and without
+-- this keyword the attempt to store duplicate dst values causes the query to fail.
+-- UPDATE IGNORE url_alias SET dst = CONCAT('users/', REPLACE(src,'/', '')) WHERE src IN (SELECT CONCAT('user/', u.uid) FROM users u WHERE u.uid NOT IN (SELECT uid FROM users_roles WHERE rid=3) AND u.uid > 0);
+
+-- don't leave e-mail addresses, etc in comments table.
+-- UPDATE comments SET name='Anonymous', mail='', homepage='http://example.com' WHERE uid=0;
+
+-- Scrub webform submissions.
+-- UPDATE webform_submitted_data set data='*scrubbed*';
+
+-- remove sensitive customer data from custom module
+-- TRUNCATE custom_customer_lead_data;
+
+-- USER PASSWORDS
+-- These statements assume you want to preserve real passwords for developers. Change 'rid=3' to the 
+-- developer or test role you want to preserve.
+
+-- DRUPAL 6
+-- Remove passwords unless users have 'developer role'
+-- UPDATE users SET pass=md5('devpassword') WHERE uid IN (SELECT uid FROM users_roles WHERE rid=3) AND uid > 0;
+
+-- Admin user should not be same but not really well known
+-- UPDATE users SET pass = MD5('supersecret!') WHERE uid = 1;
+
+-- DRUPAL 7
+-- Drupal 7 requires sites to generate a hashed password specific to their site. A script in the 
+-- docroot/scripts directory is provided for doing this. From your docroot run the following:
+--      
+--    scripts/password-hash.sh password
+--
+-- this will generate a hash for the password "password". In the following statements replace
+-- $REPLACE THIS$ with your generated hash.
+
+-- Remove passwords unless users have 'developer role'
+-- UPDATE users SET pass='$REPLACE THIS$' WHERE uid IN (SELECT uid FROM users_roles WHERE rid=3) AND uid > 0;
+
+-- Admin user should not be same but not really well known
+-- UPDATE users SET pass='$REPLACE THIS$' WHERE uid = 1;
+
+-- TRUNCATE accesslog;
+-- TRUNCATE access;
+-- TRUNCATE cache;
+-- TRUNCATE cache_filter;
+-- TRUNCATE cache_menu;
+-- TRUNCATE cache_page;
+-- TRUNCATE cache_views;
+-- TRUNCATE cache_views_data;
+-- TRUNCATE devel_queries;
+-- TRUNCATE devel_times;
+-- TRUNCATE flood;
+-- TRUNCATE history;
+-- TRUNCATE search_dataset;
+-- TRUNCATE search_index;
+-- TRUNCATE search_total;
+-- TRUNCATE sessions;
+-- TRUNCATE watchdog;
+scrub
+}
 
 base = ARGV.shift
 files.each do |file, content|

data/capistrano-didi.gemspec

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

@@ -28,14 +28,15 @@ set :drupal_version,    '7'
 set :keep_releases,     5
 set :use_sudo,          false
 
-set :domain,          'default'
-set :db_host,         'localhost'
-set :drupal_path,     'drupal'
-set :srv_usr,         'www-data'
-set :enable_robots,   false
-set :no_disable,      true
-set :local_database,  nil
-set :backup_database, true
+set :domain,            'default'
+set :db_host,           'localhost'
+set :drupal_path,       'drupal'
+set :srv_usr,           'www-data'
+set :enable_robots,     false
+set :no_disable,        true
+set :local_database,    nil
+set :backup_database,   true
+set :push_dump_enabled, false
 
 ssh_options[:forward_agent] = true
 #ssh_options[:verbose] = :debug #FIXME
@@ -63,6 +64,8 @@ _cset(:previous_release_settings)     { releases.length > 1 ? domain.to_a.map {
 _cset(:previous_release_files)        { releases.length > 1 ? domain.to_a.map { |d| File.join(previous_release, drupal_path, 'sites', d, files) } : nil }
 _cset(:previous_release_domain)       { releases.length > 1 ? domain.to_a.map { |d| File.join(previous_release, drupal_path, 'sites', d) } : nil }
 
+_cset(:is_multisite)                  { domain.to_a.size > 1 }
+
 # =========================================================================
 # Extra dependecy checks
 # =========================================================================
@@ -116,9 +119,7 @@ namespace :deploy do
     dirs += domain.map { |d| File.join(shared_path, d) }
 
     run <<-CMD
-      mkdir -p #{dirs.join(' ')}
-      #{try_sudo} chown #{user}:#{srv_usr} #{shared_files.join(' ')} &&
-      #{try_sudo} chmod g+w #{shared_files.join(' ')}
+      mkdir -p #{dirs.join(' ')} && #{try_sudo} chown #{user}:#{srv_usr} #{shared_files.join(' ')} && #{try_sudo} chmod g+w #{shared_files.join(' ')}
     CMD
 
     #create drupal config file
@@ -157,7 +158,7 @@ namespace :deploy do
 
     if previous_release
       # FIXME: executes on initial deploy:cold?
-      # FIXME: this breaks the current site untill deploy:symlink is executed ?
+      # 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
@@ -330,10 +331,10 @@ namespace :drush do
   desc "Update via drush, runs fra, updb and cc"
   task :update do
     dissite unless no_disable
-    updb
-    cc # fix for user_permissions constraint?
-    fra
-    cc # for good measure?
+    updb # database updates (also handles modules that have been moved around)
+    cc # fix for user_permissions constraint (install new modules)
+    fra # reverts all features
+    cc # clear cache (required for new menu items, hook_menu)
     ensite unless no_disable
     manage.block_robots unless enable_robots
   end
@@ -424,26 +425,47 @@ namespace :manage do
 
   desc 'Dump remote database and restore locally'
   task :pull_dump do
-    if local_database.nil?
-      puts "NO LOCAL DATABASE FOUND, set :local_database in the config file.."
-    else
-      set(:runit, Capistrano::CLI.ui.ask("WARNING!! this will overwrite this local database: '#{local_database}', type 'yes' to continue: "))
-      if runit == 'yes'
-        sql_file = File.join(dbbackups_path, "#{releases.last}-pull.sql")
-        # dump & gzip remote file
-        run "cd #{current_path}/#{drupal_path} && #{drush_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 && echo \"DROP DATABASE #{local_database};CREATE DATABASE #{local_database}\" | mysql && mysql #{local_database} < build/#{File.basename(sql_file)}" if local_database
+    abort("ERROR: multisite not supported") if is_multisite
+    abort("NO LOCAL DATABASE FOUND, set :local_database in the config file..") if local_database.nil?
+
+    set(:runit, Capistrano::CLI.ui.ask("WARNING!! will overwrite this local database: '#{local_database}', type 'yes' to continue: "))
+    if runit == 'yes'
+      sql_file = File.join(dbbackups_path, "#{releases.last}-pull.sql")
+      # dump & gzip remote file
+      run "cd #{current_path}/#{drupal_path} && #{drush_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 && echo \"DROP DATABASE #{local_database};CREATE DATABASE #{local_database}\" | mysql && mysql #{local_database} < build/#{File.basename(sql_file)}" if local_database
+      # check if file sanitation sql file exists
+      if File.exists?("config/sql/#{stage}.sql")
+        puts "  * executing \"config/sql/#{stage}.sql\""
+        system "mysql #{local_database} < config/sql/#{stage}.sql"
       end
     end
   end
 
   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?
+
+    set(:runit, Capistrano::CLI.ui.ask("WARNING!! will overwrite this REMOTE database: '#{db_name}', type 'yes' to continue: "))
+    if runit == 'yes'
+      sql_file = "#{Time.now.to_i}.sql"
+      system "if [ ! -d build ]; then mkdir build; fi" # create build folder locally if needed
+      # dump & gzip local file
+      system "cd #{drupal_path} && drush sql-dump > ../build/#{sql_file} && gzip ../build/#{sql_file}"
+      # copy to remote
+      upload "build/#{sql_file}.gz", File.join(dbbackups_path, "#{sql_file}.gz"), :once => true, :via => :scp
+      system "rm build/#{sql_file}.gz"
+      # extract and restore
+      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
 

metadata

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