Merge branch 'master' into site

This commit is contained in:
Brandon Mathis 2011-09-17 14:15:23 -05:00
commit b5df8f9ae9

View File

@ -60,12 +60,11 @@ task :watch do
compassPid = Process.spawn("compass watch") compassPid = Process.spawn("compass watch")
trap("INT") { trap("INT") {
Process.kill(9, jekyllPid) [jekyllPid, compassPid].each { |pid| Process.kill(9, pid) rescue Errno::ESRCH }
Process.kill(9, compassPid) exit 0
exit 0
} }
Process.wait [jekyllPid, compassPid].each { |pid| Process.wait(pid) }
end end
desc "preview the site in a web browser" desc "preview the site in a web browser"
@ -77,13 +76,11 @@ task :preview do
rackupPid = Process.spawn("rackup --port #{server_port}") rackupPid = Process.spawn("rackup --port #{server_port}")
trap("INT") { trap("INT") {
Process.kill(9, jekyllPid) [jekyllPid, compassPid, rackupPid].each { |pid| Process.kill(9, pid) rescue Errno::ESRCH }
Process.kill(9, compassPid) exit 0
Process.kill(9, rackupPid)
exit 0
} }
Process.wait [jekyllPid, compassPid, rackupPid].each { |pid| Process.wait(pid) }
end end
# usage rake new_post[my-new-post] or rake new_post['my new post'] or rake new_post (defaults to "new-post") # usage rake new_post[my-new-post] or rake new_post['my new post'] or rake new_post (defaults to "new-post")
@ -199,15 +196,21 @@ end
############## ##############
desc "Default deploy task" desc "Default deploy task"
multitask :deploy => [:copydot, "#{deploy_default}"] do task :deploy do
[:copydot, "#{deploy_default}"].each { |t| Rake::Task[t].execute }
end
desc "Generate website and deploy"
task :gen_deploy do
[:integrate, :generate, :deploy].each { |t| Rake::Task[t].execute }
end end
desc "copy dot files for deployment" desc "copy dot files for deployment"
task :copydot do task :copydot do
exclusions = [".", "..", ".DS_Store"] exclusions = [".", "..", ".DS_Store"]
Dir["#{source_dir}/.*"].each do |file| Dir["#{source_dir}/**/.*"].each do |file|
if !File.directory?(file) && !exclusions.include?(file) if !File.directory?(file) && !exclusions.include?(file)
cp(file, "#{public_dir}"); cp(file, file.gsub(/#{source_dir}/, "#{public_dir}"));
end end
end end
end end