capifony 2.8.2 → 2.8.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 2.8.3 / December 17, 2014
+
+Fixed: rollback using the sudo context if available.
+Fixed: support for hosts other then localhost when using `database:copy:to_local`
+Fixed: revert "Recreated composer autoload after `deploy:rollback`
+
 ### 2.8.2 / October 7, 2014
 
 * Fixed: set default `:use_composer` to true

data/README.md

@@ -1,5 +1,5 @@
-Deploying symfony Applications with Capistrano
-==============================================
+Capifony
+========
 
 [![Build Status](https://secure.travis-ci.org/everzet/capifony.png?branch=master)](http://travis-ci.org/everzet/capifony)
 

data/bin/capifony

@@ -5,7 +5,7 @@ require 'fileutils'
 
 symfony_version  = nil
 symfony_app_path = 'app'
-capifony_version = '2.8.2'
+capifony_version = '2.8.3'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"

data/lib/capifony.rb

@@ -58,4 +58,21 @@ namespace :deploy do
     run "#{try_sudo} mkdir -p #{dirs.join(' ')}"
     run "#{try_sudo} chmod g+w #{dirs.join(' ')}" if fetch(:group_writable, true)
   end
+
+  desc <<-DESC
+    Copies your project to the remote servers. This is the first stage \
+    of any deployment; moving your updated code and assets to the deployment \
+    servers. You will rarely call this task directly, however; instead, you \
+    should call the `deploy' task (to do a complete deploy) or the `update' \
+    task (if you want to perform the `restart' task separately).
+    You will need to make sure you set the :scm variable to the source \
+    control software you are using (it defaults to :subversion), and the \
+    :deploy_via variable to the strategy you want to use to deploy (it \
+    defaults to :checkout).
+  DESC
+  task :update_code, :except => { :no_release => true } do
+    on_rollback { run "#{try_sudo} rm -rf #{release_path}; true" }
+    strategy.deploy!
+    finalize_update
+  end
 end

data/lib/capifony_symfony1.rb

@@ -11,11 +11,13 @@ load 'symfony1/web'
 
 require 'yaml'
 
+set :databases_config_path, "config/databases.yml"
+
 # Dirs that need to remain the same between deploys (shared dirs)
 set :shared_children,   %w(log web/uploads)
 
 # Files that need to remain the same between deploys
-set :shared_files,      %w(config/databases.yml)
+set :shared_files,      %w(#{databases_config_path})
 
 # Asset folders (that need to be timestamped)
 set :asset_children,    %w(web/css web/images web/js)
@@ -40,7 +42,7 @@ set :use_shared_symfony, false
 set :symfony_version,    "1.4.18"
 
 def guess_symfony_orm
-  databases = YAML::load(IO.read('config/databases.yml'))
+  databases = YAML::load(IO.read(databases_config_path))
 
   if databases[symfony_env_local]
     databases[symfony_env_local].keys[0].to_s

data/lib/capifony_symfony2.rb

@@ -347,13 +347,6 @@ module Capifony
         after "deploy:create_symlink" do
           puts "--> Successfully deployed!".green
         end
-        
-        # Recreate the autoload file after rolling back
-        # https://github.com/everzet/capifony/issues/422
-        after "deploy:rollback" do
-            run "cd #{current_path} && #{composer_bin} dump-autoload #{composer_dump_autoload_options}"
-        end        
-        
       end
 
     end

data/lib/symfony1/database.rb

@@ -7,7 +7,7 @@ namespace :database do
       sqlfile   = "#{application}_dump.sql"
       config    = ""
 
-      run "#{try_sudo} cat #{shared_path}/config/databases.yml" do |ch, st, data|
+      run "#{try_sudo} cat #{shared_path}/#{databases_config_path}" do |ch, st, data|
         config = load_database_config data, symfony_env_prod
       end
 
@@ -34,7 +34,7 @@ namespace :database do
       filename  = "#{application}.local_dump.#{Time.now.strftime("%Y-%m-%d_%H-%M-%S")}.sql.gz"
       tmpfile   = "#{backup_path}/#{application}_dump_tmp.sql"
       file      = "#{backup_path}/#{filename}"
-      config    = load_database_config IO.read('config/databases.yml'), symfony_env_local
+      config    = load_database_config IO.read(databases_config_path), symfony_env_local
       sqlfile   = "#{application}_dump.sql"
 
       require "fileutils"
@@ -76,7 +76,7 @@ namespace :database do
 
       run_locally "gunzip -c #{zipped_file_path} > #{unzipped_file_path}"
 
-      config = load_database_config IO.read('config/databases.yml'), symfony_env_local
+      config = load_database_config IO.read(databases_config_path), symfony_env_local
 
       run_locally generate_sql_command('drop', config)
       run_locally generate_sql_command('create', config)
@@ -100,7 +100,7 @@ namespace :database do
       upload(file, "#{remote_tmp_dir}/#{filename}", :via => :scp)
       run "#{try_sudo} gunzip -c #{remote_tmp_dir}/#{filename} > #{remote_tmp_dir}/#{sqlfile}"
 
-      run "#{try_sudo} cat #{shared_path}/config/databases.yml" do |ch, st, data|
+      run "#{try_sudo} cat #{shared_path}/#{databases_config_path}" do |ch, st, data|
         config = load_database_config data, symfony_env_prod
       end
 

data/lib/symfony1/doctrine.rb

@@ -7,7 +7,7 @@ namespace :symfony do
 
     desc "Ensure Doctrine is correctly configured"
     task :setup do
-      conf_files_exists = capture("if test -s #{shared_path}/config/databases.yml ; then echo 'exists' ; fi").strip
+      conf_files_exists = capture("if test -s #{shared_path}/#{databases_config_path} ; then echo 'exists' ; fi").strip
       if (!conf_files_exists.eql?("exists"))
         symfony.configure.database
       end

data/lib/symfony1/propel.rb

@@ -2,7 +2,7 @@ namespace :symfony do
   namespace :propel do
     desc "Ensure Propel is correctly configured"
     task :setup, :roles => :app, :except => { :no_release => true } do
-      conf_files_exists = capture("if test -s #{shared_path}/config/propel.ini -a -s #{shared_path}/config/databases.yml ; then echo 'exists' ; fi").strip
+      conf_files_exists = capture("if test -s #{shared_path}/config/propel.ini -a -s #{shared_path}/#{databases_config_path} ; then echo 'exists' ; fi").strip
 
       # share childs again (for propel.ini file)
       shared_files << "config/propel.ini"

data/lib/symfony1/shared.rb

@@ -1,13 +1,13 @@
 namespace :shared do
   namespace :databases do
-    desc "Download config/databases.yml from remote server"
+    desc "Download database config file from remote server"
     task :to_local do
-      download("#{shared_path}/config/databases.yml", "config/databases.yml", :via => :scp)
+      download("#{shared_path}/#{databases_config_path}", databases_config_path, :via => :scp)
     end
 
-    desc "Upload config/databases.yml to remote server"
+    desc "Upload database config to remote server"
     task :to_remote do
-      upload("config/databases.yml", "#{shared_path}/config/databases.yml", :via => :scp)
+      upload(databases_config_path, "#{shared_path}/#{databases_config_path}", :via => :scp)
     end
   end
 

data/lib/symfony2/database.rb

@@ -89,9 +89,9 @@ namespace :database do
 
       case config['database_driver']
       when "pdo_mysql", "mysql"
-        `mysql -u#{config['database_user']} --password=\"#{config['database_password']}\" #{config['database_name']} < #{backup_path}/#{sqlfile}`
+        `mysql -u#{config['database_user']} --host=\"#{config['database_host']}\" --password=\"#{config['database_password']}\" #{config['database_name']} < #{backup_path}/#{sqlfile}`
       when "pdo_pgsql", "pgsql"
-        `PGPASSWORD=\"#{config['database_password']}\" psql -U #{config['database_user']} #{config['database_name']} < #{backup_path}/#{sqlfile}`
+        `PGPASSWORD=\"#{config['database_password']}\" psql -U #{config['database_user']} #{config['database_name']} -h#{config['database_host']}< #{backup_path}/#{sqlfile}`
       end
       FileUtils.rm("#{backup_path}/#{sqlfile}")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capifony
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano