From d0c2f4f1e9e331e386c36b7edf08af3c095580cb Mon Sep 17 00:00:00 2001
From: Pat Hawks <pat@pathawks.com>
Date: Mon, 31 Aug 2015 09:30:04 -0700
Subject: [PATCH] Test against Jekyll 3

---
 .travis.yml    | 22 +++++++++++++++++-----
 Gemfile        |  8 ++++++--
 script/cibuild |  1 +
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58c7652..5aed6ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,25 @@
 language: ruby
 script : script/cibuild
-rvm:
-- 2.2
-- 2.1
-- 2.0
-- 1.9.3
 sudo: false
 notifications:
   email: false
 branches:
   only:
     - master
+
+rvm:
+  - 2.2
+  - 2.1
+  - 2.0
+env:
+  - ""
+  - JEKYLL_VERSION=3.0.0.beta8
+  - JEKYLL_VERSION=2.0
+matrix:
+  include:
+    - # GitHub Pages
+      rvm: 2.1.1
+      env: GH_PAGES=true
+    - # Ruby 1.9
+      rvm: 1.9
+      env: JEKYLL_VERSION=2.0
diff --git a/Gemfile b/Gemfile
index e93fa5b..4296d7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in jekyll-gist.gemspec
 gemspec
+
+if ENV["GH_PAGES"]
+  gem "github-pages"
+elsif ENV["JEKYLL_VERSION"]
+  gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
+end
diff --git a/script/cibuild b/script/cibuild
index ca49f4c..c8abefc 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -1,3 +1,4 @@
 #! /usr/bin/env bash
+set -e
 
 bundle exec rspec