jekyll 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aab2c87d69fc03f3df6a6b6a2baefc5e46fe5904
-  data.tar.gz: ae32a99eb79b9c36914dabe91b2ef4e504a2097d
+  metadata.gz: 9425f162d036e32db265bff5b75d414e5b92ecbd
+  data.tar.gz: e9c0f102492eb8ba0c159d5f1eb751742e1178c1
 SHA512:
-  metadata.gz: 1ce28ae2b4c0dfd9d8042f636629748ee89db13afab6b1cb913969cb64d1351ccf7630d246b27c2bd361014b26836a535893907ad89f6018058815bab7a80d47
-  data.tar.gz: d5e9b0f6bb303512011243caacf34e369a832d4bf26d518455798463f5885398e9877ee6433818ebd83a2f11f81502476b5716eeec8e754f2456727d51ee35b4
+  metadata.gz: 8bff93a60c7ee953911e6eb14c8ea3d1d4df5d2c25d602b902722d659b8081ef9258eed90d46e7678555302d36d3c31035772be8173885b255c579ef4cfb9433
+  data.tar.gz: d8b58b6f2e007d96708009378f7f13d024badb03356b5e28dd9406617bc139e0e8ea579e41ebdba0529da05985c829f41b12d65c0eaceb47054b06964dedf087

data/CONTRIBUTING.markdown

@@ -11,14 +11,20 @@ following in mind:
   [RR](http://github.com/btakita/rr/tree/master).
 * If it's a brand new feature, make sure to create a new
   [Cucumber](https://github.com/cucumber/cucumber/) feature and reuse steps
-  where appropriate. Also, whipping up some documentation in your fork's wiki
+  where appropriate. Also, whipping up some documentation in your fork's `site`
   would be appreciated, and once merged it will be transferred over to the main
-  wiki.
+  `site`, jekyllrb.com.
 * If your contribution changes any Jekyll behavior, make sure to update the
   documentation. It lives in `site/docs`. If the docs are missing information,
   please feel free to add it in. Great docs make a great project!
 * Please follow the [GitHub Ruby Styleguide](https://github.com/styleguide/ruby)
   when modifying Ruby code.
+* Please do your best to submit **small pull requests**. The easier the proposed
+  change is to review, the more likely it will be merged.
+* When submitting a pull request, please make judicious use of the pull request
+  body. A description of what changes were made, the motivations behind the
+  changes and [any tasks completed or left to complete](http://git.io/gfm-tasks)
+  will also speed up review time.
 
 Test Dependencies
 -----------------
@@ -32,8 +38,8 @@ you're all set!
 Before you start, run the tests and make sure that they pass (to confirm your
 environment is configured properly):
 
-    $ rake test
-    $ rake features
+    $ bundle exec rake test
+    $ bundle exec rake features
 
 Workflow
 --------
@@ -65,8 +71,7 @@ All documentation pull requests should be directed at `master`.  Pull
 requests directed at another branch will not be accepted. 
 
 The [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) on GitHub 
-can be freely updated without a pull request as all 
-GitHub users have access.
+can be freely updated without a pull request as all GitHub users have access.
 
 Gotchas
 -------

data/History.markdown

@@ -10,7 +10,31 @@
 
 ### Site Enhancements
 
-## v1.2.0 / 2013-09-06
+## 1.2.1 / 2013-09-14
+
+### Minor Enhancements
+  * Print better messages for detached server. Mute output on detach. (#1518)
+  * Disable reverse lookup when running `jekyll serve` (#1363)
+  * Upgrade RedCarpet dependency to `~> 2.3.0` (#1515)
+  * Upgrade to Liquid `>= 2.5.2, < 2.6` (#1536)
+
+### Bug Fixes
+  * Fix file discrepancy in gemspec (#1522)
+  * Force rendering of Include tag (#1525)
+
+### Development Fixes
+  * Add a rake task to generate a new release post (#1404)
+  * Mute LSI output in tests (#1531)
+  * Update contributor documentation (#1537)
+
+### Site Enhancements
+  * Fix a couple of validation errors on the site (#1511)
+  * Make navigation menus reusable (#1507)
+  * Fix link to History page from Release v1.2.0 notes post.
+  * Fix markup in History file for command line options (#1512)
+  * Expand 1.2 release post title to 1.2.0 (#1516)
+
+## 1.2.0 / 2013-09-06
 
 ### Major Enhancements
   * Disable automatically-generated excerpts when `excerpt_separator` is `""`. (#1386)
@@ -20,7 +44,7 @@
   * Catch and fix invalid `paginate` values (#1390)
   * Remove superfluous `div.container` from the default html template for
     `jekyll new` (#1315)
-  * Add -D short-form switch for the drafts option (#1394)
+  * Add `-D` short-form switch for the drafts option (#1394)
   * Update the links in the site template for Twitter and GitHub (#1400)
   * Update dummy email address to example.com domain (#1408)
   * Update normalize.css to v2.1.2 and minify; add rake task to update
@@ -70,7 +94,7 @@
   * Fix markup for the Kramdown options (#1445)
   * Fix typos in the History file (#1454)
   * Add trailing slash to site's post URL (#1462)
-  * Clarify that --config will take multiple files (#1474)
+  * Clarify that `--config` will take multiple files (#1474)
   * Fix docs/templates.md private gist example (#1477)
   * Use `site.repository` for Jekyll's GitHub URL (#1463)
   * Add `jekyll-pageless-redirects` to list of third-party plugins (#1486)
@@ -79,12 +103,12 @@
   * XML escape the blog post title in our feed (#1501)
   * Add `jekyll-toc-generator` to list of third-party plugins (#1506)
 
-## v1.1.2 / 2013-07-25
+## 1.1.2 / 2013-07-25
 
 ### Bug Fixes
   * Require Liquid 2.5.1 (#1349)
 
-## v1.1.1 / 2013-07-24
+## 1.1.1 / 2013-07-24
 
 ### Minor Enhancements
   * Remove superfluous `table` selector from main.css in `jekyll new` template (#1328)
@@ -307,7 +331,7 @@
   * Allow symlinked files in unsafe mode (#824)
   * Add 'gist' Liquid tag to core (#822, #861)
   * New format of Jekyll output (#795)
-  * Reinstate --limit_posts and --future switches (#788)
+  * Reinstate `--limit_posts` and `--future` switches (#788)
   * Remove ambiguity from command descriptions (#815)
   * Fix SafeYAML Warnings (#807)
   * Relaxed Kramdown version to 0.14 (#808)
@@ -330,7 +354,7 @@
   * Catch all exceptions, not just StandardError descendents (#1007)
   * 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)
+  * Fix the CLI option `--plugins` to actually accept dirs and files (#993)
   * 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)

data/Rakefile

@@ -211,6 +211,31 @@ namespace :site do
       abort "You seem to have misplaced your History.markdown file. I can haz?"
     end
   end
+  
+  namespace :releases do
+    desc "Create new release post"
+    task :new, :version do |t, args|
+      raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version
+      today = Time.new.strftime('%Y-%m-%d')
+      release = args.version.to_s
+      filename = "site/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown"
+
+      File.open(filename, "wb") do |post|
+        post.puts("---")
+        post.puts("layout: news_item")
+        post.puts("title: 'Jekyll #{release} Released'")
+        post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
+        post.puts("author: ")
+        post.puts("version: #{version}")
+        post.puts("categories: [release]")
+        post.puts("---")
+        post.puts
+        post.puts
+      end
+
+      puts "Created #{filename}"
+    end
+  end
 end
 
 #############################################################################

data/bin/jekyll

@@ -65,6 +65,7 @@ command :build do |c|
   c.option '-w', '--watch', 'Watch for changes and rebuild'
   c.option '--lsi', 'Use LSI for improved related posts'
   c.option '-D', '--drafts', 'Render posts in the _drafts folder'
+  c.option '-v', '--verbose', 'Print verbose output.'
 
   c.action do |args, options|
     options = normalize_options(options.__hash__)
@@ -84,6 +85,7 @@ command :serve do |c|
   c.option '--lsi', 'Use LSI for improved related posts'
   c.option '-B', '--detach', 'Run the server in the background (detach)'
   c.option '-D', '--drafts', 'Render posts in the _drafts folder'
+  c.option '-v', '--verbose', 'Print verbose output.'
 
   c.option '-P', '--port [PORT]', 'Port to listen on'
   c.option '-H', '--host [HOST]', 'Host to bind to'

data/jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.2.0'
+  s.version           = '1.2.1'
   s.license           = 'MIT'
-  s.date              = '2013-09-06'
+  s.date              = '2013-09-14'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.markdown LICENSE]
 
-  s.add_runtime_dependency('liquid', "~> 2.5.1")
+  s.add_runtime_dependency('liquid', "~> 2.5.2")
   s.add_runtime_dependency('classifier', "~> 1.3")
   s.add_runtime_dependency('directory_watcher', "~> 1.4.1")
   s.add_runtime_dependency('maruku', "~> 0.5")
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('commander', "~> 4.1.3")
   s.add_runtime_dependency('safe_yaml', "~> 0.7.0")
   s.add_runtime_dependency('colorator', "~> 0.1")
-  s.add_runtime_dependency('redcarpet', "~> 2.2.2")
+  s.add_runtime_dependency('redcarpet', "~> 2.3.0")
 
   s.add_development_dependency('rake', "~> 10.0.3")
   s.add_development_dependency('rdoc', "~> 3.11")
@@ -126,6 +126,8 @@ Gem::Specification.new do |s|
     site/_includes/analytics.html
     site/_includes/docs_contents.html
     site/_includes/docs_contents_mobile.html
+    site/_includes/docs_option.html
+    site/_includes/docs_ul.html
     site/_includes/footer.html
     site/_includes/header.html
     site/_includes/news_contents.html
@@ -147,6 +149,7 @@ Gem::Specification.new do |s|
     site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
     site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
     site/_posts/2013-09-06-jekyll-1-2-0-released.markdown
+    site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
     site/css/gridism.css
     site/css/normalize.css
     site/css/pygments.css
@@ -189,8 +192,8 @@ Gem::Specification.new do |s|
     site/img/tube1x.png
     site/index.html
     site/js/modernizr-2.5.3.min.js
-    site/news/index.md
-    site/news/releases/index.md
+    site/news/index.html
+    site/news/releases/index.html
     test/fixtures/broken_front_matter1.erb
     test/fixtures/broken_front_matter2.erb
     test/fixtures/broken_front_matter3.erb

data/lib/jekyll.rb

@@ -60,7 +60,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.

data/lib/jekyll/commands/serve.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 module Jekyll
   module Commands
     class Serve < Command
@@ -10,31 +10,54 @@ module Jekyll
 
         FileUtils.mkdir_p(destination)
 
-        mime_types_file = File.expand_path('../mime.types', File.dirname(__FILE__))
-        mime_types = WEBrick::HTTPUtils::load_mime_types(mime_types_file)
-
         # recreate NondisclosureName under utf-8 circumstance
         fh_option = WEBrick::Config::FileHandler
         fh_option[:NondisclosureName] = ['.ht*','~*']
 
-        s = HTTPServer.new(
-          :Port => options['port'],
-          :BindAddress => options['host'],
-          :MimeTypes => mime_types
-        )
+        s = HTTPServer.new(webrick_options(options))
 
         s.mount(options['baseurl'], HTTPServlet::FileHandler, destination, fh_option)
 
         if options['detach'] # detach the server
-          pid = Process.fork {s.start}
+          pid = Process.fork { s.start }
           Process.detach(pid)
-          pid
+          Jekyll.logger.info "Server detatched with pid '#{pid}'.", "Run `kill -9 #{pid}' to stop the server."
         else # create a new server thread, then join it with current terminal
           t = Thread.new { s.start }
           trap("INT") { s.shutdown }
           t.join()
         end
       end
+
+      def self.webrick_options(config)
+        opts = {
+          :Port => config['port'],
+          :BindAddress => config['host'],
+          :MimeTypes => self.mime_types,
+          :DoNotReverseLookup => true,
+          :StartCallback => start_callback(config['detach'])
+        }
+
+        if !config['verbose']
+          opts.merge!({
+            :AccessLog => [],
+            :Logger => Log::new([], Log::WARN)
+          })
+        end
+
+        opts
+      end
+
+      def self.start_callback(detached)
+        unless detached
+          Proc.new { Jekyll.logger.info "Server running...", "press ctrl-c to stop." }
+        end
+      end
+
+      def self.mime_types
+        mime_types_file = File.expand_path('../mime.types', File.dirname(__FILE__))
+        WEBrick::HTTPUtils::load_mime_types(mime_types_file)
+      end
     end
   end
 end

data/lib/jekyll/tags/include.rb

@@ -80,6 +80,10 @@ eos
           return "The included file '_includes/#{@file}' should not be a symlink"
         end
       end
+
+      def blank?
+        false
+      end
     end
   end
 end

data/site/_includes/docs_contents.html

@@ -1,97 +1,16 @@
 <div class="unit one-fifth hide-on-mobiles">
   <aside>
     <h4>Getting Started</h4>
-    <ul>
-      <li class="{% if page.title == 'Welcome' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/home/">Welcome</a>
-      </li>
-      <li class="{% if page.title == 'Quick-start guide' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/quickstart/">Quick-start guide</a>
-      </li>
-      <li class="{% if page.title == 'Installation' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/installation/">Installation</a>
-      </li>
-      <li class="{% if page.title == 'Basic Usage' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/usage/">Basic Usage</a>
-      </li>
-      <li class="{% if page.title == 'Directory structure' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/structure/">Directory structure</a>
-      </li>
-      <li class="{% if page.title == 'Configuration' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/configuration/">Configuration</a>
-      </li>
-    </ul>
+    {% include docs_ul.html items='home quickstart installation usage structure configuration' %}
     <h4>Your Content</h4>
-    <ul>
-      <li class="{% if page.title == 'Front-matter' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/frontmatter/">Front-matter</a>
-      </li>
-      <li class="{% if page.title == 'Writing posts' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/posts/">Writing posts</a>
-      </li>
-      <li class="{% if page.title == 'Working with drafts' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/drafts/">Working with drafts</a>
-      </li>
-      <li class="{% if page.title == 'Creating pages' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/pages/">Creating pages</a>
-      </li>
-      <li class="{% if page.title == 'Variables' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/variables/">Variables</a>
-      </li>
-      <li class="{% if page.title == 'Blog migrations' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/migrations/">Blog migrations</a>
-      </li>
-    </ul>
+    {% include docs_ul.html items='frontmatter posts drafts pages variables migrations' %}
     <h4>Customization</h4>
-    <ul>
-      <li class="{% if page.title == 'Templates' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/templates/">Templates</a>
-      </li>
-      <li class="{% if page.title == 'Permalinks' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/permalinks/">Permalinks</a>
-      </li>
-      <li class="{% if page.title == 'Pagination' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/pagination/">Pagination</a>
-      </li>
-      <li class="{% if page.title == 'Plugins' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/plugins/">Plugins</a>
-      </li>
-      <li class="{% if page.title == 'Extras' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/extras/">Extras</a>
-      </li>
-    </ul>
+    {% include docs_ul.html items='templates permalinks pagination plugins extras' %}
     <h4>Deployment</h4>
-    <ul>
-      <li class="{% if page.title == 'GitHub Pages' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/github-pages/">GitHub Pages</a>
-      </li>
-      <li class="{% if page.title == 'Deployment methods' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/deployment-methods/">Other methods</a>
-      </li>
-    </ul>
+    {% include docs_ul.html items='github-pages deployment-methods' %}
     <h4>Miscellaneous</h4>
-    <ul>
-      <li class="{% if page.title == 'Troubleshooting' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/troubleshooting/">Troubleshooting</a>
-      </li>
-      <li class="{% if page.title == 'Sites using Jekyll' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/sites/">Sites using Jekyll</a>
-      </li>
-      <li class="{% if page.title == 'Resources' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/resources/">Resources</a>
-      </li>
-      <li class="{% if page.title == 'Upgrading' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/upgrading/">Upgrading</a>
-      </li>
-    </ul>
+    {% include docs_ul.html items='troubleshooting sites resources upgrading' %}
     <h4>Meta</h4>
-    <ul>
-      <li class="{% if page.title == 'Contributing' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/contributing/">Contributing</a>
-      </li>
-      <li class="{% if page.title == 'History' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/history/">History</a>
-      </li>
-    </ul>
+    {% include docs_ul.html items='contributing history' %}
   </aside>
 </div>

data/site/_includes/docs_contents_mobile.html

@@ -2,41 +2,22 @@
   <select onchange="if (this.value) window.location.href=this.value">
     <option value="">Navigate the docs…</option>
     <optgroup label="Getting started">
-      <option value="{{ site.url }}/docs/home/">Welcome</option>
-      <option value="{{ site.url }}/docs/quickstart/">Quick-start guide</option>
-      <option value="{{ site.url }}/docs/installation/">Installation</option>
-      <option value="{{ site.url }}/docs/usage/">Basic Usage</option>
-      <option value="{{ site.url }}/docs/structure/">Directory structure</option>
-      <option value="{{ site.url }}/docs/configuration/">Configuration</option>
+      {% include docs_option.html items='home quickstart installation usage structure configuration' %}
     </optgroup>
     <optgroup label="Your Content">
-      <option value="{{ site.url }}/docs/frontmatter/">Front-matter</option>
-      <option value="{{ site.url }}/docs/posts/">Writing posts</option>
-      <option value="{{ site.url }}/docs/drafts/">Working with drafts</option>
-      <option value="{{ site.url }}/docs/pages/">Creating pages</option>
-      <option value="{{ site.url }}/docs/variables/">Variables</option>
-      <option value="{{ site.url }}/docs/migrations/">Blog migrations</option>
+      {% include docs_option.html items='frontmatter posts drafts pages variables migrations' %}
     </optgroup>
     <optgroup label="Customization">
-      <option value="{{ site.url }}/docs/templates/">Templates</option>
-      <option value="{{ site.url }}/docs/permalinks/">Permalinks</option>
-      <option value="{{ site.url }}/docs/pagination/">Pagination</option>
-      <option value="{{ site.url }}/docs/plugins/">Plugins</option>
-      <option value="{{ site.url }}/docs/extras/">Extras</option>
+      {% include docs_option.html items='templates permalinks pagination plugins extras' %}
     </optgroup>
     <optgroup label="Deployment">
-      <option value="{{ site.url }}/docs/github-pages/">GitHub Pages</option>
-      <option value="{{ site.url }}/docs/deployment-methods/">Other methods</option>
+      {% include docs_option.html items='github-pages deployment-methods' %}
     </optgroup>
     <optgroup label="Miscellaneous">
-      <option value="{{ site.url }}/docs/troubleshooting/">Troubleshooting</option>
-      <option value="{{ site.url }}/docs/sites/">Sites using Jekyll</option>
-      <option value="{{ site.url }}/docs/resources/">Resources</option>
-      <option value="{{ site.url }}/docs/upgrading/">Upgrading</option>
+      {% include docs_option.html items='troubleshooting sites resources upgrading' %}
     </optgroup>
     <optgroup label="Meta">
-      <option value="{{ site.url }}/docs/contributing/">Contributing</option>
-      <option value="{{ site.url }}/docs/history/">History</option>
+      {% include docs_option.html items='contributing history' %}
     </optgroup>
   </select>
 </div>

data/site/_includes/docs_option.html

@@ -0,0 +1,11 @@
+{% assign items = include.items | split: ' ' %}
+
+{% for item in items %}
+  {% assign item_url = item | prepend:'/docs/' | append:'/' %}
+
+  {% for p in site.pages %}
+    {% if p.url == item_url %}
+      <option value="{{ site.url }}{{ p.url }}">{{ p.title }}</option>
+    {% endif %}
+  {% endfor %}
+{% endfor %}

data/site/_includes/docs_ul.html

@@ -0,0 +1,20 @@
+{% assign items = include.items | split: ' ' %}
+
+<ul>
+{% for item in items %}
+  {% assign item_url = item | prepend:'/docs/' | append:'/' %}
+
+  {% if item_url == page.url %}
+    {% assign c = 'current' %}
+  {% else %}
+    {% assign c = '' %}
+  {% endif %}
+
+  {% for p in site.pages %}
+    {% if p.url == item_url %}
+      <li class="{{ c }}"><a href="{{ site.url }}{{ p.url }}">{{ p.title }}</a></li>
+    {% endif %}
+  {% endfor %}
+
+{% endfor %}  
+</ul>

data/site/_includes/header.html

@@ -7,7 +7,7 @@
       <h1>
         <a href="{{ site.url }}/">
           <span>Jekyll</span>
-          <img src="{{ site.url }}/img/logo-2x.png" width="249px" height="115px" alt="">
+          <img src="{{ site.url }}/img/logo-2x.png" width="249" height="115" alt="">
         </a>
       </h1>
     </div>

data/site/_includes/news_item.html

@@ -14,11 +14,11 @@
       {{ post.date | date_to_string }}
     </span>
     <a href="https://github.com/{{ post.author }}" class="post-author">
-      <img src="https://github.com/{{ post.author }}.png" class="avatar" />
+      <img src="https://github.com/{{ post.author }}.png" class="avatar" alt="{{ post.author }}"/>
       {{ post.author }}
     </a>
   </div>
-  <p class="post-content">
+  <div class="post-content">
     {{ post.content }}
-  </p>
+  </div>
 </article>

data/site/_posts/2013-09-06-jekyll-1-2-0-released.markdown

@@ -1,6 +1,6 @@
 ---
 layout: news_item
-title: "Jekyll 1.2 Released"
+title: "Jekyll 1.2.0 Released"
 date: "2013-09-06 22:02:41 -0400"
 author: parkr
 version: 1.2.0
@@ -13,11 +13,11 @@ enhancements that we think you'll love.
 
 Here are a few things we think you'll want to know about this release:
 
-* Run `jekyll serve --detatch` to boot up a WEBrick server in the background. **Note:** you'll need to run `kill [server_pid]` to shut the server down.
+* Run `jekyll serve --detach` to boot up a WEBrick server in the background. **Note:** you'll need to run `kill [server_pid]` to shut the server down.
 * You can now **disable automatically-generated excerpts** if you set `excerpt_separator` to `""`.
 * If you're moving around pages and post, you can now check for **URL conflicts** by running `jekyll doctor`.
 * If you're a fan of the drafts feature, you'll be happy to know we've added `-D`, a shortened version of `--drafts`.
 * Permalinks with special characters should now generate without errors.
 * Expose the current Jekyll version as the `jekyll.version` Liquid variable.
 
-For a full run-down, visit our [change log](../history/)!
+For a full run-down, visit our [change log](/docs/history/)!

data/site/_posts/2013-09-14-jekyll-1-2-1-released.markdown

@@ -0,0 +1,19 @@
+---
+layout: news_item
+title: 'Jekyll 1.2.1 Released'
+date: 2013-09-14 20:46:50 -0400
+author: parkr
+version: 1.2.1
+categories: [release]
+---
+
+Quick turnover, anyone? A [recent incompatibility with Liquid
+v2.5.2](https://github.com/mojombo/jekyll/pull/1525) produced a nasty bug in
+which `include` tags were not rendered properly within `if` blocks. 
+
+This release also includes a better handling of detached servers (prints pid and
+the command for killing the process). **Note**: the `--detach` flag and
+`--watch` flags are presently incompatible in 1.2.x. Fix for that coming soon!
+
+For a full list of the fixes in this release, check out [the change
+log](/docs/history/)!

data/site/docs/contributing.md

@@ -16,13 +16,19 @@ following in mind:
 * If it's a brand new feature, make sure to create a new
   [Cucumber](https://github.com/cucumber/cucumber/) feature and reuse steps
   where appropriate. Also, whipping up some documentation in your fork's `site`
-  directory would be appreciated, and once merged it will also appear in
-  the next update of the main site.
-* If your contribution adds or changes any Jekyll behavior, make sure to update
-  the documentation. It lives in `site/docs`. If the docs are missing
-  information, please feel free to add it in. Great docs make a great project!
+  would be appreciated, and once merged it will be transferred over to the main
+  `site`, jekyllrb.com.
+* If your contribution changes any Jekyll behavior, make sure to update the
+  documentation. It lives in `site/docs`. If the docs are missing information,
+  please feel free to add it in. Great docs make a great project!
 * Please follow the [GitHub Ruby Styleguide](https://github.com/styleguide/ruby)
   when modifying Ruby code.
+* Please do your best to submit **small pull requests**. The easier the proposed
+  change is to review, the more likely it will be merged.
+* When submitting a pull request, please make judicious use of the pull request
+  body. A description of what changes were made, the motivations behind the
+  changes and [any tasks completed or left to complete](http://git.io/gfm-tasks)
+  will also speed up review time.
 
 <div class="note warning">
   <h5>Contributions will not be accepted without tests</h5>
@@ -47,8 +53,8 @@ Before you start, run the tests and make sure that they pass (to confirm your
 environment is configured properly):
 
 {% highlight bash %}
-$ rake test
-$ rake features
+$ bundle exec rake test
+$ bundle exec rake features
 {% endhighlight %}
 
 Workflow
@@ -79,8 +85,8 @@ git checkout -b my_awesome_feature
 git push origin my_awesome_feature
 {% endhighlight %}
 
-* Create a pull request against mojombo/jekyll and describe what your change
-  does and the why you think it should be merged.
+* Create a pull request against mojombo/jekyll:master and describe what your
+  change does and the why you think it should be merged.
 
 Updating Documentation
 ----------------------

data/site/docs/history.md

@@ -5,6 +5,127 @@ permalink: /docs/history/
 prev_section: contributing
 ---
 
+## 1.2.1 / 2013-09-14
+
+### Minor Enhancements
+- Print better messages for detached server. Mute output on detach. ([#1518]({{ site.repository }}/issues/1518))
+- Disable reverse lookup when running `jekyll serve` ([#1363]({{ site.repository }}/issues/1363))
+- Upgrade RedCarpet dependency to `~> 2.3.0` ([#1515]({{ site.repository }}/issues/1515))
+- Upgrade to Liquid `>= 2.5.2, < 2.6` ([#1536]({{ site.repository }}/issues/1536))
+
+### Bug Fixes
+- Fix file discrepancy in gemspec ([#1522]({{ site.repository }}/issues/1522))
+- Force rendering of Include tag ([#1525]({{ site.repository }}/issues/1525))
+
+### Development Fixes
+- Add a rake task to generate a new release post ([#1404]({{ site.repository }}/issues/1404))
+- Mute LSI output in tests ([#1531]({{ site.repository }}/issues/1531))
+- Update contributor documentation ([#1537]({{ site.repository }}/issues/1537))
+
+### Site Enhancements
+- Fix a couple of validation errors on the site ([#1511]({{ site.repository }}/issues/1511))
+- Make navigation menus reusable ([#1507]({{ site.repository }}/issues/1507))
+- Fix link to History page from Release v1.2.0 notes post.
+- Fix markup in History file for command line options ([#1512]({{ site.repository }}/issues/1512))
+- Expand 1.2 release post title to 1.2.0 ([#1516]({{ site.repository }}/issues/1516))
+
+## 1.2.0 / 2013-09-06
+
+### Major Enhancements
+- Disable automatically-generated excerpts when `excerpt_separator` is `""`. ([#1386]({{ site.repository }}/issues/1386))
+- Add checking for URL conflicts when running `jekyll doctor` ([#1389]({{ site.repository }}/issues/1389))
+
+### Minor Enhancements
+- Catch and fix invalid `paginate` values ([#1390]({{ site.repository }}/issues/1390))
+- Remove superfluous `div.container` from the default html template for
+    `jekyll new` ([#1315]({{ site.repository }}/issues/1315))
+- Add `-D` short-form switch for the drafts option ([#1394]({{ site.repository }}/issues/1394))
+- Update the links in the site template for Twitter and GitHub ([#1400]({{ site.repository }}/issues/1400))
+- Update dummy email address to example.com domain ([#1408]({{ site.repository }}/issues/1408))
+- Update normalize.css to v2.1.2 and minify; add rake task to update
+    normalize.css with greater ease. ([#1430]({{ site.repository }}/issues/1430))
+- Add the ability to detach the server ran by `jekyll serve` from it's
+    controlling terminal ([#1443]({{ site.repository }}/issues/1443))
+- Improve permalink generation for URLs with special characters ([#944]({{ site.repository }}/issues/944))
+- Expose the current Jekyll version to posts and pages via a new
+    `jekyll.version` variable ([#1481]({{ site.repository }}/issues/1481))
+
+### Bug Fixes
+- Markdown extension matching matches only exact matches ([#1382]({{ site.repository }}/issues/1382))
+- Fixed NoMethodError when message passed to `Stevenson#message` is nil ([#1388]({{ site.repository }}/issues/1388))
+- Use binary mode when writing file ([#1364]({{ site.repository }}/issues/1364))
+- Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and
+    Kramdown > 0.14.0 ([#1397]({{ site.repository }}/issues/1397))
+- Do not force the permalink to be a dir if it ends on .html ([#963]({{ site.repository }}/issues/963))
+- When a Liquid Exception is caught, show the full path rel. to site source ([#1415]({{ site.repository }}/issues/1415))
+- Properly read in the config options when serving the docs locally
+    ([#1444]({{ site.repository }}/issues/1444))
+- Fixed `--layouts` option for `build` and `serve` commands ([#1458]({{ site.repository }}/issues/1458))
+- Remove kramdown as a runtime dependency since it's optional ([#1498]({{ site.repository }}/issues/1498))
+- Provide proper error handling for invalid file names in the include
+    tag ([#1494]({{ site.repository }}/issues/1494))
+
+### Development Fixes
+- Remove redundant argument to
+    Jekyll::Commands::New#scaffold_post_content ([#1356]({{ site.repository }}/issues/1356))
+- Add new dependencies to the README ([#1360]({{ site.repository }}/issues/1360))
+- Fix link to contributing page in README ([#1424]({{ site.repository }}/issues/1424))
+- Update TomDoc in Pager#initialize to match params ([#1441]({{ site.repository }}/issues/1441))
+- Refactor `Site#cleanup` into `Jekyll::Site::Cleaner` class ([#1429]({{ site.repository }}/issues/1429))
+- Several other small minor refactorings ([#1341]({{ site.repository }}/issues/1341))
+- Ignore `_site` in jekyllrb.com deploy ([#1480]({{ site.repository }}/issues/1480))
+- Add Gem version and dependency badge to README ([#1497]({{ site.repository }}/issues/1497))
+
+### Site Enhancements
+- Add info about new releases ([#1353]({{ site.repository }}/issues/1353))
+- Update plugin list with jekyll-rss plugin ([#1354]({{ site.repository }}/issues/1354))
+- Update the site list page with Ruby's official site ([#1358]({{ site.repository }}/issues/1358))
+- Add `jekyll-ditaa` to list of third-party plugins ([#1370]({{ site.repository }}/issues/1370))
+- Add `postfiles` to list of third-party plugins ([#1373]({{ site.repository }}/issues/1373))
+- For internal links, use full path including trailing `/` ([#1411]({{ site.repository }}/issues/1411))
+- Use curly apostrophes in the docs ([#1419]({{ site.repository }}/issues/1419))
+- Update the docs for Redcarpet in Jekyll ([#1418]({{ site.repository }}/issues/1418))
+- Add `pluralize` and `reading_time` filters to docs ([#1439]({{ site.repository }}/issues/1439))
+- Fix markup for the Kramdown options ([#1445]({{ site.repository }}/issues/1445))
+- Fix typos in the History file ([#1454]({{ site.repository }}/issues/1454))
+- Add trailing slash to site's post URL ([#1462]({{ site.repository }}/issues/1462))
+- Clarify that `--config` will take multiple files ([#1474]({{ site.repository }}/issues/1474))
+- Fix docs/templates.md private gist example ([#1477]({{ site.repository }}/issues/1477))
+- Use `site.repository` for Jekyll's GitHub URL ([#1463]({{ site.repository }}/issues/1463))
+- Add `jekyll-pageless-redirects` to list of third-party plugins ([#1486]({{ site.repository }}/issues/1486))
+- Clarify that `date_to_xmlschema` returns an ISO 8601 string ([#1488]({{ site.repository }}/issues/1488))
+- Add `jekyll-good-include` to list of third-party plugins ([#1491]({{ site.repository }}/issues/1491))
+- XML escape the blog post title in our feed ([#1501]({{ site.repository }}/issues/1501))
+- Add `jekyll-toc-generator` to list of third-party plugins ([#1506]({{ site.repository }}/issues/1506))
+
+## 1.1.2 / 2013-07-25
+
+### Bug Fixes
+- Require Liquid 2.5.1 ([#1349]({{ site.repository }}/issues/1349))
+
+## 1.1.1 / 2013-07-24
+
+### Minor Enhancements
+- Remove superfluous `table` selector from main.css in `jekyll new` template ([#1328]({{ site.repository }}/issues/1328))
+- Abort with non-zero exit codes ([#1338]({{ site.repository }}/issues/1338))
+
+### Bug Fixes
+- Fix up the rendering of excerpts ([#1339]({{ site.repository }}/issues/1339))
+
+### Site Enhancements
+- Add Jekyll Image Tag to the plugins list ([#1306]({{ site.repository }}/issues/1306))
+- Remove erroneous statement that `site.pages` are sorted alphabetically.
+- Add info about the `_drafts` directory to the directory structure
+    docs ([#1320]({{ site.repository }}/issues/1320))
+- Improve the layout of the plugin listing by organizing it into
+    categories ([#1310]({{ site.repository }}/issues/1310))
+- Add generator-jekyllrb and grunt-jekyll to plugins page ([#1330]({{ site.repository }}/issues/1330))
+- Mention Kramdown as option for markdown parser on Extras page ([#1318]({{ site.repository }}/issues/1318))
+- Update Quick-Start page to include reminder that all requirements must be installed ([#1327]({{ site.repository }}/issues/1327))
+- Change filename in `include` example to an HTML file so as not to indicate that Jekyll
+    will automatically convert them. ([#1303]({{ site.repository }}/issues/1303))
+- Add an RSS feed for commits to Jekyll ([#1343]({{ site.repository }}/issues/1343))
+
 ## 1.1.0 / 2013-07-14
 
 ### Major Enhancements
@@ -205,7 +326,7 @@ prev_section: contributing
 - Allow symlinked files in unsafe mode ([#824]({{ site.repository }}/issues/824))
 - Add 'gist' Liquid tag to core ([#822]({{ site.repository }}/issues/822), [#861]({{ site.repository }}/issues/861))
 - New format of Jekyll output ([#795]({{ site.repository }}/issues/795))
-- Reinstate --limit_posts and --future switches ([#788]({{ site.repository }}/issues/788))
+- Reinstate `--limit_posts` and `--future` switches ([#788]({{ site.repository }}/issues/788))
 - Remove ambiguity from command descriptions ([#815]({{ site.repository }}/issues/815))
 - Fix SafeYAML Warnings ([#807]({{ site.repository }}/issues/807))
 - Relaxed Kramdown version to 0.14 ([#808]({{ site.repository }}/issues/808))
@@ -228,7 +349,7 @@ prev_section: contributing
 - Catch all exceptions, not just StandardError descendents ([#1007]({{ site.repository }}/issues/1007))
 - Bullet-proof limit_posts option ([#1004]({{ site.repository }}/issues/1004))
 - Read in YAML as UTF-8 to accept non-ASCII chars ([#836]({{ site.repository }}/issues/836))
-- Fix the CLI option --plugins to actually accept dirs and files ([#993]({{ site.repository }}/issues/993))
+- Fix the CLI option `--plugins` to actually accept dirs and files ([#993]({{ site.repository }}/issues/993))
 - Allow 'excerpt' in YAML Front-Matter to override the extracted excerpt ([#946]({{ site.repository }}/issues/946))
 - Fix cascade problem with site.baseurl, site.port and site.host. ([#935]({{ site.repository }}/issues/935))
 - Filter out directories with valid post names ([#875]({{ site.repository }}/issues/875))

data/site/docs/migrations.md

@@ -74,7 +74,7 @@ here's how:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
-    JekyllImport::WordPress.process("database", "user", "pass")'
+    JekyllImport::WordPress.process({:database => "database", :user => "user", :pass => "pass"})'
 {% endhighlight %}
 
 If you are using Webfaction and have to set up an [SSH

data/test/test_related_posts.rb

@@ -29,6 +29,7 @@ class TestRelatedPosts < Test::Unit::TestCase
                                                'destination' => dest_dir,
                                                'lsi' => true})
       end
+      any_instance_of(Jekyll::RelatedPosts) { |i| stub(i).display }
       @site = Site.new(Jekyll.configuration)
     end
 

data/test/test_tags.rb

@@ -436,5 +436,22 @@ CONTENT
         assert_match "<span id='include-param' />", @result
       end
     end
+
+    context "without parameters within if statement" do
+      setup do
+        content = <<CONTENT
+---
+title: without parameters within if statement
+---
+
+{% if true %}{% include params.html %}{% endif %}
+CONTENT
+        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+      end
+
+      should "include file with empty parameters within if statement" do
+        assert_match "<span id='include-param' />", @result
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: classifier
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -410,6 +410,8 @@ files:
 - site/_includes/analytics.html
 - site/_includes/docs_contents.html
 - site/_includes/docs_contents_mobile.html
+- site/_includes/docs_option.html
+- site/_includes/docs_ul.html
 - site/_includes/footer.html
 - site/_includes/header.html
 - site/_includes/news_contents.html
@@ -431,6 +433,7 @@ files:
 - site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
 - site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
 - site/_posts/2013-09-06-jekyll-1-2-0-released.markdown
+- site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
 - site/css/gridism.css
 - site/css/normalize.css
 - site/css/pygments.css
@@ -473,8 +476,8 @@ files:
 - site/img/tube1x.png
 - site/index.html
 - site/js/modernizr-2.5.3.min.js
-- site/news/index.md
-- site/news/releases/index.md
+- site/news/index.html
+- site/news/releases/index.html
 - test/fixtures/broken_front_matter1.erb
 - test/fixtures/broken_front_matter2.erb
 - test/fixtures/broken_front_matter3.erb
@@ -576,7 +579,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jekyll
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.