jekyllpress 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5c5fdd1ddb2b086c4b22d33eb6e974174ca696
-  data.tar.gz: bdaac49ecb5014b3368910cc64ac606ea1984fbe
+  metadata.gz: dd6682117892650ad63c153d63979873c1e42515
+  data.tar.gz: a8e78117bcdc10b196a28c96c6c0081f745d24cf
 SHA512:
-  metadata.gz: 9c077112ea772189b910eb23db1e4692d73f959bcfee41bc60c0b2326f3caf9644187e7dbc5988daf841abe8ce79c3ecc3f03aaadb735f7f1a180c066e068ea0
-  data.tar.gz: 22216e5959ff5378a873ee75772052d233f2ced80eddf0713366de667334a555b94d64e73b6083003bf2d7d7684c942a20e920206c9d46e714977208eac59ac5
+  metadata.gz: dcf10491338155651e916d09a0a331f64f5c920eef9c841204c6a8919ac1b7fa2130b0ab636baee54a65927ffc511f43375fe964c089586f844f8ee31b796f2e
+  data.tar.gz: 67d70468fd06525e2181de755b3cd1488099bec2513a606fe2e2767a6bf4bee47da94539ca96d760883c6842a040b0998c527b0e048a174f2a34eeb0eeb7e374

data/CHANGELOG

@@ -1,5 +1,8 @@
-78c8b1c (HEAD, master) new: Add :redirect command to insert a 'redirect_from:' array in the front matter of each post in the _posts directory, to allow for blog restructuring, in service of using the jekyll-redirect-from gem.
-4957944 (tag: v0.0.3, origin/master) Forgot to add thor as a dependency! Doh!
+263acca (HEAD, origin/master, master) fix: use thor actions to inject redirect_from into post.
+61a16b8 new: Add options to redirect to specify the permalink template and force overwriting.
+dbb8b67 (tag: v0.1.0) new: Add CHANGELOG.
+78c8b1c new: Add :redirect command to insert a 'redirect_from:' array in the front matter of each post in the _posts directory, to allow for blog restructuring, in service of using the jekyll-redirect-from gem.
+4957944 (tag: v0.0.3) Forgot to add thor as a dependency! Doh!
 a905e0e Move setup action to beginning of Usage section in README
 2ba98e4 (tag: v0.0.2) version bump
 2fee61c clean up tests, all running under one test_site

data/lib/jekyllpress/version.rb

@@ -1,3 +1,3 @@
 module Jekyllpress
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/jekyllpress.rb

@@ -6,6 +6,9 @@ require "jekyllpress/version"
 
 module Jekyllpress
 
+  SETUPERROR_MESSAGE = "It appears you have not set up a template directory yet.\nRun `#{$0} setup` to set up the templates properly."
+  class SetupError < RuntimeError; end
+
   class App < Thor
     include Thor::Actions
     package_name 'Jekyllpress::App'
@@ -82,58 +85,68 @@ module Jekyllpress
     end
 
     desc "redirect OLD_DIR", "Add a jekyll-redirect-from entry in every post based on OLD_DIR"
+    method_option :permalink_template, :desc => "Format of permalink for redirect (old format)", :type => :string, :aliases => %w[-p]
+    method_option :force, :desc => "Force writing of redirect_from, even if there is one already", :type => :boolean, :aliases => %w[-F]
     def redirect(old_dir="")
       @old_dir = old_dir.to_s
       @old_dir = ask("Old directory to use in redirect: ") if @old_dir.empty?
+      permalink_template = options.fetch("permalink_template") { Jekyll::Configuration::DEFAULTS["permalink"] }
+      force_redirect = options.fetch("force") { false }
       processed_posts = []
-      with_posts do |post|
-        if post.data.has_key?("redirect_from")
+      with_posts({"permalink" => permalink_template}) do |post|
+        # binding.pry
+        if post.data.has_key?("redirect_from") && !force_redirect
           say "skipping #{post.name} - redirect_from detected"
           next 
         end
-        say "processing #{post.name}"
-        post.data.merge!({
-          "redirect_from" => Array(File.join('', old_dir, post.url))
-          })
-        rewrite_post(post)
-        say "wrote #{post.name}"
+
+        time_now = Time.now
+        insert_text = %Q{# BEGIN: redirect added by jekyllpress on #{time_now}
+redirect_from:
+  - #{File.join('', old_dir, post.url)}
+# END:   redirect added by jekyllpress on #{time_now}
+}
+        insert_into_file(post_file_name(post), insert_text, :after => %r{\A---\n})
+
         processed_posts << {name: post.name, file: post_file_name(post)}
       end
+
+      binding.pry
       [__method__, @old_dir, processed_posts]
     end
 
     private
 
-    def with_config
+    def with_config(options={})
       raise "no block given at #{caller[1]}" unless block_given?
       self.class.source_root(jekyll_config["source"])
       yield jekyll_config
     end
 
-    def with_posts
-      with_config do |config|
+    def with_posts(options={})
+      with_config(options) do |config|
         site = Jekyll::Site.new(config)
         site.reset
         site.read
         site.posts.each do |post|
           yield post
         end
+        site.reset
       end
     end
 
     def check_templates
+      raise SetupError.new SETUPERROR_MESSAGE unless jekyll_config.has_key?("templates")
       File.stat(File.join(source, template_dir))
       File.stat(File.join(source, template_dir, new_page_template))
       File.stat(File.join(source, template_dir, new_post_template))
     rescue ::Errno::ENOENT => error
-      warn "It appears you have not set up a template directory yet.",
-        "Run `#{$0} setup` to set up the templates directory"
-      raise error
+      raise SetupError.new SETUPERROR_MESSAGE
     end
 
-    def jekyll_config
+    def jekyll_config(options={})
       @jekyll_config ||= begin
-        conf = Jekyll.configuration({})
+        conf = Jekyll.configuration(options)
         unless conf.has_key?("templates")
           conf.merge!({
             "templates" => {
@@ -144,8 +157,9 @@ module Jekyllpress
             })
         end
       end
-
+      # @jekyll_config ||= Jekyll.configuration(options)
     end
+
     def new_ext
       jekyll_config["markdown_ext"].split(',').first
     end
@@ -190,16 +204,6 @@ module Jekyllpress
       File.join(post.site.source, post.path)
     end
 
-    def rewrite_post(post)
-      file = post_file_name(post)
-      # backup current file
-      FileUtils.copy_file(file, "#{file}.bak")
-      File.open(file, 'w') do |f|
-        f.puts post.data.to_yaml
-        f.puts "---"
-        f.write post.content
-      end
-    end
   end
 
 end

data/spec/lib/jekyllpress_spec.rb

@@ -1,144 +1,215 @@
 require 'spec_helper'
 
-jekyll_match = %r[(gems/jekyll-.+/lib/jekyll)]
-# load 'jekyllpress.rb'; STDERR.puts $".grep(jekyll_match);  exit;
+TEST_SITE = 'test_site'
+
+def kill_jekyll
+  # This is a weird little discombobulation.
+  # I'm not altogether sure why I have to do this, but apparently
+  # the way thor, rspec, and jekyll all meld, something goes haywire.
+  $".delete_if{|x| x.match(%r[(/gems/jekyll-.+/lib/jekyll)])}
+  # run `load 'jekyllpress.rb'` in each test setup where you have a 
+  # jekyll test directory to work with
+end
 
-Dir.chdir(Pathname.new('spec/test_site')) do |test_dir|
-  $".delete_if{|x| x.match(jekyll_match)} ; load 'jekyllpress.rb' # Have to load this *after* we're in the working directory
-  # STDERR.puts Jekyll::Configuration::DEFAULTS["source"]
+describe "my Jekyllpress Thor script" do
 
-  describe Jekyllpress::App do
+  describe ":version" do
+    before(:all) do
+      kill_jekyll
+      load 'jekyllpress.rb'
+    end
 
-    # it "should bloody well be in the damn spec/test_site directory!!!" do
-    #   expect(Jekyll::Configuration::DEFAULTS["source"]).to include("spec/test_site")
-    # end
+    it {expect(Jekyllpress::App.start(%w[version])).to include(Jekyllpress::VERSION)}
+    it {expect(Jekyllpress::App.start(%w[-V])).to include(Jekyllpress::VERSION)}
+    it {expect(Jekyllpress::App.start(%w[--version])).to include(Jekyllpress::VERSION)}
+  end  
+
+  describe ":new_post" do
+    before(:all) do
+      kill_jekyll
+      Dir.chdir("spec") do |spec_dir|
+        FileUtils.rm_rf TEST_SITE
+        `jekyll new #{TEST_SITE}`
+        Dir.chdir(TEST_SITE) do |test_site|
+          load 'jekyllpress.rb'
+          Jekyllpress::App.start(%w[setup])
+          @action, @title, @filename, @categories, @tags = Jekyllpress::App.start(%w[new_post A\ New\ Post -c one two three -t able baker charlie])
+        end
+      end
+    end
+
+    after(:all) do
+      Dir.chdir("spec") do |spec_dir|
+        FileUtils.rm_rf TEST_SITE
+      end
+    end
 
-    describe ":version" do
-      it {expect(Jekyllpress::App.start(%w[version])).to include(Jekyllpress::VERSION)}
-      it {expect(Jekyllpress::App.start(%w[-V])).to include(Jekyllpress::VERSION)}
-      it {expect(Jekyllpress::App.start(%w[--version])).to include(Jekyllpress::VERSION)}
-    end  
+    it {expect(@action).to eq :new_post}
+    it {expect(@title).to eq "A New Post"}
+    it {expect(@categories).to eq %w[one two three]}
+    it {expect(@tags).to eq %w[able baker charlie]}
+    it {expect(@filename).to be_a String}
+    it {expect(@filename).not_to be_empty}
+    it {expect(@filename).to include("/_posts/#{Time.now.strftime("%Y-%m-%d")}-a-new-post.markdown")}
+  end
 
-    describe ":new_post" do
-      before(:all) do
-        # STDERR.puts "test_dir is #{test_dir}"
-        Dir.chdir(test_dir) do |test_dir|
-          # binding.pry
-          @posts_dir = Pathname.new('_posts')
-          raise "#{@posts_dir} does not exist!" unless @posts_dir.directory?
-          @posts_dir.children.each(&:unlink)
-          @templates = Pathname.new('_templates')
-          @templates.rmtree if @templates.exist?
+  describe ":new_page" do
+    before(:all) do
+      kill_jekyll
+      Dir.chdir("spec") do |spec_dir|
+        FileUtils.rm_rf TEST_SITE
+        `jekyll new #{TEST_SITE}`
+        Dir.chdir(TEST_SITE) do |test_site|
+          load 'jekyllpress.rb'
           Jekyllpress::App.start(%w[setup])
-          @action, @title, @filename, @categories, @tags = Jekyllpress::App.start(%w[new_post A\ New\ Post -c=one two three -t=a b c])
         end
       end
-      # it "should bloody well be in the damn spec/test_site directory!!!" do
-      #   expect(Jekyll::Configuration::DEFAULTS["source"]).to include("spec/test_site")
-      # end
-      it {expect(@action).to eq :new_post}
-      it {expect(@title).to eq "A New Post"}
-      it {expect(@categories).to eq %w[one two three]}
-      it {expect(@tags).to eq %w[a b c]}
+    end
+
+    after(:all) do
+      Dir.chdir("spec") do |spec_dir|
+        FileUtils.rm_rf TEST_SITE
+      end
+    end
+
+
+    it "should report an error if location is an absolute path" do
+      expect{Jekyllpress::App.start(%w[new_page bogus --location /pages])}.to raise_error(RuntimeError, "location can not be an absolute path: /pages")
+    end
+
+    context "create a new page" do
+      before(:all) do
+        @action, @title, @filename, @location = Jekyllpress::App.start(%w[new_page A\ New\ Page -l=pages])
+      end
+
+      after(:all) do
+        File.unlink(@filename)
+      end
+
+      it {expect(@action).to eq :new_page}
+      it {expect(@title).to eq "A New Page"}
+      it {expect(@location).to eq "pages"}
       it {expect(@filename).to be_a String}
       it {expect(@filename).not_to be_empty}
-      it {expect(@filename).to include("#{test_dir}/_posts/#{Time.now.strftime("%Y-%m-%d")}-a-new-post.markdown")}
+      it {expect(@filename).to include("/pages/a-new-page/index.markdown")}
     end
+  end
 
-    describe ":new_page" do
-      it "should report an error if location is an absolute path" do
-        expect{Jekyllpress::App.start(%w[new_page bogus --location /pages])}.to raise_error(RuntimeError, "location can not be an absolute path: /pages")
-      end
-
-      context "create a new page" do
-        before(:all) do
-          Dir.chdir(test_dir) do |test_dir|
-            @pages_dir = Pathname.new('pages')
-            raise "#{@pages_dir} does not exist!" unless @pages_dir.directory?
-            @pages_dir.children.each(&:rmtree)
-            @templates = Pathname.new('_templates')
-            @templates.rmtree if @templates.exist?
-            Jekyllpress::App.start(%w[setup])
-            @action, @title, @filename, @location = Jekyllpress::App.start(%w[new_page A\ New\ Page -l=pages])
-          end
+  describe "no templates" do
+
+    before(:all) do
+      kill_jekyll
+      Dir.chdir("spec") do |spec_dir|
+        FileUtils.rm_rf TEST_SITE
+        `jekyll new #{TEST_SITE}`
+        Dir.chdir(TEST_SITE) do |test_site|
+          load 'jekyllpress.rb'
         end
-        it {expect(@action).to eq :new_page}
-        it {expect(@title).to eq "A New Page"}
-        it {expect(@location).to eq "pages"}
-        it {expect(@filename).to be_a String}
-        it {expect(@filename).not_to be_empty}
-        it {expect(@filename).to include("#{test_dir}/pages/a-new-page/index.markdown")}
       end
     end
 
-    describe "no templates" do
+    after(:all) do
+      Dir.chdir("spec") do |spec_dir|
+        FileUtils.rm_rf TEST_SITE
+      end
+    end
 
+    it "should abort when no templates are found" do
+      expect{Jekyllpress::App.start(%w[new_page blah])}.to raise_error(Jekyllpress::SetupError)
+    end
+
+    context ":setup" do
       before(:all) do
-        Dir.chdir(test_dir) do |test_dir|
-          @templates = Pathname.new('_templates')
-          @templates.rmtree if @templates.exist?
-        end
+        @action, @source, @template_dir, @new_post_template, @new_page_template = Jekyllpress::App.start(%w[setup])
       end
-      
-      it "should abort when no templates are found" do
-        expect{Jekyllpress::App.start(%w[new_page blah])}.to raise_error(::Errno::ENOENT)
-        expect(@templates.directory?).not_to eq(true)
-      end
-      
-      context ":setup" do
-        before(:all) do
-          @action, @source, @template_dir, @new_post_template, @new_page_template = Jekyllpress::App.start(%w[setup])
+
+      it { expect(@action).to eq(:setup) }
+      it { expect(@source).to include("spec/test_site") }
+      it { expect(@template_dir).to eq("_templates") }
+      it { expect(@new_post_template).to eq("new_post.markdown") }
+      it { expect(@new_page_template).to eq("new_page.markdown") }
+
+      it "templates directory created" do
+        Dir.chdir(File.join("spec",TEST_SITE)) do |test_dir|
+          expect(File.directory?(@template_dir)).to eq true
         end
-      
-        it { expect(@action).to eq(:setup) }
-        it { expect(@source).to include("spec/test_site") }
-        it { expect(@template_dir).to eq("_templates") }
-        it { expect(@new_post_template).to eq("new_post.markdown") }
-        it { expect(@new_page_template).to eq("new_page.markdown") }
-      
-        it "templates directory created" do
-          Dir.chdir(test_dir) do |test_dir|
-            expect(File.directory?(@template_dir)).to eq true
-          end
+      end
+
+      it "new_post_template created" do
+        Dir.chdir(File.join("spec",TEST_SITE)) do |test_dir|
+          expect(File.exist?(File.join(@template_dir, @new_post_template)))
         end
-      
-        it "new_post_template created" do
-          Dir.chdir(test_dir) do |test_dir|
-            expect(File.exist?(File.join(@template_dir, @new_post_template)))
-          end
+      end
+
+      it "new_page_template created" do
+        Dir.chdir(File.join("spec",TEST_SITE)) do |test_dir|
+          expect(File.exist?(File.join(@template_dir, @new_page_template)))
         end
-      
-        it "new_page_template created" do
-          Dir.chdir(test_dir) do |test_dir|
-            expect(File.exist?(File.join(@template_dir, @new_page_template)))
+      end
+
+    end
+
+  end
+
+  describe ":redirect" do
+    before do
+      kill_jekyll
+      Dir.chdir("spec") do |spec_dir|
+        FileUtils.rm_rf TEST_SITE
+        `jekyll new #{TEST_SITE}`
+        Dir.chdir(TEST_SITE) do |test_site|
+          load 'jekyllpress.rb'
+          File.open(File.join("_posts","2013-12-31-an-old-post.markdown"), 'w') do |post|
+            frontmatter = {
+              "title" => "An old post", 
+              "date" => "2013-12-31 12:31",
+              "layout" => "post", 
+              "redirect_from" => Array("/oldsite/2013/12/31/an-old-post/")
+            }
+            post.puts frontmatter.to_yaml
+            post.puts "---"
+            post.puts "Old horse kitty kat peanut butter engine."
+            post.puts "\n"
+            post.puts "This is a post with a redirect_from."
           end
         end
-      
       end
-
     end
 
-    describe ":redirect" do
-      before(:all) do
-        @action, @old_dir, @posts = Jekyllpress::App.start(%w[redirect BLOG])
+    after do
+      Dir.chdir("spec") do |spec_dir|
+        FileUtils.rm_rf TEST_SITE
       end
+    end
+
+    # after(:each) do # restore backups to normal
+    #   @posts.each do |post|
+    #     FileUtils.mv("#{post[:file]}.bak", post[:file], force: true, verbose: true)
+    #   end
+    # end
 
-      it "each post has a redirect_from: in frontmatter" do
+    it "only one post has a redirect_from: in frontmatter" do
+      Dir.chdir(File.join("spec", TEST_SITE)) do |test_site|
+        @action, @old_dir, @posts = Jekyllpress::App.start(%w[redirect BLOG])
+        expect(@posts.count).to eq(1)
         @posts.each do |post|
           post_content = File.read post[:file]
           expect(post_content).to match(%r{^redirect_from:$}) 
+          expect(post_content).to  match(%r{^  - /BLOG/})
         end
       end
+    end
 
-      after(:all) do
-        # restore backups to normal
-        @posts.each do |post|
-          FileUtils.mv("#{post[:file]}.bak", post[:file], force: true)
-        end
+    it "all posts have a redirect_from: in frontmatter" do
+      @action, @old_dir, @posts = Jekyllpress::App.start(%w[redirect BLOG -F])
+      expect(@posts.count).to  eq(2)
+      @posts.each do |post|
+        post_content = File.read post[:file]
+        expect(post_content).to match(%r{^redirect_from:$})
+        expect(post_content).to  match(%r{^  - /BLOG/})
       end
-
-
     end
 
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyllpress
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tamara Temple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -188,20 +188,6 @@ files:
 - spec/jekyllpress_spec.rb
 - spec/lib/jekyllpress_spec.rb
 - spec/spec_helper.rb
-- spec/test_site/.gitignore
-- spec/test_site/_config.yml
-- spec/test_site/_includes/footer.html
-- spec/test_site/_includes/head.html
-- spec/test_site/_includes/header.html
-- spec/test_site/_layouts/default.html
-- spec/test_site/_layouts/page.html
-- spec/test_site/_layouts/post.html
-- spec/test_site/_templates/new_page.markdown
-- spec/test_site/_templates/new_post.markdown
-- spec/test_site/about.md
-- spec/test_site/css/main.css
-- spec/test_site/feed.xml
-- spec/test_site/index.html
 homepage: https://github.com/tamouse/jekyllpress
 licenses:
 - MIT
@@ -230,18 +216,4 @@ test_files:
 - spec/jekyllpress_spec.rb
 - spec/lib/jekyllpress_spec.rb
 - spec/spec_helper.rb
-- spec/test_site/.gitignore
-- spec/test_site/_config.yml
-- spec/test_site/_includes/footer.html
-- spec/test_site/_includes/head.html
-- spec/test_site/_includes/header.html
-- spec/test_site/_layouts/default.html
-- spec/test_site/_layouts/page.html
-- spec/test_site/_layouts/post.html
-- spec/test_site/_templates/new_page.markdown
-- spec/test_site/_templates/new_post.markdown
-- spec/test_site/about.md
-- spec/test_site/css/main.css
-- spec/test_site/feed.xml
-- spec/test_site/index.html
 has_rdoc: 

data/spec/test_site/.gitignore

@@ -1 +0,0 @@
-_site

data/spec/test_site/_config.yml

@@ -1,12 +0,0 @@
-# Site settings
-title: Your awesome title
-email: your-email@domain.com
-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

data/spec/test_site/_includes/footer.html

@@ -1,61 +0,0 @@
-<footer class="site-footer">
-
-  <div class="wrap">
-
-    <h2 class="footer-heading">{{ site.title }}</h2>
-
-    <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-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>
-
-    <div class="footer-col-3 column">
-      <p class="text">{{ site.description }}</p>
-    </div>
-
-  </div>
-
-</footer>

data/spec/test_site/_includes/head.html

@@ -1,12 +0,0 @@
-<head>
-    <meta charset="utf-8">
-    <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="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>

data/spec/test_site/_includes/header.html

@@ -1,28 +0,0 @@
-<header class="site-header">
-
-  <div class="wrap">
-
-    <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
-
-    <nav class="site-nav">
-      <a href="#" class="menu-icon">
-        <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 %}
-        {% endfor %}
-      </div>
-    </nav>
-
-  </div>
-
-</header>

data/spec/test_site/_layouts/default.html

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-  {% include head.html %}
-
-    <body>
-
-    {% include header.html %}
-
-    <div class="page-content">
-      <div class="wrap">
-      {{ content }}
-      </div>
-    </div>
-
-    {% include footer.html %}
-
-    </body>
-</html>

data/spec/test_site/_layouts/page.html

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

data/spec/test_site/_layouts/post.html

@@ -1,15 +0,0 @@
----
-layout: default
----
-<div class="post">
-
-  <header class="post-header">
-    <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 }}
-  </article>
-
-</div>

data/spec/test_site/_templates/new_page.markdown

@@ -1,5 +0,0 @@
----
-layout: page
-title: <%= @title %>
-date: <%= Time.now.strftime("%Y-%m-%d %H:%M") %>
----

data/spec/test_site/_templates/new_post.markdown

@@ -1,7 +0,0 @@
----
-layout: post
-title: <%= @title %>
-date: <%= Time.now.strftime("%Y-%m-%d %H:%M") %>
-categories: <%= @categories %>
-tags: <%= @tags %>
----

data/spec/test_site/about.md

@@ -1,11 +0,0 @@
----
-layout: page
-title: About
-permalink: /about/
----
-
-This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
-
-You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new)
-
-You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)

data/spec/test_site/css/main.css

@@ -1,410 +0,0 @@
-/* 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; }
-
-}

data/spec/test_site/feed.xml

@@ -1,30 +0,0 @@
----
-layout: none
----
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>{{ site.title | xml_escape }}</title>
-    <description>{{ site.description | xml_escape }}</description>
-    <link>{{ site.url }}{{ site.baseurl }}/</link>
-    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml" />
-    <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
-    <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
-    <generator>Jekyll v{{ jekyll.version }}</generator>
-    {% for post in site.posts limit:10 %}
-      <item>
-        <title>{{ post.title | xml_escape }}</title>
-        <description>{{ post.content | xml_escape }}</description>
-        <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
-        <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
-        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
-        {% for tag in post.tags %}
-        <category>{{ tag | xml_escape }}</category>
-        {% endfor %}
-        {% for cat in post.categories %}
-        <category>{{ cat | xml_escape }}</category>
-        {% endfor %}
-      </item>
-    {% endfor %}
-  </channel>
-</rss>

data/spec/test_site/index.html

@@ -1,20 +0,0 @@
----
-layout: default
----
-
-<div class="home">
-
-  <h1>Posts</h1>
-
-  <ul class="posts">
-    {% for post in site.posts %}
-      <li>
-        <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>
-
-  <p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: site.baseurl }}">via RSS</a></p>
-
-</div>