Support Jekyll 3.0

- Update to Jekyll v3.0
- Switch from Pygments.rb to Rouge for syntax highlighting
- Include jekyll-gist gem
- Close #56

Author: mmistakes

.gitignore

@@ -5,4 +5,5 @@ _site
 codekit-config.json
 node_modules
 _asset_bundler_cache
-.sass-cache
+.sass-cache
+.jekyll-metadata

Gemfile

@@ -1,6 +1,7 @@
 # Skinny Bones Gemfile
 source "https://rubygems.org"
 
-gem 'jekyll', '2.5.3'
-gem 'jekyll-sitemap'
-gem 'octopress', '~> 3.0'
+gem "jekyll", "~> 3.0"
+gem "jekyll-sitemap"
+gem "jekyll-gist"
+gem "octopress", "~> 3.0"

Gemfile.lock

@@ -2,47 +2,28 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
-    blankslate (2.1.2.4)
-    classifier-reborn (2.0.4)
-      fast-stemmer (~> 1.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.10.0)
     colorator (0.1)
-    execjs (2.6.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fast-stemmer (1.0.2)
     ffi (1.9.10)
-    ffi (1.9.10-x64-mingw32)
-    jekyll (2.5.3)
-      classifier-reborn (~> 2.0)
+    jekyll (3.1.1)
       colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
-    jekyll-paginate (1.1.0)
     jekyll-sass-converter (1.4.0)
       sass (~> 3.4)
-    jekyll-sitemap (0.9.0)
+    jekyll-sitemap (0.10.0)
     jekyll-watch (1.3.1)
       listen (~> 3.0)
     kramdown (1.9.0)
-    liquid (2.6.3)
+    liquid (3.0.6)
     listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -60,36 +41,28 @@ GEM
       titlecase
     octopress-deploy (1.3.0)
       colorator
-    octopress-escape-code (2.0.6)
-      octopress-hooks (~> 2.0)
+    octopress-escape-code (2.1.1)
+      jekyll (~> 3.0)
     octopress-hooks (2.6.1)
       jekyll (>= 2.0)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (3.3.4)
+    rouge (1.10.1)
     safe_yaml (1.0.4)
     sass (3.4.21)
     sawyer (0.6.0)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     titlecase (0.1.1)
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
-  x64-mingw32
 
 DEPENDENCIES
-  jekyll (= 2.5.3)
+  jekyll (~> 3.0)
+  jekyll-gist
   jekyll-sitemap
   octopress (~> 3.0)
 

README.md

@@ -2,8 +2,6 @@
 
 Just a little something I'm using to jump start a site refresh. I like to think of it as a starter for building your own Jekyll site. I purposely keep the styling minimal and bare to make it easier to add your own flare and markup.
 
-**Jekyll 3 Update:** A version of Skinny Bones compatible with Jekyll 3 can be found in the [`jekyll3` branch](https://github.com/mmistakes/skinny-bones-jekyll/tree/jekyll3). GitHub Pages is [locked at version 2.4](https://pages.github.com/versions/) so some keep that in mind if you're trying to use 3.0 features that aren't supported there yet.
-
 I'm currently using a variation of it on my personal website [Made Mistakes](http://mademistakes.com) with some modifications. To learn more about how to use the theme and install it check out the [Skinny Bones demo](http://mmistakes.github.io/skinny-bones-jekyll/) (*work in progress*).
 
 ![screenshot of Skinny Bones](http://mmistakes.github.io/skinny-bones-jekyll/images/skinny-bones-theme-feature.jpg)
@@ -12,7 +10,8 @@ I'm currently using a variation of it on my personal website [Made Mistakes](htt
 
 ## Notable Features
 
-* Stylesheet built using Sass. *Requires Jekyll 2.x*
+* Jekyll 3.x and GitHub Pages compatible.
+* Stylesheet built using Sass.
 * Data files for easier customization of the site navigation/footer and for supporting multiple authors.
 * Optional Disqus comments, table of contents, social sharing links, and Google AdSense ads.
 * And more.

_config.yml

@@ -10,14 +10,15 @@ url:
 # Jekyll configuration
 
 sass:
-    sass_dir: _sass
-    style: compressed
+  sass_dir: _sass
+  style: compressed
 permalink: /:categories/:title/
 kramdown:
   toc_levels: 1..2
-highlighter: pygments
+highlighter: rouge
 gems:
   - jekyll-sitemap
+  - jekyll-gist
 
 
 # Octopress configuration