capifony 2.1.10 → 2.1.11

data/CHANGELOG

@@ -1,3 +1,15 @@
+== 2.1.11 / July 20, 2012
+
+* Fix hard-coded "app" references
+* Fix hard-coded path to "app"
+* Fix set_permissions task. Refs #166
+* Try to fix #166
+* Setting :roles, etc. for each task (Symfony2 only currently)
+* Fix set_permissions task. Refs #166
+* Fix documentation link
+* Fix #163
+* fix elsif synthax
+
 == 2.1.10 / July 16, 2012
 
 * Fix CS
@@ -15,7 +27,7 @@
 * Add task for updating `assets_version` in `config.yml`
 * Avoid the use of try_sudo
 * More `:no_release`...
-*  Since `:roles` isn't used in Capifony, these need `:no_release` *at least*.
+* Since `:roles` isn't used in Capifony, these need `:no_release` *at least*.
 * Fixing missing `pretty_print`.
 
 == 2.1.9 / July 3, 2012

data/README.md

@@ -33,7 +33,7 @@ lot easier.
 
 ## What's next? ##
 
-Read the [capifony documentation](http://everzet.github.com/capifony/)
+Read the [capifony documentation](http://capifony.org/)
 
 
 ## Contributors ##

data/lib/capifony.rb

@@ -19,7 +19,7 @@ namespace :deploy do
     Blank task exists as a hook into which to install your own environment \
     specific behaviour.
   DESC
-  task :start, :roles => :app do
+  task :start, :roles => :app, :except => { :no_release => true } do
     # Empty Task to overload with your platform specifics
   end
 
@@ -27,12 +27,17 @@ namespace :deploy do
     Blank task exists as a hook into which to install your own environment \
     specific behaviour.
   DESC
-  task :stop, :roles => :app do
+  task :stop, :roles => :app, :except => { :no_release => true } do
     # Empty Task to overload with your platform specifics
   end
 
-  desc "Overwrite the restart task because symfony doesn't need it."
-  task :restart do ; end
+  desc <<-DESC
+    Blank task exists as a hook into which to install your own environment \
+    specific behaviour.
+  DESC
+  task :restart, :roles => :app, :except => { :no_release => true } do
+    # Empty Task to overload with your platform specifics
+  end
 
   desc <<-DESC
     Prepares one or more servers for deployment. Before you can use any \
@@ -46,7 +51,7 @@ namespace :deploy do
     It is safe to run this task on servers that have already been set up; it \
     will not destroy any deployed revisions or data.
   DESC
-  task :setup, :except => { :no_release => true } do
+  task :setup, :roles => :app, :except => { :no_release => true } do
     dirs = [deploy_to, releases_path, shared_path]
     run "mkdir -p #{dirs.join(' ')}"
     run "chmod g+w #{dirs.join(' ')}" if fetch(:group_writable, true)

data/lib/symfony1/database.rb

@@ -1,7 +1,7 @@
 namespace :database do
   namespace :dump do
     desc "Dump remote database"
-    task :remote do
+    task :remote, :roles => :db, :only => { :primary => true } do
       filename  = "#{application}.remote_dump.#{Time.now.strftime("%Y-%m-%d_%H-%M-%S")}.sql.gz"
       file      = "/tmp/#{filename}"
       sqlfile   = "#{application}_dump.sql"
@@ -61,7 +61,7 @@ namespace :database do
 
   namespace :move do
     desc "Dump remote database, download it to local & populate here"
-    task :to_local do
+    task :to_local, :roles => :db, :only => { :primary => true } do
 
       database.dump.remote
 
@@ -86,7 +86,7 @@ namespace :database do
     end
 
     desc "Dump local database, load it to remote & populate there"
-    task :to_remote do
+    task :to_remote, :roles => :db, :only => { :primary => true } do
 
       filename  = "#{application}.local_dump.latest.sql.gz"
       file      = "backups/#{filename}"

data/lib/symfony2.rb

@@ -93,7 +93,11 @@ def guess_symfony_version
 end
 
 def remote_file_exists?(full_path)
-  'true' ==  capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
+  'true' == capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
+end
+
+def remote_command_exists?(command)
+  'true' == capture("type -P #{command} &>/dev/null && echo 'true' || echo 'false'")
 end
 
 after "deploy:finalize_update" do

data/lib/symfony2/database.rb

@@ -4,13 +4,13 @@ require "zlib"
 namespace :database do
   namespace :dump do
     desc "Dumps remote database"
-    task :remote do
+    task :remote, :roles => :db, :only => { :primary => true } do
       filename  = "#{application}.remote_dump.#{Time.now.to_i}.sql.gz"
       file      = "/tmp/#{filename}"
       sqlfile   = "#{application}_dump.sql"
       config    = ""
 
-      run "cat #{current_path}/app/config/parameters.yml" do |ch, st, data|
+      run "cat #{current_path}/#{app_path}/config/parameters.yml" do |ch, st, data|
         config = load_database_config data, symfony_env_prod
       end
 
@@ -25,7 +25,6 @@ namespace :database do
         end
       end
 
-
       FileUtils.mkdir_p("backups")
       get file, "backups/#{filename}"
       begin
@@ -41,7 +40,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/config/parameters.yml'), symfony_env_local
+      config    = load_database_config IO.read("#{app_path}/config/parameters.yml"), symfony_env_local
       sqlfile   = "#{application}_dump.sql"
 
       FileUtils::mkdir_p("backups")
@@ -72,9 +71,9 @@ namespace :database do
 
   namespace :move do
     desc "Dumps remote database, downloads it to local, and populates here"
-    task :to_local do
+    task :to_local, :roles => :db, :only => { :primary => true } do
       filename  = "#{application}.remote_dump.latest.sql.gz"
-      config    = load_database_config IO.read('app/config/parameters.yml'), symfony_env_local
+      config    = load_database_config IO.read("#{app_path}/config/parameters.yml"), symfony_env_local
       sqlfile   = "#{application}_dump.sql"
 
       database.dump.remote
@@ -94,7 +93,7 @@ namespace :database do
     end
 
     desc "Dumps local database, loads it to remote, and populates there"
-    task :to_remote do
+    task :to_remote, :roles => :db, :only => { :primary => true } do
       filename  = "#{application}.local_dump.latest.sql.gz"
       file      = "backups/#{filename}"
       sqlfile   = "#{application}_dump.sql"

data/lib/symfony2/deploy.rb

@@ -4,7 +4,7 @@ namespace :deploy do
     Sets permissions for writable_dirs folders as described in the Symfony documentation
     (http://symfony.com/doc/master/book/installation.html#configuration-and-setup)
   DESC
-  task :set_permissions, :roles => :app do
+  task :set_permissions, :roles => :app, :except => { :no_release => true } do
     if writable_dirs && permission_method
       dirs = []
 
@@ -19,17 +19,17 @@ namespace :deploy do
       end
 
       methods = {
-        :chmod => "#{try_sudo} chmod +a \"#{webserver_user} allow delete,write,append,file_inherit,directory_inherit\" %s",
-        :acl   => "#{try_sudo} setfacl -dR -m u:#{webserver_user}:rwx %s",
-        :chown => "#{try_sudo} chown #{webserver_user} %s"
+        :chmod => "chmod +a \"#{webserver_user} allow delete,write,append,file_inherit,directory_inherit\" %s",
+        :acl   => "setfacl -dR -m u:#{webserver_user}:rwx %s",
+        :chown => "chown #{webserver_user} %s"
       }
 
       if methods[permission_method]
         pretty_print "--> Setting permissions"
 
-        if use_sudo
-          run sprintf(methods[permission_method], dirs.join(' '))
-        else if permission_method == :chown
+        if fetch(:use_sudo, false)
+          sudo sprintf(methods[permission_method], dirs.join(' '))
+        elsif permission_method == :chown
           puts "    You can't use chown method without sudoing"
         else
           dirs.each do |dir|
@@ -37,7 +37,7 @@ namespace :deploy do
             if is_owner && permission_method != :chown
               run sprintf(methods[permission_method], dir)
             else
-              puts "    #{dir} is not owned by #{user} or you are using 'chown' method without 'use_sudo'"
+              puts "    #{dir} is not owned by #{user} or you are using 'chown' method without ':use_sudo'"
             end
           end
         end
@@ -49,7 +49,7 @@ namespace :deploy do
   end
 
   desc "Symlinks static directories and static files that need to remain between deployments"
-  task :share_childs, :except => { :no_release => true } do
+  task :share_childs, :roles => :app, :except => { :no_release => true } do
     if shared_children
       pretty_print "--> Creating symlinks for shared directories"
 
@@ -77,7 +77,7 @@ namespace :deploy do
   end
 
   desc "Updates latest release source path"
-  task :finalize_update, :except => { :no_release => true } do
+  task :finalize_update, :roles => :app, :except => { :no_release => true } do
     run "chmod -R g+w #{latest_release}" if fetch(:group_writable, true)
 
     pretty_print "--> Creating cache directory"
@@ -99,7 +99,7 @@ namespace :deploy do
       else
         pretty_print "--> Normalizing asset timestamps"
 
-        run "find #{asset_paths} -exec touch -t #{stamp} {} ';' >& /dev/null || true", :env => { "TZ" => "UTC" }
+        run "find #{asset_paths} -exec touch -t #{stamp} {} ';' &> /dev/null || true", :env => { "TZ" => "UTC" }
         puts_ok
       end
     end
@@ -109,20 +109,20 @@ namespace :deploy do
     Deploys and starts a `cold' application. This is useful if you have not \
     deployed your application before.
   DESC
-  task :cold do
+  task :cold, :roles => :app, :except => { :no_release => true } do
     update
     start
   end
 
   desc "Deploys the application and runs the test suite"
-  task :testall, :except => { :no_release => true } do
+  task :testall, :roles => :app, :except => { :no_release => true } do
     update_code
     create_symlink
     run "cd #{latest_release} && phpunit -c #{app_path} src"
   end
 
   desc "Runs the Symfony2 migrations"
-  task :migrate do
+  task :migrate, :roles => :app, :except => { :no_release => true }, :only => { :primary => true } do
     if model_manager == "doctrine"
       symfony.doctrine.migrations.migrate
     else

data/lib/symfony2/doctrine.rb

@@ -2,7 +2,7 @@ namespace :symfony do
   namespace :doctrine do
     namespace :cache do
       desc "Clears all metadata cache for a entity manager"
-      task :clear_metadata do
+      task :clear_metadata, :roles => :app, :except => { :no_release => true } do
         pretty_print "--> Clearing Doctrine metadata cache"
 
         run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-metadata --env=#{symfony_env_prod}"
@@ -10,7 +10,7 @@ namespace :symfony do
       end
 
       desc "Clears all query cache for a entity manager"
-      task :clear_query do
+      task :clear_query, :roles => :app, :except => { :no_release => true } do
         pretty_print "--> Clearing Doctrine query cache"
 
         run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-query --env=#{symfony_env_prod}"
@@ -18,7 +18,7 @@ namespace :symfony do
       end
 
       desc "Clears result cache for a entity manager"
-      task :clear_result do
+      task :clear_result, :roles => :app, :except => { :no_release => true } do
         pretty_print "--> Clearing Doctrine result cache"
 
         run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-result --env=#{symfony_env_prod}"
@@ -27,40 +27,39 @@ namespace :symfony do
     end
 
     namespace :database do
-      desc "Creates the configured databases"
-      task :create, :roles => :db, :only => { :primary => true } do
-        pretty_print "--> Creating databases"
-
-        run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:database:create --env=#{symfony_env_prod}"
-        puts_ok
-      end
-
-      desc "Drops the configured databases"
-      task :drop, :roles => :db, :only => { :primary => true } do
-        pretty_print "--> Dropping databases"
+      [:create, :drop].each do |action|
+        desc "#{action.to_s.capitalize}s the configured databases"
+        task action, :roles => :app, :except => { :no_release => true } do
+          case action.to_s
+          when "create"
+            pretty_print "--> Creating databases"
+          when "drop"
+            pretty_print "--> Dropping databases"
+          end
 
-        run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:database:drop --env=#{symfony_env_prod}"
-        puts_ok
+          run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:database:#{action.to_s} --env=#{symfony_env_prod}", :once => true
+          puts_ok
+        end
       end
     end
 
     namespace :schema do
       desc "Processes the schema and either create it directly on EntityManager Storage Connection or generate the SQL output"
-      task :create do
-        run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:create --env=#{symfony_env_prod}"
+      task :create, :roles => :app, :except => { :no_release => true } do
+        run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:create --env=#{symfony_env_prod}", :once => true
       end
 
       desc "Drops the complete database schema of EntityManager Storage Connection or generate the corresponding SQL output"
-      task :drop do
-        run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:drop --env=#{symfony_env_prod}"
+      task :drop, :roles => :app, :except => { :no_release => true } do
+        run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:drop --env=#{symfony_env_prod}", :once => true
       end
     end
 
     namespace :migrations do
       desc "Executes a migration to a specified version or the latest available version"
-      task :migrate, :roles => :db, :only => { :primary => true } do
+      task :migrate, :roles => :app, :except => { :no_release => true } do
         currentVersion = nil
-        run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:status --env=#{symfony_env_prod}" do |ch, stream, out|
+        run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:status --env=#{symfony_env_prod}", :once => true do |ch, stream, out|
           if stream == :out and out =~ /Current Version:[^$]+\(([\w]+)\)/
             currentVersion = Regexp.last_match(1)
           end
@@ -76,31 +75,41 @@ namespace :symfony do
 
         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)")
-            run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:migrate #{currentVersion} --env=#{symfony_env_prod} --no-interaction"
+            run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:migrate #{currentVersion} --env=#{symfony_env_prod} --no-interaction", :once => true
           end
         }
 
         if !interactive_mode || Capistrano::CLI.ui.agree("Do you really want to migrate #{symfony_env_prod}'s database? (y/N)")
-          run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:migrate --env=#{symfony_env_prod} --no-interaction"
+          run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:migrate --env=#{symfony_env_prod} --no-interaction", :once => true
         end
       end
 
       desc "Views the status of a set of migrations"
-      task :status do
-        run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:status --env=#{symfony_env_prod}"
+      task :status, :roles => :app, :except => { :no_release => true } do
+        run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:status --env=#{symfony_env_prod}", :once => true
       end
     end
 
     namespace :mongodb do
-      namespace :schema do
-        desc "Allows you to create databases, collections and indexes for your documents"
-        task :create do
-          run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:mongodb:schema:create --env=#{symfony_env_prod}"
+      [:create, :update, :drop].each do |action|
+        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}"
+
+            run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:mongodb:schema:#{action.to_s} --env=#{symfony_env_prod}", :once => true
+            puts_ok
+          end
         end
 
-        desc "Allows you to drop databases, collections and indexes for your documents"
-        task :drop do
-          run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:mongodb:schema:drop --env=#{symfony_env_prod}"
+        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}"
+
+            run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:mongodb:schema:#{action.to_s} --index --env=#{symfony_env_prod}", :once => true
+            puts_ok
+          end
         end
       end
     end
@@ -108,10 +117,10 @@ namespace :symfony do
 
   namespace :init do
     desc "Mounts ACL tables in the database"
-    task :acl, :roles => :db, :only => { :primary => true } do
+    task :acl, :roles => :app, :except => { :no_release => true } do
       pretty_print "--> Mounting Doctrine ACL tables"
 
-      run "cd #{latest_release} && #{php_bin} #{symfony_console} init:acl --env=#{symfony_env_prod}"
+      run "cd #{latest_release} && #{php_bin} #{symfony_console} init:acl --env=#{symfony_env_prod}", :once => true
       puts_ok
     end
   end

data/lib/symfony2/propel.rb

@@ -1,26 +1,25 @@
 namespace :symfony do
   namespace :propel do
     namespace :database do
-      desc "Creates the configured databases"
-      task :create, :roles => :db, :only => { :primary => true } do
-        pretty_print "--> Creating databases"
-
-        run "cd #{latest_release} && #{php_bin} #{symfony_console} propel:database:create --env=#{symfony_env_prod}"
-        puts_ok
-      end
-
-      desc "Drops the configured databases"
-      task :drop, :roles => :db, :only => { :primary => true } do
-        pretty_print "--> Dropping databases"
-
-        run "cd #{latest_release} && #{php_bin} #{symfony_console} propel:database:drop --env=#{symfony_env_prod}"
-        puts_ok
+      [:create, :drop].each do |action|
+        desc "#{action.to_s.capitalize}s the configured databases"
+        task action, :roles => :app, :except => { :no_release => true } do
+          case action.to_s
+          when "create"
+            pretty_print "--> Creating databases"
+          when "drop"
+            pretty_print "--> Dropping databases"
+          end
+
+          run "cd #{latest_release} && #{php_bin} #{symfony_console} propel:database:#{action.to_s} --env=#{symfony_env_prod}", :once => true
+          puts_ok
+        end
       end
     end
 
     namespace :build do
       desc "Builds the Model classes"
-      task :model do
+      task :model, :roles => :app, :except => { :no_release => true } do
         command = "propel:model:build"
         if /2\.0\.[0-9]+.*/ =~ symfony_version
           command = "propel:build-model"
@@ -33,7 +32,7 @@ namespace :symfony do
       end
 
       desc "Builds SQL statements"
-      task :sql do
+      task :sql, :roles => :app, :except => { :no_release => true } do
         command = "propel:sql:build"
         if /2\.0\.[0-9]+.*/ =~ symfony_version
           command = "propel:build-sql"
@@ -46,7 +45,7 @@ namespace :symfony do
       end
 
       desc "Inserts SQL statements"
-      task :sql_load, :roles => :db, :only => { :primary => true } do
+      task :sql_load, :roles => :app, :except => { :no_release => true } do
         command = "propel:sql:insert"
         if /2\.0\.[0-9]+.*/ =~ symfony_version
           command = "propel:insert-sql"
@@ -54,12 +53,12 @@ namespace :symfony do
 
         pretty_print "--> Inserting Propel SQL"
 
-        run "cd #{latest_release} && #{php_bin} #{symfony_console} #{command} --force --env=#{symfony_env_prod}"
+        run "cd #{latest_release} && #{php_bin} #{symfony_console} #{command} --force --env=#{symfony_env_prod}", :once => true
         puts_ok
       end
 
       desc "Builds the Model classes, SQL statements and insert SQL"
-      task :all_and_load do
+      task :all_and_load, :roles => :app, :except => { :no_release => true } do
         pretty_print "--> Setting up Propel (classes, SQL)"
 
         run "cd #{latest_release} && #{php_bin} #{symfony_console} propel:build --insert-sql --env=#{symfony_env_prod}"
@@ -67,13 +66,13 @@ namespace :symfony do
       end
 
       desc "Generates ACLs models"
-      task :acl do
+      task :acl, :roles => :app, :except => { :no_release => true } do
         run "cd #{latest_release} && #{php_bin} #{symfony_console} propel:acl:init --env=#{symfony_env_prod}"
       end
 
       desc "Inserts propel ACL tables"
-      task :acl_load, :roles => :db, :only => { :primary => true } do
-        run "cd #{latest_release} && #{php_bin} #{symfony_console} propel:acl:init --env=#{symfony_env_prod} --force"
+      task :acl_load, :roles => :app, :except => { :no_release => true } do
+        run "cd #{latest_release} && #{php_bin} #{symfony_console} propel:acl:init --env=#{symfony_env_prod} --force", :once => true
       end
     end
   end

data/lib/symfony2/symfony.rb

@@ -1,6 +1,6 @@
 namespace :symfony do
   desc "Runs custom symfony command"
-  task :default do
+  task :default, :roles => :app, :except => { :no_release => true } do
     prompt_with_default(:task_arguments, "cache:clear")
 
     stream "cd #{latest_release} && #{php_bin} #{symfony_console} #{task_arguments} --env=#{symfony_env_prod}"
@@ -8,12 +8,12 @@ namespace :symfony do
 
   namespace :assets do
     desc "Updates assets version (in config.yml)"
-    task :update_version, :except => { :no_release => true } do
-       run "sed -i 's/\\(assets_version: \\)\\(.*\\)$/\\1 #{real_revision}/g' #{latest_release}/app/config/config.yml"
+    task :update_version, :roles => :app, :except => { :no_release => true } do
+       run "sed -i 's/\\(assets_version: \\)\\(.*\\)$/\\1 #{real_revision}/g' #{latest_release}/#{app_path}/config/config.yml"
     end
 
     desc "Installs bundle's assets"
-    task :install, :except => { :no_release => true } do
+    task :install, :roles => :app, :except => { :no_release => true } do
       pretty_print "--> Installing bundle's assets"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_console} assets:install #{web_path} --env=#{symfony_env_prod}"
@@ -23,7 +23,7 @@ namespace :symfony do
 
   namespace :assetic do
     desc "Dumps all assets to the filesystem"
-    task :dump, :except => { :no_release => true } do
+    task :dump, :roles => :app,  :except => { :no_release => true } do
       pretty_print "--> Dumping all assets to the filesystem"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_console} assetic:dump --env=#{symfony_env_prod} --no-debug"
@@ -33,7 +33,7 @@ namespace :symfony do
 
   namespace :vendors do
     desc "Runs the bin/vendors script to install the vendors (fast if already installed)"
-    task :install, :except => { :no_release => true } do
+    task :install, :roles => :app, :except => { :no_release => true } do
       pretty_print "--> Installing vendors"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_vendors} install"
@@ -41,7 +41,7 @@ namespace :symfony do
     end
 
     desc "Runs the bin/vendors script to reinstall the vendors"
-    task :reinstall, :except => { :no_release => true } do
+    task :reinstall, :roles => :app, :except => { :no_release => true } do
       pretty_print "--> Reinstalling vendors"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_vendors} install --reinstall"
@@ -49,7 +49,7 @@ namespace :symfony do
     end
 
     desc "Runs the bin/vendors script to upgrade the vendors"
-    task :upgrade, :except => { :no_release => true } do
+    task :upgrade, :roles => :app, :except => { :no_release => true } do
       pretty_print "--> Upgrading vendors"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_vendors} update"
@@ -59,11 +59,11 @@ namespace :symfony do
 
   namespace :bootstrap do
     desc "Runs the bin/build_bootstrap script"
-    task :build, :except => { :no_release => true } do
+    task :build, :roles => :app, :except => { :no_release => true } do
       pretty_print "--> Building bootstrap file"
 
       if !remote_file_exists?("#{latest_release}/#{build_bootstrap}") && true == use_composer then
-        build_bootstrap = "vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php"
+        set :build_bootstrap, "vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php"
         run "cd #{latest_release} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} #{app_path} || echo '#{build_bootstrap} not found, skipped'"
       else
         run "cd #{latest_release} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} || echo '#{build_bootstrap} not found, skipped'"
@@ -75,15 +75,22 @@ namespace :symfony do
 
   namespace :composer do
     desc "Gets composer and installs it"
-    task :get, :except => { :no_release => true } do
+    task :get, :roles => :app, :except => { :no_release => true } do
+      if remote_command_exists?('composer')
+        pretty_print "--> Updating Composer in PATH"
+
+        run "composer self-update"
+      else
         pretty_print "--> Downloading Composer"
 
         run "cd #{latest_release} && curl -s http://getcomposer.org/installer | #{php_bin}"
-        puts_ok
+      end
+
+      puts_ok
     end
 
     desc "Runs composer to install vendors from composer.lock file"
-    task :install, :except => { :no_release => true } do
+    task :install, :roles => :app, :except => { :no_release => true } do
       if !remote_file_exists?("#{latest_release}/composer.phar")
         symfony.composer.get
       end
@@ -95,7 +102,7 @@ namespace :symfony do
     end
 
     desc "Runs composer to update vendors, and composer.lock file"
-    task :update, :except => { :no_release => true } do
+    task :update, :roles => :app, :except => { :no_release => true } do
       if !remote_file_exists?("#{latest_release}/composer.phar")
         symfony.composer.get
       end
@@ -109,7 +116,7 @@ namespace :symfony do
 
   namespace :cache do
     desc "Clears cache"
-    task :clear, :except => { :no_release => true } do
+    task :clear, :roles => :app, :except => { :no_release => true } do
       pretty_print "--> Clearing cache"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_console} cache:clear --env=#{symfony_env_prod}"
@@ -118,7 +125,7 @@ namespace :symfony do
     end
 
     desc "Warms up an empty cache"
-    task :warmup, :except => { :no_release => true } do
+    task :warmup, :roles => :app, :except => { :no_release => true } do
       pretty_print "--> Warming up cache"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_console} cache:warmup --env=#{symfony_env_prod}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capifony
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 2
   - 1
-  - 10
-  version: 2.1.10
+  - 11
+  version: 2.1.11
 platform: ruby
 authors: 
 - Konstantin Kudryashov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-16 00:00:00 Z
+date: 2012-07-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano