Beginning work on class-based hooks.

History.markdown

@@ -2,120 +2,6 @@
 
 ### Major Enhancements
 
-### Minor Enhancements
-
-### Bug Fixes
-
-### Development Fixes
-
-### Site Enhancements
-
-## 2.3.0 / 2014-08-10
-
-### Minor Enhancements
-
-  * Allow Convertibles to be converted by >= 1 converters (#2704)
-  * Allow Sass files to be rendered in Liquid, but never place them in layouts. (#2733)
-  * Add `jekyll help` command (#2707)
-  * Use `.scss` for `site_template` styles. (#2667)
-  * Don't require the `scope` key in front matter defaults (#2659)
-  * No longer set `permalink: pretty` in the `_config.yml` for the site template (#2680)
-  * Rework site template to utilize Sass (#2687)
-  * Notify the user when auto-regeneration is disabled. (#2696)
-  * Allow partial variables in include tag filename argument (#2693)
-  * Move instances of `Time.parse` into a Utils method (#2682)
-  * Ignore subfolders in the `_posts` folder (#2705) REVERTS (#2633)
-  * Front Matter default types should always be pluralized (#2732)
-  * Read in static files into `collection.files` as `StaticFile`s (#2737)
-  * Add `sassify` and `scssify` Liquid filters (#2739)
-  * Replace `classifier` gem with `classifier-reborn` (#2721)
-
-### Bug Fixes
-
-  * Use only the last extname when multiple converters exist (#2722)
-  * Call `#to_liquid` before calling `#to_json` in jsonify filter (#2729)
-  * Use non padded config in `strftime` to avoid parse string twice (#2673)
-  * Replace deprecated Ruby methods with undeprecated ones (#2664)
-  * Catch errors when parsing Post `date` front matter value & produce nice error message (#2649)
-  * Allow static files in Collections (#2615)
-  * Fixed typo in `Deprecator#gracefully_require` error message (#2694)
-  * Remove preemptive loading of the 'classifier' gem. (#2697)
-  * Use case-insensitive checking for the file extensions when loading config files (#2718)
-  * When Reading Documents, Respect `encoding` Option (#2720)
-  * Refactor based on jekyll-watch clean-up. (#2716)
-  * `Document#to_s` should produce just the content of the document (#2731)
-
-### Development Fixes
-
-  * Only include lib files in the gem (#2671)
-  * Fix `git diff` command in `proof` script (#2672)
-  * Make default rake task a multitask so tests run in parallel (#2735)
-
-### Site Enhancements
-
-  * Use Sass and a Docs Collection (#2651)
-  * Add `latest_version.txt` file to the site (#2740)
-  * Be more ambiguous about `page.content`. But more transparent. (#2522)
-  * Streamlining front matter wording (instead of front-matter/frontmatter) (#2674)
-  * Add note that source directory cannot be modified in GitHub Pages (#2669)
-  * Fix links from #2669 to be actual HTML. Whoops. (#2679)
-  * Add link to `jekyll-slim` in list of third-party plugins (#2689)
-  * Add Barry Clark's Smashing Magazine tutorial to resources page (#2688)
-  * Reorganize and update default configuration settings (#2456)
-  * Fixing indentation in the configuration docs about Redcarpet exts (#2717)
-  * Use `null` in YAML instead of `nil` in default config list (#2719)
-  * Fix typo in Continuous Integration docs (#2708)
-
-## 2.2.0 / 2014-07-29
-
-### Minor Enhancements
-
-  * Throw a warning if the specified layout does not exist (#2620)
-  * Whitelist Pygments options in safe mode (#2642)
-
-### Bug Fixes
-
-  * Remove unnecessary `Jekyll::Tags::IncludeTag#blank?` method (#2625)
-  * Categories in the path are ignored (#2633)
-
-### Development Fixes
-
-  * Refactoring Errors & Requires of Third-Party stuff (#2591)
-  * Add further tests for categories (#2584)
-  * Proof site with html-proofer on change (#2605)
-  * Fix up bug in #2605 which caused proofing the site not to function (#2608)
-  * Use `bundle exec` in `script/proof` (#2610)
-
-### Site Enhancements
-
-  * Update Kramdown urls (#2588)
-  * Add `Jekyll::AutolinkEmail` and `Jekyll::GitMetadata` to the list of
-    third-party plugins (#2596)
-  * Fix a bunch of broken links in the site (#2601)
-  * Replace dead links with working links (#2611)
-  * Add jekyll-hook to deployment methods (#2617)
-  * Added kramdown-with-pygments plugin to the list of third-party plugins (#2623)
-  * Update outdated "Extras" page and remove duplicate documentation (#2622)
-  * Add co2 plugin to list of third-party plugins (#2639)
-  * Attempt to clarify the way Sass imports happen (#2642)
-
-## 2.1.1 / 2014-07-01
-
-### Bug Fixes
-
-  * Patch read vulnerabilities for data & confirm none for layouts (#2563)
-  * Update Maruku dependency to allow use of the latest version (#2576)
-  * Remove conditional assignment from document URL to prevent stale urls (#2575)
-
-### Site Enhancements
-
-  * Add vertical margin to `highlight` to separate code blocks (#2558)
-  * Add `html_pages` to Variables docs (#2567)
-  * Fixed broken link to Permalinks page (#2572)
-  * Update link to Windows installation guide (#2578)
-
-## 2.1.0 / 2014-06-28
-
 ### Minor Enhancements
 
   * Bump to the latest Liquid version, 2.6.1 (#2495)
@@ -136,13 +22,11 @@
   * Upgrade listen to `2.7.6 <= x < 3.0.0` (#2492)
   * Allow configuration of different Twitter and GitHub usernames in site template (#2485)
   * Bump Pygments to v0.6.0 (#2504)
-  * Front matter defaults for documents in collections (#2419)
+  * Front-matter defaults for documents in collections (#2419)
   * Include files with a url which ends in `/` in the `site.html_pages` list (#2524)
   * Make `highlight` tag use `language-` prefix in CSS class (#2511)
   * Lookup item property via `item#to_liquid` before `#data` or `#[]` in filters (#2493)
   * Skip initial build of site on serve with flag (#2477)
-  * Add support for `hl_lines` in `highlight` tag (#2532)
-  * Spike out `--watch` flag into a separate gem (#2550)
 
 ### Bug Fixes
 
@@ -154,7 +38,7 @@
   * Prevent code from overflowing container in site template (#2429)
   * Encode URLs in UTF-8 when escaping and unescaping (#2420)
   * No Layouts or Liquid for Asset Files (#2431)
-  * Allow front matter defaults to set post categories (#2373)
+  * Allow front-matter defaults to set post categories (#2373)
   * Fix command in subcommand deprecation warning (#2457)
   * Keep all parent directories of files/dirs in `keep_files` (#2458)
   * When using RedCarpet and Rouge without Rouge installed, fixed erroneous
@@ -162,11 +46,6 @@
   * Ignore *all* directories and files that merit it on auto-generation (#2459)
   * Before copying file, explicitly remove the old one (#2535)
   * Merge file system categories with categories from YAML. (#2531)
-  * Deep merge front matter defaults (#2490)
-  * Ensure exclude and include arrays are arrays of strings (#2542)
-  * Allow collections to have dots in their filenames (#2552)
-  * Collections shouldn't try to read in directories as files (#2552)
-  * Be quiet very quickly. (#2520)
 
 ### Development Fixes
 
@@ -174,7 +53,6 @@
   * Add test for sorting UTF-8 characters (#2384)
   * Use `https` for GitHub links in documentation (#2470)
   * Remove coverage reporting with Coveralls (#2494)
-  * Fix a bit of missing TomDoc to `Jekyll::Commands::Build#build` (#2554)
 
 ### Site Enhancements
 
@@ -187,7 +65,7 @@
   * Prevent table from extending parent width in permalink style table (#2424)
   * Add collections to info about pagination support (#2389)
   * Add `jekyll_github_sample` plugin to list of third-party plugins (#2463)
-  * Clarify documentation around front matter defaults and add details
+  * Clarify documentation around front-matter defaults and add details
     about defaults for collections. (#2439)
   * Add Jekyll Project Version Tag to list of third-party plugins (#2468)
   * Use `https` for GitHub links across whole site (#2470)
@@ -196,9 +74,6 @@
   * Add link to jekyll-compress-html to list of third-party plugins (#2514)
   * Add Piwigo Gallery to list of third-party plugins (#2526)
   * Set `show_drafts` to `false` in default configuration listing (#2536)
-  * Provide an updated link for Windows installation instructions (#2544)
-  * Remove `url` from configuration docs (#2547)
-  * Documentation for Continuous Integration for your Jekyll Site (#2432)
 
 ## 2.0.3 / 2014-05-08
 
@@ -222,7 +97,7 @@
   * Update docs to reflect new `baseurl` default (#2341)
   * Add links to headers who have an ID. (#2342)
   * Use symbol instead of HTML number in `upgrading.md` (#2351)
-  * Fix link to front matter defaults docs (#2353)
+  * Fix link to frontmatter defaults docs (#2353)
   * Fix for `History.markdown` in order to fix history page in docs (#2363)
 
 ## 2.0.2 / 2014-05-07
@@ -262,7 +137,7 @@
   * Expose `site.static_files` to Liquid (#2075)
   * Complete redesign of the template site generated by `jekyll new` (#2050)
   * Update Listen from 1.x to 2.x (#2097)
-  * Front matter defaults (#2205)
+  * Front-matter defaults (#2205)
   * Deprecate `relative_permalinks` configuration option (default to `false`) (#2307)
   * Exclude files based on prefix as well as `fnmatch?` (#2303)
 
@@ -307,7 +182,7 @@
   * Permit YAML blocks to end with three dots to better conform with the
     YAML spec (#2110)
   * Use `File.exist?` instead of deprecated `File.exists?` (#2214)
-  * Require newline after start of YAML Front Matter header (#2211)
+  * Require newline after start of YAML front-matter header (#2211)
   * Add the ability for pages to be marked as `published: false` (#1492)
   * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy
     looking up of variable values in a Liquid context. (#2253)
@@ -980,7 +855,7 @@
   * Bullet-proof `limit_posts` option (#1004)
   * Read in YAML as UTF-8 to accept non-ASCII chars (#836)
   * Fix the CLI option `--plugins` to actually accept dirs and files (#993)
-  * Allow 'excerpt' in YAML front matter to override the extracted excerpt (#946)
+  * Allow 'excerpt' in YAML Front-Matter to override the extracted excerpt (#946)
   * Fix cascade problem with site.baseurl, site.port and site.host. (#935)
   * Filter out directories with valid post names (#875)
   * Fix symlinked static files not being correctly built in unsafe mode (#909)
@@ -992,7 +867,7 @@
   * Patch for multibyte URI problem with `jekyll serve` (#723)
   * Order plugin execution by priority (#864)
   * Fixed Page#dir and Page#url for edge cases (#536)
-  * Fix broken `post_url` with posts with a time in their YAML front matter (#831)
+  * Fix broken `post_url` with posts with a time in their YAML Front-Matter (#831)
   * Look for plugins under the source directory (#654)
   * Tumblr Migrator: finds `_posts` dir correctly, fixes truncation of long
       post names (#775)
@@ -1051,7 +926,7 @@
   * Fix error with `limit_posts` (#442)
   * Properly select dotfile during directory scan (#363, #431, #377)
   * Allow setting of Kramdown `smart_quotes` (#482)
-  * Ensure front matter is at start of file (#562)
+  * Ensure front-matter is at start of file (#562)
 
 ## 0.11.2 / 2011-12-27
   * Bug Fixes
@@ -1172,7 +1047,7 @@
 ## 0.5.6 / 2010-01-08
   * Bug Fixes
   * Require redcloth >= 4.2.1 in tests (#92)
-  * Don't break on triple dashes in yaml front matter (#93)
+  * Don't break on triple dashes in yaml frontmatter (#93)
 
 ### Minor Enhancements
   * Allow .mkd as markdown extension
@@ -1207,9 +1082,9 @@
   * Configuration options set in config.yml are now available through the
       site payload (@vilcans)
   * Posts can now have an empty YAML front matter or none at all
-      (@ bahuvrihi)
+      (@bahuvrihi)
   * Bug Fixes
-  * Fixing Ruby 1.9 issue that requires `#to_s` on the err object
+  * Fixing Ruby 1.9 issue that requires to_s on the err object
       (@Chrononaut)
   * Fixes for pagination and ordering posts on the same day (@ujh)
   * Made pages respect permalinks style and permalinks in yml front matter
@@ -1219,8 +1094,8 @@
   * Added trailing slash to pretty permalink style so Apache is happy
       (@eugenebolshakov)
   * Bad markdown processor in config fails sooner and with better message
-      (@ gcnovus)
-  * Allow CRLFs in yaml front matter (@juretta)
+      (@gcnovus)
+  * Allow CRLFs in yaml frontmatter (@juretta)
   * Added Date#xmlschema for Ruby versions < 1.9
 
 ## 0.5.1 / 2009-05-06

README.markdown

@@ -5,7 +5,7 @@
 [![Code Climate](http://img.shields.io/codeclimate/github/jekyll/jekyll.svg)](https://codeclimate.com/github/jekyll/jekyll)
 [![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll)
 
-By Tom Preston-Werner, Nick Quaranto, Parker Moore, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!
+By Tom Preston-Werner, Nick Quaranto, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!
 
 Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served by Apache, Nginx or another web server. Jekyll is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories.
 

Rakefile

@@ -14,7 +14,7 @@ require 'jekyll/version'
 #############################################################################
 
 def name
-  @name ||= File.basename(Dir['*.gemspec'].first, ".*")
+  @name ||= Dir['*.gemspec'].first.split('.').first
 end
 
 def version
@@ -53,32 +53,13 @@ def liquid_escape(markdown)
   markdown.gsub(/(`{[{%].+[}%]}`)/, "{% raw %}\\1{% endraw %}")
 end
 
-def custom_release_header_anchors(markdown)
-  header_regexp = /^(\d{1,2})\.(\d{1,2})\.(\d{1,2}) \/ \d{4}-\d{2}-\d{2}/
-  section_regexp = /^### \w+ \w+$/
-  markdown.split(/^##\s/).map do |release_notes|
-    _, major, minor, patch = *release_notes.match(header_regexp)
-    release_notes
-      .gsub(header_regexp, "\\0\n{: #v\\1-\\2-\\3}")
-      .gsub(section_regexp) { |section| "#{section}\n{: ##{sluffigy(section)}-v#{major}-#{minor}-#{patch}}" }
-  end.join("\n## ")
-end
-
-def sluffigy(header)
-  header.gsub(/#/, '').strip.downcase.gsub(/\s+/, '-')
-end
-
 def remove_head_from_history(markdown)
   index = markdown =~ /^##\s+\d+\.\d+\.\d+/
   markdown[index..-1]
 end
 
 def converted_history(markdown)
-  remove_head_from_history(
-    custom_release_header_anchors(
-      liquid_escape(
-        linkify(
-          normalize_bullets(markdown)))))
+  remove_head_from_history(liquid_escape(linkify(normalize_bullets(markdown))))
 end
 
 #############################################################################
@@ -87,7 +68,7 @@ end
 #
 #############################################################################
 
-multitask :default => [:test, :features]
+task :default => [:test, :features]
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -160,7 +141,7 @@ namespace :site do
   end
 
   desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
-  task :publish => [:history, :version_file] do
+  task :publish => [:history] do
     # Ensure the gh-pages dir exists so we can generate into it.
     puts "Checking for gh-pages dir..."
     unless File.exist?("./gh-pages")
@@ -204,7 +185,7 @@ namespace :site do
         "permalink" => "/docs/history/",
         "prev_section" => "contributing"
       }
-      Dir.chdir('site/_docs/') do
+      Dir.chdir('site/docs/') do
         File.open("history.md", "w") do |file|
           file.write("#{front_matter.to_yaml}---\n\n")
           file.write(converted_history(history_file))
@@ -215,11 +196,6 @@ namespace :site do
     end
   end
 
-  desc "Write the site latest_version.txt file"
-  task :version_file do
-    File.open('site/latest_version.txt', 'wb') { |f| f.write(version) }
-  end
-
   namespace :releases do
     desc "Create new release post"
     task :new, :version do |t, args|
@@ -252,20 +228,18 @@ end
 #
 #############################################################################
 
-desc "Release #{name} v#{version}"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!
   end
-  sh "git commit --allow-empty -m 'Release :gem: #{version}'"
+  sh "git commit --allow-empty -m 'Release #{version}'"
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
 end
 
-desc "Build #{name} v#{version} into pkg/"
 task :build do
   mkdir_p "pkg"
   sh "gem build #{gemspec_file}"

cucumber.yml

@@ -0,0 +1,3 @@
+default: --format pretty
+travis: --format progress
+html_report: --format progress --format html --out=features_report.html

features/frontmatter_defaults.feature

@@ -83,8 +83,6 @@ Feature: frontmatter defaults
     And I have a "index.html" file that contains "nothing"
     And I have a "_slides/slide1.html" file with content: 
     """
-    ---
-    ---
     Value: {{ page.myval }}
     """
     And I have a "_config.yml" file with content:
@@ -130,9 +128,3 @@ Feature: frontmatter defaults
     When I run jekyll build
     Then the _site directory should exist
     And I should see "Value: Override" in "_site/slides/slide2.html"
-
-  Scenario: Deep merge frontmatter defaults
-    Given I have an "index.html" page with fruit "{orange: 1}" that contains "Fruits: {{ page.fruit.orange | plus: page.fruit.apple }}"
-    And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {fruit: {apple: 2}}}]"
-    When I run jekyll build
-    Then I should see "Fruits: 3" in "_site/index.html"

features/include_tag.feature

@@ -66,14 +66,3 @@ Feature: Include tags
     When I run jekyll build
     Then the _site directory should exist
     And I should see "one included" in "_site/index.html"
-
-  Scenario: Include a file with partial variables
-    Given I have an _includes directory
-    And I have an "_includes/one.html" file that contains "one included"
-    And I have a configuration file with:
-    | key          | value |
-    | include_file | one   |
-    And I have an "index.html" page that contains "{% include {{ site.include_file }}.html %}"
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "one included" in "_site/index.html"

features/markdown.feature

@@ -45,7 +45,7 @@ Feature: Markdown
     When I run jekyll build
     Then the _site directory should exist
     And I should see "My awesome code" in "_site/index.html"
-    And I should see "<pre><code>My awesome code</code></pre>" in "_site/index.html"
+    And I should see "<pre><code>\nMy awesome code\n</code></pre>" in "_site/index.html"
 
   Scenario: Maruku fenced codeblocks
     Given I have a configuration file with "markdown" set to "maruku"
@@ -64,4 +64,4 @@ Feature: Markdown
     When I run jekyll build
     Then the _site directory should exist
     And I should see "My awesome string" in "_site/index.html"
-    And I should see "<pre class="ruby"><code class="ruby">puts &quot;My awesome string&quot;</code></pre>" in "_site/index.html"
+    And I should see "<pre class="ruby"><code class="ruby">\nputs &quot;My awesome string&quot;\n</code></pre>" in "_site/index.html"

features/post_data.feature

@@ -70,41 +70,17 @@ Feature: Post data
     Then the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
 
-  Scenario: Use post.categories variable when category is in a folder and has category in YAML
-    Given I have a movies directory
-    And I have a movies/_posts directory
-    And I have a _layouts directory
-    And I have the following post in "movies":
-      | title     | date       | layout | category | content                 |
-      | Star Wars | 2009-03-27 | simple | film     | Luke, I am your father. |
-    And I have a simple layout that contains "Post category: {{ page.categories }}"
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Post category: movies" in "_site/movies/film/2009/03/27/star-wars.html"
-
   Scenario: Use post.categories variable when category is in a folder and has categories in YAML
     Given I have a movies directory
     And I have a movies/_posts directory
     And I have a _layouts directory
     And I have the following post in "movies":
-      | title     | date       | layout | categories        | content                 |
-      | Star Wars | 2009-03-27 | simple | [film, scifi]     | Luke, I am your father. |
+      | title     | date       | layout | categories | content                 |
+      | Star Wars | 2009-03-27 | simple | [film]     | Luke, I am your father. |
     And I have a simple layout that contains "Post category: {{ page.categories }}"
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "Post category: movies" in "_site/movies/film/scifi/2009/03/27/star-wars.html"
-
-  Scenario: Use post.categories variable when category is in a folder and duplicated category is in YAML
-    Given I have a movies directory
-    And I have a movies/_posts directory
-    And I have a _layouts directory
-    And I have the following post in "movies":
-      | title     | date       | layout | category | content                 |
-      | Star Wars | 2009-03-27 | simple | movies   | Luke, I am your father. |
-    And I have a simple layout that contains "Post category: {{ page.categories }}"
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
+    And I should see "Post category: movies" in "_site/movies/film/2009/03/27/star-wars.html"
 
   Scenario: Use post.tags variable
     Given I have a _posts directory
@@ -165,23 +141,12 @@ Feature: Post data
     Then the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
 
-  Scenario: Use post.categories variable when categories are in YAML
+  Scenario: Use post.categories variable when category is in YAML
     Given I have a _posts directory
     And I have a _layouts directory
     And I have the following post:
-      | title     | date       | layout | categories          | content                 |
-      | Star Wars | 2009-03-27 | simple | ['scifi', 'movies'] | Luke, I am your father. |
-    And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
-
-  Scenario: Use post.categories variable when categories are in YAML and are duplicated
-    Given I have a _posts directory
-    And I have a _layouts directory
-    And I have the following post:
-      | title     | date       | layout | categories           | content                 |
-      | Star Wars | 2009-03-27 | simple | ['movies', 'movies'] | Luke, I am your father. |
+      | title     | date       | layout | category | content                 |
+      | Star Wars | 2009-03-27 | simple | movies   | Luke, I am your father. |
     And I have a simple layout that contains "Post category: {{ page.categories }}"
     When I run jekyll build
     Then the _site directory should exist

features/site_configuration.feature

@@ -273,11 +273,3 @@ Feature: Site configuration
     And I should see "Whatever" in "_site/index.html"
     And the "_site/test.txt" file should exist
     And I should see "this is a test" in "_site/test.txt"
-
-  Scenario: arbitrary file reads via layouts
-    Given I have an "index.html" page with layout "page" that contains "FOO"
-    And I have a "_config.yml" file that contains "layouts: '../../../../../../../../../../../../../../usr/include'"
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "FOO" in "_site/index.html"
-    And I should not see " " in "_site/index.html"

features/step_definitions/jekyll_steps.rb

@@ -22,8 +22,8 @@ Before do
 end
 
 After do
-  FileUtils.rm_rf(TEST_DIR)   if File.exist?(TEST_DIR)
-  FileUtils.rm(JEKYLL_COMMAND_OUTPUT_FILE) if File.exist?(JEKYLL_COMMAND_OUTPUT_FILE)
+  FileUtils.rm_rf(TEST_DIR)   if File.exists?(TEST_DIR)
+  FileUtils.rm(JEKYLL_COMMAND_OUTPUT_FILE) if File.exists?(JEKYLL_COMMAND_OUTPUT_FILE)
 end
 
 World(Test::Unit::Assertions)

features/support/overview.rb

@@ -1,183 +0,0 @@
-require 'fileutils'
-require 'colorator'
-require 'cucumber/formatter/console'
-require 'cucumber/formatter/io'
-require 'gherkin/formatter/escaping'
-
-module Features
-  module Support
-    # The formatter used for <tt>--format pretty</tt> (the default formatter).
-    #
-    # This formatter prints features to plain text - exactly how they were parsed,
-    # just prettier. That means with proper indentation and alignment of table columns.
-    #
-    # If the output is STDOUT (and not a file), there are bright colours to watch too.
-    #
-    class Overview
-      include FileUtils
-      include Cucumber::Formatter::Console
-      include Cucumber::Formatter::Io
-      include Gherkin::Formatter::Escaping
-      attr_writer :indent
-      attr_reader :runtime
-
-      def initialize(runtime, path_or_io, options)
-        @runtime, @io, @options = runtime, ensure_io(path_or_io, "pretty"), options
-        @exceptions = []
-        @indent = 0
-        @prefixes = options[:prefixes] || {}
-        @delayed_messages = []
-      end
-
-      def before_features(features)
-        print_profile_information
-      end
-
-      def after_features(features)
-        print_summary(features)
-      end
-
-      def before_feature(feature)
-        @exceptions = []
-        @indent = 0
-      end
-
-      def comment_line(comment_line)
-      end
-
-      def after_tags(tags)
-      end
-
-      def tag_name(tag_name)
-      end
-
-      def before_feature_element(feature_element)
-        @indent = 2
-        @scenario_indent = 2
-      end
-
-      def after_feature_element(feature_element)
-      end
-
-      def before_background(background)
-        @indent = 2
-        @scenario_indent = 2
-        @in_background = true
-      end
-
-      def after_background(background)
-        @in_background = nil
-      end
-
-      def background_name(keyword, name, file_colon_line, source_indent)
-        print_feature_element_name(keyword, name, file_colon_line, source_indent)
-      end
-
-      def before_examples_array(examples_array)
-      end
-
-      def examples_name(keyword, name)
-      end
-
-      def before_outline_table(outline_table)
-      end
-
-      def after_outline_table(outline_table)
-      end
-
-      def scenario_name(keyword, name, file_colon_line, source_indent)
-        print_feature_element_name(keyword, name, file_colon_line, source_indent)
-      end
-
-      def before_step(step)
-        @current_step = step
-      end
-
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
-        @hide_this_step = false
-        if exception
-          if @exceptions.include?(exception)
-            @hide_this_step = true
-            return
-          end
-          @exceptions << exception
-        end
-        if status != :failed && @in_background ^ background
-          @hide_this_step = true
-          return
-        end
-        @status = status
-      end
-
-      CHARS = {
-        :failed    => "x".red,
-        :pending   => "?".yellow,
-        :undefined => "x".red,
-        :passed    => ".".green,
-        :skipped   => "-".blue
-      }
-
-      def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
-        @io.print CHARS[status]
-      end
-
-      def doc_string(string)
-        return if @options[:no_multiline] || @hide_this_step
-        s = %{"""\n#{string}\n"""}.indent(@indent)
-        s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}.join("\n")
-        @io.puts(format_string(s, @current_step.status))
-        @io.flush
-      end
-
-      def exception(exception, status)
-        return if @hide_this_step
-        print_exception(exception, status, @indent)
-        @io.flush
-      end
-
-      def before_multiline_arg(multiline_arg)
-      end
-
-      def after_multiline_arg(multiline_arg)
-      end
-
-      def before_table_row(table_row)
-      end
-
-      def after_table_row(table_row)
-      end
-
-      def after_table_cell(cell)
-      end
-
-      def table_cell_value(value, status)
-      end
-
-      private
-
-      def print_feature_element_name(keyword, name, file_colon_line, source_indent)
-        @io.puts
-        names = name.empty? ? [name] : name.split("\n")
-        line = "  #{keyword}: #{names[0]}"
-        if @options[:source]
-          line_comment = "#{file_colon_line}"
-          @io.print(line_comment)
-        end
-        @io.print(line)
-        @io.print " "
-        @io.flush
-      end
-
-      def cell_prefix(status)
-        @prefixes[status]
-      end
-
-      def print_summary(features)
-        @io.puts
-        print_stats(features, @options)
-        print_snippets(@options)
-        print_passing_wip(@options)
-      end
-    end
-  end
-end

jekyll.gemspec

@@ -20,31 +20,28 @@ Gem::Specification.new do |s|
   s.email    = 'tom@mojombo.com'
   s.homepage = 'https://github.com/jekyll/jekyll'
 
-  all_files       = `git ls-files -z`.split("\x0")
-  s.files         = all_files.grep(%r{^(bin|lib)/})
-  s.executables   = all_files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.markdown LICENSE]
 
-  s.add_runtime_dependency('liquid',    "~> 2.6.1")
-  s.add_runtime_dependency('kramdown',  "~> 1.3")
+  s.add_runtime_dependency('liquid', "~> 2.6.1")
+  s.add_runtime_dependency('classifier', "~> 1.3")
+  s.add_runtime_dependency('listen', [">= 2.7.6", "< 3.0.0"])
+  s.add_runtime_dependency('kramdown', "~> 1.3")
+  s.add_runtime_dependency('pygments.rb', "~> 0.6.0")
   s.add_runtime_dependency('mercenary', "~> 0.3.3")
   s.add_runtime_dependency('safe_yaml', "~> 1.0")
   s.add_runtime_dependency('colorator', "~> 0.1")
-
-  # Before 3.0 drops, phase the following gems out as dev dependencies
-  # and gracefully handle their absence.
-  s.add_runtime_dependency('pygments.rb', "~> 0.6.0")
   s.add_runtime_dependency('redcarpet', "~> 3.1")
   s.add_runtime_dependency('toml', '~> 0.1.0')
   s.add_runtime_dependency('jekyll-paginate', '~> 1.0')
   s.add_runtime_dependency('jekyll-gist', '~> 1.0')
   s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
   s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
-  s.add_runtime_dependency('jekyll-watch', '~> 1.1')
-  s.add_runtime_dependency('classifier-reborn', "~> 2.0")
 
   s.add_development_dependency('rake', "~> 10.1")
   s.add_development_dependency('rdoc', "~> 3.11")
@@ -53,7 +50,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rr', "~> 1.1")
   s.add_development_dependency('cucumber', "1.3.11")
   s.add_development_dependency('RedCloth', "~> 4.2")
-  s.add_development_dependency('maruku', "~> 0.7.0")
+  s.add_development_dependency('maruku', "0.7.0")
   s.add_development_dependency('rdiscount', "~> 1.6")
   s.add_development_dependency('launchy', "~> 2.3")
   s.add_development_dependency('simplecov', "~> 0.7")

lib/jekyll.rb

@@ -18,56 +18,70 @@ require 'rubygems'
 # stdlib
 require 'fileutils'
 require 'time'
+require 'safe_yaml/load'
 require 'English'
 require 'pathname'
 require 'logger'
 
 # 3rd party
-require 'safe_yaml/load'
 require 'liquid'
 require 'kramdown'
 require 'colorator'
+require 'toml'
+
+# internal requires
+require 'jekyll/version'
+require 'jekyll/utils'
+require 'jekyll/hooks'
+require 'jekyll/log_adapter'
+require 'jekyll/stevenson'
+require 'jekyll/deprecator'
+require 'jekyll/configuration'
+require 'jekyll/document'
+require 'jekyll/collection'
+require 'jekyll/plugin_manager'
+require 'jekyll/frontmatter_defaults'
+require 'jekyll/site'
+require 'jekyll/convertible'
+require 'jekyll/url'
+require 'jekyll/layout'
+require 'jekyll/page'
+require 'jekyll/post'
+require 'jekyll/excerpt'
+require 'jekyll/draft'
+require 'jekyll/filters'
+require 'jekyll/static_file'
+require 'jekyll/errors'
+require 'jekyll/related_posts'
+require 'jekyll/cleaner'
+require 'jekyll/entry_filter'
+require 'jekyll/layout_reader'
+require 'jekyll/publisher'
+require 'jekyll/renderer'
+
+# extensions
+require 'jekyll/plugin'
+require 'jekyll/converter'
+require 'jekyll/generator'
+require 'jekyll/command'
+require 'jekyll/liquid_extensions'
+
+require_all 'jekyll/commands'
+require_all 'jekyll/converters'
+require_all 'jekyll/converters/markdown'
+require_all 'jekyll/generators'
+require_all 'jekyll/tags'
+
+# plugins
+require 'jekyll-coffeescript'
+require 'jekyll-sass-converter'
+require 'jekyll-paginate'
+require 'jekyll-gist'
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
 
-  # internal requires
-  autoload :Cleaner,             'jekyll/cleaner'
-  autoload :Collection,          'jekyll/collection'
-  autoload :Configuration,       'jekyll/configuration'
-  autoload :Convertible,         'jekyll/convertible'
-  autoload :Deprecator,          'jekyll/deprecator'
-  autoload :Document,            'jekyll/document'
-  autoload :Draft,               'jekyll/draft'
-  autoload :EntryFilter,         'jekyll/entry_filter'
-  autoload :Errors,              'jekyll/errors'
-  autoload :Excerpt,             'jekyll/excerpt'
-  autoload :Filters,             'jekyll/filters'
-  autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
-  autoload :Layout,              'jekyll/layout'
-  autoload :LayoutReader,        'jekyll/layout_reader'
-  autoload :LogAdapter,          'jekyll/log_adapter'
-  autoload :Page,                'jekyll/page'
-  autoload :PluginManager,       'jekyll/plugin_manager'
-  autoload :Post,                'jekyll/post'
-  autoload :Publisher,           'jekyll/publisher'
-  autoload :RelatedPosts,        'jekyll/related_posts'
-  autoload :Renderer,            'jekyll/renderer'
-  autoload :Site,                'jekyll/site'
-  autoload :StaticFile,          'jekyll/static_file'
-  autoload :Stevenson,           'jekyll/stevenson'
-  autoload :URL,                 'jekyll/url'
-  autoload :Utils,               'jekyll/utils'
-  autoload :VERSION,             'jekyll/version'
-
-  # extensions
-  require 'jekyll/plugin'
-  require 'jekyll/converter'
-  require 'jekyll/generator'
-  require 'jekyll/command'
-  require 'jekyll/liquid_extensions'
-
   # Public: Tells you which Jekyll environment you are building in so you can skip tasks
   # if you need to.  This is useful when doing expensive compression tasks on css and
   # images and allows you to skip that when working in development.
@@ -130,18 +144,3 @@ module Jekyll
     end
   end
 end
-
-require_all 'jekyll/commands'
-require_all 'jekyll/converters'
-require_all 'jekyll/converters/markdown'
-require_all 'jekyll/generators'
-require_all 'jekyll/tags'
-
-# Eventually remove these for 3.0 as non-core
-Jekyll::Deprecator.gracefully_require(%w[
-  toml
-  jekyll-paginate
-  jekyll-gist
-  jekyll-coffeescript
-  jekyll-sass-converter
-])

lib/jekyll/collection.rb

@@ -22,28 +22,14 @@ module Jekyll
       @docs ||= []
     end
 
-    # Fetch the static files in this collection.
-    # Defaults to an empty array if no static files have been read in.
-    #
-    # Returns an array of Jekyll::StaticFile objects.
-    def files
-      @files ||= []
-    end
-
     # Read the allowed documents into the collection's array of docs.
     #
     # Returns the sorted array of docs.
     def read
       filtered_entries.each do |file_path|
-        full_path = Jekyll.sanitized_path(directory, file_path)
-        if Utils.has_yaml_header? full_path
-          doc = Jekyll::Document.new(full_path, { site: site, collection: self })
-          doc.read
-          docs << doc
-        else
-          relative_dir = File.join(relative_directory, File.dirname(file_path)).chomp("/.")
-          files << StaticFile.new(site, site.source, relative_dir, File.basename(full_path), self)
-        end
+        doc = Jekyll::Document.new(Jekyll.sanitized_path(directory, file_path), { site: site, collection: self })
+        doc.read
+        docs << doc
       end
       docs.sort!
     end
@@ -66,7 +52,7 @@ module Jekyll
     def filtered_entries
       return Array.new unless exists?
       Dir.chdir(directory) do
-        entry_filter.filter(entries).reject { |f| File.directory?(f) }
+        entry_filter.filter(entries)
       end
     end
 
@@ -119,7 +105,7 @@ module Jekyll
     #
     # Returns a sanitized version of the label.
     def sanitize_label(label)
-      label.gsub(/[^a-z0-9_\-\.]/i, '')
+      label.gsub(/[^a-z0-9_\-]/i, '')
     end
 
     # Produce a representation of this Collection for use in Liquid.
@@ -132,7 +118,6 @@ module Jekyll
       metadata.merge({
         "label"     => label,
         "docs"      => docs,
-        "files"     => files,
         "directory" => directory,
         "output"    => write?,
         "relative_directory" => relative_directory

lib/jekyll/command.rb

@@ -19,6 +19,31 @@ module Jekyll
         super(base)
       end
 
+      # Paths to ignore for the watch option
+      #
+      # options - A Hash of options passed to the command
+      #
+      # Returns a list of relative paths from source that should be ignored
+      def ignore_paths(options)
+        source      = options['source']
+        destination = options['destination']
+        config_files = Configuration[options].config_files(options)
+        paths = config_files + Array(destination)
+        ignored = []
+
+        source_abs = Pathname.new(source).expand_path
+        paths.each do |p|
+          path_abs = Pathname.new(p).expand_path
+          begin
+            rel_path = path_abs.relative_path_from(source_abs).to_s
+            ignored << Regexp.new(Regexp.escape(rel_path)) unless rel_path.start_with?('../')
+          rescue ArgumentError
+            # Could not find a relative path
+          end
+        end
+        ignored
+      end
+
       # Run Site#process and catch errors
       #
       # site - the Jekyll::Site object
@@ -26,7 +51,7 @@ module Jekyll
       # Returns nothing
       def process_site(site)
         site.process
-      rescue Jekyll::Errors::FatalException => e
+      rescue Jekyll::FatalException => e
         Jekyll.logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
         Jekyll.logger.error "", "------------------------------------"
         Jekyll.logger.error "", e.message

lib/jekyll/commands/build.rb

@@ -32,18 +32,13 @@ module Jekyll
           else
             build(site, options)
           end
-
-          if options.fetch('watch', false)
-            watch(site, options)
-          else
-            Jekyll.logger.info "Auto-regeneration:", "disabled. Use --watch to enable."
-          end
+          watch(site, options) if options['watch']
         end
 
         # Build your Jekyll site.
         #
         # site - the Jekyll::Site instance to build
-        # options - A Hash of options passed to the command
+        # options - the
         #
         # Returns nothing.
         def build(site, options)
@@ -63,8 +58,38 @@ module Jekyll
         #
         # Returns nothing.
         def watch(site, options)
-          Deprecator.gracefully_require 'jekyll-watch'
-          Jekyll::Watcher.watch(options)
+          require 'listen'
+
+          listener = Listen.to(
+            options['source'],
+            :ignore => ignore_paths(options),
+            :force_polling => options['force_polling']
+          ) do |modified, added, removed|
+            t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+            n = modified.length + added.length + removed.length
+            print Jekyll.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} "
+            begin
+              process_site(site)
+              puts  "...done."
+            rescue => e
+              puts "...error:"
+              Jekyll.logger.warn "Error:", e.message
+              Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information."
+            end
+          end
+          listener.start
+
+          Jekyll.logger.info "Auto-regeneration:", "enabled for '#{source}'"
+
+          unless options['serving']
+            trap("INT") do
+              listener.stop
+              puts "     Halting auto-regeneration."
+              exit 0
+            end
+
+            loop { sleep 1000 }
+          end
         end
 
       end # end of class << self

lib/jekyll/commands/help.rb

@@ -1,33 +0,0 @@
-module Jekyll
-  module Commands
-    class Help < Command
-      class << self
-
-        def init_with_program(prog)
-          prog.command(:help) do |c|
-            c.syntax 'help [subcommand]'
-            c.description 'Show the help message, optionally for a given subcommand.'
-
-            c.action do |args, _|
-              cmd = (args.first || "").to_sym
-              if args.empty?
-                puts prog
-              elsif prog.has_command? cmd
-                puts prog.commands[cmd]
-              else
-                invalid_command(prog, cmd)
-                abort
-              end
-            end
-          end
-        end
-
-        def invalid_command(prog, cmd)
-          Jekyll.logger.error "Error:", "Hmm... we don't know what the '#{cmd}' command is."
-          Jekyll.logger.info  "Valid commands:", prog.commands.keys.join(", ")
-        end
-
-      end
-    end
-  end
-end

lib/jekyll/configuration.rb

@@ -6,55 +6,46 @@ module Jekyll
     # Default options. Overridden by values in _config.yml.
     # Strings rather than symbols are used for compatibility with YAML.
     DEFAULTS = {
-      # Where things are
       'source'        => Dir.pwd,
       'destination'   => File.join(Dir.pwd, '_site'),
       'plugins'       => '_plugins',
       'layouts'       => '_layouts',
       'data_source'   =>  '_data',
+      'keep_files'    => ['.git','.svn'],
+      'gems'          => [],
       'collections'   => nil,
 
-      # Handling Reading
-      'safe'          => false,
-      'include'       => ['.htaccess'],
-      'exclude'       => [],
-      'keep_files'    => ['.git','.svn'],
-      'encoding'      => 'utf-8',
-      'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
-      'textile_ext'   => 'textile',
+      'timezone'      => nil,           # use the local timezone
 
-      # Filtering Content
+      'encoding'      => 'utf-8',       # always use utf-8 encoding. NEVER FORGET
+
+      'safe'          => false,
+      'detach'        => false,          # default to not detaching the server
       'show_drafts'   => nil,
       'limit_posts'   => 0,
+      'lsi'           => false,
       'future'        => true,           # remove and make true just default
       'unpublished'   => false,
 
-      # Plugins
-      'whitelist'     => [],
-      'gems'          => [],
-
-      # Conversion
-      'markdown'      => 'kramdown',
-      'highlighter'   => 'pygments',
-      'lsi'           => false,
-      'excerpt_separator' => "\n\n",
-
-      # Serving
-      'detach'        => false,          # default to not detaching the server
-      'port'          => '4000',
-      'host'          => '0.0.0.0',
-      'baseurl'       => '',
-
-      # Backwards-compatibility options
       'relative_permalinks' => false,
 
-      # Output Configuration
+      'markdown'      => 'kramdown',
+      'highlighter'   => 'pygments',
       'permalink'     => 'date',
+      'baseurl'       => '',
+      'include'       => ['.htaccess'],
+      'exclude'       => [],
       'paginate_path' => '/page:num',
-      'timezone'      => nil,           # use the local timezone
 
-      'quiet'         => false,
-      'defaults'      => [],
+      'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
+      'textile_ext'   => 'textile',
+
+      'port'          => '4000',
+      'host'          => '0.0.0.0',
+
+      'excerpt_separator' => "\n\n",
+
+      'defaults'     => [],
 
       'maruku' => {
         'use_tex'    => false,
@@ -112,15 +103,11 @@ module Jekyll
       override['source'] || self['source'] || DEFAULTS['source']
     end
 
-    def quiet?(override = {})
-      override['quiet'] || self['quiet'] || DEFAULTS['quiet']
-    end
-
     def safe_load_file(filename)
       case File.extname(filename)
-      when /\.toml/i
+      when '.toml'
         TOML.load_file(filename)
-      when /\.ya?ml/i
+      when /\.y(a)?ml/
         SafeYAML.load_file(filename)
       else
         raise ArgumentError, "No parser for '#{filename}' is available. Use a .toml or .y(a)ml file instead."
@@ -133,9 +120,6 @@ module Jekyll
     #
     # Returns an Array of config files
     def config_files(override)
-      # Be quiet quickly.
-      Jekyll.logger.log_level = :error if quiet?(override)
-
       # Get configuration from <source>/_config.yml or <source>/<config_file>
       config_files = override.delete('config')
       if config_files.to_s.empty?
@@ -208,7 +192,7 @@ module Jekyll
     def backwards_compatibilize
       config = clone
       # Provide backwards-compatibility
-      if config.key?('auto') || config.key?('watch')
+      if config.has_key?('auto') || config.has_key?('watch')
         Jekyll.logger.warn "Deprecation:", "Auto-regeneration can no longer" +
                             " be set from your configuration file(s). Use the"+
                             " --watch/-w command-line option instead."
@@ -216,23 +200,23 @@ module Jekyll
         config.delete('watch')
       end
 
-      if config.key? 'server'
+      if config.has_key? 'server'
         Jekyll.logger.warn "Deprecation:", "The 'server' configuration option" +
                             " is no longer accepted. Use the 'jekyll serve'" +
                             " subcommand to serve your site with WEBrick."
         config.delete('server')
       end
 
-      if config.key? 'server_port'
+      if config.has_key? 'server_port'
         Jekyll.logger.warn "Deprecation:", "The 'server_port' configuration option" +
                             " has been renamed to 'port'. Please update your config" +
                             " file accordingly."
         # copy but don't overwrite:
-        config['port'] = config['server_port'] unless config.key?('port')
+        config['port'] = config['server_port'] unless config.has_key?('port')
         config.delete('server_port')
       end
 
-      if config.key? 'pygments'
+      if config.has_key? 'pygments'
         Jekyll.logger.warn "Deprecation:", "The 'pygments' configuration option" +
                             " has been renamed to 'highlighter'. Please update your" +
                             " config file accordingly. The allowed values are 'rouge', " +
@@ -250,7 +234,6 @@ module Jekyll
             " as a list of comma-separated values."
           config[option] = csv_to_array(config[option])
         end
-        config[option].map!(&:to_s)
       end
 
       if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku")
@@ -264,7 +247,7 @@ module Jekyll
     def fix_common_issues
       config = clone
 
-      if config.key?('paginate') && (!config['paginate'].is_a?(Integer) || config['paginate'] < 1)
+      if config.has_key?('paginate') && (!config['paginate'].is_a?(Integer) || config['paginate'] < 1)
         Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a" +
           " positive integer or nil. It's currently set to '#{config['paginate'].inspect}'."
         config['paginate'] = nil

lib/jekyll/converters/markdown.rb

@@ -11,41 +11,22 @@ module Jekyll
         @parser =
           case @config['markdown'].downcase
             when 'redcarpet' then RedcarpetParser.new(@config)
-            when 'kramdown'  then KramdownParser.new(@config)
+            when 'kramdown' then KramdownParser.new(@config)
             when 'rdiscount' then RDiscountParser.new(@config)
-            when 'maruku'    then MarukuParser.new(@config)
+            when 'maruku' then MarukuParser.new(@config)
           else
             # So they can't try some tricky bullshit or go down the ancestor chain, I hope.
             if allowed_custom_class?(@config['markdown'])
               self.class.const_get(@config['markdown']).new(@config)
             else
               Jekyll.logger.error "Invalid Markdown Processor:", "#{@config['markdown']}"
-              Jekyll.logger.error "", "Valid options are [ #{valid_processors.join(" | ")} ]"
-              raise Errors::FatalException, "Invalid Markdown Processor: #{@config['markdown']}"
+              Jekyll.logger.error "", "Valid options are [ maruku | rdiscount | kramdown | redcarpet ]"
+              raise FatalException, "Invalid Markdown Processor: #{@config['markdown']}"
             end
           end
         @setup = true
       end
 
-      def valid_processors
-        %w[
-          maruku
-          rdiscount
-          kramdown
-          redcarpet
-        ] + third_party_processors
-      end
-
-      def third_party_processors
-        self.class.constants - %w[
-          KramdownParser
-          MarukuParser
-          RDiscountParser
-          RedcarpetParser
-          PRIORITIES
-        ].map(&:to_sym)
-      end
-
       def matches(ext)
         rgx = '^\.(' + @config['markdown_ext'].gsub(',','|') +')$'
         ext =~ Regexp.new(rgx, Regexp::IGNORECASE)

lib/jekyll/converters/markdown/kramdown_parser.rb

@@ -8,7 +8,7 @@ module Jekyll
         rescue LoadError
           STDERR.puts 'You are missing a library required for Markdown. Please run:'
           STDERR.puts '  $ [sudo] gem install kramdown'
-          raise Errors::FatalException.new("Missing dependency: kramdown")
+          raise FatalException.new("Missing dependency: kramdown")
         end
 
         def convert(content)
@@ -16,7 +16,7 @@ module Jekyll
           if @config['kramdown']['use_coderay']
             %w[wrap line_numbers line_numbers_start tab_width bold_every css default_lang].each do |opt|
               key = "coderay_#{opt}"
-              @config['kramdown'][key] = @config['kramdown']['coderay'][key] unless @config['kramdown'].key?(key)
+              @config['kramdown'][key] = @config['kramdown']['coderay'][key] unless @config['kramdown'].has_key?(key)
             end
           end
 

lib/jekyll/converters/markdown/maruku_parser.rb

@@ -15,7 +15,7 @@ module Jekyll
         rescue LoadError
           STDERR.puts 'You are missing a library required for Markdown. Please run:'
           STDERR.puts '  $ [sudo] gem install maruku'
-          raise Errors::FatalException.new("Missing dependency: maruku")
+          raise FatalException.new("Missing dependency: maruku")
         end
 
         def load_divs_library

lib/jekyll/converters/markdown/rdiscount_parser.rb

@@ -3,9 +3,13 @@ module Jekyll
     class Markdown
       class RDiscountParser
         def initialize(config)
-          Jekyll::Deprecator.gracefully_require "rdiscount"
+          require 'rdiscount'
           @config = config
           @rdiscount_extensions = @config['rdiscount']['extensions'].map { |e| e.to_sym }
+        rescue LoadError
+          STDERR.puts 'You are missing a library required for Markdown. Please run:'
+          STDERR.puts '  $ [sudo] gem install rdiscount'
+          raise FatalException.new("Missing dependency: rdiscount")
         end
 
         def convert(content)

lib/jekyll/converters/markdown/redcarpet_parser.rb

@@ -14,7 +14,7 @@ module Jekyll
         module WithPygments
           include CommonMethods
           def block_code(code, lang)
-            Jekyll::Deprecator.gracefully_require("pygments")
+            require 'pygments'
             lang = lang && lang.split.first || "text"
             add_code_tags(
               Pygments.highlight(code, :lexer => lang, :options => { :encoding => 'utf-8' }),
@@ -55,40 +55,45 @@ module Jekyll
 
 
         def initialize(config)
-          Deprecator.gracefully_require("redcarpet")
+          require 'redcarpet'
           @config = config
           @redcarpet_extensions = {}
           @config['redcarpet']['extensions'].each { |e| @redcarpet_extensions[e.to_sym] = true }
 
-          @renderer ||= class_with_proper_highlighter(@config['highlighter'])
-        end
+          @renderer ||= case @config['highlighter']
+                        when 'pygments'
+                          Class.new(Redcarpet::Render::HTML) do
+                            include WithPygments
+                          end
+                        when 'rouge'
+                          Class.new(Redcarpet::Render::HTML) do
+                            begin
+                              require 'rouge'
+                              require 'rouge/plugins/redcarpet'
+                            rescue LoadError => e
+                              Jekyll.logger.error "You are missing the 'rouge' gem. Please run:"
+                              Jekyll.logger.error " $ [sudo] gem install rouge"
+                              Jekyll.logger.error "Or add 'rouge' to your Gemfile."
+                              raise FatalException.new("Missing dependency: rouge")
+                            end
 
-        def class_with_proper_highlighter(highlighter)
-          case highlighter
-          when "pygments"
-            Class.new(Redcarpet::Render::HTML) do
-              include WithPygments
-            end
-          when "rouge"
-            Class.new(Redcarpet::Render::HTML) do
-              Jekyll::Deprecator.gracefully_require(%w[
-                rouge
-                rouge/plugins/redcarpet
-              ])
+                            if Rouge.version < '1.3.0'
+                              abort "Please install Rouge 1.3.0 or greater and try running Jekyll again."
+                            end
 
-              if Rouge.version < '1.3.0'
-                abort "Please install Rouge 1.3.0 or greater and try running Jekyll again."
-              end
-
-              include Rouge::Plugins::Redcarpet
-              include CommonMethods
-              include WithRouge
-            end
-          else
-            Class.new(Redcarpet::Render::HTML) do
-              include WithoutHighlighting
-            end
-          end
+                            include Rouge::Plugins::Redcarpet
+                            include CommonMethods
+                            include WithRouge
+                          end
+                        else
+                          Class.new(Redcarpet::Render::HTML) do
+                            include WithoutHighlighting
+                          end
+                        end
+        rescue LoadError
+          STDERR.puts 'You are missing a library required for Markdown. Please run:'
+          STDERR.puts '  $ [sudo] gem install redcarpet'
+          raise FatalException.new("Missing dependency: redcarpet")
         end
 
         def convert(content)

lib/jekyll/converters/textile.rb

@@ -13,7 +13,7 @@ module Jekyll
       rescue LoadError
         STDERR.puts 'You are missing a library required for Textile. Please run:'
         STDERR.puts '  $ [sudo] gem install RedCloth'
-        raise Errors::FatalException.new("Missing dependency: RedCloth")
+        raise FatalException.new("Missing dependency: RedCloth")
       end
 
       def matches(ext)
@@ -32,7 +32,7 @@ module Jekyll
         return RedCloth.new(content).to_html if @config['redcloth'].nil?
 
         # List of attributes defined on RedCloth
-        # (from https://github.com/jgarber/redcloth/blob/master/lib/redcloth/textile_doc.rb)
+        # (from http://redcloth.rubyforge.org/classes/RedCloth/TextileDoc.html)
         attrs = ['filter_classes', 'filter_html', 'filter_ids', 'filter_styles',
                 'hard_breaks', 'lite_mode', 'no_span_caps', 'sanitize_html']
 

lib/jekyll/convertible.rb

@@ -25,7 +25,7 @@ module Jekyll
 
     # Whether the file is published or not, as indicated in YAML front-matter
     def published?
-      !(data.key?('published') && data['published'] == false)
+      !(data.has_key?('published') && data['published'] == false)
     end
 
     # Returns merged option hash for File.read of self.site (if exists)
@@ -43,7 +43,7 @@ module Jekyll
     # Returns nothing.
     def read_yaml(base, name, opts = {})
       begin
-        self.content = File.read(Jekyll.sanitized_path(base, name),
+        self.content = File.read(File.join(base, name),
                                  merged_file_read_opts(opts))
         if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
           self.content = $POSTMATCH
@@ -62,14 +62,11 @@ module Jekyll
     #
     # Returns nothing.
     def transform
-      converters.reduce(content) do |output, converter|
-        begin
-          converter.convert output
-        rescue => e
-          Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error converting '#{path}'."
-          raise e
-        end
-      end
+      self.content = converter.convert(content)
+    rescue => e
+      Jekyll.logger.error "Conversion error:", "There was an error converting" +
+        " '#{path}'."
+      raise e
     end
 
     # Determine the extension depending on content_type.
@@ -77,21 +74,15 @@ module Jekyll
     # Returns the String extension for the output file.
     #   e.g. ".html" for an HTML output file.
     def output_ext
-      if converters.all? { |c| c.is_a?(Jekyll::Converters::Identity) }
-        ext
-      else
-        converters.map { |c|
-          c.output_ext(ext) unless c.is_a?(Jekyll::Converters::Identity)
-        }.compact.last
-      end
+      converter.output_ext(ext)
     end
 
     # Determine which converter to use based on this convertible's
     # extension.
     #
     # Returns the Converter instance.
-    def converters
-      @converters ||= site.converters.select { |c| c.matches(ext) }.sort
+    def converter
+      @converter ||= site.converters.find { |c| c.matches(ext) }
     end
 
     # Render Liquid in the content
@@ -128,12 +119,12 @@ module Jekyll
     #
     # Returns the type of self.
     def type
-      if is_a?(Draft)
-        :drafts
-      elsif is_a?(Post)
-        :posts
+      if is_a?(Post)
+        :post
       elsif is_a?(Page)
-        :pages
+        :page
+      elsif is_a?(Draft)
+        :draft
       end
     end
 
@@ -143,21 +134,7 @@ module Jekyll
     # Returns true if the extname belongs to the set of extensions
     #   that asset files use.
     def asset_file?
-      sass_file? || coffeescript_file?
-    end
-
-    # Determine whether the document is a Sass file.
-    #
-    # Returns true if extname == .sass or .scss, false otherwise.
-    def sass_file?
-      %w[.sass .scss].include?(ext)
-    end
-
-    # Determine whether the document is a CoffeeScript file.
-    #
-    # Returns true if extname == .coffee, false otherwise.
-    def coffeescript_file?
-      '.coffee'.eql?(ext)
+      %w[.sass .scss .coffee].include?(ext)
     end
 
     # Determine whether the file should be rendered with Liquid.
@@ -165,7 +142,7 @@ module Jekyll
     # Returns false if the document is either an asset file or a yaml file,
     #   true otherwise.
     def render_with_liquid?
-      !coffeescript_file?
+      !asset_file?
     end
 
     # Determine whether the file should be placed into layouts.
@@ -176,15 +153,6 @@ module Jekyll
       !asset_file?
     end
 
-    # Checks if the layout specified in the document actually exists
-    #
-    # layout - the layout to check
-    #
-    # Returns true if the layout is invalid, false if otherwise
-    def invalid_layout?(layout)
-      !data["layout"].nil? && layout.nil? && !(self.is_a? Jekyll::Excerpt)
-    end
-
     # Recursively render layouts
     #
     # layouts - a list of the layouts
@@ -195,9 +163,6 @@ module Jekyll
     def render_all_layouts(layouts, payload, info)
       # recursively render layouts
       layout = layouts[data["layout"]]
-
-      Jekyll.logger.warn("Build Warning:", "Layout '#{data["layout"]}' requested in #{path} does not exist.") if invalid_layout? layout
-
       used = Set.new([layout])
 
       while layout
@@ -228,11 +193,11 @@ module Jekyll
       info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload['page'] } }
 
       # render and transform content (this becomes the final content of the object)
-      payload["highlighter_prefix"] = converters.first.highlighter_prefix
-      payload["highlighter_suffix"] = converters.first.highlighter_suffix
+      payload["highlighter_prefix"] = converter.highlighter_prefix
+      payload["highlighter_suffix"] = converter.highlighter_suffix
 
       self.content = render_liquid(content, payload, info) if render_with_liquid?
-      self.content = transform
+      transform
 
       # output keeps track of what will finally be written
       self.output = content

lib/jekyll/deprecator.rb

@@ -1,8 +1,6 @@
 module Jekyll
-  module Deprecator
-    extend self
-
-    def process(args)
+  class Deprecator
+    def self.process(args)
       no_subcommand(args)
       arg_is_present? args, "--server", "The --server command has been replaced by the \
                           'serve' subcommand."
@@ -18,44 +16,21 @@ module Jekyll
       arg_is_present? args, "--url", "The 'url' setting can only be set in your config files."
     end
 
-    def no_subcommand(args)
+    def self.no_subcommand(args)
       if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first)
-        deprecation_message "Jekyll now uses subcommands instead of just \
+        Jekyll.logger.error "Deprecation:", "Jekyll now uses subcommands instead of just \
                             switches. Run `jekyll --help' to find out more."
       end
     end
 
-    def arg_is_present?(args, deprecated_argument, message)
+    def self.arg_is_present?(args, deprecated_argument, message)
       if args.include?(deprecated_argument)
         deprecation_message(message)
       end
     end
 
-    def deprecation_message(message)
+    def self.deprecation_message(message)
       Jekyll.logger.error "Deprecation:", message
     end
-
-    def defaults_deprecate_type(old, current)
-      Jekyll.logger.warn "Defaults:", "The '#{old}' type has become '#{current}'."
-      Jekyll.logger.warn "Defaults:", "Please update your front-matter defaults to use 'type: #{current}'."
-    end
-
-    def gracefully_require(gem_name)
-      Array(gem_name).each do |name|
-        begin
-          require name
-        rescue LoadError => e
-          Jekyll.logger.error "Dependency Error:", <<-MSG
-  Yikes! It looks like you don't have #{name} or one of its dependencies installed.
-  In order to use Jekyll as currently configured, you'll need to install this gem.
-
-  The full error message from Ruby is: '#{e.message}'
-
-  If you run into trouble, you can find helpful resources at http://jekyllrb.com/help/!
-MSG
-          raise Errors::MissingDependencyException.new(name)
-        end
-      end
-    end
   end
 end

lib/jekyll/document.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module Jekyll
   class Document
     include Comparable
@@ -17,7 +15,6 @@ module Jekyll
       @site = relations[:site]
       @path = path
       @collection = relations[:collection]
-      @has_yaml_header = nil
     end
 
     # Fetch the Document's data.
@@ -80,21 +77,7 @@ module Jekyll
     # Returns true if the extname belongs to the set of extensions
     #   that asset files use.
     def asset_file?
-      sass_file? || coffeescript_file?
-    end
-
-    # Determine whether the document is a Sass file.
-    #
-    # Returns true if extname == .sass or .scss, false otherwise.
-    def sass_file?
-      %w[.sass .scss].include?(extname)
-    end
-
-    # Determine whether the document is a CoffeeScript file.
-    #
-    # Returns true if extname == .coffee, false otherwise.
-    def coffeescript_file?
-      '.coffee'.eql?(extname)
+      %w[.sass .scss .coffee].include?(extname)
     end
 
     # Determine whether the file should be rendered with Liquid.
@@ -102,7 +85,7 @@ module Jekyll
     # Returns false if the document is either an asset file or a yaml file,
     #   true otherwise.
     def render_with_liquid?
-      !(coffeescript_file? || yaml_file?)
+      !(asset_file? || yaml_file?)
     end
 
     # Determine whether the file should be placed into layouts.
@@ -144,7 +127,7 @@ module Jekyll
     #
     # Returns the computed URL for the document.
     def url
-      @url = URL.new({
+      @url ||= URL.new({
         template:     url_template,
         placeholders: url_placeholders,
         permalink:    permalink
@@ -189,7 +172,7 @@ module Jekyll
     #
     # Returns true if the 'published' key is specified in the YAML front-matter and not `false`.
     def published?
-      !(data.key?('published') && data['published'] == false)
+      !(data.has_key?('published') && data['published'] == false)
     end
 
     # Read in the file and assign the content and data based on the file contents.
@@ -252,7 +235,7 @@ module Jekyll
     #
     # Returns the content of the document
     def to_s
-      content || ''
+      output || content
     end
 
     # Compare this document against another document.

lib/jekyll/errors.rb

@@ -1,9 +1,4 @@
 module Jekyll
-  module Errors
-    class FatalException < RuntimeError
-    end
-
-    class MissingDependencyException < FatalException
-    end
+  class FatalException < StandardError
   end
 end

lib/jekyll/excerpt.rb

@@ -1,3 +1,4 @@
+require 'jekyll/convertible'
 require 'forwardable'
 
 module Jekyll

lib/jekyll/filters.rb

@@ -25,28 +25,6 @@ module Jekyll
       converter.convert(input)
     end
 
-    # Convert a Sass string into CSS output.
-    #
-    # input - The Sass String to convert.
-    #
-    # Returns the CSS formatted String.
-    def sassify(input)
-      site = @context.registers[:site]
-      converter = site.getConverterImpl(Jekyll::Converters::Sass)
-      converter.convert(input)
-    end
-
-    # Convert a Scss string into CSS output.
-    #
-    # input - The Scss String to convert.
-    #
-    # Returns the CSS formatted String.
-    def scssify(input)
-      site = @context.registers[:site]
-      converter = site.getConverterImpl(Jekyll::Converters::Scss)
-      converter.convert(input)
-    end
-
     # Format a date in short format e.g. "27 Jan 2011".
     #
     # date - the Time to format.
@@ -177,7 +155,7 @@ module Jekyll
     #
     # Returns the converted json string
     def jsonify(input)
-      as_liquid(input).to_json
+      input.to_json
     end
 
     # Group an array of items by a property
@@ -276,9 +254,5 @@ module Jekyll
         item[property.to_s]
       end
     end
-
-    def as_liquid(item)
-      item.respond_to?(:to_liquid) ? item.to_liquid : item
-    end
   end
 end

lib/jekyll/frontmatter_defaults.rb

@@ -1,180 +1,148 @@
 module Jekyll
-  # This class handles custom defaults for YAML frontmatter settings.
-  # These are set in _config.yml and apply both to internal use (e.g. layout)
-  # and the data available to liquid.
-  #
-  # It is exposed via the frontmatter_defaults method on the site class.
-  class FrontmatterDefaults
-    # Initializes a new instance.
-    def initialize(site)
-      @site = site
-    end
-
-    def update_deprecated_types(set)
-      return set unless set.key?('scope') && set['scope'].key?('type')
-
-      set['scope']['type'] = case set['scope']['type']
-      when 'page'
-        Deprecator.defaults_deprecate_type('page', 'pages')
-        'pages'
-      when 'post'
-        Deprecator.defaults_deprecate_type('post', 'posts')
-        'posts'
-      when 'draft'
-        Deprecator.defaults_deprecate_type('draft', 'drafts')
-        'drafts'
-      else
-        set['scope']['type']
+  class Configuration
+    # This class handles custom defaults for YAML frontmatter settings.
+    # These are set in _config.yml and apply both to internal use (e.g. layout)
+    # and the data available to liquid.
+    #
+    # It is exposed via the frontmatter_defaults method on the site class.
+    class FrontmatterDefaults
+      # Initializes a new instance.
+      def initialize(site)
+        @site = site
       end
 
-      set
-    end
+      # Finds a default value for a given setting, filtered by path and type
+      #
+      # path - the path (relative to the source) of the page, post or :draft the default is used in
+      # type - a symbol indicating whether a :page, a :post or a :draft calls this method
+      #
+      # Returns the default value or nil if none was found
+      def find(path, type, setting)
+        value = nil
+        old_scope = nil
 
-    # Finds a default value for a given setting, filtered by path and type
-    #
-    # path - the path (relative to the source) of the page, post or :draft the default is used in
-    # type - a symbol indicating whether a :page, a :post or a :draft calls this method
-    #
-    # Returns the default value or nil if none was found
-    def find(path, type, setting)
-      value = nil
-      old_scope = nil
+        matching_sets(path, type).each do |set|
+          if set['values'].has_key?(setting) && has_precedence?(old_scope, set['scope'])
+            value = set['values'][setting]
+            old_scope = set['scope']
+          end
+        end
+        value
+      end
 
-      matching_sets(path, type).each do |set|
-        if set['values'].key?(setting) && has_precedence?(old_scope, set['scope'])
-          value = set['values'][setting]
-          old_scope = set['scope']
+      # Collects a hash with all default values for a page or post
+      #
+      # path - the relative path of the page or post
+      # type - a symbol indicating the type (:post, :page or :draft)
+      #
+      # Returns a hash with all default values (an empty hash if there are none)
+      def all(path, type)
+        defaults = {}
+        old_scope = nil
+        matching_sets(path, type).each do |set|
+          if has_precedence?(old_scope, set['scope'])
+            defaults.merge! set['values']
+            old_scope = set['scope']
+          else
+            defaults = set['values'].merge(defaults)
+          end
+        end
+        defaults
+      end
+
+      private
+
+      # Checks if a given default setting scope matches the given path and type
+      #
+      # scope - the hash indicating the scope, as defined in _config.yml
+      # path - the path to check for
+      # type - the type (:post, :page or :draft) to check for
+      #
+      # Returns true if the scope applies to the given path and type
+      def applies?(scope, path, type)
+        applies_path?(scope, path) && applies_type?(scope, type)
+      end
+
+      def applies_path?(scope, path)
+        return true if scope['path'].empty?
+
+        scope_path = Pathname.new(scope['path'])
+        Pathname.new(sanitize_path(path)).ascend do |path|
+          if path == scope_path
+            return true
+          end
         end
       end
-      value
-    end
 
-    # Collects a hash with all default values for a page or post
-    #
-    # path - the relative path of the page or post
-    # type - a symbol indicating the type (:post, :page or :draft)
-    #
-    # Returns a hash with all default values (an empty hash if there are none)
-    def all(path, type)
-      defaults = {}
-      old_scope = nil
-      matching_sets(path, type).each do |set|
-        if has_precedence?(old_scope, set['scope'])
-          defaults = Utils.deep_merge_hashes(defaults, set['values'])
-          old_scope = set['scope']
+      def applies_type?(scope, type)
+        !scope.has_key?('type') || scope['type'] == type.to_s
+      end
+
+      # Checks if a given set of default values is valid
+      #
+      # set - the default value hash, as defined in _config.yml
+      #
+      # Returns true if the set is valid and can be used in this class
+      def valid?(set)
+        set.is_a?(Hash) && set['scope'].is_a?(Hash) && set['scope']['path'].is_a?(String) && set['values'].is_a?(Hash)
+      end
+
+      # Determines if a new scope has precedence over an old one
+      #
+      # old_scope - the old scope hash, or nil if there's none
+      # new_scope - the new scope hash
+      #
+      # Returns true if the new scope has precedence over the older
+      def has_precedence?(old_scope, new_scope)
+        return true if old_scope.nil?
+
+        new_path = sanitize_path(new_scope['path'])
+        old_path = sanitize_path(old_scope['path'])
+
+        if new_path.length != old_path.length
+          new_path.length >= old_path.length
+        elsif new_scope.has_key? 'type'
+          true
         else
-          defaults = Utils.deep_merge_hashes(set['values'], defaults)
+          !old_scope.has_key? 'type'
         end
       end
-      defaults
-    end
 
-    private
-
-    # Checks if a given default setting scope matches the given path and type
-    #
-    # scope - the hash indicating the scope, as defined in _config.yml
-    # path - the path to check for
-    # type - the type (:post, :page or :draft) to check for
-    #
-    # Returns true if the scope applies to the given path and type
-    def applies?(scope, path, type)
-      applies_path?(scope, path) && applies_type?(scope, type)
-    end
-
-    def applies_path?(scope, path)
-      return true if !scope.has_key?('path') || scope['path'].empty?
-
-      scope_path = Pathname.new(scope['path'])
-      Pathname.new(sanitize_path(path)).ascend do |path|
-        if path == scope_path
-          return true
+      # Collects a list of sets that match the given path and type
+      #
+      # Returns an array of hashes
+      def matching_sets(path, type)
+        valid_sets.select do |set|
+          applies?(set['scope'], path, type)
         end
       end
-    end
 
-    # Determines whether the scope applies to type.
-    # The scope applies to the type if:
-    #   1. no 'type' is specified
-    #   2. the 'type' in the scope is the same as the type asked about
-    #
-    # scope - the Hash defaults set being asked about application
-    # type  - the type of the document being processed / asked about
-    #         its defaults.
-    #
-    # Returns true if either of the above conditions are satisfied,
-    #   otherwise returns false
-    def applies_type?(scope, type)
-      !scope.key?('type') || scope['type'].eql?(type.to_s)
-    end
+      # Returns a list of valid sets
+      #
+      # This is not cached to allow plugins to modify the configuration
+      # and have their changes take effect
+      #
+      # Returns an array of hashes
+      def valid_sets
+        sets = @site.config['defaults']
+        return [] unless sets.is_a?(Array)
 
-    # Checks if a given set of default values is valid
-    #
-    # set - the default value hash, as defined in _config.yml
-    #
-    # Returns true if the set is valid and can be used in this class
-    def valid?(set)
-      set.is_a?(Hash) && set['values'].is_a?(Hash)
-    end
-
-    # Determines if a new scope has precedence over an old one
-    #
-    # old_scope - the old scope hash, or nil if there's none
-    # new_scope - the new scope hash
-    #
-    # Returns true if the new scope has precedence over the older
-    def has_precedence?(old_scope, new_scope)
-      return true if old_scope.nil?
-
-      new_path = sanitize_path(new_scope['path'])
-      old_path = sanitize_path(old_scope['path'])
-
-      if new_path.length != old_path.length
-        new_path.length >= old_path.length
-      elsif new_scope.key? 'type'
-        true
-      else
-        !old_scope.key? 'type'
+        sets.select do |set|
+          unless valid?(set)
+            Jekyll.logger.warn "Default:", "An invalid default set was found"
+          end
+          valid?(set)
+        end
       end
-    end
 
-    # Collects a list of sets that match the given path and type
-    #
-    # Returns an array of hashes
-    def matching_sets(path, type)
-      valid_sets.select do |set|
-        !set.has_key?('scope') || applies?(set['scope'], path, type)
-      end
-    end
-
-    # Returns a list of valid sets
-    #
-    # This is not cached to allow plugins to modify the configuration
-    # and have their changes take effect
-    #
-    # Returns an array of hashes
-    def valid_sets
-      sets = @site.config['defaults']
-      return [] unless sets.is_a?(Array)
-
-      sets.map do |set|
-        if valid?(set)
-          update_deprecated_types(set)
+      # Sanitizes the given path by removing a leading and addding a trailing slash
+      def sanitize_path(path)
+        if path.nil? || path.empty?
+          ""
         else
-          Jekyll.logger.warn "Defaults:", "An invalid front-matter default set was found:"
-          Jekyll.logger.warn "#{set}"
-          nil
+          path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1/')
         end
-      end.compact
-    end
-
-    # Sanitizes the given path by removing a leading and addding a trailing slash
-    def sanitize_path(path)
-      if path.nil? || path.empty?
-        ""
-      else
-        path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1/')
       end
     end
   end
-end
+end

lib/jekyll/hooks.rb

@@ -0,0 +1,62 @@
+module Jekyll
+  module Hooks
+
+    class HookCollection
+      include Enumerable
+
+      def each(&block)
+        if block.nil?
+          hook_methods
+        else
+          hook_methods.each &block
+        end
+      end
+
+      def hook_methods
+        @hook_methods ||= Array.new
+      end
+
+      def add_hook(proc)
+        hook_methods << proc
+      end
+
+      def exec(*args)
+        if args.empty?
+          hook_methods.each { |hook| hook.call }
+        else
+          hook_methods.each do |hook|
+            args.each { |arg| hook.call(arg) }
+          end
+        end
+      end
+
+    end
+
+    %w[
+      post_reset
+      pre_read
+      post_read
+      pre_generate
+      post_generate
+      pre_render
+      post_render
+      pre_cleanup
+      post_cleanup
+      pre_write
+      post_write
+    ].each do |method|
+      declaration = <<-METH
+      def #{method}(method_name, *args)
+        cr = caller
+        ((@hooks ||= Hash.new).fetch(method_name.to_s, HookCollection.new)).add_hook -> { cr.send(method_name.to_sym, args) }
+      end
+      def #{method}_exec(*args)
+        ((@hooks ||= Hash.new).fetch(method_name.to_s, HookCollection.new)).exec(*args)
+      end
+METH
+puts declaration
+      class_eval declaration
+    end
+
+  end
+end

lib/jekyll/plugin.rb

@@ -27,7 +27,7 @@ module Jekyll
     # Returns the Symbol priority.
     def self.priority(priority = nil)
       @priority ||= nil
-      if priority && PRIORITIES.key?(priority)
+      if priority && PRIORITIES.has_key?(priority)
         @priority = priority
       end
       @priority || :normal
@@ -56,15 +56,6 @@ module Jekyll
       PRIORITIES[other.priority] <=> PRIORITIES[self.priority]
     end
 
-    # Spaceship is priority [higher -> lower]
-    #
-    # other - The class to be compared.
-    #
-    # Returns -1, 0, 1.
-    def <=>(other)
-      self.class <=> other.class
-    end
-
     # Initialize a new plugin. This should be overridden by the subclass.
     #
     # config - The Hash of configuration options.

lib/jekyll/post.rb

@@ -60,8 +60,8 @@ module Jekyll
         site.frontmatter_defaults.find(File.join(dir, name), type, key)
       end
 
-      if data.key?('date')
-        self.date = Utils.parse_date(data["date"].to_s, "Post '#{relative_path}' does not have a valid date in the YAML front matter.")
+      if data.has_key?('date')
+        self.date = Time.parse(data["date"].to_s)
       end
 
       populate_categories
@@ -69,7 +69,7 @@ module Jekyll
     end
 
     def published?
-      if data.key?('published') && data['published'] == false
+      if data.has_key?('published') && data['published'] == false
         false
       else
         true
@@ -78,9 +78,8 @@ module Jekyll
 
     def populate_categories
       categories_from_data = Utils.pluralized_array_from_hash(data, 'category', 'categories')
-      self.categories = (
-        Array(categories) + categories_from_data
-      ).map {|c| c.to_s.downcase}.flatten.uniq
+      self.categories = (Array(categories) + categories_from_data).map {|c| c.to_s.downcase}
+      categories.flatten!
     end
 
     def populate_tags
@@ -159,9 +158,14 @@ module Jekyll
     # Returns nothing.
     def process(name)
       m, cats, date, slug, ext = *name.match(MATCHER)
-      self.date = Utils.parse_date(date, "Post '#{relative_path}' does not have a valid date in the filename.")
+      self.date = Time.parse(date)
       self.slug = slug
       self.ext = ext
+    rescue ArgumentError
+      path = File.join(@dir || "", name)
+      msg  =  "Post '#{path}' does not have a valid date.\n"
+      msg  << "Fix the date, or exclude the file or directory from being processed"
+      raise FatalException.new(msg)
     end
 
     # The generated directory into which the post will be placed
@@ -216,8 +220,8 @@ module Jekyll
         :month       => date.strftime("%m"),
         :day         => date.strftime("%d"),
         :title       => slug,
-        :i_day       => date.strftime("%-d"),
-        :i_month     => date.strftime("%-m"),
+        :i_day       => date.strftime("%d").to_i.to_s,
+        :i_month     => date.strftime("%m").to_i.to_s,
         :categories  => (categories || []).map { |c| c.to_s }.join('/'),
         :short_month => date.strftime("%b"),
         :short_year  => date.strftime("%y"),

lib/jekyll/related_posts.rb

@@ -10,7 +10,7 @@ module Jekyll
     def initialize(post)
       @post = post
       @site = post.site
-      require 'classifier-reborn' if site.lsi
+      require 'classifier' if site.lsi
     end
 
     def build
@@ -27,7 +27,7 @@ module Jekyll
 
     def build_index
       self.class.lsi ||= begin
-        lsi = ClassifierReborn::LSI.new(:auto_rebuild => false)
+        lsi = Classifier::LSI.new(:auto_rebuild => false)
         display("Populating LSI...")
 
         site.posts.each do |x|

lib/jekyll/renderer.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module Jekyll
   class Renderer
 
@@ -49,17 +47,14 @@ module Jekyll
         output = render_liquid(output, payload, info)
       end
 
-      output = convert(output)
-      document.content = output
-
       if document.place_in_layout?
         place_in_layouts(
-          output,
+          convert(output),
           payload,
           info
         )
       else
-        output
+        convert(output)
       end
     end
 
@@ -97,15 +92,6 @@ module Jekyll
       raise e
     end
 
-    # Checks if the layout specified in the document actually exists
-    #
-    # layout - the layout to check
-    #
-    # Returns true if the layout is invalid, false if otherwise
-    def invalid_layout?(layout)
-      !document.data["layout"].nil? && layout.nil?
-    end
-
     # Render layouts and place given content inside.
     #
     # content - the content to be placed in the layout
@@ -115,9 +101,6 @@ module Jekyll
     def place_in_layouts(content, payload, info)
       output = content.dup
       layout = site.layouts[document.data["layout"]]
-
-      Jekyll.logger.warn("Build Warning:", "Layout '#{document.data["layout"]}' requested in #{document.relative_path} does not exist.") if invalid_layout? layout
-
       used   = Set.new([layout])
 
       while layout

lib/jekyll/site.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module Jekyll
   class Site
     attr_accessor :config, :layouts, :posts, :pages, :static_files,
@@ -10,6 +8,8 @@ module Jekyll
 
     attr_accessor :converters, :generators
 
+    include Jekyll::Hooks
+
     # Public: Initialize a new Site.
     #
     # config - A Hash containing site configuration details.
@@ -51,7 +51,7 @@ module Jekyll
     #
     # Returns nothing
     def reset
-      self.time = (config['time'] ? Utils.parse_date(config['time'].to_s, "Invalid time in _config.yml.") : Time.now)
+      self.time = (config['time'] ? Time.parse(config['time'].to_s) : Time.now)
       self.layouts = {}
       self.posts = []
       self.pages = []
@@ -82,7 +82,7 @@ module Jekyll
       dest_pathname = Pathname.new(dest)
       Pathname.new(source).ascend do |path|
         if path == dest_pathname
-          raise Errors::FatalException.new "Destination directory cannot be or contain the Source directory."
+          raise FatalException.new "Destination directory cannot be or contain the Source directory."
         end
       end
     end
@@ -144,7 +144,7 @@ module Jekyll
         if File.directory?(f_abs)
           f_rel = File.join(dir, f)
           read_directories(f_rel) unless dest.sub(/\/$/, '') == f_abs
-        elsif Utils.has_yaml_header?(f_abs)
+        elsif has_yaml_header?(f_abs)
           page = Page.new(self, source, dir, f)
           pages << page if publisher.publish?(page)
         else
@@ -197,7 +197,7 @@ module Jekyll
     #
     # Returns nothing
     def read_data(dir)
-      base = Jekyll.sanitized_path(source, dir)
+      base = File.join(source, dir)
       read_data_to(base, self.data)
     end
 
@@ -216,7 +216,7 @@ module Jekyll
       end
 
       entries.each do |entry|
-        path = Jekyll.sanitized_path(dir, entry)
+        path = File.join(dir, entry)
         next if File.symlink?(path) && safe
 
         key = sanitize_filename(File.basename(entry, '.*'))
@@ -432,7 +432,7 @@ module Jekyll
 
     def documents
       collections.reduce(Set.new) do |docs, (_, collection)|
-        docs + collection.docs + collection.files
+        docs.merge(collection.docs)
       end.to_a
     end
 
@@ -445,7 +445,7 @@ module Jekyll
     end
 
     def frontmatter_defaults
-      @frontmatter_defaults ||= FrontmatterDefaults.new(self)
+      @frontmatter_defaults ||= Configuration::FrontmatterDefaults.new(self)
     end
 
     private
@@ -454,6 +454,10 @@ module Jekyll
       pages.any? { |page| page.uses_relative_permalinks }
     end
 
+    def has_yaml_header?(file)
+      !!(File.open(file, 'rb') { |f| f.read(5) } =~ /\A---\r?\n/)
+    end
+
     def limit_posts!
       limit = posts.length < limit_posts ? posts.length : limit_posts
       self.posts = posts[-limit, limit]

lib/jekyll/static_file.rb

@@ -9,12 +9,11 @@ module Jekyll
     # base - The String path to the <source>.
     # dir  - The String path between <source> and the file.
     # name - The String filename of the file.
-    def initialize(site, base, dir, name, collection = nil)
+    def initialize(site, base, dir, name)
       @site = site
       @base = base
       @dir  = dir
       @name = name
-      @collection = collection
     end
 
     # Returns source file path.
@@ -24,11 +23,7 @@ module Jekyll
 
     # Returns the source file path relative to the site source
     def relative_path
-      @relative_path ||= File.join(*[@dir, @name].compact)
-    end
-
-    def extname
-      File.extname(path)
+      @relative_path ||= path.sub(/\A#{@site.source}/, '')
     end
 
     # Obtain destination path.
@@ -37,15 +32,7 @@ module Jekyll
     #
     # Returns destination file path.
     def destination(dest)
-      File.join(*[dest, destination_rel_dir, @name].compact)
-    end
-
-    def destination_rel_dir
-      if @collection
-        @dir.gsub(/\A_/, '')
-      else
-        @dir
-      end
+      File.join(*[dest, @dir, @name].compact)
     end
 
     # Returns last modification time for this file.
@@ -60,13 +47,6 @@ module Jekyll
       @@mtimes[path] != mtime
     end
 
-    # Whether to write the file to the filesystem
-    #
-    # Returns true.
-    def write?
-      true
-    end
-
     # Write the static file to the destination directory (if modified).
     #
     # dest - The String path to the destination dir.
@@ -95,7 +75,7 @@ module Jekyll
 
     def to_liquid
       {
-        "path"          => File.join("", relative_path),
+        "path"          => relative_path,
         "modified_time" => mtime.to_s,
         "extname"       => File.extname(relative_path)
       }

lib/jekyll/tags/highlight.rb

@@ -4,11 +4,9 @@ module Jekyll
       include Liquid::StandardFilters
 
       # The regular expression syntax checker. Start with the language specifier.
-      # Follow that by zero or more space separated options that take one of three
-      # forms: name, name=value, or name="<quoted list>"
-      #
-      # <quoted list> is a space-separated list of numbers
-      SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=(\w+|"([0-9]+\s)*[0-9]+"))?)*)$/
+      # Follow that by zero or more space separated options that take one of two
+      # forms: name or name=value
+      SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=\w+)?)*)$/
 
       def initialize(tag_name, markup, tokens)
         super
@@ -16,14 +14,8 @@ module Jekyll
           @lang = $1.downcase
           @options = {}
           if defined?($2) && $2 != ''
-            # Split along 3 possible forms -- key="<quoted list>", key=value, or key
-            $2.scan(/(?:\w="[^"]*"|\w=\w|\w)+/) do |opt|
+            $2.split.each do |opt|
               key, value = opt.split('=')
-              # If a quoted list, convert to array
-              if value && value.include?("\"")
-                  value.gsub!(/"/, "")
-                  value = value.split
-              end
               @options[key.to_sym] = value || true
             end
           end
@@ -44,11 +36,9 @@ eos
         suffix = context["highlighter_suffix"] || ""
         code = super.to_s.strip
 
-        is_safe = !!context.registers[:site].safe
-
         output = case context.registers[:site].highlighter
         when 'pygments'
-          render_pygments(code, is_safe)
+          render_pygments(code)
         when 'rouge'
           render_rouge(code)
         else
@@ -59,30 +49,11 @@ eos
         prefix + rendered_output + suffix
       end
 
-      def sanitized_opts(opts, is_safe)
-        if is_safe
-          Hash[[
-            [:startinline, opts.fetch(:startinline, nil)],
-            [:hl_linenos,  opts.fetch(:hl_linenos, nil)],
-            [:linenos,     opts.fetch(:linenos, nil)],
-            [:encoding,    opts.fetch(:encoding, 'utf-8')],
-            [:cssclass,    opts.fetch(:cssclass, nil)]
-          ].reject {|f| f.last.nil? }]
-        else
-          opts
-        end
-      end
-
-      def render_pygments(code, is_safe)
+      def render_pygments(code)
         require 'pygments'
-
         @options[:encoding] = 'utf-8'
 
-        highlighted_code = Pygments.highlight(
-          code,
-          :lexer   => @lang,
-          :options => sanitized_opts(@options, is_safe)
-        )
+        highlighted_code = Pygments.highlight(code, :lexer => @lang, :options => @options)
 
         if highlighted_code.nil?
           Jekyll.logger.error "There was an error highlighting your code:"

lib/jekyll/tags/include.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module Jekyll
   module Tags
     class IncludeTagError < StandardError
@@ -16,7 +14,7 @@ module Jekyll
       SYNTAX_EXAMPLE = "{% include file.ext param='value' param2='value' %}"
 
       VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
-      VARIABLE_SYNTAX = /(?<variable>[^{]*\{\{\s*(?<name>[\w\-\.]+)\s*(\|.*)?\}\}[^\s}]*)(?<params>.*)/
+      VARIABLE_SYNTAX = /(?<variable>\{\{\s*(?<name>[\w\-\.]+)\s*(\|.*)?\}\})(?<params>.*)/
 
       INCLUDES_DIR = '_includes'
 
@@ -133,6 +131,10 @@ eos
         File.exist?(path) && File.realpath(path).start_with?(dir)
       end
 
+      def blank?
+        false
+      end
+
       # This method allows to modify the file content by inheriting from the class.
       def source(file, context)
         File.read(file, file_read_opts(context))

lib/jekyll/tags/post_url.rb

@@ -7,9 +7,9 @@ module Jekyll
 
       def initialize(name)
         all, path, date, slug = *name.sub(/^\//, "").match(MATCHER)
-        raise ArgumentError.new("'#{name}' does not contain valid date and/or title.") unless all
+        raise ArgumentError.new("'#{name}' does not contain valid date and/or title") unless all
         @slug = path ? path + slug : slug
-        @date = Utils.parse_date(date, "'#{name}' does not contain valid date.")
+        @date = Time.parse(date)
       end
 
       def ==(other)

lib/jekyll/utils.rb

@@ -1,106 +1,87 @@
 module Jekyll
   module Utils
-    extend self
+    class << self
 
-    # Merges a master hash with another hash, recursively.
-    #
-    # master_hash - the "parent" hash whose values will be overridden
-    # other_hash  - the other hash whose values will be persisted after the merge
-    #
-    # This code was lovingly stolen from some random gem:
-    # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
-    #
-    # Thanks to whoever made it.
-    def deep_merge_hashes(master_hash, other_hash)
-      target = master_hash.dup
+      # Merges a master hash with another hash, recursively.
+      #
+      # master_hash - the "parent" hash whose values will be overridden
+      # other_hash  - the other hash whose values will be persisted after the merge
+      #
+      # This code was lovingly stolen from some random gem:
+      # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+      #
+      # Thanks to whoever made it.
+      def deep_merge_hashes(master_hash, other_hash)
+        target = master_hash.dup
 
-      other_hash.keys.each do |key|
-        if other_hash[key].is_a? Hash and target[key].is_a? Hash
-          target[key] = Utils.deep_merge_hashes(target[key], other_hash[key])
-          next
+        other_hash.keys.each do |key|
+          if other_hash[key].is_a? Hash and target[key].is_a? Hash
+            target[key] = Utils.deep_merge_hashes(target[key], other_hash[key])
+            next
+          end
+
+          target[key] = other_hash[key]
         end
 
-        target[key] = other_hash[key]
+        target
       end
 
-      target
-    end
-
-    # Read array from the supplied hash favouring the singular key
-    # and then the plural key, and handling any nil entries.
-    #
-    # hash - the hash to read from
-    # singular_key - the singular key
-    # plural_key - the plural key
-    #
-    # Returns an array
-    def pluralized_array_from_hash(hash, singular_key, plural_key)
-      [].tap do |array|
-        array << (value_from_singular_key(hash, singular_key) || value_from_plural_key(hash, plural_key))
-      end.flatten.compact
-    end
-
-    def value_from_singular_key(hash, key)
-      hash[key] if (hash.key?(key) || (hash.default_proc && hash[key]))
-    end
-
-    def value_from_plural_key(hash, key)
-      if hash.key?(key) || (hash.default_proc && hash[key])
-        val = hash[key]
-        case val
-        when String
-          val.split
-        when Array
-          val.compact
+      # Read array from the supplied hash favouring the singular key
+      # and then the plural key, and handling any nil entries.
+      #
+      # hash - the hash to read from
+      # singular_key - the singular key
+      # plural_key - the plural key
+      #
+      # Returns an array
+      def pluralized_array_from_hash(hash, singular_key, plural_key)
+        [].tap do |array|
+          array << (value_from_singular_key(hash, singular_key) || value_from_plural_key(hash, plural_key))
+        end.flatten.compact
+      end
+      
+      def value_from_singular_key(hash, key)
+        hash[key] if (hash.has_key?(key) || (hash.default_proc && hash[key]))
+      end
+      
+      def value_from_plural_key(hash, key)
+        if hash.has_key?(key) || (hash.default_proc && hash[key])
+          val = hash[key]
+          case val
+          when String
+            val.split
+          when Array
+            val.compact
+          end
         end
       end
-    end
 
-    def transform_keys(hash)
-      result = {}
-      hash.each_key do |key|
-        result[yield(key)] = hash[key]
+      def transform_keys(hash)
+        result = {}
+        hash.each_key do |key|
+          result[yield(key)] = hash[key]
+        end
+        result
       end
-      result
-    end
 
-    # Apply #to_sym to all keys in the hash
-    #
-    # hash - the hash to which to apply this transformation
-    #
-    # Returns a new hash with symbolized keys
-    def symbolize_hash_keys(hash)
-      transform_keys(hash) { |key| key.to_sym rescue key }
-    end
+      # Apply #to_sym to all keys in the hash
+      #
+      # hash - the hash to which to apply this transformation
+      #
+      # Returns a new hash with symbolized keys
+      def symbolize_hash_keys(hash)
+        transform_keys(hash) { |key| key.to_sym rescue key }
+      end
 
-    # Apply #to_s to all keys in the Hash
-    #
-    # hash - the hash to which to apply this transformation
-    #
-    # Returns a new hash with stringified keys
-    def stringify_hash_keys(hash)
-      transform_keys(hash) { |key| key.to_s rescue key }
-    end
+      # Apply #to_s to all keys in the Hash
+      #
+      # hash - the hash to which to apply this transformation
+      #
+      # Returns a new hash with stringified keys
+      def stringify_hash_keys(hash)
+        transform_keys(hash) { |key| key.to_s rescue key }
+      end
 
-    # Parse a date/time and throw an error if invalid
-    #
-    # input - the date/time to parse
-    # msg - (optional) the error message to show the user
-    #
-    # Returns the parsed date if successful, throws a FatalException
-    # if not
-    def parse_date(input, msg = "Input could not be parsed.")
-      Time.parse(input)
-    rescue ArgumentError
-      raise Errors::FatalException.new("Invalid date '#{input}': " + msg)
     end
-
-    # Determines whether a given file has
-    #
-    # Returns true if the YAML front matter is present.
-    def has_yaml_header?(file)
-      !!(File.open(file, 'rb') { |f| f.read(5) } =~ /\A---\r?\n/)
-    end
-
   end
 end

lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.3.0'
+  VERSION = '2.0.3'
 end

lib/site_template/_config.yml

@@ -1,14 +1,12 @@
 # Site settings
 title: Your awesome title
 email: your-email@domain.com
-description: > # this means to ignore newlines until "baseurl:"
-  Write an awesome description for your new site here. You can edit this
-  line in _config.yml. It will appear in your document head meta (for
-  Google search results) and in your feed.xml site description.
-baseurl: "" # the subpath of your site, e.g. /blog/
-url: "http://yourdomain.com" # the base hostname & protocol for your site
+description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
+baseurl: ""
+url: "http://yourdomain.com"
 twitter_username: jekyllrb
 github_username:  jekyll
 
 # Build settings
 markdown: kramdown
+permalink: pretty

lib/site_template/_includes/footer.html

@@ -1,53 +1,59 @@
 <footer class="site-footer">
 
-  <div class="wrapper">
+  <div class="wrap">
 
     <h2 class="footer-heading">{{ site.title }}</h2>
 
-    <div class="footer-col-wrapper">
-      <div class="footer-col  footer-col-1">
-        <ul class="contact-list">
-          <li>{{ site.title }}</li>
-          <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
-        </ul>
-      </div>
+    <div class="footer-col-1 column">
+      <ul>
+        <li>{{ site.title }}</li>
+        <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
+      </ul>
+    </div>
 
-      <div class="footer-col  footer-col-2">
-        <ul class="social-media-list">
-          {% if site.github_username %}
-          <li>
-            <a href="https://github.com/{{ site.github_username }}">
-              <span class="icon  icon--github">
-                <svg viewBox="0 0 16 16">
-                  <path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
-                </svg>
-              </span>
+    <div class="footer-col-2 column">
+      <ul>
+        {% if site.github_username %}<li>
+          <a href="https://github.com/{{ site.github_username }}">
+            <span class="icon github">
+              <svg version="1.1" class="github-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+                 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+                <path fill-rule="evenodd" clip-rule="evenodd" fill="#C2C2C2" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761
+                c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32
+                c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472
+                c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037
+                C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65
+                c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261
+                c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082
+                c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129
+                c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
+              </svg>
+            </span>
+            <span class="username">{{ site.github_username }}</span>
+          </a>
+        </li>{% endif %}
+        {% if site.twitter_username %}<li>
+          <a href="https://twitter.com/{{ site.twitter_username }}">
+            <span class="icon twitter">
+              <svg version="1.1" class="twitter-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+                 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+                <path fill="#C2C2C2" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
+                c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27
+                c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767
+                c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206
+                C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271
+                c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469
+                c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
+              </svg>
+            </span>
+            <span class="username">{{ site.twitter_username }}</span>
+          </a>
+        </li>{% endif %}
+      </ul>
+    </div>
 
-              <span class="username">{{ site.github_username }}</span>
-            </a>
-          </li>
-          {% endif %}
-
-          {% if site.twitter_username %}
-          <li>
-            <a href="https://twitter.com/{{ site.twitter_username }}">
-              <span class="icon  icon--twitter">
-                <svg viewBox="0 0 16 16">
-                  <path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
-                  c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
-                </svg>
-              </span>
-
-              <span class="username">{{ site.twitter_username }}</span>
-            </a>
-          </li>
-          {% endif %}
-        </ul>
-      </div>
-
-      <div class="footer-col  footer-col-3">
-        <p class="text">{{ site.description }}</p>
-      </div>
+    <div class="footer-col-3 column">
+      <p class="text">{{ site.description }}</p>
     </div>
 
   </div>

lib/site_template/_includes/head.html

@@ -1,11 +1,12 @@
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
+    <meta name="viewport" content="width=device-width">
     <meta name="description" content="{{ site.description }}">
-
-    <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+
+    <!-- Custom CSS -->
+    <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
+
 </head>

lib/site_template/_includes/header.html

@@ -1,23 +1,24 @@
 <header class="site-header">
 
-  <div class="wrapper">
+  <div class="wrap">
 
     <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
 
     <nav class="site-nav">
       <a href="#" class="menu-icon">
-        <svg viewBox="0 0 18 15">
-          <path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
-          <path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
-          <path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
+        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+           viewBox="0 0 18 15" enable-background="new 0 0 18 15" xml:space="preserve">
+          <path fill="#505050" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0
+            h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
+          <path fill="#505050" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484
+            h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
+          <path fill="#505050" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0
+            c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
         </svg>
       </a>
-
       <div class="trigger">
         {% for page in site.pages %}
-          {% if page.title %}
-          <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
-          {% endif %}
+          {% if page.title %}<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>{% endif %}
         {% endfor %}
       </div>
     </nav>

lib/site_template/_layouts/default.html

@@ -3,18 +3,17 @@
 
   {% include head.html %}
 
-  <body>
+    <body>
 
     {% include header.html %}
 
     <div class="page-content">
-      <div class="wrapper">
-        {{ content }}
+      <div class="wrap">
+      {{ content }}
       </div>
     </div>
 
     {% include footer.html %}
 
-  </body>
-
-</html>
+    </body>
+</html>

lib/site_template/_layouts/page.html

@@ -4,11 +4,11 @@ layout: default
 <div class="post">
 
   <header class="post-header">
-    <h1 class="post-title">{{ page.title }}</h1>
+    <h1>{{ page.title }}</h1>
   </header>
 
   <article class="post-content">
-    {{ content }}
+  {{ content }}
   </article>
 
-</div>
+</div>

lib/site_template/_layouts/post.html

@@ -4,12 +4,12 @@ layout: default
 <div class="post">
 
   <header class="post-header">
-    <h1 class="post-title">{{ page.title }}</h1>
-    <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+    <h1>{{ page.title }}</h1>
+    <p class="meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
   </header>
 
   <article class="post-content">
-    {{ content }}
+  {{ content }}
   </article>
 
-</div>
+</div>

lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb

@@ -4,9 +4,9 @@ title:  "Welcome to Jekyll!"
 date:   <%= Time.now.strftime('%Y-%m-%d %H:%M:%S') %>
 categories: jekyll update
 ---
-You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve --watch`, which launches a web server and auto-regenerates your site when a file is updated.
 
-To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
+You'll find this post in your `_posts` directory - edit this post and re-build (or run with the `-w` switch) to see your changes!
+To add new posts, simply add a file in the `_posts` directory that follows the convention: YYYY-MM-DD-name-of-post.ext.
 
 Jekyll also offers powerful support for code snippets:
 
@@ -18,8 +18,7 @@ print_hi('Tom')
 #=> prints 'Hi, Tom' to STDOUT.
 {% endhighlight %}
 
-Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll’s dedicated Help repository][jekyll-help].
+Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll's GitHub repo][jekyll-gh].
 
-[jekyll]:      http://jekyllrb.com
-[jekyll-gh]:   https://github.com/jekyll/jekyll
-[jekyll-help]: https://github.com/jekyll/jekyll-help
+[jekyll-gh]: https://github.com/jekyll/jekyll
+[jekyll]:    http://jekyllrb.com

lib/site_template/_sass/_base.scss

@@ -1,203 +0,0 @@
-/**
- * Reset some basic elements
- */
-body, h1, h2, h3, h4, h5, h6,
-p, blockquote, pre, hr,
-dl, dd, ol, ul, figure {
-    margin: 0;
-    padding: 0;
-}
-
-
-
-/**
- * Basic styling
- */
-body {
-    font-family: $base-font-family;
-    font-size: $base-font-size;
-    line-height: $base-line-height;
-    font-weight: 300;
-    color: $text-color;
-    background-color: $background-color;
-}
-
-
-
-/**
- * Set `margin-bottom` to maintain vertycal rhythm
- */
-h1, h2, h3, h4, h5, h6,
-p, blockquote, pre,
-ul, ol, dl, figure,
-%vertical-rhythm {
-    margin-bottom: $spacing-unit / 2;
-}
-
-
-
-/**
- * Images
- */
-img {
-    max-width: 100%;
-    vertical-align: middle;
-}
-
-
-
-/**
- * Figures
- */
-figure > img {
-    display: block;
-}
-
-figcaption {
-    font-size: $small-font-size;
-}
-
-
-
-/**
- * Lists
- */
-ul, ol {
-    margin-left: $spacing-unit;
-}
-
-li {
-    > ul,
-    > ol {
-         margin-bottom: 0;
-    }
-}
-
-
-
-/**
- * Headings
- */
-h1, h2, h3, h4, h5, h6 {
-    font-weight: 300;
-}
-
-
-
-/**
- * Links
- */
-a {
-    color: $brand-color;
-    text-decoration: none;
-
-    &:visited {
-        color: darken($brand-color, 15%);
-    }
-
-    &:hover {
-        color: $text-color;
-        text-decoration: underline;
-    }
-}
-
-
-
-/**
- * Blockquotes
- */
-blockquote {
-    color: $grey-color;
-    border-left: 4px solid $grey-color-light;
-    padding-left: $spacing-unit / 2;
-    font-size: 18px;
-    letter-spacing: -1px;
-    font-style: italic;
-
-    > :last-child {
-        margin-bottom: 0;
-    }
-}
-
-
-
-/**
- * Code formatting
- */
-pre,
-code {
-    font-size: 15px;
-    border: 1px solid $grey-color-light;
-    border-radius: 3px;
-    background-color: #eef;
-}
-
-code {
-    padding: 1px 5px;
-}
-
-pre {
-    padding: 8px 12px;
-    overflow-x: scroll;
-
-    > code {
-        border: 0;
-        padding-right: 0;
-        padding-left: 0;
-    }
-}
-
-
-
-/**
- * Wrapper
- */
-.wrapper {
-    max-width: -webkit-calc(800px - (#{$spacing-unit} * 2));
-    max-width:         calc(800px - (#{$spacing-unit} * 2));
-    margin-right: auto;
-    margin-left: auto;
-    padding-right: $spacing-unit;
-    padding-left: $spacing-unit;
-    @extend %clearfix;
-
-    @include media-query($on-laptop) {
-        max-width: -webkit-calc(800px - (#{$spacing-unit}));
-        max-width:         calc(800px - (#{$spacing-unit}));
-        padding-right: $spacing-unit / 2;
-        padding-left: $spacing-unit / 2;
-    }
-}
-
-
-
-/**
- * Clearfix
- */
-%clearfix {
-
-    &:after {
-        content: "";
-        display: table;
-        clear: both;
-    }
-}
-
-
-
-/**
- * Icons
- */
-.icon {
-
-    > svg {
-        display: inline-block;
-        width: 16px;
-        height: 16px;
-        vertical-align: middle;
-
-        path {
-            fill: $grey-color;
-        }
-    }
-}

lib/site_template/_sass/_layout.scss

@@ -1,236 +0,0 @@
-/**
- * Site header
- */
-.site-header {
-    border-top: 5px solid $grey-color-dark;
-    border-bottom: 1px solid $grey-color-light;
-    min-height: 56px;
-
-    // Positioning context for the mobile navigation icon
-    position: relative;
-}
-
-.site-title {
-    font-size: 26px;
-    line-height: 56px;
-    letter-spacing: -1px;
-    margin-bottom: 0;
-    float: left;
-
-    &,
-    &:visited {
-        color: $grey-color-dark;
-    }
-}
-
-.site-nav {
-    float: right;
-    line-height: 56px;
-
-    .menu-icon {
-        display: none;
-    }
-
-    .page-link {
-        color: $text-color;
-        line-height: $base-line-height;
-
-        // Gaps between nav items, but not on the first one
-        &:not(:first-child) {
-            margin-left: 20px;
-        }
-    }
-
-    @include media-query($on-palm) {
-        position: absolute;
-        top: 9px;
-        right: 30px;
-        background-color: $background-color;
-        border: 1px solid $grey-color-light;
-        border-radius: 5px;
-        text-align: right;
-
-        .menu-icon {
-            display: block;
-            float: right;
-            width: 36px;
-            height: 26px;
-            line-height: 0;
-            padding-top: 10px;
-            text-align: center;
-
-            > svg {
-                width: 18px;
-                height: 15px;
-
-                path {
-                    fill: $grey-color-dark;
-                }
-            }
-        }
-
-        .trigger {
-            clear: both;
-            display: none;
-        }
-
-        &:hover .trigger {
-            display: block;
-            padding-bottom: 5px;
-        }
-
-        .page-link {
-            display: block;
-            padding: 5px 10px;
-        }
-    }
-}
-
-
-
-/**
- * Site footer
- */
-.site-footer {
-    border-top: 1px solid $grey-color-light;
-    padding: $spacing-unit 0;
-}
-
-.footer-heading {
-    font-size: 18px;
-    margin-bottom: $spacing-unit / 2;
-}
-
-.contact-list,
-.social-media-list {
-    list-style: none;
-    margin-left: 0;
-}
-
-.footer-col-wrapper {
-    font-size: 15px;
-    color: $grey-color;
-    margin-left: -$spacing-unit / 2;
-    @extend %clearfix;
-}
-
-.footer-col {
-    float: left;
-    margin-bottom: $spacing-unit / 2;
-    padding-left: $spacing-unit / 2;
-}
-
-.footer-col-1 {
-    width: -webkit-calc(35% - (#{$spacing-unit} / 2));
-    width:         calc(35% - (#{$spacing-unit} / 2));
-}
-
-.footer-col-2 {
-    width: -webkit-calc(20% - (#{$spacing-unit} / 2));
-    width:         calc(20% - (#{$spacing-unit} / 2));
-}
-
-.footer-col-3 {
-    width: -webkit-calc(45% - (#{$spacing-unit} / 2));
-    width:         calc(45% - (#{$spacing-unit} / 2));
-}
-
-@include media-query($on-laptop) {
-    .footer-col-1,
-    .footer-col-2 {
-        width: -webkit-calc(50% - (#{$spacing-unit} / 2));
-        width:         calc(50% - (#{$spacing-unit} / 2));
-    }
-
-    .footer-col-3 {
-        width: -webkit-calc(100% - (#{$spacing-unit} / 2));
-        width:         calc(100% - (#{$spacing-unit} / 2));
-    }
-}
-
-@include media-query($on-palm) {
-    .footer-col {
-        float: none;
-        width: -webkit-calc(100% - (#{$spacing-unit} / 2));
-        width:         calc(100% - (#{$spacing-unit} / 2));
-    }
-}
-
-
-
-/**
- * Page content
- */
-.page-content {
-    padding: $spacing-unit 0;
-}
-
-.page-heading {
-    font-size: 20px;
-}
-
-.post-list {
-    margin-left: 0;
-    list-style: none;
-
-    > li {
-        margin-bottom: $spacing-unit;
-    }
-}
-
-.post-meta {
-    font-size: $small-font-size;
-    color: $grey-color;
-}
-
-.post-link {
-    display: block;
-    font-size: 24px;
-}
-
-
-
-/**
- * Posts
- */
-.post-header {
-    margin-bottom: $spacing-unit;
-}
-
-.post-title {
-    font-size: 42px;
-    letter-spacing: -1px;
-    line-height: 1;
-
-    @include media-query($on-laptop) {
-        font-size: 36px;
-    }
-}
-
-.post-content {
-    margin-bottom: $spacing-unit;
-
-    h2 {
-        font-size: 32px;
-
-        @include media-query($on-laptop) {
-            font-size: 28px;
-        }
-    }
-
-    h3 {
-        font-size: 26px;
-
-        @include media-query($on-laptop) {
-            font-size: 22px;
-        }
-    }
-
-    h4 {
-        font-size: 20px;
-
-        @include media-query($on-laptop) {
-            font-size: 18px;
-        }
-    }
-}

lib/site_template/_sass/_syntax-highlighting.scss

@@ -1,67 +0,0 @@
-/**
- * Syntax highlighting styles
- */
-.highlight {
-    background: #fff;
-    @extend %vertical-rhythm;
-
-    .c     { color: #998; font-style: italic } // Comment
-    .err   { color: #a61717; background-color: #e3d2d2 } // Error
-    .k     { font-weight: bold } // Keyword
-    .o     { font-weight: bold } // Operator
-    .cm    { color: #998; font-style: italic } // Comment.Multiline
-    .cp    { color: #999; font-weight: bold } // Comment.Preproc
-    .c1    { color: #998; font-style: italic } // Comment.Single
-    .cs    { color: #999; font-weight: bold; font-style: italic } // Comment.Special
-    .gd    { color: #000; background-color: #fdd } // Generic.Deleted
-    .gd .x { color: #000; background-color: #faa } // Generic.Deleted.Specific
-    .ge    { font-style: italic } // Generic.Emph
-    .gr    { color: #a00 } // Generic.Error
-    .gh    { color: #999 } // Generic.Heading
-    .gi    { color: #000; background-color: #dfd } // Generic.Inserted
-    .gi .x { color: #000; background-color: #afa } // Generic.Inserted.Specific
-    .go    { color: #888 } // Generic.Output
-    .gp    { color: #555 } // Generic.Prompt
-    .gs    { font-weight: bold } // Generic.Strong
-    .gu    { color: #aaa } // Generic.Subheading
-    .gt    { color: #a00 } // Generic.Traceback
-    .kc    { font-weight: bold } // Keyword.Constant
-    .kd    { font-weight: bold } // Keyword.Declaration
-    .kp    { font-weight: bold } // Keyword.Pseudo
-    .kr    { font-weight: bold } // Keyword.Reserved
-    .kt    { color: #458; font-weight: bold } // Keyword.Type
-    .m     { color: #099 } // Literal.Number
-    .s     { color: #d14 } // Literal.String
-    .na    { color: #008080 } // Name.Attribute
-    .nb    { color: #0086B3 } // Name.Builtin
-    .nc    { color: #458; font-weight: bold } // Name.Class
-    .no    { color: #008080 } // Name.Constant
-    .ni    { color: #800080 } // Name.Entity
-    .ne    { color: #900; font-weight: bold } // Name.Exception
-    .nf    { color: #900; font-weight: bold } // Name.Function
-    .nn    { color: #555 } // Name.Namespace
-    .nt    { color: #000080 } // Name.Tag
-    .nv    { color: #008080 } // Name.Variable
-    .ow    { font-weight: bold } // Operator.Word
-    .w     { color: #bbb } // Text.Whitespace
-    .mf    { color: #099 } // Literal.Number.Float
-    .mh    { color: #099 } // Literal.Number.Hex
-    .mi    { color: #099 } // Literal.Number.Integer
-    .mo    { color: #099 } // Literal.Number.Oct
-    .sb    { color: #d14 } // Literal.String.Backtick
-    .sc    { color: #d14 } // Literal.String.Char
-    .sd    { color: #d14 } // Literal.String.Doc
-    .s2    { color: #d14 } // Literal.String.Double
-    .se    { color: #d14 } // Literal.String.Escape
-    .sh    { color: #d14 } // Literal.String.Heredoc
-    .si    { color: #d14 } // Literal.String.Interpol
-    .sx    { color: #d14 } // Literal.String.Other
-    .sr    { color: #009926 } // Literal.String.Regex
-    .s1    { color: #d14 } // Literal.String.Single
-    .ss    { color: #990073 } // Literal.String.Symbol
-    .bp    { color: #999 } // Name.Builtin.Pseudo
-    .vc    { color: #008080 } // Name.Variable.Class
-    .vg    { color: #008080 } // Name.Variable.Global
-    .vi    { color: #008080 } // Name.Variable.Instance
-    .il    { color: #099 } // Literal.Number.Integer.Long
-}

lib/site_template/css/main.css

@@ -0,0 +1,410 @@
+/* Base */
+/* ----------------------------------------------------------*/
+
+* {
+  margin: 0;
+  padding: 0;
+}
+
+html, body { height: 100%; }
+
+body {
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 1.5;
+  font-weight: 300;
+  background-color: #fdfdfd;
+}
+
+h1, h2, h3, h4, h5, h6 { font-size: 100%; font-weight: 400; }
+
+a         { color: #2a7ae2; text-decoration: none; }
+a:hover   { color: #000; text-decoration: underline; }
+a:visited { color: #205caa; }
+
+/* Utility */
+
+.wrap:before,
+.wrap:after { content:""; display:table; }
+.wrap:after { clear: both; }
+.wrap {
+  max-width: 800px;
+  padding: 0 30px;
+  margin: 0 auto;
+  zoom: 1;
+}
+
+
+/* Layout Styles */
+/* ----------------------------------------------------------*/
+
+/* Site header */
+
+.site-header {
+  border-top: 5px solid #333;
+  border-bottom: 1px solid #e8e8e8;
+  min-height: 56px;
+  background-color: white;
+}
+
+.site-title,
+.site-title:hover,
+.site-title:visited {
+  display: block;
+  color: #333;
+  font-size: 26px;
+  letter-spacing: -1px;
+  float: left;
+  line-height: 56px;
+  position: relative;
+  z-index: 1;
+}
+
+.site-nav {
+  float: right;
+  line-height: 56px;
+}
+
+.site-nav .menu-icon { display: none; }
+
+.site-nav .page-link {
+  margin-left: 20px;
+  color: #727272;
+  letter-spacing: -.5px;
+}
+
+/* Site footer */
+
+.site-footer {
+  border-top: 1px solid #e8e8e8;
+  padding: 30px 0;
+}
+
+.footer-heading {
+  font-size: 18px;
+  font-weight: 300;
+  letter-spacing: -.5px;
+  margin-bottom: 15px;
+}
+
+.site-footer .column { float: left; margin-bottom: 15px; }
+
+.footer-col-1 {
+  width: 270px; /*fallback*/
+  width: -webkit-calc(35% - 10px);
+  width: -moz-calc(35% - 10px);
+  width: -o-calc(35% - 10px);
+  width: calc(35% - 10px);
+  margin-right: 10px
+}
+.footer-col-2 {
+  width: 175px; /*fallback*/
+  width: -webkit-calc(23.125% - 10px);
+  width: -moz-calc(23.125% - 10px);
+  width: -o-calc(23.125% - 10px);
+  width: calc(23.125% - 10px);
+  margin-right: 10px
+}
+.footer-col-3 {
+  width: 335px; /*fallback*/
+  width: -webkit-calc(41.875%);
+  width: -moz-calc(41.875%);
+  width: -o-calc(41.875%);
+  width: calc(41.875%);
+}
+
+.site-footer ul { list-style: none; }
+
+.site-footer li,
+.site-footer p {
+  font-size: 15px;
+  letter-spacing: -.3px;
+  color: #828282;
+}
+
+.github-icon-svg,
+.twitter-icon-svg {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  position: relative;
+  top: 3px;
+}
+
+
+/* Page Content styles */
+/* ----------------------------------------------------------*/
+
+.page-content {
+  padding: 30px 0;
+  background-color: #fff;
+}
+
+
+/* Home styles */
+/* ----------------------------------------------------------*/
+
+.home h1 { margin-bottom: 25px; }
+
+.posts { list-style-type: none; }
+
+.posts li { margin-bottom: 30px; }
+
+.posts .post-link {
+  font-size: 24px;
+  letter-spacing: -1px;
+  line-height: 1;
+}
+
+.posts .post-date {
+  display: block;
+  font-size: 15px;
+  color: #818181;
+}
+
+
+/* Post styles */
+/* ----------------------------------------------------------*/
+
+.post-header { margin: 10px 0 30px; }
+
+.post-header h1 {
+  font-size: 42px;
+  letter-spacing: -1.75px;
+  line-height: 1;
+  font-weight: 300;
+}
+
+.post-header .meta {
+  font-size: 15px;
+  color: #818181;
+  margin-top: 5px;
+}
+
+.post-content { margin: 0 0 30px; }
+
+.post-content > * { margin: 20px 0; }
+
+
+.post-content h1,
+.post-content h2,
+.post-content h3,
+.post-content h4,
+.post-content h5,
+.post-content h6 {
+  line-height: 1;
+  font-weight: 300;
+  margin: 40px 0 20px;
+}
+
+.post-content h2 {
+  font-size: 32px;
+  letter-spacing: -1.25px;
+}
+
+.post-content h3 {
+  font-size: 26px;
+  letter-spacing: -1px;
+}
+
+.post-content h4 {
+  font-size: 20px;
+  letter-spacing: -1px;
+}
+
+.post-content blockquote {
+  border-left: 4px solid #e8e8e8;
+  padding-left: 20px;
+  font-size: 18px;
+  opacity: .6;
+  letter-spacing: -1px;
+  font-style: italic;
+  margin: 30px 0;
+}
+
+.post-content ul,
+.post-content ol { padding-left: 20px; }
+
+.post pre,
+.post code {
+  border: 1px solid #d5d5e9;
+  background-color: #eef;
+  padding: 8px 12px;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  font-size: 15px;
+  overflow:scroll;
+}
+
+.post code { padding: 1px 5px; }
+
+.post ul,
+.post ol { margin-left: 1.35em; }
+
+.post pre code {
+  border: 0;
+  padding-right: 0;
+  padding-left: 0;
+}
+
+/* terminal */
+.post pre.terminal {
+  border: 1px solid #000;
+  background-color: #333;
+  color: #FFF;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+
+.post pre.terminal code { background-color: #333; }
+
+/* Syntax highlighting styles */
+/* ----------------------------------------------------------*/
+
+.highlight  { background: #ffffff; }
+.highlight .c { color: #999988; font-style: italic } /* Comment */
+.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.highlight .k { font-weight: bold } /* Keyword */
+.highlight .o { font-weight: bold } /* Operator */
+.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
+.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #aa0000 } /* Generic.Error */
+.highlight .gh { color: #999999 } /* Generic.Heading */
+.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
+.highlight .go { color: #888888 } /* Generic.Output */
+.highlight .gp { color: #555555 } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
+.highlight .gt { color: #aa0000 } /* Generic.Traceback */
+.highlight .kc { font-weight: bold } /* Keyword.Constant */
+.highlight .kd { font-weight: bold } /* Keyword.Declaration */
+.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #009999 } /* Literal.Number */
+.highlight .s { color: #d14 } /* Literal.String */
+.highlight .na { color: #008080 } /* Name.Attribute */
+.highlight .nb { color: #0086B3 } /* Name.Builtin */
+.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
+.highlight .no { color: #008080 } /* Name.Constant */
+.highlight .ni { color: #800080 } /* Name.Entity */
+.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
+.highlight .nn { color: #555555 } /* Name.Namespace */
+.highlight .nt { color: #000080 } /* Name.Tag */
+.highlight .nv { color: #008080 } /* Name.Variable */
+.highlight .ow { font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #009999 } /* Literal.Number.Float */
+.highlight .mh { color: #009999 } /* Literal.Number.Hex */
+.highlight .mi { color: #009999 } /* Literal.Number.Integer */
+.highlight .mo { color: #009999 } /* Literal.Number.Oct */
+.highlight .sb { color: #d14 } /* Literal.String.Backtick */
+.highlight .sc { color: #d14 } /* Literal.String.Char */
+.highlight .sd { color: #d14 } /* Literal.String.Doc */
+.highlight .s2 { color: #d14 } /* Literal.String.Double */
+.highlight .se { color: #d14 } /* Literal.String.Escape */
+.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
+.highlight .si { color: #d14 } /* Literal.String.Interpol */
+.highlight .sx { color: #d14 } /* Literal.String.Other */
+.highlight .sr { color: #009926 } /* Literal.String.Regex */
+.highlight .s1 { color: #d14 } /* Literal.String.Single */
+.highlight .ss { color: #990073 } /* Literal.String.Symbol */
+.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #008080 } /* Name.Variable.Class */
+.highlight .vg { color: #008080 } /* Name.Variable.Global */
+.highlight .vi { color: #008080 } /* Name.Variable.Instance */
+.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
+
+
+/* media queries */
+/* ----------------------------------------------------------*/
+
+
+@media screen and (max-width: 750px) {
+
+  .footer-col-1 { width: 50%; }
+
+  .footer-col-2 {
+    width: 45%; /*fallback*/
+    width: -webkit-calc(50% - 10px);
+    width: -moz-calc(50% - 10px);
+    width: -o-calc(50% - 10px);
+    width: calc(50% - 10px);
+    margin-right: 0;
+  }
+
+  .site-footer .column.footer-col-3 {
+    width: auto;
+    float: none;
+    clear: both;
+  }
+
+}
+
+@media screen and (max-width: 600px) {
+
+  .wrap { padding: 0 12px; }
+
+  .site-nav {
+    position: fixed;
+    z-index: 10;
+    top: 14px; right: 8px;
+    background-color: white;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 1px solid #e8e8e8;
+  }
+
+  .site-nav .menu-icon {
+    display: block;
+    font-size: 24px;
+    color: #505050;
+    float: right;
+    width: 36px;
+    text-align: center;
+    line-height: 36px;
+  }
+
+  .site-nav .menu-icon svg { width: 18px; height: 16px; }
+
+  .site-nav .trigger {
+    clear: both;
+    margin-bottom: 5px;
+    display: none;
+  }
+
+  .site-nav:hover .trigger { display: block; }
+
+  .site-nav .page-link {
+    display: block;
+    text-align: right;
+    line-height: 1.25;
+    padding: 5px 10px;
+    margin: 0;
+  }
+
+  .post-header h1 { font-size: 36px; }
+  .post-content h2 { font-size: 28px; }
+  .post-content h3 { font-size: 22px; }
+  .post-content h4 { font-size: 18px; }
+  .post-content blockquote { padding-left: 10px; }
+  .post-content ul,
+  .post-content ol { padding-left: 10px; }
+
+  .site-footer .column {
+    float: none;
+    clear: both;
+    width: auto;
+    margin: 0 0 15px; }
+
+}

lib/site_template/css/main.scss

@@ -1,49 +0,0 @@
----
-# Only the main Sass file needs front matter (the dashes are enough)
----
-@charset "utf-8";
-
-
-
-// Our variables
-$base-font-family: Helvetica, Arial, sans-serif;
-$base-font-size:   16px;
-$small-font-size:  $base-font-size * 0.875;
-$base-line-height: 1.5;
-
-$spacing-unit:     30px;
-
-$text-color:       #111;
-$background-color: #fdfdfd;
-$brand-color:      #2a7ae2;
-
-$grey-color:       #828282;
-$grey-color-light: lighten($grey-color, 40%);
-$grey-color-dark:  darken($grey-color, 25%);
-
-$on-palm:          600px;
-$on-laptop:        800px;
-
-
-
-// Using media queries with like this:
-// @include media-query($palm) {
-//     .wrapper {
-//         padding-right: $spacing-unit / 2;
-//         padding-left: $spacing-unit / 2;
-//     }
-// }
-@mixin media-query($device) {
-    @media screen and (max-width: $device) {
-        @content;
-    }
-}
-
-
-
-// Import partials from `sass_dir` (defaults to `_sass`)
-@import
-        "base",
-        "layout",
-        "syntax-highlighting"
-;

lib/site_template/feed.xml

@@ -1,5 +1,5 @@
 ---
-layout: null
+layout: none
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">

lib/site_template/index.html

@@ -4,16 +4,13 @@ layout: default
 
 <div class="home">
 
-  <h1 class="page-heading">Posts</h1>
+  <h1>Posts</h1>
 
-  <ul class="post-list">
+  <ul class="posts">
     {% for post in site.posts %}
       <li>
-        <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span>
-
-        <h2>
-          <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
-        </h2>
+        <span class="post-date">{{ post.date | date: "%b %-d, %Y" }}</span>
+        <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
       </li>
     {% endfor %}
   </ul>

script/cibuild

@@ -1,16 +1,4 @@
 #! /bin/bash
 
-set -e
-
-parallelize_tests() {
-  ls -1 script/{test,cucumber,proof} | xargs -P 3 -L 1 /bin/bash
-}
-
-serialize_tests() {
-  script/proof
-  script/test
-  script/cucumber
-}
-
 script/branding
-time parallelize_tests
+bundle exec rake

script/cucumber

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-time bundle exec cucumber \
-  -f Features::Support::Overview \
-  "$@"

script/proof

@@ -1,22 +0,0 @@
-#! /bin/bash
-#
-# Usage:
-#   script/proof
-
-set -e
-
-git diff --name-only ..master | grep '^site/' || {
-    echo "No site files changed. We'll skip proofing."
-    exit 0
-}
-
-echo "Some site files have been changed! Proofing..."
-
-command -v htmlproof || {
-    echo "Installing HTML::Proofer!"
-    gem install html-proofer -- --use-system-libraries
-}
-
-bundle exec jekyll build -s site -d _site --trace
-printf "\e[0;36mProofing begins now!\e[0m\n"
-htmlproof ./_site

script/test

@@ -1,20 +1,11 @@
 #! /bin/bash
-#
-# Usage:
-#   script/test
-#   script/test <test_file>
+
+set -x
 
 if [ -z "$1" ]; then
-  TEST_FILES="./test/test_*.rb"
+  TEST_FILES="test/test*.rb"
 else
   TEST_FILES="$@"
 fi
 
-RAKE_LIB_DIR=$(ruby -e "puts Gem::Specification.find_by_name('rake').gem_dir + '/lib'")
-
-set -x
-
-time bundle exec ruby -I"lib:test" \
-  -I"${RAKE_LIB_DIR}" \
-  "${RAKE_LIB_DIR}/rake/rake_test_loader.rb" \
-  $TEST_FILES
+/usr/bin/env bundle exec ruby -I"lib:test" -r rake -r rake/rake_test_loader ${TEST_FILES}

site/_config.yml

@@ -1,15 +1,10 @@
 markdown: kramdown
 highlighter: pygments
 relative_permalinks: false
+gauges_id: 503c5af6613f5d0f19000027
 permalink: /news/:year/:month/:day/:title/
 excerpt_separator: noifniof3nioaniof3nioafafinoafnoif
-
-gauges_id: 503c5af6613f5d0f19000027
-google_analytics_id: UA-50755011-1
-
 repository: https://github.com/jekyll/jekyll
 help_url: https://github.com/jekyll/jekyll-help
-
-collections:
-  docs:
-    output: true
+google_analytics_id: UA-50755011-1
+timezone: America/Los_Angeles

site/_data/docs.yml

@@ -31,7 +31,6 @@
   docs:
   - github-pages
   - deployment-methods
-  - continuous-integration
 
 - title: Miscellaneous
   docs:

site/_docs/continuous-integration.md

@@ -1,177 +0,0 @@
----
-layout: docs
-title: Continuous Integration
-prev_section: deployment-methods
-next_section: troubleshooting
-permalink: /docs/continuous-integration/
----
-
-You can easily test your website build against one or more versions of Ruby.
-The following guide will show you how to set up a free build environment on
-[Travis][0], with [GitHub][1] integration for pull requests. Paid
-alternatives exist for private repositories.
-
-[0]: https://travis-ci.org/
-[1]: https://github.com/
-
-## 1. Enabling Travis and GitHub
-
-Enabling Travis builds for your GitHub repository is pretty simple:
-
-1. Go to your profile on travis-ci.org: https://travis-ci.org/profile/username
-2. Find the repository for which you're interested in enabling builds.
-3. Click the slider on the right so it says "ON" and is a dark grey.
-4. Optionally configure the build by clicking on the wrench icon. Further
-   configuration happens in you `.travis.yml` file. More details on that
-   below.
-
-## 2. The Test Script
-
-The simplest test script simply runs `jekyll build` and ensures that Jekyll
-doesn't fail to build the site. It doesn't check the resulting site, but it
-does ensure things are built properly.
-
-When testing Jekyll output, there is no better tool than [html-proofer][2].
-This tool checks your resulting site to ensure all links and images exist.
-Utilize it either with the convenient `htmlproof` command-line executable,
-or write a Ruby script which utilizes the gem.
-
-### The HTML Proofer Executable
-
-{% highlight bash %}
-#!/usr/bin/env bash
-set -e # halt script on error
-
-bundle exec jekyll build
-bundle exec htmlproof ./_site
-{% endhighlight %}
-
-Some options can be specified via command-line switches. Check out the
-`html-proofer` README for more information about these switches, or run
-`htmlproof --help` locally.
-
-### The HTML Proofer Library
-
-You can also invoke `html-proofer` in Ruby scripts (e.g. in a Rakefile):
-
-{% highlight ruby %}
-#!/usr/bin/env ruby
-
-require 'html/proofer'
-HTML::Proofer.new("./_site").run
-{% endhighlight %}
-
-Options are given as a second argument to `.new`, and are encoded in a
-symbol-keyed Ruby Hash. More information about the configuration options,
-check out `html-proofer`'s README file.
-
-[2]: https://github.com/gjtorikian/html-proofer
-
-## 3. Configuring Your Travis Builds
-
-This file is used to configure your Travis builds. Because Jekyll is built
-with Ruby and requires RubyGems to install, we use the Ruby language build
-environment. Below is a sample `.travis.yml` file, and what follows that is
-an explanation of each line.
-
-{% highlight yaml %}
-language: ruby
-rvm:
-- 2.1
-script: ./script/cibuild
-
-# branch whitelist
-branches:
-  only:
-  - gh-pages     # test the gh-pages branch
-  - /pages-(.*)/ # test every branch which starts with "pages-"
-
-env:
-  global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
-{% endhighlight %}
-
-Ok, now for an explanation of each line:
-
-{% highlight yaml %}
-language: ruby
-{% endhighlight %}
-
-This line tells Travis to use a Ruby build container. It gives your script
-access to Bundler, RubyGems, and a Ruby runtime.
-
-{% highlight yaml %}
-rvm:
-- 2.1
-{% endhighlight %}
-
-RVM is a popular Ruby Version Manager (like rbenv, chruby, etc). This
-directive tells Travis the Ruby version to use when running your test
-script.
-
-{% highlight yaml %}
-script: ./script/cibuild
-{% endhighlight %}
-
-Travis allows you to run any arbitrary shell script to test your site. One
-convention is to put all scripts for your project in the `script`
-directory, and to call your test script `cibuild`. This line is completely
-customizable. If your script won't change much, you can write your test
-incantation here directly:
-
-{% highlight yaml %}
-script: jekyll build && htmlproof ./_site
-{% endhighlight %}
-
-The `script` directive can be absolutely any valid shell command.
-
-{% highlight yaml %}
-# branch whitelist
-branches:
-  only:
-  - gh-pages     # test the gh-pages branch
-  - /pages-(.*)/ # test every branch which starts with "pages-"
-{% endhighlight %}
-
-You want to ensure the Travis builds for your site are being run only on
-the branch or branches which contain your site. One means of ensuring this
-isolation is including a branch whitelist in your Travis configuration
-file. By specifying the `gh-pages` branch, you will ensure the associated
-test script (discussed above) is only executed on site branches. If you use
-a pull request flow for proposing changes, you may wish to enforce a
-convention for your builds such that all branches containing edits are
-prefixed, exemplified above with the `/pages-(.*)/` regular expression.
-
-The `branches` directive is completely optional.
-
-{% highlight yaml %}
-env:
-  global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
-{% endhighlight %}
-
-Using `html-proofer`? You'll want this environment variable. Nokogiri, used
-to parse HTML files in your compiled site, comes bundled with libraries
-which it must compile each time it is installed. Luckily, you can
-dramatically increase the install time of Nokogiri by setting the
-environment variable `NOKOGIRI_USE_SYSTEM_LIBRARIES` to `true`.
-
-## 4. Gotchas
-
-### Exclude `vendor`
-
-Travis bundles all gems in the `vendor` directory on its build servers,
-which Jekyll will mistakenly read and explode on. To avoid this, exclude
-`vendor` in your `_config.yml`:
-
-{% highlight yaml %}
-exclude: [vendor]
-{% endhighlight %}
-
-### Questions?
-
-This entire guide is open-source. Go ahead and [edit it][3] if you have a
-fix or [ask for help][4] if you run into trouble and need some help.
-
-[3]: https://github.com/jekyll/jekyll/edit/master/site/_docs/continuous-integration.md
-[4]: https://github.com/jekyll/jekyll-help#how-do-i-ask-a-question

site/_docs/extras.md

@@ -1,18 +0,0 @@
----
-layout: docs
-title: Extras
-prev_section: plugins
-next_section: github-pages
-permalink: /docs/extras/
----
-
-There are a number of (optional) extra features that Jekyll supports that you
-may want to install, depending on how you plan to use Jekyll.
-
-## Math Support
-
-Kramdown comes with optional support for LaTeX to PNG rendering via [MathJax](http://www.mathjax.org/) within math blocks. See the Kramdown documentation on [math blocks](http://kramdown.gettalong.org/syntax.html#math-blocks) and [math support](http://kramdown.gettalong.org/converter/html.html#math-support) for more details.
-
-## Alternative Markdown Processors
-
-See the Markdown section on the [configuration page](/docs/configuration/#markdown-options) for instructions on how to use and configure alternative Markdown processors, as well as how to create [custom processors](/docs/configuration/#custom-markdown-processors).

site/_includes/css/style.css

@@ -699,7 +699,6 @@ pre, code {
 }
 
 .highlight {
-  margin: 1em 0;
   padding: 10px 0;
   width: 100%;
   overflow: auto;

site/_includes/docs_option.html

@@ -3,7 +3,7 @@
 {% for item in items %}
   {% assign item_url = item | prepend:"/docs/" | append:"/" %}
 
-  {% for p in site.docs %}
+  {% for p in site.pages %}
     {% if p.url == item_url %}
       <option value="{{ site.url }}{{ p.url }}">{{ p.title }}</option>
     {% endif %}

site/_includes/docs_ul.html

@@ -10,7 +10,7 @@
     {% assign c = "" %}
   {% endif %}
 
-  {% for p in site.docs %}
+  {% for p in site.pages %}
     {% if p.url == item_url %}
       <li class="{{ c }}"><a href="{{ site.url }}{{ p.url }}">{{ p.title }}</a></li>
     {% endif %}

site/_posts/2013-05-06-jekyll-1-0-0-released.markdown

@@ -19,5 +19,5 @@ examples and for compiling this list):
 
 Take a look at the [Upgrading][] page in the docs for more detailed information.
 
-[history]: /docs/history/#v1-0-0
+[history]: /docs/history/#100__20130506
 [Upgrading]: /docs/upgrading/

site/_posts/2013-05-08-jekyll-1-0-1-released.markdown

@@ -24,4 +24,4 @@ See the [History][] page for more information on this release.
 [#{{ issue }}]: {{ site.repository }}/issues/{{ issue }}
 {% endfor %}
 
-[History]: /docs/history/#v1-0-1
+[History]: /docs/history/#101__20130508

site/_posts/2013-05-12-jekyll-1-0-2-released.markdown

@@ -25,4 +25,4 @@ See the [History][] page for more information on this release.
 [#{{ issue }}]: {{ site.repository }}/issues/{{ issue }}
 {% endfor %}
 
-[History]: /docs/history/#v1-0-2
+[History]: /docs/history/#102__20130512

site/_posts/2013-06-07-jekyll-1-0-3-released.markdown

@@ -22,4 +22,4 @@ See the [History][] page for more information on this release.
 [#{{ issue }}]: {{ site.repository }}/issues/{{ issue }}
 {% endfor %}
 
-[History]: /docs/history/#v1-0-3
+[History]: /docs/history/#103__20130607

site/_posts/2014-03-24-jekyll-1-5-0-released.markdown

@@ -16,4 +16,4 @@ For a full changelog, check out our [history][] page.
 Now, back to work on 2.0.0!
 
 [fun issue with path sanitizing]: https://github.com/jekyll/jekyll/issues/1948
-[history]: /docs/history/#v1-5-0
+[history]: /docs/history/#150__20140324

site/_posts/2014-05-06-jekyll-turns-2-0-0.markdown

@@ -13,7 +13,7 @@ Jam-packed with some [highly-requested features and bugfixes galore][changelog],
 1. [Collections](/docs/collections/) - Collections allow you to define an unlimited number of custom document types (beyond just posts and pages) for different types of content you may want to author in Jekyll such as API documentation or a cookbook!
 2. [Brand new site template](https://github.com/jekyll/jekyll/pull/2050#issuecomment-35938016) (thanks [@jglovier][]!) - Getting started with Jekyll just got a lot easier and a lot more beautiful. Just run `jekyll new <path>` and you're good to go.
 3. [Native Sass & CoffeeScript support](/docs/assets/) - We love CSS and JavaScript as much as the next guy, but there will always be a special place in our hearts for Sass and CoffeeScript. We now offer native support for these file types &mdash; no more messing around with Rake or Grunt!
-4. [YAML Front Matter defaults](/docs/configuration/#front-matter-defaults) - If you've set `layout: post` more than once in your life, you'll love this new feature: set front matter defaults for a given directory or type.
+4. [YAML Front-Matter defaults](/docs/configuration/#frontmatter-defaults) - If you've set `layout: post` more than once in your life, you'll love this new feature: set front-matter defaults for a given directory or type.
 5. [Custom markdown processors](/docs/configuration/#custom-markdown-processors) - Always wanted to use your favourite home-grown Markdown converter, but couldn't with Jekyll? Now you can. Simply specify `markdown: MyConverterClass` and you're on your way.
 6. [Addition of `where` and `group_by` Liquid filters](/docs/templates/#filters) - Simplifying your Liquid templates one filter at a time. The `where` filter selects from an array all items within which have a given value for a property. The `group_by` filter groups all items in an array which have the same value for a given property.
 7. [Switch from Maruku to Kramdown as default markdown converter](https://github.com/jekyll/jekyll/pull/1988) - Maruku is dead. We've replaced it with the converter which has the closest feature parity: Kramdown!
@@ -22,10 +22,10 @@ Check out our [changelog][] for a complete list of all (200+) changes.
 
 Many thanks to these 183 contributors for making Jekyll 2.0.0 happen:
 
-Parker Moore, Matt Rogers, maul.esel, Anatol Broder, Zach Gersh, Joel Glovier, Ben Balter, XhmikosR, Coby Chapple, John Piasetzki, Aidan Feldman, Robin Dupret, Pascal Borreli, Troy Swanson, Erik Michaels-Ober, albertogg, Lucas Jenss, Matt Rogers & Persa Zula, Eric Mill, Shigeya Suzuki, Jens Nazarenus, ddavison, Pat Hawks, Rob Wierzbowski, MURAOKA Taro, Casey Lang, Fabian Rodriguez, Greg Karékinian, Zlatan Vasović, Christopher Nicotera, Dmitry Chestnykh, Ryan Morrissey, Jordon, John Hughes, akira yamada, Matt Swanson, Jashank Jeremy, Matthew Iversen, Meeka, liufengyun, Anand Narayan, nitoyon, Geoff Shannon, Benjamin J. Balter, Juan Ignacio Donoso, David Briggs, Benjamin Esham, Slava Pavlutin, Assaf Gelber, Josh Brown, Nick Fagerlund, Davide Ficano, pilosus, Anthony Smith, André Arko, Mikael Konutgan, Matthew Scharley, Dan Tao, scribu, Mort Yao, m, Stephen McDonald, Marcus Stollsteimer, Thomas Torsney-Weir, Jordon Bedwell, Tom Preston-Werner, Lincoln Mullen, Philip Poots, Ivan Tse, Christopher Giroir, Valery Tolstov, Wlodek Bzyl, Xavier Noria, Yi Zeng, Persa Zula, Phil Leggetter, Pirogov Evgenij, Rafael Revi, Rob McGuire-Dale, Rob Muhlestein, Robin Mehner, Roland Warmerdam, Rusty Geldmacher, Sam Rayner, Santeri Paavolainen, Sebastian Morr, Stephan Groß, Steven Spasbo, Tobias Brunner, Tuomas Kareinen, Tyler Margison, Uwe Dauernheim, Yihang Ho, Zach Leatherman, Zequez, andrew morton, andrewhavens, imathis, jannypie, jaybe@jekyll, kk_Ataka, markets, redwallhp, schneems, szymzet, thomasdao, tomsugden, wǒis神仙, 张君君, Noah Slater, Abhi Yerra, Adam Heckler, Ahmed Hazem, Aigars Dzerviniks, Aleksey V. Zapparov, Andreas Möller, Andy Lindeman, Arlen Cuss, Aziz Shamim, Ben Baker-Smith, Ben Hanzl, Ben Hildred, Brian Kim, Brice, Carol Nichols, Chezou, Chris Jones, Christian Grobmeier, Christoph Hochstrasser, Christoph Schiessl, Clint Shryock, Colin Dean, Corey Ward, Damian Lettie, Daniel Schauenberg, David Ensinger, David Paschich, David Sawyer, David Silva Smith, Donald Perry, Doug Johnston, Edward Ball, Eric Dobson, Erik Dungan, Florent Guilleux, Francis, Frederic ROS, GSI2013, Garen Torikian, George Anderson, Giuseppe Capizzi, Ishibashi Hideto, Jarrod Birch, Jeff Kolesky, Jens Bissinger, Jens Krause, John Firebaugh, John Papandriopoulos, Josh Branchaud, Katy DeCorah, Lachlan Holden, Mark Prins, Markus Roth, Martin Charles, Matt Iversen, Matt Sheehan, Matt Swensen, Matthias Vogelgesang, Michael Parker, Miha Rekar, Nathan Youngman, Nick Quaranto, Nick Quinlan, Nick Schonning, Nicolas Alpi, Nicolás Reynolds, Nikkau, 4ensicLog, Octavian Damiean, Olov Lassus, PatrickC8t, Paul Annesley, and Paul Oppenheim.
+Parker Moore, Matt Rogers, maul.esel, Anatol Broder, Zach Gersh, Joel Glovier, Ben Balter, XhmikosR, Coby Chapple, John Piasetzki, Aidan Feldman, Robin Dupret, Pascal Borreli, Troy Swanson, Erik Michaels-Ober, albertogg, Lucas Jenss, Matt Rogers & Persa Zula, Eric Mill, Shigeya Suzuki, Jens Nazarenus, ddavison, Pat Hawks, Rob Wierzbowski, MURAOKA Taro, Casey Lang, Fabian Rodriguez, Greg Karékinian, Zlatan Vasović, Christopher Nicotera, Dmitry Chestnykh, Ryan Morrissey, Jordon, John Hughes, akira yamada, Matt Swanson, Jashank Jeremy, Matthew Iversen, Meeka, liufengyun, Anand Narayan, nitoyon, Geoff Shannon, Benjamin J. Balter, Juan Ignacio Donoso, David Briggs, Benjamin Esham, Slava Pavlutin, Assaf Gelber, Josh Brown, Nick Fagerlund, Davide Ficano, pilosus, Anthony Smith, André Arko, Mikael Konutgan, Matthew Scharley, Dan Tao, scribu, Mort Yao, m, Stephen McDonald, Marcus Stollsteimer, Thomas Torsney-Weir, Jordon Bedwell, Tom Preston-Werner, Lincoln Mullen, Philip Poots, Ivan Tse, Christopher Giroir, Valery Tolstov, Wlodek Bzyl, Xavier Noria, Yi Zeng, Persa Zula, Phil Leggetter, Pirogov Evgenij, Rafael Revi, Rob McGuire-Dale, Rob Muhlestein, Robin Mehner, Roland Warmerdam, Rusty Geldmacher, Sam Rayner, Santeri Paavolainen, Sebastian Morr, Stephan Groß, Steven Spasbo, Tobias Brunner, Tuomas Kareinen, Tyler Margison, Uwe Dauernheim, Yihang Ho, Zach Leatherman, Zequez, andrew morton, andrewhavens, imathis, jannypie, jaybe@jekyll, kk_Ataka, markets, redwallhp, schneems, szymzet, thomasdao, tomsugden, wǒ_is神仙, 张君君, Noah Slater, Abhi Yerra, Adam Heckler, Ahmed Hazem, Aigars Dzerviniks, Aleksey V. Zapparov, Andreas Möller, Andy Lindeman, Arlen Cuss, Aziz Shamim, Ben Baker-Smith, Ben Hanzl, Ben Hildred, Brian Kim, Brice, Carol Nichols, Chezou, Chris Jones, Christian Grobmeier, Christoph Hochstrasser, Christoph Schiessl, Clint Shryock, Colin Dean, Corey Ward, Damian Lettie, Daniel Schauenberg, David Ensinger, David Paschich, David Sawyer, David Silva Smith, Donald Perry, Doug Johnston, Edward Ball, Eric Dobson, Erik Dungan, Florent Guilleux, Francis, Frederic ROS, GSI2013, Garen Torikian, George Anderson, Giuseppe Capizzi, Ishibashi Hideto, Jarrod Birch, Jeff Kolesky, Jens Bissinger, Jens Krause, John Firebaugh, John Papandriopoulos, Josh Branchaud, Katy DeCorah, Lachlan Holden, Mark Prins, Markus Roth, Martin Charles, Matt Iversen, Matt Sheehan, Matt Swensen, Matthias Vogelgesang, Michael Parker, Miha Rekar, Nathan Youngman, Nick Quaranto, Nick Quinlan, Nick Schonning, Nicolas Alpi, Nicolás Reynolds, Nikkau, 4ensicLog, Octavian Damiean, Olov Lassus, PatrickC8t, Paul Annesley, and Paul Oppenheim.
 
 Happy developing!
 
 [changelog]: /docs/history/
 [@jglovier]: https://github.com/jglovier
-[jekyll-1]: /news/2013/05/06/jekyll-1-0-0-released/
+[jekyll-1]: {% post_url 2013-05-05-jekyll-1-0-0-released %}

site/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown

@@ -1,31 +0,0 @@
----
-layout: news_item
-title: 'Jekyll Turns 21! Err... I mean 2.1.0.'
-date: 2014-06-28 17:26:59 -0400
-author: parkr
-version: 2.1.0
-categories: [release]
----
-
-Jekyll's finally [legal to drink in the States](http://en.wikipedia.org/wiki/Legal_drinking_age).
-And he's done a lot of learning in the process! Here are some of the new
-things to look forward to:
-
-- Uses the latest Liquid version (2.6.1) (#2495)
-- Set front matter defaults for collections (#2419)
-- Set a collection-specific URL template (#2418)
-- `pygments.rb` 0.6.0! (#2504)
-- `.json` files in `_data` (#2369)
-- Allow subdirectories in `_data` (#2395)
-- Add support for `hl_lines` in `highlight` tag (#2532)
-- Post categories now merge with directory, front matter, and defaults (#2373)
-- New `--skip_initial_build` flag for `jekyll serve` (#2477)
-- A bajilion bug fixes and site updates!
-
-Let's go party!
-
-*Check out the [full changelog](/docs/history/#v2-1-0) for more.*
-
-Many thanks to these 37 contributors for the 2.1.0 release:
-
-Alberto Grespan, Alessandro Lorenzi, Alex Medearis, Alfred Xing, Anatol Broder, Ben, Ben Balter, Bud Parr, Chezou, Denilson Figueiredo de Sá, Denilson Sá, Ivan Tse, Jens Nazarenus, Jesse Shawl, Jordon Bedwell, Josh Davis, János Rusiczki, Marc Ransome, Mathieu Bruyen, Matt Rogers, Parker Moore, Pat Hawks, Paul Henry, Peter Rhoades, Philipp Rudloff, Quinn Shanahan, Renaud Martinet, Rob Murray, Rodrigo Dumont, Simon Sarris, Terry, Terry Schmidt, Tomer Cohen, XhmikosR, Yihang Ho, jaybe@jekyll, and mikecole.

site/_posts/2014-07-01-jekyll-2-1-1-released.markdown

@@ -1,30 +0,0 @@
----
-layout: news_item
-title: 'Jekyll 2.1.1 Released'
-date: 2014-07-01 20:16:43 -0400
-author: parkr
-version: 2.1.1
-categories: [release]
----
-
-This is a minor release for Jekyll 2.1.0. It fixes a couple bugs and
-introduces fixes for a couple security-related issues.
-
-It covers two security vulnerabilities:
-
-1. One in the reading of data
-2. One in the `layouts` setting
-
-They were identified in Jekyll 1.5.1 and has been confirmed as patched
-in this version and the version used by GitHub Pages. If you are in the
-business of building Jekyll sites, please ensure you upgrade to 2.1.1 as
-soon as possible.
-
-For more, check out [`jekyll/jekyll#2563`](https://github.com/jekyll/jekyll/pull/2563).
-
-Additionally, the dependency on Maruku has been loosened and a bug was
-fixed with document URLs.
-
-As always, check out the [full changelog](/docs/history/) for more info!
-
-Happy Jekylling!

site/_posts/2014-07-29-jekyll-2-2-0-released.markdown

@@ -1,19 +0,0 @@
----
-layout: news_item
-title: 'Jekyll 2.2.0 Released'
-date: 2014-07-29 18:59:13 -0400
-author: parkr
-version: 2.2.0
-categories: [release]
----
-
-Jekyll 2.2.0 contains a few key updates:
-
-1. A warning will now fire if you specify a layout in any of your pages or
-    posts that doesn't exist.
-2. Certain Pygments options are now whitelisted in safe mode
-3. Categories in a post's path are now respected (i.e. folders in `_posts`
-   will now work properly).
-
-As always, a full list of the updates are on the
-[history page](/docs/history#v2-2-0). Happy Jekylling!

site/_posts/2014-08-10-jekyll-2-3-0-released.markdown

@@ -1,41 +0,0 @@
----
-layout: news_item
-title: 'Jekyll 2.3.0 Released'
-date: 2014-08-10 20:38:34 -0400
-author: parkr
-version: 2.3.0
-categories: [release]
----
-
-This latest release of Jekyll includes a slew of enhancements and bug
-fixes. Some of the highlights:
-
-* Strange bug around spacing/indentation should be resolved. [It was a
-  curious bug indeed.](https://github.com/jekyll/jekyll/issues/2676)
-* Pages, Posts, and Drafts can now be converted by multiple converters.
-* Static files can now be safely included in collections. They'll be placed
-  in a `collection.files` array. `collection.docs` still holds exclusively
-  content with YAML front matter.
-* Sass files can once again be rendered by Liquid. However, neither Sass
-  nor CoffeeScript can ever have a layout. Bonus: `scssify` and `sassify`
-  Liquid filters.
-* Partial variables allowed now in the path argument of `include` calls
-* We added a `jekyll help` command. Pass it a subcommand to see more info
-  about that subcommand. Or don't, to see the help for `jekyll` itself.
-* Lots of fixes to the site template we use for `jekyll new`, including
-  converting the CSS into SCSS.
-* The `jsonify` filter will now call `#to_liquid` for you
-* Lots, lots more!
-
-One change deserves special note. In [#2633][], subfolders *inside* a
-`_posts` folder were processed and added as categories to the posts. It
-turns out, this behaviour was unwanted by a large number of individuals, as
-it is a handy way to organize posts. Ultimately, we decided to revert this
-change in [#2705][], because it was a change in behaviour that was already
-well-established (at least since Jekyll v0.7.0), and was convenient.
-
-[#2633]: {{ site.repository }}/issues/2633
-[#2705]: {{ site.repository }}/issues/2705
-
-For more excellent CHANGELOG reading material, check out the [History
-page](/docs/history/)! Happy Jekylling!

site/css/screen.css

@@ -0,0 +1,31 @@
+---
+---
+
+{% capture screen %}
+/*                *\
+ * $normalize.css *
+\*                */
+{% include css/normalize.css %}
+/*                *\
+ * $gridism.css   *
+\*                */
+{% include css/gridism.css %}
+/*                *\
+ * $style.css     *
+\*                */
+{% include css/style.css %}
+/*                *\
+ * $pygments.css  *
+\*                */
+{% include css/pygments.css %}
+/*                *\
+ * $font-awesome.css  *
+\*                */
+{% include css/font-awesome.css %}
+{% endcapture %}
+
+{% if site.GH_ENV %}
+  {{ screen | strip_newlines | remove: '  ' }}
+{% else %}
+  {{ screen }}
+{% endif %}

site/css/screen.scss

@@ -1,8 +0,0 @@
----
----
-
-@import "normalize";
-@import "gridism";
-@import "style";
-@import "pygments";
-@import "font-awesome"

site/docs/assets.md

@@ -21,19 +21,14 @@ or `.coffee`) and start the file with two lines of triple dashes, like this:
 
 Jekyll treats these files the same as a regular page, in that the output file
 will be placed in the same directory that it came from. For instance, if you
-have a file named `css/styles.scss` in your site's source folder, Jekyll
+have a file named `/css/styles.scss` in your site's source folder, Jekyll
 will process it and put it in your site's destination folder under
-`css/styles.css`.
+`/css/styles.css`.
 
 ## Sass/SCSS
 
 Jekyll allows you to customize your Sass conversion in certain ways.
 
-Place all your partials in your `sass_dir`, which defaults to
-`<source>/_sass`. Place your main SCSS or Sass files in the place you want
-them to be in the output file, such as `<source>/css`. For an example, take
-a look at [this example site using Sass support in Jekyll][example-sass].
-
 If you are using Sass `@import` statements, you'll need to ensure that your
 `sass_dir` is set to the base directory that contains your Sass files. You
 can do that thusly:
@@ -43,23 +38,7 @@ sass:
     sass_dir: _sass
 {% endhighlight %}
 
-The Sass converter will default the `sass_dir` configuration option to
-`_sass`.
-
-[example-sass]: https://github.com/jekyll/jekyll-sass-converter/tree/master/example
-
-<div class="note info">
-  <h5>The <code>sass_dir</code> is only used by Sass</h5>
-  <p>
-
-    Note that the `sass_dir` becomes the load path for Sass imports,
-    nothing more. This means that Jekyll does not know about these files
-    directly, so any files here should not contain the YAML Front Matter as
-    described above nor will they be transformed as described above. This
-    folder should only contain imports.
-
-  </p>
-</div>
+The Sass converter will default to `_sass`.
 
 You may also specify the output style with the `style` option in your
 `_config.yml` file:

site/docs/collections.md

@@ -37,7 +37,7 @@ collections:
 ### Step 2: Add your content
 
 Create a corresponding folder (e.g. `<source>/_my_collection`) and add documents.
-YAML Front Matter is read in as data if it exists, if not, then everything is just stuck in the Document's `content` attribute.
+YAML front-matter is read in as data if it exists, if not, then everything is just stuck in the Document's `content` attribute.
 
 Note: the folder must be named identical to the collection you defined in you config.yml file, with the addition of the preceding `_` character.
 
@@ -56,7 +56,7 @@ For example, if you have `_my_collection/some_subdir/some_doc.md`,
 it will be rendered using Liquid and the Markdown converter of your
 choice and written out to `<dest>/my_collection/some_subdir/some_doc.html`.
 
-As for posts with [Permalinks](../permalinks/), document URL can be customized by setting a `permalink` metadata to the collection:
+As for posts with [Permalinks](../Permalinks/), document URL can be customized by setting a `permalink` metadata to the collection:
 
 {% highlight yaml %}
 collections:
@@ -178,7 +178,7 @@ The collections are also available under `site.collections`, with the metadata y
 
 ### Documents
 
-In addition to any YAML Front Matter provided in the document's corresponding file, each document has the following attributes:
+In addition to any YAML front-matter provided in the document's corresponding file, each document has the following attributes:
 
 <div class="mobile-side-scroller">
 <table>
@@ -195,10 +195,10 @@ In addition to any YAML Front Matter provided in the document's corresponding fi
       </td>
       <td>
         <p>
-          The (unrendered) content of the document. If no YAML Front Matter is provided,
-          this is the entirety of the file contents. If YAML Front Matter
+          The (unrendered) content of the document. If no YAML front-matter is provided,
+          this is the entirety of the file contents. If YAML front-matter
           is used, then this is all the contents of the file after the terminating
-          `---` of the front matter.
+          `---` of the front-matter.
         </p>
       </td>
     </tr>

site/docs/configuration.md

@@ -125,12 +125,12 @@ class="flag">flags</code> (specified on the command-line) that control them.
       <td>
         <p class='name'><strong>Defaults</strong></p>
         <p class='description'>
-            Set defaults for <a href="../frontmatter/" title="YAML Front Matter">YAML Front Matter</a>
+            Set defaults for <a href="../frontmatter/" title="YAML frontmatter">YAML frontmatter</a>
             variables.
         </p>
       </td>
       <td class='align-center'>
-        <p>see <a href="#front-matter-defaults" title="details">below</a></p>
+        <p>see <a href="#frontmatter-defaults" title="details">below</a></p>
       </td>
     </tr>
   </tbody>
@@ -276,9 +276,9 @@ before your site is served.
   </p>
 </div>
 
-## Front Matter defaults
+## Frontmatter defaults
 
-Using [YAML Front Matter](../frontmatter/) is one way that you can specify configuration in the pages and posts for your site. Setting things like a default layout, or customizing the title, or specifying a more precise date/time for the post can all be added to your page or post front matter.
+Using [YAML front-matter](../frontmatter/) is one way that you can specify configuration in the pages and posts for your site. Setting things like a default layout, or customizing the title, or specifying a more precise date/time for the post can all be added to your page or post front-matter.
 
 Often times, you will find that you are repeating a lot of configuration options. Setting the same layout in each file, adding the same category - or categories - to a post, etc. You can even add custom variables like author names, which might be the same for the majority of posts on your blog.
 
@@ -304,13 +304,13 @@ defaults:
   -
     scope:
       path: "" # an empty string here means all files in the project
-      type: "posts"
+      type: "post"
     values:
       layout: "default"
 {% endhighlight %}
 
-Now, this will only set the layout for files where the type is `posts`.
-The different types that are available to you are `pages`, `posts`, `drafts` or any collection in your site. While `type` is optional, you must specify a value for `path` when creating a `scope/values` pair.
+Now, this will only set the layout for files where the type is `post`.
+The different types that are available to you are `page`, `post`, `draft` or any collection in your site. While `type` is optional, you must specify a value for `path` when creating a `scope/values` pair.
 
 As mentioned earlier, you can set multiple scope/values pairs for `defaults`.
 
@@ -319,16 +319,17 @@ defaults:
   -
     scope:
       path: ""
-      type: "posts"
+      type: "post"
     values:
       layout: "my-site"
   -
     scope:
       path: "projects"
-      type: "pages"
+      type: "page"
     values:
       layout: "project" # overrides previous default layout
       author: "Mr. Hyde"
+      category: "project"
 {% endhighlight %}
 
 With these defaults, all posts would use the `my-site` layout. Any html files that exist in the `projects/` folder will use the `project` layout, if it exists. Those files will also have the `page.author` [liquid variable](../variables/) set to `Mr. Hyde` as well as have the category for the page set to `project`.
@@ -342,7 +343,7 @@ defaults:
   -
     scope:
       path: ""
-      type: "my_collection" # a collection in your site, in plural form
+      type: "my_collection" # a collection in your site
     values:
       layout: "default"
 {% endhighlight %}
@@ -353,9 +354,9 @@ In this example the `layout` is set to `default` inside the [collection](../coll
 
 Jekyll will apply all of the configuration settings you specify in the `defaults` section of your `_config.yml` file. However, you can choose to override settings from other scope/values pair by specifying a more specific path for the scope.
 
-You can see that in the last example above. First, we set the default layout to `my-site`. Then, using a more specific path, we set the default layout for files in the `projects/` path to `project`. This can be done with any value that you would set in the page or post front matter.
+You can see that in the last example above. First, we set the default layout to `my-site`. Then, using a more specific path, we set the default layout for files in the `projects/` path to `project`. This can be done with any value that you would set in the page or post front-matter.
 
-Finally, if you set defaults in the site configuration by adding a `defaults` section to your `_config.yml` file, you can override those settings in a post or page file. All you need to do is specify the settings in the post or page front matter. For example:
+Finally, if you set defaults in the site configuration by adding a `defaults` section to your `_config.yml` file, you can override those settings in a post or page file. All you need to do is specify the settings in the post or page front-matter. For example:
 
 {% highlight yaml %}
 # In _config.yml
@@ -364,7 +365,7 @@ defaults:
   -
     scope:
       path: "projects"
-      type: "pages"
+      type: "page"
     values:
       layout: "project"
       author: "Mr. Hyde"
@@ -399,57 +400,43 @@ configuration file or on the command-line, Jekyll will run using these options.
 </div>
 
 {% highlight yaml %}
-# Where things are
 source:      .
 destination: ./_site
 plugins:     ./_plugins
 layouts:     ./_layouts
-data_source: ./_data
-collections: null
+include:     ['.htaccess']
+exclude:     []
+keep_files:  ['.git','.svn']
+gems:        []
+timezone:    nil
+encoding:    nil
 
-# Handling Reading
-safe:         false
-include:      [".htaccess"]
-exclude:      []
-keep_files:   [".git", ".svn"]
-encoding:     "utf-8"
-markdown_ext: "markdown,mkdown,mkdn,mkd,md"
-textile_ext:  "textile"
-
-# Filtering Content
-show_drafts: null
-limit_posts: 0
 future:      true
-unpublished: false
-
-# Plugins
-whitelist: []
-gems:      []
-
-# Conversion
-markdown:    kramdown
+show_drafts: false
+limit_posts: 0
 highlighter: pygments
-lsi:         false
+
+relative_permalinks: true
+
+permalink:     date
+paginate_path: 'page:num'
+paginate:      nil
+
+markdown:      kramdown
+markdown_ext:  markdown,mkdown,mkdn,mkd,md
+textile_ext:   textile
+
 excerpt_separator: "\n\n"
 
-# Serving
-detach:  false
-port:    4000
-host:    0.0.0.0
-baseurl: "" # does not include hostname
+safe:        false
+watch:       false    # deprecated
+server:      false    # deprecated
+host:        0.0.0.0
+port:        4000
+baseurl:     ""
+url:         http://localhost:4000
+lsi:         false
 
-# Backwards-compatibility
-relative_permalinks: false
-
-# Outputting
-permalink:     date
-paginate_path: /page:num
-timezone:      null
-
-quiet:    false
-defaults: []
-
-# Markdown Processors
 maruku:
   use_tex:    false
   use_divs:   false
@@ -465,20 +452,20 @@ redcarpet:
   extensions: []
 
 kramdown:
-  auto_ids:      true
-  footnote_nr:   1
+  auto_ids: true
+  footnote_nr: 1
   entity_output: as_char
-  toc_levels:    1..6
-  smart_quotes:  lsquo,rsquo,ldquo,rdquo
-  use_coderay:   false
+  toc_levels: 1..6
+  smart_quotes: lsquo,rsquo,ldquo,rdquo
+  use_coderay: false
 
   coderay:
-    coderay_wrap:              div
-    coderay_line_numbers:      inline
-    coderay_line_number_start: 1
-    coderay_tab_width:         4
-    coderay_bold_every:        10
-    coderay_css:               style
+    coderay_wrap: div
+    coderay_line_numbers: inline
+    coderay_line_numbers_start: 1
+    coderay_tab_width: 4
+    coderay_bold_every: 10
+    coderay_css: style
 
 redcloth:
   hard_breaks: true
@@ -496,14 +483,13 @@ Jekyll handles two special Redcarpet extensions:
 
 - `no_fenced_code_blocks` --- By default, Jekyll sets the `fenced_code_blocks` extension (for delimiting code blocks with triple tildes or triple backticks) to `true`, probably because GitHub's eager adoption of them is starting to make them inescapable. Redcarpet's normal `fenced_code_blocks` extension is inert when used with Jekyll; instead, you can use this inverted version of the extension for disabling fenced code.
 
-Note that you can also specify a language for highlighting after the first delimiter:
+    Note that you can also specify a language for highlighting after the first delimiter:
 
         ```ruby
         # ...ruby code
         ```
 
-With both fenced code blocks and highlighter enabled, this will statically highlight the code; without any syntax highlighter, it will add a `class="LANGUAGE"` attribute to the `<code>` element, which can be used as a hint by various JavaScript code highlighting libraries.
-
+    With both fenced code blocks and highlighter enabled, this will statically highlight the code; without any syntax highlighter, it will add a `class="LANGUAGE"` attribute to the `<code>` element, which can be used as a hint by various JavaScript code highlighting libraries.
 - `smart` --- This pseudo-extension turns on SmartyPants, which converts straight quotes to curly quotes and runs of hyphens to em (`---`) and en (`--`) dashes.
 
 All other extensions retain their usual names from Redcarpet, and no renderer options aside from `smart` can be specified in Jekyll. [A list of available extensions can be found in the Redcarpet README file.][redcarpet_extensions] Make sure you're looking at the README for the right version of Redcarpet: Jekyll currently uses v2.2.x, and extensions like `footnotes` and `highlight` weren't added until after version 3.0.0. The most commonly used extensions are:

site/docs/contributing.md

@@ -106,9 +106,9 @@ The [Jekyll wiki]({{ site.repository }}/wiki) on GitHub
 can be freely updated without a pull request as all
 GitHub users have access.
 
-If you want to add your plugin to the [list of plugins](/docs/plugins/#available-plugins),
+If you want to add your plugin to the [list of plugins](/docs/plugins/#available_plugins),
 please submit a pull request modifying the [plugins page source
-file]({{ site.repository }}/blob/master/site/_docs/plugins.md) by adding a
+file]({{ site.repository }}/blob/master/site/docs/plugins.md) by adding a
 link to your plugin under the proper subheading depending upon its type.
 
 Gotchas

site/docs/datafiles.md

@@ -94,8 +94,7 @@ The organizations can then be accessed via `site.data.orgs`, followed by the fil
 {% highlight html %}
 {% raw %}
 <ul>
-{% for org_hash in site.data.orgs %}
-{% assign org = org_hash[1] %}
+{% for org in site.data.orgs %}
   <li>
     <a href="https://github.com/{{ org.username }}">
       {{ org.name }}

site/docs/deployment-methods.md

@@ -73,23 +73,10 @@ Deploying is now as easy as telling nginx or Apache to look at
 laptops$ git push deploy master
 {% endhighlight %}
 
-### Jekyll-hook
-
-You can also use jekyll-hook, a server that listens for webhook posts from
-GitHub, generates a website with Jekyll, and moves it somewhere to be
-published. Use this to run your own GitHub Pages-style web server.
-
-This method is useful if you need to serve your websites behind a firewall,
-need extra server-level features like HTTP basic authentication or want to
-host your site directly on a CDN or file host like S3.
-
-Setup steps are fully documented
-[in the `jekyll-hook` repo](https://github.com/developmentseed/jekyll-hook).
-
 ### Rake
 
 Another way to deploy your Jekyll site is to use [Rake](https://github.com/jimweirich/rake), [HighLine](https://github.com/JEG2/highline), and
-[Net::SSH](https://github.com/net-ssh/net-ssh). A more complex example of deploying Jekyll with Rake that deals with multiple branches can be found in [Git Ready](https://github.com/gitready/gitready/blob/cdfbc4ec5321ff8d18c3ce936e9c749dbbc4f190/Rakefile).
+[Net::SSH](http://net-ssh.rubyforge.org/). A more complex example of deploying Jekyll with Rake that deals with multiple branches can be found in [Git Ready](https://github.com/gitready/gitready/blob/cdfbc4ec5321ff8d18c3ce936e9c749dbbc4f190/Rakefile).
 
 ### rsync
 
@@ -99,7 +86,7 @@ this script from within Textmate.
 
 ## Rack-Jekyll
 
-[Rack-Jekyll](https://github.com/adaoraul/rack-jekyll/) is an easy way to deploy your site on any Rack server such as Amazon EC2, Slicehost, Heroku, and so forth. It also can run with [shotgun](https://github.com/rtomayko/shotgun/), [rackup](https://github.com/rack/rack), [mongrel](https://github.com/mongrel/mongrel), [unicorn](https://github.com/defunkt/unicorn/), and [others](https://github.com/adaoraul/rack-jekyll#readme).
+[Rack-Jekyll](https://github.com/adaoraul/rack-jekyll/) is an easy way to deploy your site on any Rack server such as Amazon EC2, Slicehost, Heroku, and so forth. It also can run with [shotgun](https://github.com/rtomakyo/shotgun/), [rackup](https://github.com/rack/rack), [mongrel](https://github.com/mongrel/mongrel), [unicorn](https://github.com/defunkt/unicorn/), and [others](https://github.com/adaoraul/rack-jekyll#readme).
 
 Read [this post](http://blog.crowdint.com/2010/08/02/instant-blog-using-jekyll-and-heroku.html) on how to deploy to Heroku using Rack-Jekyll.
 

site/docs/extras.md

@@ -0,0 +1,90 @@
+---
+layout: docs
+title: Extras
+prev_section: plugins
+next_section: github-pages
+permalink: /docs/extras/
+---
+
+There are a number of (optional) extra features that Jekyll supports that you
+may want to install, depending on how you plan to use Jekyll.
+
+## LaTeX Support
+
+Maruku comes with optional support for LaTeX to PNG rendering via blahtex
+(Version 0.6) which must be in your `$PATH` along with `dvips`.
+
+## Alternative Markdown Processors
+
+While Jekyll defaults to using Maruku for Markdown conversion, you may use one
+of the other three pre-defined markdown parsers or define your own.
+
+### RDiscount
+
+If you prefer to use [RDiscount](https://github.com/rtomayko/rdiscount) instead
+of [Maruku](https://github.com/bhollis/maruku) for Markdown, just make sure you have
+it installed:
+
+{% highlight bash %}
+$ [sudo] gem install rdiscount
+{% endhighlight %}
+
+And then specify RDiscount as the Markdown engine in your `_config.yml` file to
+have Jekyll run with that option.
+
+{% highlight yaml %}
+# In _config.yml
+markdown: rdiscount
+{% endhighlight %}
+
+### Kramdown
+
+You can also use [Kramdown](http://kramdown.rubyforge.org/) instead of Maruku
+for Markdown. Make sure that Kramdown is installed:
+
+{% highlight bash %}
+$ [sudo] gem install kramdown
+{% endhighlight %}
+
+Then you can specify Kramdown as the Markdown engine in `_config.yml`.
+
+{% highlight yaml %}
+# In _config.yml
+markdown: kramdown
+{% endhighlight %}
+
+Kramdown has various options for customizing the HTML output. The
+[Configuration](/docs/configuration/) page lists the default options used by
+Jekyll. A complete list of options is also available on the [Kramdown
+website](http://kramdown.rubyforge.org/options.html).
+
+### User-Defined
+
+So, you're totally at odds with our four built-in markdown parsers, eh? No
+sweat. You can define one as a plugin:
+
+{% highlight ruby %}
+require 'jekyll'
+require 'some_renderer'
+
+class Jekyll::Converters::Markdown::MyCustomParser
+  def initialize(config)
+    @site_config = config
+  end
+
+  def convert(content)
+    # (this _must_ return the resulting String after the rendering)
+    SomeRenderer.new(@site_config).to_html(content)
+  end
+end
+{% endhighlight %}
+
+Once you've got that setup, ask Jekyll to use your custom markdown parser in
+your `_config.yml` file:
+
+{% highlight yaml %}
+markdown: MyCustomParser
+{% endhighlight %}
+
+(Note that this **is case-sensitive**, and is only the piece after
+`Jekyll::Converters::Markdown`.) And there you are!

site/docs/frontmatter.md

@@ -1,12 +1,12 @@
 ---
 layout: docs
-title: Front Matter
+title: Front-matter
 prev_section: configuration
 next_section: posts
 permalink: /docs/frontmatter/
 ---
 
-The front matter is where Jekyll starts to get really cool. Any file that
+The front-matter is where Jekyll starts to get really cool. Any file that
 contains a [YAML](http://yaml.org/) front matter block will be processed by
 Jekyll as a special file. The front matter must be the first thing in the file
 and must take the form of valid YAML set between triple-dashed lines. Here is a
@@ -39,7 +39,7 @@ relies on.
   <h5>ProTip™: Front Matter Variables Are Optional</h5>
   <p>
     If you want to use <a href="../variables/">Liquid tags and variables</a> but
-    don’t need anything in your front matter, just leave it empty! The set of
+    don’t need anything in your front-matter, just leave it empty! The set of
     triple-dashed lines with nothing in between will still get Jekyll to process
     your file. (This is useful for things like CSS and RSS feeds!)
   </p>
@@ -48,7 +48,7 @@ relies on.
 ## Predefined Global Variables
 
 There are a number of predefined global variables that you can set in the
-front matter of a page or post.
+front-matter of a page or post.
 
 <div class="mobile-side-scroller">
 <table>
@@ -154,7 +154,7 @@ title:
 
 ## Predefined Variables for Posts
 
-These are available out-of-the-box to be used in the front matter for a post.
+These are available out-of-the-box to be used in the front-matter for a post.
 
 <div class="mobile-side-scroller">
 <table>
@@ -183,8 +183,8 @@ These are available out-of-the-box to be used in the front matter for a post.
 <div class="note">
   <h5>ProTip™: Don't repeat yourself</h5>
   <p>
-    If you don't want to repeat your frequently used front matter variables over and over,
-    just define <a href="../configuration/#front-matter-defaults" title="Front Matter defaults">defaults</a>
+    If you don't want to repeat your frequently used front-matter variables over and over,
+    just define <a href="../configuration/#frontmatter-defaults" title="frontmatter defaults">defaults</a>
     for them and only override them where necessary (or not at all). This works both for predefined
     and custom variables.
   </p>

site/docs/github-pages.md

@@ -8,7 +8,7 @@ permalink: /docs/github-pages/
 
 [GitHub Pages](http://pages.github.com) are public web pages for users,
 organizations, and repositories, that are freely hosted on GitHub's
-`github.io` domain or on a custom domain name of your choice. GitHub Pages are
+[github.io]() domain or on a custom domain name of your choice. GitHub Pages are
 powered by Jekyll behind the scenes, so in addition to supporting regular HTML
 content, they’re also a great way to host your Jekyll-powered website for free.
 
@@ -54,14 +54,6 @@ actual software project for Jekyll, however the Jekyll website (that you’re
 looking at right now) is contained in the [gh-pages
 branch]({{ site.repository }}/tree/gh-pages) of the same repository.
 
-<div class="note warning">
-  <h5>Source Files Must be in the Root Directory</h5>
-  <p>
-Github Pages <a href="https://help.github.com/articles/troubleshooting-github-pages-build-failures#source-setting">overrides</a> the <a href="http://jekyllrb.com/docs/configuration/#global-configuration">“Site Source”</a> configuration value, so if you locate your files anywhere other than the root directory, your site may not build correctly.
-  </p>
-</div>
-
-
 ### Project Page URL Structure
 
 Sometimes it's nice to preview your Jekyll site before you push your `gh-pages`

site/docs/heroku.md

@@ -0,0 +1,9 @@
+---
+layout: docs
+title: Heroku
+prev_section: github-pages
+next_section: manual-deployment
+permalink: /docs/heroku/
+---
+
+Move along, people. Nothing to see here.

site/docs/index.md

@@ -16,7 +16,7 @@ development of Jekyll itself.
 Jekyll is a simple, blog-aware, static site generator. It takes a template
 directory containing raw text files in various formats, runs it through
 [Markdown](http://daringfireball.net/projects/markdown/) (or
-[Textile](http://redcloth.org/textile)) and
+[Textile](http://textile.sitemonks.com/)) and
 [Liquid](http://wiki.shopify.com/Liquid)
 converters, and spits out a complete, ready-to-publish static website suitable
 for serving with your favorite web server. Jekyll also happens to be the engine

site/docs/installation.md

@@ -16,12 +16,9 @@ describing the issue you encountered and how we might make the process easier.
 Installing Jekyll is easy and straight-forward, but there are a few requirements
 you’ll need to make sure your system has before you start.
 
-- [Ruby](http://www.ruby-lang.org/en/downloads/) (including development
-  headers)
+- [Ruby](http://www.ruby-lang.org/en/downloads/)
 - [RubyGems](http://rubygems.org/pages/download)
 - Linux, Unix, or Mac OS X
-- [NodeJS](http://nodejs.org), or another JavaScript runtime (for
-  CoffeeScript support).
 
 <div class="note info">
   <h5>Running Jekyll on Windows</h5>
@@ -35,7 +32,7 @@ you’ll need to make sure your system has before you start.
 ## Install with RubyGems
 
 The best way to install Jekyll is via
-[RubyGems](http://rubygems.org/pages/download). At the terminal prompt,
+[RubyGems](http://docs.rubygems.org/read/chapter/3). At the terminal prompt,
 simply run the following command to install Jekyll:
 
 {% highlight bash %}