capistrano-didi 0.4.4 → 0.4.5

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  data.tar.gz: f6c724b62e44dba0b97f1bb999638f291ef84c971dda7363d9934e93f7089305d24f3ccdde8dd8159b2fdd31ef46fabc462a010d4bf05a077051a6ca9374327c
+  metadata.gz: 6a0013ad8ea262cf9abae39b4ce059089df2dcc3edabd9e8db253c1a99462c9fb33f87504ca3193eeb082676e4efd214728016fce71e41fbe7778ca390737bc1
+SHA1: 
+  data.tar.gz: 349f43606d84dd6bbf717557d9d4fac959dd8dcf
+  metadata.gz: 341d92e5320779d85725ae66d0a10de7164c7143

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+## 0.4.5 / 3 July 2013
+
+* added support for private files directory, using the user_private_files flag.
+
 ## 0.4.4 / 19 Oct 2012
 
 * fixed issue where wrong previous releases folder was used during cleanup_shared_symlinks
@@ -33,8 +37,8 @@
 
 ## 0.3.2 / 23 Mar 2012
 
-* added config option: enable_robots, default to false 
-* added config option: drush_path, on remote server 
+* 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
 
@@ -45,4 +49,4 @@
 ## 0.3.0 / 24 Nov 2011
 
 * fix symlinks on rollback
-* added manage:dbdump_previous task
+* added manage:dbdump_previous task

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/bin/didify

@@ -38,7 +38,7 @@ end
 files = {
   "Capfile" => unindent(<<-FILE),
     require 'railsless-deploy'          # gem install railsless-deploy
-    require 'didi/recipes/didi.rb'      # gem install capistrano-didi 
+    require 'didi/recipes/didi.rb'      # gem install capistrano-didi
     load 'config/deploy'
     require 'capistrano/ext/multistage' # gem install capistrano
   FILE
@@ -59,6 +59,7 @@ set :db_type, "mysql"
 set :db_name, "database_name"
 set :db_username, "database_user_name"
 set :db_password, "database_password"
+set :db_prefix, "database_prefix"
 
 set :profile, "minimal"
 set :domain, "default"
@@ -69,9 +70,9 @@ 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;
@@ -102,7 +103,7 @@ UPDATE users SET mail=CONCAT('user', uid, '@example.com'), init=CONCAT('user', u
 -- TRUNCATE custom_customer_lead_data;
 
 -- USER PASSWORDS
--- These statements assume you want to preserve real passwords for developers. Change 'rid=3' to the 
+-- 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
@@ -113,9 +114,9 @@ UPDATE users SET mail=CONCAT('user', uid, '@example.com'), init=CONCAT('user', u
 -- 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 
+-- 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

data/capistrano-didi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-didi"
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koen Van Winckel"]
-  s.date = "2012-10-19"
+  s.date = "2013-07-03"
   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

@@ -10,6 +10,7 @@ _cset(:db_type)         { abort "Please specify the Drupal database type (:db_ty
 _cset(:db_name)         { abort "Please specify the Drupal database name (:db_name)." }
 _cset(:db_username)     { abort "Please specify the Drupal database username (:db_username)." }
 _cset(:db_password)     { abort "Please specify the Drupal database password (:db_password)." }
+_cset(:db_prefix)       { abort "Please specify the Drupal database prefix (:db_prefix)." }
 
 _cset(:profile)         { abort "Please specify the Drupal install profile (:profile)." }
 _cset(:site)            { abort "Please specify the Drupal site (:site)." }
@@ -37,6 +38,9 @@ set :no_disable,        true
 set :local_database,    nil
 set :backup_database,   true
 set :push_dump_enabled, false
+set :make_install_profile,      false
+set :make_file,         ''
+set :use_private_files, false
 
 ssh_options[:forward_agent] = true
 #ssh_options[:verbose] = :debug #FIXME
@@ -48,13 +52,15 @@ ssh_options[:forward_agent] = true
 # =========================================================================
 _cset :settings,          'settings.php'
 _cset :files,             'files'
+_cset :private_files,     'private'
 _cset :dbbackups,         'db_backups'
 _cset :drush_path,        ''
 
-_cset(:shared_settings) { domain.to_a.map { |d| File.join(shared_path, d, settings) } }
-_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?
+_cset(:shared_settings)         { domain.to_a.map { |d| File.join(shared_path, d, settings) } }
+_cset(:shared_files)            { domain.to_a.map { |d| File.join(shared_path, d, files) } }
+_cset(:shared_private_files)    { domain.to_a.map { |d| File.join(shared_path, d, private_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
@@ -71,11 +77,13 @@ set(:previous_revision) { capture("cat #{previous_release}/REVISION", :except =>
 
 _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_private_files)         { domain.to_a.map { |d| File.join(release_path, drupal_path, 'sites', d, private_files) } }
 _cset(:release_domain)                { domain.to_a.map { |d| File.join(release_path, drupal_path, 'sites', d) } }
 
-_cset(:previous_release_settings)     { releases.length > 1 ? domain.to_a.map { |d| File.join(previous_release, drupal_path, 'sites', d, settings) } : nil }
-_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(:previous_release_settings)             { releases.length > 1 ? domain.to_a.map { |d| File.join(previous_release, drupal_path, 'sites', d, settings) } : nil }
+_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_private_files)        { releases.length > 1 ? domain.to_a.map { |d| File.join(previous_release, drupal_path, 'sites', d, private_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 }
 
@@ -135,6 +143,13 @@ namespace :deploy do
       mkdir -p #{dirs.join(' ')} && #{try_sudo} chown #{user}:#{srv_usr} #{shared_files.join(' ')} && #{try_sudo} chmod g+w #{shared_files.join(' ')}
     CMD
 
+    # Generate private files when enabled.
+    if use_private_files
+      run <<-CMD
+        mkdir -p #{shared_private_files} && #{try_sudo} chown #{user}:#{srv_usr} #{shared_private_files.join(' ')} && #{try_sudo} chmod g+w #{shared_private_files.join(' ')}
+      CMD
+    end
+
     #create drupal config file
     domain.each_with_index do |d, i|
       configuration = drupal_settings(drupal_version, d)
@@ -145,6 +160,9 @@ namespace :deploy do
 
   desc "[internal] Rebuild files and settings symlinks"
   task :finalize_update, :except => { :no_release => true } do
+    if make_install_profile
+      run "cd #{current_release} && drush make #{make_file} #{drupal_path}"
+    end
     # Specifies an on_rollback hook for the currently executing task. If this
     # or any subsequent task then fails, and a transaction is active, this
     # hook will be executed.
@@ -152,6 +170,9 @@ namespace :deploy do
       if previous_release
         #FIXME: won't work on mulitsite config
         run "ln -nfs #{shared_files} #{previous_release_files} && ln -nfs #{shared_settings} #{previous_release_settings}"
+        if use_private_files
+          run "ln -nfs #{shared_private_files} #{previous_release_private_files}"
+        end
       else
         logger.important "no previous release to rollback to, rollback of drupal shared data skipped."
       end
@@ -167,6 +188,14 @@ namespace :deploy do
         ln -nfs #{shared_settings[i]} #{release_settings[i]}
         CMD
     end
+
+    if use_private_files
+      shared_private_files.each_with_index do |sf, i|
+        run <<-CMD
+          ln -nfs #{sf} #{release_private_files[i]}
+          CMD
+      end
+    end
   end
 
   desc "[internal] cleanup old symlinks, must run after deploy:symlink"
@@ -178,6 +207,11 @@ namespace :deploy do
           rm -f #{previous_release_settings[i]} &&
           rm -f #{previous_release_files[i]}
         CMD
+        if use_private_files
+          run <<-CMD
+            rm -f #{previous_release_private_files[i]}
+          CMD
+        end
       end
     end
   end
@@ -235,6 +269,14 @@ namespace :deploy do
             ln -nfs #{shared_settings[i]} #{previous_release_settings[i]}
           CMD
         end
+
+        if use_private_files
+          shared_private_files.each_with_index do |sf, i|
+            run <<-CMD
+              ln -nfs #{sf} #{previous_release_private_files[i]}
+            CMD
+          end
+        end
       else
         abort "could not rollback the code because there is no prior release"
       end
@@ -258,7 +300,7 @@ namespace :deploy do
     end
 
   end
-  
+
   namespace :web do
     desc "Makes the application web-accessible again."
     task :enable do
@@ -497,8 +539,31 @@ namespace :manage do
       run "rm  #{File.join(dbbackups_path, "#{sql_file}")}"
     end
   end
-end
 
+  desc 'Download files and extract locally'
+  task :pull_files do
+    abort("ERROR: multisite not supported") if is_multisite
+
+    set(:runit, Capistrano::CLI.ui.ask("Do you want to download the files? type 'yes' to continue: "))
+    if runit == 'yes'
+      run "if [ ! -d #{deploy_to}/tmp ]; then mkdir #{deploy_to}/tmp; fi" # create tmp folder if needed
+      # pack and remote file
+      file = "#{deploy_to}/tmp/#{releases.last}.tar.gz"
+      run "cd #{current_path}/#{drupal_path}/sites/default && tar -zcvf #{file} files/*"
+      # copy to local
+      system "if [ ! -d build ]; then mkdir build; fi" # create build folder locally if needed
+      download "#{file}", "build/", :once => true, :via => :scp
+      run "rm #{file}"
+      set(:extract, Capistrano::CLI.ui.ask("Do you want to extract #{File.basename(file)}? type 'yes' to continue: "))
+      if extract == 'yes'
+        # extract the files
+        set(:where, Capistrano::CLI.ui.ask("Where? (default: build): "))
+        dest = where == '' ? "build" : "#{where}"
+        system "tar -zxvf build/#{File.basename(file)} -C #{dest}"
+      end
+    end
+  end
+end
 
 # =========================
 # Helper methods
@@ -535,7 +600,7 @@ $databases = array ('default' => array ('default' => array (
   'host' => '#{db_host}',
   'port' => '',
   'driver' => '#{db_type}',
-  'prefix' => '',
+  'prefix' => '#{db_prefix}',
 )));
 ini_set('session.gc_probability', 1);
 ini_set('session.gc_divisor', 100);
@@ -555,4 +620,4 @@ if (file_exists($path)) {
   end
 end
 
-end # Capistrano::Configuration.instance.load
+end # Capistrano::Configuration.instance.load

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-didi
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 4
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Koen Van Winckel
@@ -15,132 +9,87 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-19 00:00:00 Z
+date: 2013-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: railsless-deploy
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
         version: 1.0.2
-  version_requirements: *id001
-  name: railsless-deploy
-  prerelease: false
   type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: capistrano
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 2
-        - 12
-        - 0
         version: 2.12.0
-  version_requirements: *id002
-  name: capistrano
-  prerelease: false
   type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - &id006 
+      - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id003
-  name: shoulda
-  prerelease: false
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 1
-        - 3
         version: 1.1.3
-  version_requirements: *id004
-  name: bundler
-  prerelease: false
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
         version: 1.6.4
-  version_requirements: *id005
-  name: jeweler
-  prerelease: false
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
   name: rcov
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 2
-        - 12
-        - 0
-        version: 2.12.0
+    - *id006
+  type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: capistrano
   prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 2.12.0
+  type: :runtime
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: railsless-deploy
   prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.2
   type: :runtime
+  version_requirements: *id009
 description: didi is a collection of recipes for capistrano that allow drupal to be deployed, tested and used in a CI environment
 email: koenvw@gmail.com
 executables: 
@@ -169,33 +118,23 @@ files:
 homepage: http://github.com/koenvw/didi
 licenses: 
 - MIT
+metadata: {}
+
 post_install_message: => "didify" and "didi" commands installed. Try them out!
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id006
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id006
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 3
 summary: didi - drupal deployment script based on capistrano