All config in one file, loaded using load:defaults task

peterjmit · Nov 7, 2013 · 3031ab1 · peterjmit · Nov 7, 2013 · 3031ab1
1 parent 8972709
commit 3031ab1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/lib/capistrano/symfony.rb b/lib/capistrano/symfony.rb
@@ -1,8 +1,13 @@
-load File.expand_path("../symfony/defaults.rb", __FILE__)
 # Core tasks for deploying symfony
 load File.expand_path("../tasks/symfony.rake", __FILE__)
 
 # Additional tasks
 require "capistrano/symfony/console"
 require "capistrano/symfony/composer"
 require "capistrano/symfony/assets"
+
+namespace :load do
+  task :defaults do
+    load 'capistrano/symfony/defaults.rb'
+  end
+end
diff --git a/lib/capistrano/symfony/assets.rb b/lib/capistrano/symfony/assets.rb
@@ -1,17 +1 @@
-# Use AsseticBundle
-set :dump_assetic_assets,   false
-
-# Assets install
-set :assets_install,        false
-set :assets_symlinks,       false
-set :assets_relative,       false
-set :assets_install_path,   fetch(:web_path)
-
-# Whether to update `assets_version` in `config.yml`
-set :update_assets_version, false
-
-set :normalize_asset_timestamps, true
-# Asset folders (that need to be timestamped)
-set :asset_children,        [fetch(:web_path) + "/css", fetch(:web_path) + "/images", fetch(:web_path) + "/js"]
-
 load File.expand_path("../../tasks/assets.rake", __FILE__)
diff --git a/lib/capistrano/symfony/console.rb b/lib/capistrano/symfony/console.rb
@@ -1,4 +1 @@
-# Symfony console bin
-set :symfony_console, fetch(:app_path) + "/console"
-
 load File.expand_path("../../tasks/symfony_console.rake", __FILE__)
diff --git a/lib/capistrano/symfony/defaults.rb b/lib/capistrano/symfony/defaults.rb
@@ -59,3 +59,20 @@
 # If set to false, it will never ask for confirmations (migrations task for instance)
 # Use it carefully, really!
 set :interactive_mode,      true
+set :symfony_console, fetch(:app_path) + "/console"
+
+# Use AsseticBundle
+set :dump_assetic_assets,   false
+
+# Assets install
+set :assets_install,        false
+set :assets_symlinks,       false
+set :assets_relative,       false
+set :assets_install_path,   fetch(:web_path)
+
+# Whether to update `assets_version` in `config.yml`
+set :update_assets_version, false
+
+set :normalize_asset_timestamps, true
+# Asset folders (that need to be timestamped)
+set :asset_children,        [fetch(:web_path) + "/css", fetch(:web_path) + "/images", fetch(:web_path) + "/js"]