From 17311872d6a93c770a574a9408e8e9415ebe98a6 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 15 Mar 2013 00:55:45 +0100
Subject: [PATCH] Initial changes to integrate Jekyll 1.0

---
 Gemfile             |  2 +-
 Gemfile.lock        | 16 +++++++++++-----
 Rakefile            |  2 +-
 lib/guard/jekyll.rb |  6 +++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index c28accf..924cc2d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source "http://rubygems.org"
 group :development do
   gem 'rake', '~> 10.0.3'
   gem 'rack', '~> 1.5.0'
-  gem 'jekyll', '~> 0.12.0'
+  gem 'jekyll', '~> 1.0.0.beta1'
   gem 'redcarpet', '~> 2.2.2'
   gem 'pygments.rb', '~> 0.3.4'
   gem 'RedCloth', '~> 4.2.9'
diff --git a/Gemfile.lock b/Gemfile.lock
index 970639c..1d4d975 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,6 +10,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
+    commander (4.1.3)
+      highline (~> 1.6.11)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -17,7 +19,7 @@ GEM
     directory_watcher (1.4.1)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    fast-stemmer (1.0.1)
+    fast-stemmer (1.0.2)
     ffi (1.2.0)
     fssm (0.2.9)
     guard (1.6.2)
@@ -35,14 +37,17 @@ GEM
     guard-shell (0.5.1)
       guard (>= 1.1.0)
     haml (3.1.7)
-    jekyll (0.12.0)
+    highline (1.6.15)
+    jekyll (1.0.0.beta1)
       classifier (~> 1.3)
+      commander (~> 4.1.3)
       directory_watcher (~> 1.1)
-      kramdown (~> 0.13.4)
+      kramdown (~> 0.14)
       liquid (~> 2.3)
       maruku (~> 0.5)
       pygments.rb (~> 0.3.2)
-    kramdown (0.13.8)
+      safe_yaml (~> 0.7.0)
+    kramdown (0.14.2)
     liquid (2.3.0)
     listen (0.7.3)
     lumberjack (1.0.2)
@@ -70,6 +75,7 @@ GEM
       ffi (>= 0.5.0)
     redcarpet (2.2.2)
     rubypants (0.2.0)
+    safe_yaml (0.7.1)
     sass (3.2.4)
     sass-globbing (1.0.0)
       sass (>= 3.1)
@@ -101,7 +107,7 @@ DEPENDENCIES
   guard-compass
   guard-shell
   haml (~> 3.1.7)
-  jekyll (~> 0.12.0)
+  jekyll (~> 1.0.0.beta1)
   liquid (~> 2.3.0)
   minitest (~> 4.6)
   pygments.rb (~> 0.3.4)
diff --git a/Rakefile b/Rakefile
index da613da..b391858 100644
--- a/Rakefile
+++ b/Rakefile
@@ -110,7 +110,7 @@ task :generate do
   configurator.write_configs_for_generation
   puts "## Generating Site with Jekyll"
   system "compass compile --css-dir #{configuration[:source]}/stylesheets"
-  system "jekyll --no-server --no-auto #{'--no-future' if Octopress.env == 'production'}"
+  system "jekyll build"
   unpublished = get_unpublished(Dir.glob("#{configuration[:source]}/#{configuration[:posts_dir]}/*.*"), {env: Octopress.env, message: "\nThese posts were not generated:"})
   puts unpublished unless unpublished.empty?
   configurator.remove_configs_for_generation
diff --git a/lib/guard/jekyll.rb b/lib/guard/jekyll.rb
index e8f8e9f..058f219 100644
--- a/lib/guard/jekyll.rb
+++ b/lib/guard/jekyll.rb
@@ -8,7 +8,7 @@ require 'octopress'
 module Guard
   class Jekyll < Guard
 
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
 
     # Calls #run_all if the :all_on_start option is present.
     def start
@@ -20,7 +20,7 @@ module Guard
       if Watcher.match_files(self, Dir.glob('{,**/}*{,.*}').uniq).size > 0
         configurator = Octopress::Configuration.new
         configurator.write_configs_for_generation
-        system "jekyll#{' --no-future' if Octopress.env == 'production'}"
+        system "jekyll build"
         configurator.remove_configs_for_generation
       end
     end
@@ -28,7 +28,7 @@ module Guard
     def run_on_changes(_)
       configurator = Octopress::Configuration.new
       configurator.write_configs_for_generation
-      system "jekyll#{' --no-future' if Octopress.env == 'production'}"
+      system "jekyll build"
       configurator.remove_configs_for_generation
     end
   end