diff --git a/Rakefile b/Rakefile index e5abaad..1f66492 100644 --- a/Rakefile +++ b/Rakefile @@ -60,7 +60,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) puts "Starting to watch source with Jekyll and Compass." system "compass compile --css-dir #{source_dir}/stylesheets" - jekyllPid = Process.spawn({"OCTOPRESS_ENV"=>"preview"}, "jekyll --auto") + jekyllPid = Process.spawn("jekyll --auto") compassPid = Process.spawn("compass watch") trap("INT") { @@ -76,7 +76,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) puts "Starting to watch source with Jekyll and Compass. Starting Rack on port #{server_port}" system "compass compile --css-dir #{source_dir}/stylesheets" - jekyllPid = Process.spawn({"OCTOPRESS_ENV"=>"preview"}, "jekyll --auto") + jekyllPid = Process.spawn("jekyll --auto") compassPid = Process.spawn("compass watch") rackupPid = Process.spawn("rackup --port #{server_port}") diff --git a/plugins/preview_unpublished.rb b/plugins/preview_unpublished.rb deleted file mode 100644 index 321ffd6..0000000 --- a/plugins/preview_unpublished.rb +++ /dev/null @@ -1,48 +0,0 @@ -# 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 //_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 \ No newline at end of file