capifony 2.2.8 → 2.2.9

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 2.2.9 / May 6, 2013
+
+* Change setfacl call to match Symfony2 permission granting instructions
+* Fixed default deploy.rb (refs #354)
+* Add 'symfony_debug' setting to toggle --no-debug on console commands
+* Add test for #362
+* Use capistrano-maintenance 0.0.3
+* Added custom assets:install path
+* update specs
+* Dump Assetic files to latest release directory
+* add unit test for doctrine_clear_use_flush_option
+* remove inline condition
+* add use of flush option in doctrine:clear_* task
+
 ### 2.2.8 / March 5, 2013
 
 * Remove the ability to copy of Composer

data/bin/capifony

@@ -5,7 +5,7 @@ require 'fileutils'
 
 symfony_version  = nil
 symfony_app_path = 'app'
-capifony_version = '2.2.8'
+capifony_version = '2.2.9'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"
@@ -78,8 +78,7 @@ if symfony_version == 2
       # Or: `propel`
 
       role :web,        domain                         # Your HTTP server, Apache/etc
-      role :app,        domain                         # This may be the same as your `Web` server
-      role :db,         domain, :primary => true       # This is where Symfony2 migrations will run
+      role :app,        domain, :primary => true       # This may be the same as your `Web` server
 
       set  :keep_releases,  3
 
@@ -106,8 +105,7 @@ set :scm,         :git
 # Or: `accurev`, `bzr`, `cvs`, `darcs`, `subversion`, `mercurial`, `perforce`, or `none`
 
 role :web,        domain                         # Your HTTP server, Apache/etc
-role :app,        domain                         # This may be the same as your `Web` server
-role :db,         domain, :primary => true       # This is where symfony migrations will run
+role :app,        domain, :primary => true       # This may be the same as your `Web` server
 
 set  :keep_releases,  3'
   }

data/lib/capifony_symfony2.rb

@@ -29,6 +29,9 @@ module Capifony
 
         # Symfony console bin
         set :symfony_console,       app_path + "/console"
+        
+        # Symfony debug flag for console commands
+        set :symfony_debug,         false
 
         # Symfony log path
         set :log_path,              app_path + "/logs"
@@ -78,6 +81,7 @@ module Capifony
         set :assets_install,        true
         set :assets_symlinks,       false
         set :assets_relative,       false
+        set :assets_install_path,   web_path
 
         # Whether to update `assets_version` in `config.yml`
         set :update_assets_version, false
@@ -114,6 +118,9 @@ module Capifony
 
         # Doctrine custom entity manager
         set :doctrine_em,           false
+        
+        # Use --flush option in doctrine:clear_* task 
+        set :doctrine_clear_use_flush_option, false
 
         # Symfony2 version
         set(:symfony_version)       { guess_symfony_version }
@@ -145,6 +152,16 @@ module Capifony
         def remote_command_exists?(command)
           'true' == capture("if [ -x \"$(which #{command})\" ]; then echo 'true'; fi").strip
         end
+        
+        def console_options
+          console_options = "--env=#{symfony_env_prod}"
+          
+          if !symfony_debug
+             console_options += " --no-debug"
+          end
+          
+          return console_options
+        end
 
         STDOUT.sync
         $error = false

data/lib/symfony2/deploy.rb

@@ -24,7 +24,7 @@ namespace :deploy do
           "chmod +a \"#{webserver_user} allow delete,write,append,file_inherit,directory_inherit\" %s"
         ],
         :acl   => [
-          "setfacl -R -m u:#{user}:rwx -m u:#{webserver_user}:rwx %s",
+          "setfacl -R -m u:#{user}:rwX -m u:#{webserver_user}:rwX %s",
           "setfacl -dR -m u:#{user}:rwx -m u:#{webserver_user}:rwx %s"
         ],
         :chown => ["chown #{webserver_user} %s"]

data/lib/symfony2/doctrine.rb

@@ -5,7 +5,13 @@ namespace :symfony do
       task :clear_metadata, :roles => :app, :except => { :no_release => true } do
         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}#{doctrine_em_flag}'"
+        if doctrine_clear_use_flush_option
+            flush_option = " --flush"
+        else
+            flush_option = ""
+        end
+
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-metadata #{console_options}#{doctrine_em_flag}#{flush_option}'"
         capifony_puts_ok
       end
 
@@ -13,7 +19,13 @@ namespace :symfony do
       task :clear_query, :roles => :app, :except => { :no_release => true } do
         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}#{doctrine_em_flag}'"
+        if doctrine_clear_use_flush_option
+            flush_option = " --flush"
+        else
+            flush_option = ""
+        end
+        
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-query #{console_options}#{doctrine_em_flag}#{flush_option}'"
         capifony_puts_ok
       end
 
@@ -21,7 +33,13 @@ namespace :symfony do
       task :clear_result, :roles => :app, :except => { :no_release => true } do
         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}#{doctrine_em_flag}'"
+        if doctrine_clear_use_flush_option
+            flush_option = " --flush"
+        else
+            flush_option = ""
+        end
+        
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-result #{console_options}#{doctrine_em_flag}#{flush_option}'"
         capifony_puts_ok
       end
     end
@@ -32,7 +50,7 @@ namespace :symfony do
         capifony_pretty_print "--> Dropping databases"
 
         if !interactive_mode || Capistrano::CLI.ui.agree("Do you really want to drop #{symfony_env_prod}'s database? (y/N)")
-          run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:database:drop --force --env=#{symfony_env_prod}'", :once => true
+          run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:database:drop --force #{console_options}'", :once => true
         end
         capifony_puts_ok
       end
@@ -41,7 +59,7 @@ namespace :symfony do
       task :create, :roles => :app, :except => { :no_release => true } do
         capifony_pretty_print "--> Creating databases"
 
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:database:create --env=#{symfony_env_prod}'", :once => true
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:database:create #{console_options}'", :once => true
         capifony_puts_ok
       end
     end
@@ -51,7 +69,7 @@ namespace :symfony do
       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}#{doctrine_em_flag}'", :once => true
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:create #{console_options}#{doctrine_em_flag}'", :once => true
         capifony_puts_ok
       end
 
@@ -60,7 +78,7 @@ namespace :symfony do
         capifony_pretty_print "--> Droping schema"
 
         if !interactive_mode || Capistrano::CLI.ui.agree("Do you really want to drop #{symfony_env_prod}'s database schema? (y/N)")
-          run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:drop --force --env=#{symfony_env_prod}#{doctrine_em_flag}'", :once => true
+          run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:drop --force #{console_options}#{doctrine_em_flag}'", :once => true
         end
         capifony_puts_ok
       end
@@ -69,21 +87,21 @@ namespace :symfony do
       task :update, :roles => :app, :except => { :no_release => true } do
         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}#{doctrine_em_flag}'", :once => true
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:update --force #{console_options}#{doctrine_em_flag}'", :once => true
         capifony_puts_ok
       end
     end
 
     desc "Load data fixtures"
     task :load_fixtures, :roles => :app, :except => { :no_release => true } do
-      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:fixtures:load --env=#{symfony_env_prod}#{doctrine_em_flag}'", :once => true
+      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:fixtures:load #{console_options}#{doctrine_em_flag}'", :once => true
     end
 
     namespace :migrations do
       desc "Executes a migration to a specified version or the latest available version"
       task :migrate, :roles => :app, :only => { :primary => true }, :except => { :no_release => true } do
         currentVersion = nil
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} --no-ansi doctrine:migrations:status --env=#{symfony_env_prod}#{doctrine_em_flag}'", :once => true do |ch, stream, out|
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} --no-ansi doctrine:migrations:status #{console_options}#{doctrine_em_flag}'", :once => true do |ch, stream, out|
           if stream == :out and out =~ /Current Version:.+\(([\w]+)\)/
             currentVersion = Regexp.last_match(1)
           end
@@ -99,18 +117,18 @@ 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 "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:migrate #{currentVersion} --env=#{symfony_env_prod} --no-interaction#{doctrine_em_flag}'", :once => true
+            run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:migrate #{currentVersion} #{console_options} --no-interaction#{doctrine_em_flag}'", :once => true
           end
         }
 
         if !interactive_mode || Capistrano::CLI.ui.agree("Do you really want to migrate #{symfony_env_prod}'s database? (y/N)")
-          run "#{try_sudo} sh -c ' cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:migrate --env=#{symfony_env_prod} --no-interaction#{doctrine_em_flag}'", :once => true
+          run "#{try_sudo} sh -c ' cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:migrate #{console_options} --no-interaction#{doctrine_em_flag}'", :once => true
         end
       end
 
       desc "Views the status of a set of migrations"
       task :status, :roles => :app, :except => { :no_release => true } do
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:status --env=#{symfony_env_prod}#{doctrine_em_flag}'", :once => true
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:status #{console_options}#{doctrine_em_flag}'", :once => true
       end
     end
 
@@ -121,7 +139,7 @@ namespace :symfony do
           task action, :roles => :app, :except => { :no_release => true } do
             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
+            run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:mongodb:schema:#{action.to_s} #{console_options}'", :once => true
             capifony_puts_ok
           end
         end
@@ -132,7 +150,7 @@ namespace :symfony do
             task action, :roles => :app do
               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
+              run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:mongodb:schema:#{action.to_s} --index #{console_options}'", :once => true
               capifony_puts_ok
             end
           end
@@ -145,7 +163,7 @@ namespace :symfony do
       task :acl, :roles => :app, :except => { :no_release => true } do
         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
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} init:acl #{console_options}'", :once => true
         capifony_puts_ok
       end
     end

data/lib/symfony2/propel.rb

@@ -11,7 +11,7 @@ namespace :symfony do
             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
+          run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} propel:database:#{action.to_s} #{console_options}'", :once => true
           capifony_puts_ok
         end
       end
@@ -27,7 +27,7 @@ namespace :symfony do
 
         capifony_pretty_print "--> Generating Propel classes"
 
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} #{command} --env=#{symfony_env_prod}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} #{command} #{console_options}'"
         capifony_puts_ok
       end
 
@@ -40,7 +40,7 @@ namespace :symfony do
 
         capifony_pretty_print "--> Generating Propel SQL"
 
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} #{command} --env=#{symfony_env_prod}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} #{command} #{console_options}'"
         capifony_puts_ok
       end
 
@@ -53,7 +53,7 @@ namespace :symfony do
 
         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
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} #{command} --force #{console_options}'", :once => true
         capifony_puts_ok
       end
 
@@ -61,18 +61,18 @@ namespace :symfony do
       task :all_and_load, :roles => :app, :except => { :no_release => true } do
         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}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} propel:build --insert-sql #{console_options}'"
         capifony_puts_ok
       end
 
       desc "Generates ACLs models"
       task :acl, :roles => :app, :except => { :no_release => true } do
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} propel:acl:init --env=#{symfony_env_prod}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} propel:acl:init #{console_options}'"
       end
 
       desc "Inserts propel ACL tables"
       task :acl_load, :roles => :app, :except => { :no_release => true } do
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} propel:acl:init --env=#{symfony_env_prod} --force'", :once => true
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} propel:acl:init #{console_options} --force'", :once => true
       end
     end
   end

data/lib/symfony2/symfony.rb

@@ -3,7 +3,7 @@ namespace :symfony do
   task :default, :roles => :app, :except => { :no_release => true } do
     prompt_with_default(:task_arguments, "cache:clear")
 
-    stream "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} #{task_arguments} --env=#{symfony_env_prod}'"
+    stream "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} #{task_arguments} #{console_options}'"
   end
 
 
@@ -46,7 +46,7 @@ namespace :symfony do
         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}'"
+      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} assets:install #{assets_install_path}#{install_options} #{console_options}'"
       capifony_puts_ok
     end
   end
@@ -56,7 +56,7 @@ namespace :symfony do
     task :dump, :roles => :app,  :except => { :no_release => true } do
       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'"
+      run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} assetic:dump #{console_options} #{latest_release}/#{web_path}'"
       capifony_puts_ok
     end
   end
@@ -169,7 +169,7 @@ namespace :symfony do
           capifony_pretty_print "--> Warming up cache"
         end
 
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} cache:#{action.to_s} --env=#{symfony_env_prod}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} cache:#{action.to_s} #{console_options}'"
         run "#{try_sudo} chmod -R g+w #{latest_release}/#{cache_path}"
         capifony_puts_ok
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capifony
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -73,7 +73,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 description: ! '    Capistrano is an open source tool for running scripts on multiple
   servers. It’s primary use is for easily deploying applications. While it was built
   specifically for deploying Rails apps, it’s pretty simple to customize it to deploy