capifony 2.2.6 → 2.2.7

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+### 2.2.7 / February 3, 2013
+
+* Implemented :doctrine_em configuration option (#321)
+* Added :doctrine_em symbol with default value of `false`
+* Added `before` hooks for relevant symfony:doctrine commands to assemble --em flag
+* Added flag variable to commands being run
+* Added tests for --em flag in spec file
+* Updated specs for doctrine drop tasks
+* Added confirmation to doctrine drops tasks
+* Fixed symfony:doctrine:database:drop (missed --force argument too).
+* Added confirmation for symfony:doctrine:database:drop and symfony:doctrine:schema:drop.
+* Compatibility to Capistrano 2.14.1
+* Fixed symfony:doctrine:schema:drop - added --force
+* Task symfony:doctrine:schema:drop never actually droped schema because of missing --force parameter.
+
 ### 2.2.6 / January 17, 2013
 
 * Clear controllers should only run on the app role

data/bin/capifony

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

data/lib/capifony_symfony2.rb

@@ -112,6 +112,9 @@ module Capifony
         # Model manager: (doctrine, propel)
         set :model_manager,         "doctrine"
 
+        # Doctrine custom entity manager
+        set :doctrine_em,           false
+
         # Symfony2 version
         set(:symfony_version)       { guess_symfony_version }
 
@@ -191,6 +194,22 @@ module Capifony
           end
         end
 
+        [
+          "symfony:doctrine:cache:clear_metadata",
+          "symfony:doctrine:cache:clear_query",
+          "symfony:doctrine:cache:clear_result",
+          "symfony:doctrine:schema:create",
+          "symfony:doctrine:schema:drop",
+          "symfony:doctrine:schema:update",
+          "symfony:doctrine:load_fixtures",
+          "symfony:doctrine:migrations:migrate",
+          "symfony:doctrine:migrations:status",
+        ].each do |action|
+          before action do
+            set :doctrine_em_flag, doctrine_em ? " --em=#{doctrine_em}" : ""
+          end
+        end
+
         ["symfony:composer:install", "symfony:composer:update"].each do |action|
           before action do
             if copy_vendors

data/lib/symfony2/doctrine.rb

@@ -5,7 +5,7 @@ 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}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-metadata --env=#{symfony_env_prod}#{doctrine_em_flag}'"
         capifony_puts_ok
       end
 
@@ -13,7 +13,7 @@ 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}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-query --env=#{symfony_env_prod}#{doctrine_em_flag}'"
         capifony_puts_ok
       end
 
@@ -21,25 +21,28 @@ 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}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-result --env=#{symfony_env_prod}#{doctrine_em_flag}'"
         capifony_puts_ok
       end
     end
 
     namespace :database do
-      [: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"
-            capifony_pretty_print "--> Creating databases"
-          when "drop"
-            capifony_pretty_print "--> Dropping databases"
-          end
+      desc "Drops the configured databases"
+      task :drop, :roles => :app, :except => { :no_release => true } do
+        capifony_pretty_print "--> Dropping databases"
 
-          run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:database:#{action.to_s} --env=#{symfony_env_prod}'", :once => true
-          capifony_puts_ok
+        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
         end
+        capifony_puts_ok
+      end
+      
+      desc "Creates the configured databases"
+      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
+        capifony_puts_ok
       end
     end
 
@@ -48,7 +51,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}'", :once => true
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:schema:create --env=#{symfony_env_prod}#{doctrine_em_flag}'", :once => true
         capifony_puts_ok
       end
 
@@ -56,7 +59,9 @@ namespace :symfony do
       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
+        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
+        end
         capifony_puts_ok
       end
 
@@ -64,23 +69,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}'", :once => true
+        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
         capifony_puts_ok
       end
     end
 
-    namespace :fixtures do
-      desc "Load data fixtures"
-      task :load, :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}'", :once => true
-      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
     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}'", :once => true do |ch, stream, out|
+        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|
           if stream == :out and out =~ /Current Version:.+\(([\w]+)\)/
             currentVersion = Regexp.last_match(1)
           end
@@ -96,18 +99,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'", :once => true
+            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
           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'", :once => true
+          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
         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}'", :once => true
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:status --env=#{symfony_env_prod}#{doctrine_em_flag}'", :once => true
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capifony
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 2
-  - 6
-  version: 2.2.6
+  - 7
+  version: 2.2.7
 platform: ruby
 authors: 
 - Konstantin Kudryashov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-16 00:00:00 Z
+date: 2013-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 49
         segments: 
@@ -32,6 +32,14 @@ dependencies:
         - 13
         - 5
         version: 2.13.5
+    - - <=
+      - !ruby/object:Gem::Version 
+        hash: 53
+        segments: 
+        - 2
+        - 14
+        - 1
+        version: 2.14.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency