capifony 2.1.16 → 2.2.0

data/lib/symfony2/database.rb

@@ -1,16 +1,17 @@
-require "fileutils"
-require "zlib"
+require 'fileutils'
+require 'zlib'
 
 namespace :database do
   namespace :dump do
     desc "Dumps remote database"
     task :remote, :roles => :db, :only => { :primary => true } do
-      filename  = "#{application}.remote_dump.#{Time.now.to_i}.sql.gz"
+      env       = fetch(:deploy_env, "remote")
+      filename  = "#{application}.#{env}_dump.#{Time.now.to_i}.sql.gz"
       file      = "#{remote_tmp_dir}/#{filename}"
       sqlfile   = "#{application}_dump.sql"
       config    = ""
 
-      run "#{try_sudo} cat #{current_path}/#{app_path}/config/parameters.yml" do |ch, st, data|
+      run "#{try_sudo} cat #{current_path}/#{app_config_path}/#{app_config_file}" do |ch, st, data|
         config = load_database_config data, symfony_env_prod
       end
 
@@ -28,9 +29,9 @@ namespace :database do
       FileUtils.mkdir_p("backups")
       get file, "backups/#{filename}"
       begin
-        FileUtils.ln_sf(filename, "backups/#{application}.remote_dump.latest.sql.gz")
+        FileUtils.ln_sf(filename, "backups/#{application}.#{env}_dump.latest.sql.gz")
       rescue NotImplementedError # hack for windows which doesnt support symlinks
-        FileUtils.cp_r("backups/#{filename}", "backups/#{application}.remote_dump.latest.sql.gz")
+        FileUtils.cp_r("backups/#{filename}", "backups/#{application}.#{env}_dump.latest.sql.gz")
       end
       run "#{try_sudo} rm #{file}"
     end
@@ -40,7 +41,7 @@ namespace :database do
       filename  = "#{application}.local_dump.#{Time.now.to_i}.sql.gz"
       tmpfile   = "backups/#{application}_dump_tmp.sql"
       file      = "backups/#{filename}"
-      config    = load_database_config IO.read("#{app_path}/config/parameters.yml"), symfony_env_local
+      config    = load_database_config IO.read("#{app_config_path}/#{app_config_file}"), symfony_env_local
       sqlfile   = "#{application}_dump.sql"
 
       FileUtils::mkdir_p("backups")
@@ -72,8 +73,9 @@ namespace :database do
   namespace :move do
     desc "Dumps remote database, downloads it to local, and populates here"
     task :to_local, :roles => :db, :only => { :primary => true } do
-      filename  = "#{application}.remote_dump.latest.sql.gz"
-      config    = load_database_config IO.read("#{app_path}/config/parameters.yml"), symfony_env_local
+      env       = fetch(:deploy_env, "remote")
+      filename  = "#{application}.#{env}_dump.latest.sql.gz"
+      config    = load_database_config IO.read("#{app_config_path}/#{app_config_file}"), symfony_env_local
       sqlfile   = "#{application}_dump.sql"
 
       database.dump.remote
@@ -104,7 +106,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 #{current_path}/#{app_path}/config/parameters.yml" do |ch, st, data|
+      run "#{try_sudo} cat #{current_path}/#{app_config_path}/#{app_config_file}" do |ch, st, data|
         config = load_database_config data, symfony_env_prod
       end
 

data/lib/symfony2/deploy.rb

@@ -31,7 +31,7 @@ namespace :deploy do
       }
 
       if methods[permission_method]
-        pretty_print "--> Setting permissions"
+        capifony_pretty_print "--> Setting permissions"
 
         if fetch(:use_sudo, false)
           methods[permission_method].each do |cmd|
@@ -51,7 +51,7 @@ namespace :deploy do
             end
           end
         end
-        puts_ok
+        capifony_puts_ok
       else
         puts "    Permission method '#{permission_method}' does not exist.".yellow
       end
@@ -61,7 +61,7 @@ namespace :deploy do
   desc "Symlinks static directories and static files that need to remain between deployments"
   task :share_childs, :roles => :app, :except => { :no_release => true } do
     if shared_children
-      pretty_print "--> Creating symlinks for shared directories"
+      capifony_pretty_print "--> Creating symlinks for shared directories"
 
       shared_children.each do |link|
         run "#{try_sudo} mkdir -p #{shared_path}/#{link}"
@@ -69,11 +69,11 @@ namespace :deploy do
         run "#{try_sudo} ln -nfs #{shared_path}/#{link} #{release_path}/#{link}"
       end
 
-      puts_ok
+      capifony_puts_ok
     end
 
     if shared_files
-      pretty_print "--> Creating symlinks for shared files"
+      capifony_pretty_print "--> Creating symlinks for shared files"
 
       shared_files.each do |link|
         link_dir = File.dirname("#{shared_path}/#{link}")
@@ -82,7 +82,7 @@ namespace :deploy do
         run "#{try_sudo} ln -nfs #{shared_path}/#{link} #{release_path}/#{link}"
       end
 
-      puts_ok
+      capifony_puts_ok
     end
   end
 
@@ -90,13 +90,13 @@ namespace :deploy do
   task :finalize_update, :roles => :app, :except => { :no_release => true } do
     run "#{try_sudo} chmod -R g+w #{latest_release}" if fetch(:group_writable, true)
 
-    pretty_print "--> Creating cache directory"
+    capifony_pretty_print "--> Creating cache directory"
 
     run "#{try_sudo} sh -c 'if [ -d #{latest_release}/#{cache_path} ] ; then rm -rf #{latest_release}/#{cache_path}; fi'"
     run "#{try_sudo} sh -c 'mkdir -p #{latest_release}/#{cache_path} && chmod -R 0777 #{latest_release}/#{cache_path}'"
     run "#{try_sudo} chmod -R g+w #{latest_release}/#{cache_path}"
 
-    puts_ok
+    capifony_puts_ok
 
     share_childs
 
@@ -107,10 +107,10 @@ namespace :deploy do
       if asset_paths.chomp.empty?
         puts "    No asset paths found, skipped".yellow
       else
-        pretty_print "--> Normalizing asset timestamps"
+        capifony_pretty_print "--> Normalizing asset timestamps"
 
         run "#{try_sudo} find #{asset_paths} -exec touch -t #{stamp} {} ';' &> /dev/null || true", :env => { "TZ" => "UTC" }
-        puts_ok
+        capifony_puts_ok
       end
     end
   end
@@ -125,7 +125,7 @@ namespace :deploy do
   end
 
   desc "Deploys the application and runs the test suite"
-  task :testall, :roles => :app, :except => { :no_release => true } do
+  task :test_all, :roles => :app, :except => { :no_release => true } do
     update_code
     create_symlink
     run "#{try_sudo} sh -c 'cd #{latest_release} && phpunit -c #{app_path} src'"
@@ -142,7 +142,7 @@ namespace :deploy do
     end
   end
 
-  desc "Totaly drops :deploy_to directory"
+  desc "Drops :deploy_to directory"
   task :drop do
     if Capistrano::CLI.ui.ask("Are you sure remove #{deploy_to} (y/n)") == 'y'
       run "#{try_sudo} rm -rf #{deploy_to}"

data/lib/symfony2/doctrine.rb

@@ -3,26 +3,26 @@ namespace :symfony do
     namespace :cache do
       desc "Clears all metadata cache for a entity manager"
       task :clear_metadata, :roles => :app, :except => { :no_release => true } do
-        pretty_print "--> Clearing Doctrine metadata cache"
+        capifony_pretty_print "--> Clearing Doctrine metadata cache"
 
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-metadata --env=#{symfony_env_prod}'"
-        puts_ok
+        capifony_puts_ok
       end
 
       desc "Clears all query cache for a entity manager"
       task :clear_query, :roles => :app, :except => { :no_release => true } do
-        pretty_print "--> Clearing Doctrine query cache"
+        capifony_pretty_print "--> Clearing Doctrine query cache"
 
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-query --env=#{symfony_env_prod}'"
-        puts_ok
+        capifony_puts_ok
       end
 
       desc "Clears result cache for a entity manager"
       task :clear_result, :roles => :app, :except => { :no_release => true } do
-        pretty_print "--> Clearing Doctrine result cache"
+        capifony_pretty_print "--> Clearing Doctrine result cache"
 
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-result --env=#{symfony_env_prod}'"
-        puts_ok
+        capifony_puts_ok
       end
     end
 
@@ -32,13 +32,13 @@ namespace :symfony do
         task action, :roles => :app, :except => { :no_release => true } do
           case action.to_s
           when "create"
-            pretty_print "--> Creating databases"
+            capifony_pretty_print "--> Creating databases"
           when "drop"
-            pretty_print "--> Dropping databases"
+            capifony_pretty_print "--> Dropping databases"
           end
 
           run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:database:#{action.to_s} --env=#{symfony_env_prod}'", :once => true
-          puts_ok
+          capifony_puts_ok
         end
       end
     end
@@ -46,17 +46,26 @@ namespace :symfony do
     namespace :schema do
       desc "Processes the schema and either create it directly on EntityManager Storage Connection or generate the SQL output"
       task :create, :roles => :app, :except => { :no_release => true } do
+        capifony_pretty_print "--> Creating schema"
+
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:create --env=#{symfony_env_prod}'", :once => true
+        capifony_puts_ok
       end
 
       desc "Drops the complete database schema of EntityManager Storage Connection or generate the corresponding SQL output"
       task :drop, :roles => :app, :except => { :no_release => true } do
+        capifony_pretty_print "--> Droping schema"
+
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:drop --env=#{symfony_env_prod}'", :once => true
+        capifony_puts_ok
       end
 
       desc "Updates database schema of EntityManager Storage Connection"
       task :update, :roles => :app, :except => { :no_release => true } do
-        try_sudo "sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:update --force --env=#{symfony_env_prod}'", :once => true
+        capifony_pretty_print "--> Updating schema"
+
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:update --force --env=#{symfony_env_prod}'", :once => true
+        capifony_puts_ok
       end
     end
 
@@ -76,7 +85,7 @@ namespace :symfony do
         if currentVersion == nil
           raise "Could not find current database migration version"
         end
-        puts "    Current database version: #{currentVersion}"
+        logger.info "    Current database version: #{currentVersion}"
 
         on_rollback {
           if !interactive_mode || Capistrano::CLI.ui.agree("Do you really want to migrate #{symfony_env_prod}'s database back to version #{currentVersion}? (y/N)")
@@ -100,10 +109,10 @@ namespace :symfony do
         namespace :schema do
           desc "Allows you to #{action.to_s} databases, collections and indexes for your documents"
           task action, :roles => :app, :except => { :no_release => true } do
-            pretty_print "--> Executing MongoDB schema #{action.to_s}"
+            capifony_pretty_print "--> Executing MongoDB schema #{action.to_s}"
 
             run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:mongodb:schema:#{action.to_s} --env=#{symfony_env_prod}'", :once => true
-            puts_ok
+            capifony_puts_ok
           end
         end
 
@@ -111,10 +120,10 @@ namespace :symfony do
           namespace :indexes do
             desc "Allows you to #{action.to_s} indexes *only* for your documents"
             task action, :roles => :app do
-              pretty_print "--> Executing MongoDB indexes #{action.to_s}"
+              capifony_pretty_print "--> Executing MongoDB indexes #{action.to_s}"
 
               run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:mongodb:schema:#{action.to_s} --index --env=#{symfony_env_prod}'", :once => true
-              puts_ok
+              capifony_puts_ok
             end
           end
         end
@@ -124,10 +133,10 @@ namespace :symfony do
     namespace :init do
       desc "Mounts ACL tables in the database"
       task :acl, :roles => :app, :except => { :no_release => true } do
-        pretty_print "--> Mounting Doctrine ACL tables"
+        capifony_pretty_print "--> Mounting Doctrine ACL tables"
 
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} init:acl --env=#{symfony_env_prod}'", :once => true
-        puts_ok
+        capifony_puts_ok
       end
     end
   end

data/lib/symfony2/propel.rb

@@ -6,13 +6,13 @@ namespace :symfony do
         task action, :roles => :app, :except => { :no_release => true } do
           case action.to_s
           when "create"
-            pretty_print "--> Creating databases"
+            capifony_pretty_print "--> Creating databases"
           when "drop"
-            pretty_print "--> Dropping databases"
+            capifony_pretty_print "--> Dropping databases"
           end
 
           run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} propel:database:#{action.to_s} --env=#{symfony_env_prod}'", :once => true
-          puts_ok
+          capifony_puts_ok
         end
       end
     end
@@ -25,10 +25,10 @@ namespace :symfony do
           command = "propel:build-model"
         end
 
-        pretty_print "--> Generating Propel classes"
+        capifony_pretty_print "--> Generating Propel classes"
 
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} #{command} --env=#{symfony_env_prod}'"
-        puts_ok
+        capifony_puts_ok
       end
 
       desc "Builds SQL statements"
@@ -38,10 +38,10 @@ namespace :symfony do
           command = "propel:build-sql"
         end
 
-        pretty_print "--> Generating Propel SQL"
+        capifony_pretty_print "--> Generating Propel SQL"
 
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} #{command} --env=#{symfony_env_prod}'"
-        puts_ok
+        capifony_puts_ok
       end
 
       desc "Inserts SQL statements"
@@ -51,18 +51,18 @@ namespace :symfony do
           command = "propel:insert-sql"
         end
 
-        pretty_print "--> Inserting Propel SQL"
+        capifony_pretty_print "--> Inserting Propel SQL"
 
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} #{command} --force --env=#{symfony_env_prod}'", :once => true
-        puts_ok
+        capifony_puts_ok
       end
 
       desc "Builds the Model classes, SQL statements and insert SQL"
       task :all_and_load, :roles => :app, :except => { :no_release => true } do
-        pretty_print "--> Setting up Propel (classes, SQL)"
+        capifony_pretty_print "--> Setting up Propel (classes, SQL)"
 
         run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} propel:build --insert-sql --env=#{symfony_env_prod}'"
-        puts_ok
+        capifony_puts_ok
       end
 
       desc "Generates ACLs models"

data/lib/symfony2/symfony.rb

@@ -25,68 +25,68 @@ namespace :symfony do
   namespace :assets do
     desc "Updates assets version (in config.yml)"
     task :update_version, :roles => :app, :except => { :no_release => true } do
-       run "#{try_sudo} sed -i 's/\\(assets_version: \\)\\([a-zA-Z0-9_]*\\)\\(.*\\)$/\\1 \"#{real_revision[0,7]}\"\\3/g' #{latest_release}/#{app_path}/config/config.yml"
+      run "#{try_sudo} sed -i 's/\\(assets_version: \\)\\([a-zA-Z0-9_]*\\)\\(.*\\)$/\\1 \"#{real_revision[0,7]}\"\\3/g' #{latest_release}/#{app_path}/config/config.yml"
     end
 
     desc "Installs bundle's assets"
     task :install, :roles => :app, :except => { :no_release => true } do
-      pretty_print "--> Installing bundle's assets"
+      capifony_pretty_print "--> Installing bundle's assets"
 
       install_options = ''
 
       if true == assets_symlinks then
-          install_options += " --symlink"
+        install_options += " --symlink"
       end
 
       if true == assets_relative then
-          install_options += " --relative"
+        install_options += " --relative"
       end
 
-      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} assets:install #{web_path} #{install_options} --env=#{symfony_env_prod}'"
-      puts_ok
+      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} assets:install #{web_path}#{install_options} --env=#{symfony_env_prod}'"
+      capifony_puts_ok
     end
   end
 
   namespace :assetic do
     desc "Dumps all assets to the filesystem"
     task :dump, :roles => :app,  :except => { :no_release => true } do
-      pretty_print "--> Dumping all assets to the filesystem"
+      capifony_pretty_print "--> Dumping all assets to the filesystem"
 
       run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} assetic:dump --env=#{symfony_env_prod} --no-debug'"
-      puts_ok
+      capifony_puts_ok
     end
   end
 
   namespace :vendors do
     desc "Runs the bin/vendors script to install the vendors (fast if already installed)"
     task :install, :roles => :app, :except => { :no_release => true } do
-      pretty_print "--> Installing vendors"
+      capifony_pretty_print "--> Installing vendors"
 
       run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_vendors} install'"
-      puts_ok
+      capifony_puts_ok
     end
 
     desc "Runs the bin/vendors script to reinstall the vendors"
     task :reinstall, :roles => :app, :except => { :no_release => true } do
-      pretty_print "--> Reinstalling vendors"
+      capifony_pretty_print "--> Reinstalling vendors"
 
       run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_vendors} install --reinstall'"
-      puts_ok
+      capifony_puts_ok
     end
 
     desc "Runs the bin/vendors script to upgrade the vendors"
     task :upgrade, :roles => :app, :except => { :no_release => true } do
-      pretty_print "--> Upgrading vendors"
+      capifony_pretty_print "--> Upgrading vendors"
 
       run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_vendors} update'"
-      puts_ok
+      capifony_puts_ok
     end
   end
 
   namespace :bootstrap do
     desc "Runs the bin/build_bootstrap script"
     task :build, :roles => :app, :except => { :no_release => true } do
-      pretty_print "--> Building bootstrap file"
+      capifony_pretty_print "--> Building bootstrap file"
 
       if !remote_file_exists?("#{latest_release}/#{build_bootstrap}") && true == use_composer then
         set :build_bootstrap, "vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php"
@@ -95,99 +95,102 @@ namespace :symfony do
         run "#{try_sudo} sh -c 'cd #{latest_release} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} || echo '#{build_bootstrap} not found, skipped''"
       end
 
-      puts_ok
+      capifony_puts_ok
     end
   end
 
   namespace :composer do
     desc "Gets composer and installs it"
     task :get, :roles => :app, :except => { :no_release => true } do
-      pretty_print "--> Downloading Composer"
       if !remote_file_exists?("#{latest_release}/composer.phar")
+        capifony_pretty_print "--> Downloading Composer"
+
         run "#{try_sudo} sh -c 'cd #{latest_release} && curl -s http://getcomposer.org/installer | #{php_bin}'"
       else
-        run "#{try_sudo} cd #{latest_release} && #{php_bin} composer.phar self-update"
+        capifony_pretty_print "--> Updating Composer"
+
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} composer.phar self-update'"
       end
-      puts_ok
+      capifony_puts_ok
     end
 
     desc "Updates composer"
-    task :update, :roles => :app, :except => { :no_release => true } do
-      pretty_print "--> Updating Composer"
+    task :self_update, :roles => :app, :except => { :no_release => true } do
+      capifony_pretty_print "--> Updating Composer"
       try_sudo "#{composer_bin} self-update"
-      puts_ok
+      capifony_puts_ok
     end
 
     desc "Runs composer to install vendors from composer.lock file"
     task :install, :roles => :app, :except => { :no_release => true } do
       if composer_bin
-        symfony.composer.update
+        symfony.composer.self_update
       else
         symfony.composer.get
         composer_bin = "#{php_bin} composer.phar"
       end
 
-      pretty_print "--> Installing Composer dependencies"
+      capifony_pretty_print "--> Installing Composer dependencies"
       run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} install #{composer_options}'"
-      puts_ok
+      capifony_puts_ok
     end
 
     desc "Runs composer to update vendors, and composer.lock file"
     task :update, :roles => :app, :except => { :no_release => true } do
       if composer_bin
-        symfony.composer.update
+        symfony.composer.self_update
       else
         symfony.composer.get
         composer_bin = "#{php_bin} composer.phar"
       end
 
-      pretty_print "--> Updating Composer dependencies"
+      capifony_pretty_print "--> Updating Composer dependencies"
       run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} update #{composer_options}'"
-      puts_ok
+      capifony_puts_ok
     end
 
     desc "Dumps an optimized autoloader"
     task :dump_autoload, :roles => :app, :except => { :no_release => true } do
       if composer_bin
-        symfony.composer.update
+        symfony.composer.self_update
       else
         symfony.composer.get
         composer_bin = "#{php_bin} composer.phar"
       end
 
-      pretty_print "--> Dumping an optimized autoloader"
+      capifony_pretty_print "--> Dumping an optimized autoloader"
       run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} dump-autoload --optimize'"
-      puts_ok
+      capifony_puts_ok
     end
   end
 
   namespace :cache do
     desc "Clears cache"
     task :clear, :roles => :app, :except => { :no_release => true } do
-      pretty_print "--> Clearing cache"
+      capifony_pretty_print "--> Clearing cache"
 
       run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} cache:clear --env=#{symfony_env_prod}'"
       run "#{try_sudo} chmod -R g+w #{latest_release}/#{cache_path}"
-      puts_ok
+      capifony_puts_ok
     end
 
     desc "Warms up an empty cache"
     task :warmup, :roles => :app, :except => { :no_release => true } do
-      pretty_print "--> Warming up cache"
+      capifony_pretty_print "--> Warming up cache"
 
       run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} cache:warmup --env=#{symfony_env_prod}'"
       run "#{try_sudo} chmod -R g+w #{latest_release}/#{cache_path}"
-      puts_ok
+      capifony_puts_ok
     end
   end
 
   namespace :project do
     desc "Clears all non production environment controllers"
     task :clear_controllers do
-      pretty_print "--> Clear controllers"
+      capifony_pretty_print "--> Clear controllers"
 
       run "#{try_sudo} sh -c 'cd #{latest_release} && rm -f #{web_path}/app_*.php'"
-      puts_ok
+      capifony_puts_ok
     end
   end
 end