Merge pull request #895 from parkr/remove-copydot

Remove copydot task in favor of Jekyll's include config (Fixes #894)
This commit is contained in:
Brandon Mathis 2012-12-28 08:33:53 -08:00
commit 970d4d56a4
2 changed files with 2 additions and 15 deletions

View File

@ -12,9 +12,6 @@ rsync_delete = false
rsync_args = "" # Any extra arguments to pass to rsync
deploy_default = "rsync"
# Hidden "dot" files that should be included with the deployed site (see task copydot)
copy_dot_files = []
# This will be configured for you when you run config_deploy
deploy_branch = "gh-pages"
@ -278,7 +275,6 @@ end
desc "Default deploy task"
task :deploy do
Rake::Task[:copydot].invoke(source_dir, public_dir)
Rake::Task["#{deploy_default}"].execute
end
@ -286,16 +282,6 @@ desc "Generate website and deploy"
task :gen_deploy => [:integrate, :generate, :deploy] do
end
desc "copy dot files for deployment"
task :copydot, :source, :dest do |t, args|
files = [".htaccess"] | copy_dot_files
Dir["#{args.source}/.*"].each do |file|
if !File.directory?(file) && files.include?(File.basename(file))
cp(file, file.gsub(/#{args.source}/, "#{args.dest}"));
end
end
end
desc "Deploy website via rsync"
task :rsync do
exclude = ""
@ -311,7 +297,6 @@ multitask :push do
if File.directory?(deploy_dir)
puts "## Deploying branch to GitHub Pages "
(Dir["#{deploy_dir}/*"]).each { |f| rm_rf(f) }
Rake::Task[:copydot].invoke(public_dir, deploy_dir)
puts "Attempting pull, to sync local deployment repository"
cd "#{deploy_dir}" do
system "git pull origin #{deploy_branch}"

View File

@ -34,6 +34,8 @@ destination: public
plugins: plugins
code_dir: downloads/code
category_dir: blog/categories
include:
- .htaccess
markdown: rdiscount
pygments: false # Jekyll's default Python Pygments have been replaced by pygments.rb. Set to true to use Albino + Pythong Pygments