Commit afdf10a4 by Calen Pennington

Clean up how asset prereq tasks are wired up

parent 6485b85a
...@@ -151,9 +151,11 @@ desc "Watch all assets for changes and automatically recompile" ...@@ -151,9 +151,11 @@ desc "Watch all assets for changes and automatically recompile"
multitask 'assets:watch' multitask 'assets:watch'
namespace :assets do namespace :assets do
[:xmodule, :coffee, :sass].each do |asset_type| {:xmodule => :install_python_prereqs,
:coffee => :install_node_prereqs,
:sass => :install_ruby_prereqs}.each_pair do |asset_type, prereq_task|
desc "Compile all #{asset_type} assets" desc "Compile all #{asset_type} assets"
task asset_type do task asset_type => prereq_task do
cmd = send(asset_type.to_s + "_cmd", watch=false, debug=false) cmd = send(asset_type.to_s + "_cmd", watch=false, debug=false)
sh(cmd) sh(cmd)
end end
...@@ -164,13 +166,13 @@ namespace :assets do ...@@ -164,13 +166,13 @@ namespace :assets do
namespace asset_type do namespace asset_type do
desc "Compile all #{asset_type} assets in debug mode" desc "Compile all #{asset_type} assets in debug mode"
task :debug do task :debug => prereq_task do
cmd = send(asset_type.to_s + "_cmd", watch=false, debug=true) cmd = send(asset_type.to_s + "_cmd", watch=false, debug=true)
sh(cmd) sh(cmd)
end end
desc "Watch all #{asset_type} assets and compile on change" desc "Watch all #{asset_type} assets and compile on change"
task :watch do task :watch => prereq_task do
cmd = send(asset_type.to_s + "_cmd", watch=true, debug=true) cmd = send(asset_type.to_s + "_cmd", watch=true, debug=true)
background_process(cmd) background_process(cmd)
end end
...@@ -181,11 +183,10 @@ namespace :assets do ...@@ -181,11 +183,10 @@ namespace :assets do
# so force a recompile first # so force a recompile first
task "sass:watch" => "assets:sass:debug" task "sass:watch" => "assets:sass:debug"
multitask :sass => [:install_ruby_prereqs, :xmodule] multitask :sass => 'assets:xmodule'
multitask :coffee => [:install_node_prereqs, :xmodule] multitask 'sass:debug' => 'assets:xmodule:debug'
multitask 'coffee:debug' => [:install_ruby_prereqs, 'xmodule:debug'] multitask :coffee => 'assets:xmodule'
multitask 'sass:debug' => [:install_node_prereqs, 'xmodule:debug'] multitask 'coffee:debug' => 'assets:xmodule:debug'
task :xmodule => :install_python_prereqs
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment