Merge pull request #293 from imathis/generate_environment
Introduce distinction between preview/productive site generation
This commit is contained in:
commit
7f3ad1c1cc
11
Rakefile
11
Rakefile
@ -59,7 +59,7 @@ task :watch do
|
|||||||
raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." unless File.directory?(source_dir)
|
raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." unless File.directory?(source_dir)
|
||||||
puts "Starting to watch source with Jekyll and Compass."
|
puts "Starting to watch source with Jekyll and Compass."
|
||||||
system "compass compile --css-dir #{source_dir}/stylesheets" unless File.exist?("#{source_dir}/stylesheets/screen.css")
|
system "compass compile --css-dir #{source_dir}/stylesheets" unless File.exist?("#{source_dir}/stylesheets/screen.css")
|
||||||
jekyllPid = Process.spawn("jekyll --auto")
|
jekyllPid = Process.spawn({"OCTOPRESS_ENV"=>"preview"}, "jekyll --auto")
|
||||||
compassPid = Process.spawn("compass watch")
|
compassPid = Process.spawn("compass watch")
|
||||||
|
|
||||||
trap("INT") {
|
trap("INT") {
|
||||||
@ -75,7 +75,7 @@ task :preview do
|
|||||||
raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." unless File.directory?(source_dir)
|
raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." unless File.directory?(source_dir)
|
||||||
puts "Starting to watch source with Jekyll and Compass. Starting Rack on port #{server_port}"
|
puts "Starting to watch source with Jekyll and Compass. Starting Rack on port #{server_port}"
|
||||||
system "compass compile --css-dir #{source_dir}/stylesheets" unless File.exist?("#{source_dir}/stylesheets/screen.css")
|
system "compass compile --css-dir #{source_dir}/stylesheets" unless File.exist?("#{source_dir}/stylesheets/screen.css")
|
||||||
jekyllPid = Process.spawn("jekyll --auto")
|
jekyllPid = Process.spawn({"OCTOPRESS_ENV"=>"preview"}, "jekyll --auto")
|
||||||
compassPid = Process.spawn("compass watch")
|
compassPid = Process.spawn("compass watch")
|
||||||
rackupPid = Process.spawn("rackup --port #{server_port}")
|
rackupPid = Process.spawn("rackup --port #{server_port}")
|
||||||
|
|
||||||
@ -200,6 +200,13 @@ end
|
|||||||
|
|
||||||
desc "Default deploy task"
|
desc "Default deploy task"
|
||||||
task :deploy do
|
task :deploy do
|
||||||
|
# Check if preview posts exist, which should not be published
|
||||||
|
if File.exists?(".preview-mode")
|
||||||
|
puts "## Found posts in preview mode, regenerating files ..."
|
||||||
|
File.delete(".preview-mode")
|
||||||
|
Rake::Task[:generate].execute
|
||||||
|
end
|
||||||
|
|
||||||
Rake::Task[:copydot].invoke(source_dir, public_dir)
|
Rake::Task[:copydot].invoke(source_dir, public_dir)
|
||||||
Rake::Task["#{deploy_default}"].execute
|
Rake::Task["#{deploy_default}"].execute
|
||||||
end
|
end
|
||||||
|
48
plugins/preview_unpublished.rb
Normal file
48
plugins/preview_unpublished.rb
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
# Monkeypatch for Jekyll
|
||||||
|
# Introduce distinction between preview/productive site generation
|
||||||
|
# so posts with YAML attribute `published: false` can be previewed
|
||||||
|
# on localhost without being published to the productive environment.
|
||||||
|
|
||||||
|
module Jekyll
|
||||||
|
|
||||||
|
class Site
|
||||||
|
# Read all the files in <source>/<dir>/_posts and create a new Post
|
||||||
|
# object with each one.
|
||||||
|
#
|
||||||
|
# dir - The String relative path of the directory to read.
|
||||||
|
#
|
||||||
|
# Returns nothing.
|
||||||
|
def read_posts(dir)
|
||||||
|
base = File.join(self.source, dir, '_posts')
|
||||||
|
return unless File.exists?(base)
|
||||||
|
entries = Dir.chdir(base) { filter_entries(Dir['**/*']) }
|
||||||
|
|
||||||
|
# first pass processes, but does not yet render post content
|
||||||
|
entries.each do |f|
|
||||||
|
if Post.valid?(f)
|
||||||
|
post = Post.new(self, self.source, dir, f)
|
||||||
|
|
||||||
|
# Monkeypatch:
|
||||||
|
# On preview environment (localhost), publish all posts
|
||||||
|
if ENV.has_key?('OCTOPRESS_ENV') && ENV['OCTOPRESS_ENV'] == 'preview' && post.data.has_key?('published') && post.data['published'] == false
|
||||||
|
post.published = true
|
||||||
|
# Set preview mode flag (if necessary), `rake generate` will check for it
|
||||||
|
# to prevent pushing preview posts to productive environment
|
||||||
|
File.open(".preview-mode", "w") {}
|
||||||
|
end
|
||||||
|
|
||||||
|
if post.published && (self.future || post.date <= self.time)
|
||||||
|
self.posts << post
|
||||||
|
post.categories.each { |c| self.categories[c] << post }
|
||||||
|
post.tags.each { |c| self.tags[c] << post }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
self.posts.sort!
|
||||||
|
|
||||||
|
# limit the posts if :limit_posts option is set
|
||||||
|
self.posts = self.posts[-limit_posts, limit_posts] if limit_posts
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue
Block a user