Merge pull request everzet#320 from KingCrunch/capistrano2.14-compat

Compatibility to Capistrano 2.14.1
mgallego · Jan 20, 2013 · ea7ba1f · ea7ba1f
2 parents 2222ffa + d2f7a19
commit ea7ba1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/capifony.gemspec b/capifony.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.bindir       = "bin"
   spec.executables << "capifony"
 
-  spec.add_dependency 'capistrano', "~> 2.13.5"
+  spec.add_dependency 'capistrano', ">= 2.13.5","<= 2.14.1"
   spec.add_dependency 'colored', ">= 1.2.0"
   spec.add_dependency 'inifile', ">= 2.0.2"
   spec.add_dependency 'capistrano-maintenance', '0.0.2'

diff --git a/lib/symfony2/doctrine.rb b/lib/symfony2/doctrine.rb
@@ -69,11 +69,9 @@
       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}'", :once => true
     end
 
     namespace :migrations do