jekyll 1.0.4 → 1.1.1

data/Rakefile

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'rdoc'
 require 'date'
+require 'yaml'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
 
@@ -44,6 +45,39 @@ def replace_header(head, header_name)
   head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
 end
 
+def normalize_bullets(markdown)
+  markdown.gsub(/\s{2}\*{1}/, "-")
+end
+
+def linkify_prs(markdown)
+  markdown.gsub(/#(\d+)/) do |word|
+    "[#{word}](https://github.com/mojombo/jekyll/issues/#{word.delete("#")})"
+  end
+end
+
+def linkify_users(markdown)
+  markdown.gsub(/(@\w+)/) do |username|
+    "[#{username}](https://github.com/#{username.delete("@")})"
+  end
+end
+
+def linkify(markdown)
+  linkify_users(linkify_prs(markdown))
+end
+
+def liquid_escape(markdown)
+  markdown.gsub(/(`{[{%].+[}%]}`)/, "{% raw %}\\1{% endraw %}")
+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(liquid_escape(linkify(normalize_bullets(markdown))))
+end
+
 #############################################################################
 #
 # Standard tasks
@@ -150,32 +184,23 @@ namespace :site do
 
   desc "Create a nicely formatted history page for the jekyll site based on the repo history."
   task :history do
-    # First lets go ahead and format the file correctly (mainly bullet points)
-    puts "Generating the History doc"
-    # Checking to make sure the History file exists in the root of the repo
     if File.exist?("History.markdown")
-      # Read the file and save to a variable so we can do the replacements
-      file_time = File.read("History.markdown")
-      # Replacing the contents of the file for the markdown bullets & issue links
-      rep_bullets = file_time.gsub(/\s{2}\*{1}/, "-")
-      rep_links = rep_bullets.gsub(/#(\d+)/) do |word|
-        "[#{word}](https://github.com/mojombo/jekyll/issues/#{word.delete("#")})"
-      end
-      # Create a hash for the front matter that is to be included
-      front_matter = {"layout" => "docs", "title" => "History",
-                      "permalink" => "/docs/history/",
-                      "prev_section" => "upgrading"}
-      # Finally we need to copy the file to the /history directory
+      history_file = File.read("History.markdown")
+      front_matter = {
+        "layout" => "docs",
+        "title" => "History",
+        "permalink" => "/docs/history/",
+        "prev_section" => "contributing"
+      }
       Dir.chdir('site/docs/') do
         File.open("history.md", "w") do |file|
           file.write("#{front_matter.to_yaml}---\n\n")
-          file.write(rep_links)
+          file.write(converted_history(history_file))
         end
       end
     else
-      puts "Something went wrong"
+      abort "You seem to have misplaced your History.markdown file. I can haz?"
     end
-    puts "Done"
   end
 end
 

data/bin/jekyll

@@ -12,7 +12,7 @@ program :name, 'jekyll'
 program :version, Jekyll::VERSION
 program :description, 'Jekyll is a blog-aware, static site generator in Ruby'
 
-default_command :help
+default_command :default
 
 global_option '-s', '--source [DIR]', 'Source directory (defaults to ./)'
 global_option '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
@@ -33,11 +33,22 @@ def normalize_options(options)
   options
 end
 
+command :default do |c|
+  c.action do |args, options|
+    if args.empty?
+      command(:help).run
+    else
+      Jekyll.logger.abort_with "Invalid command. Use --help for more information"
+    end
+  end
+end
+
 command :new do |c|
   c.syntax = 'jekyll new PATH'
   c.description = 'Creates a new Jekyll site scaffold in PATH'
 
   c.option '--force', 'Force creation even if PATH already exists'
+  c.option '--blank', 'Creates scaffolding but with empty files'
 
   c.action do |args, options|
     Jekyll::Commands::New.process(args, options.__hash__)
@@ -102,6 +113,25 @@ command :doctor do |c|
 end
 alias_command :hyde, :doctor
 
+command :docs do |c|
+  c.syntax = 'jekyll docs'
+  c.description = "Launch local server with docs for Jekyll v#{Jekyll::VERSION}"
+
+  c.option '-p', '--port [PORT]', 'Port to listen on'
+  c.option '-u', '--host [HOST]', 'Host to bind to'
+
+  c.action do |args, options|
+    options = normalize_options(options.__hash__)
+    options = Jekyll.configuration(options).merge({
+      'source' => File.expand_path("../site", File.dirname(__FILE__)),
+      'destination' => File.expand_path("../site/_site", File.dirname(__FILE__))
+    })
+    puts options
+    Jekyll::Commands::Build.process(options)
+    Jekyll::Commands::Serve.process(options)
+  end
+end
+
 command :import do |c|
   c.syntax = 'jekyll import <platform> [options]'
   c.description = 'Import your old blog to Jekyll'

data/features/create_sites.feature

@@ -3,6 +3,13 @@ Feature: Create sites
   I want to be able to make a static site
   In order to share my awesome ideas with the interwebs
 
+  Scenario: Blank site
+    Given I do not have a "test_blank" directory
+    When I call jekyll new with test_blank --blank
+    Then the test_blank/_layouts directory should exist
+    And the test_blank/_posts directory should exist
+    And the "test_blank/index.html" file should exist
+
   Scenario: Basic site
     Given I have an "index.html" file that contains "Basic Site"
     When I run jekyll
@@ -110,3 +117,14 @@ Feature: Create sites
     When I run jekyll
     Then the _site directory should exist
     And I should see "SomeDirective" in "_site/.htaccess"
+
+  Scenario: File was replaced by a directory
+    Given I have a "test" file that contains "some stuff"
+    When I run jekyll
+    Then the _site directory should exist
+    When I delete the file "test"
+    Given I have a test directory
+    And I have a "test/index.html" file that contains "some other stuff"
+    When I run jekyll
+    Then the _site/test directory should exist
+    And I should see "some other stuff" in "_site/test/index.html"

data/features/include_tag.feature

@@ -0,0 +1,35 @@
+Feature: Include tags
+  In order to share their content across several pages
+  As a hacker who likes to blog
+  I want to be able to include files in my blog posts
+
+  Scenario: Include a file with parameters
+    Given I have an _includes directory
+    And I have an "_includes/header.html" file that contains "<header>My awesome blog header: {{include.param}}</header>"
+    And I have an "_includes/params.html" file that contains "Parameters:<ul>{% for param in include %}<li>{{param[0]}} = {{param[1]}}</li>{% endfor %}</ul>"
+    And I have an "_includes/ignore.html" file that contains "<footer>My blog footer</footer>"
+    And I have a _posts directory
+    And I have the following post:
+      | title                               | date       | layout  | content |
+      | Include Files                       | 2013-03-21 | default | {% include header.html param="myparam" %} |
+      | Ignore params if unused             | 2013-03-21 | default | {% include ignore.html date="today" %} |
+      | List multiple parameters            | 2013-03-21 | default | {% include params.html date="today" start="tomorrow" %} |
+      | Dont keep parameters                | 2013-03-21 | default | {% include ignore.html param="test" %}\n{% include header.html %} |
+      | Allow params with spaces and quotes | 2013-04-07 | default | {% include params.html cool="param with spaces" super="\"quoted\"" single='has "quotes"' escaped='\'single\' quotes' %} |
+      | Parameter syntax                    | 2013-04-12 | default | {% include params.html param1_or_2="value" %} |
+      | Pass a variable                     | 2013-06-22 | default | {% assign var = 'some text' %}{% include params.html local=var layout=page.layout %} |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "<header>My awesome blog header: myparam</header>" in "_site/2013/03/21/include-files.html"
+    And I should not see "myparam" in "_site/2013/03/21/ignore-params-if-unused.html"
+    And I should see "<li>date = today</li>" in "_site/2013/03/21/list-multiple-parameters.html"
+    And I should see "<li>start = tomorrow</li>" in "_site/2013/03/21/list-multiple-parameters.html"
+    And I should not see "<header>My awesome blog header: myparam</header>" in "_site/2013/03/21/dont-keep-parameters.html"
+    But I should see "<header>My awesome blog header: </header>" in "_site/2013/03/21/dont-keep-parameters.html"
+    And I should see "<li>cool = param with spaces</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
+    And I should see "<li>super = &#8220;quoted&#8221;</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
+    And I should see "<li>single = has &#8220;quotes&#8221;</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
+    And I should see "<li>escaped = &#8216;single&#8217; quotes</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
+    And I should see "<li>param1_or_2 = value</li>" in "_site/2013/04/12/parameter-syntax.html"
+    And I should see "<li>local = some text</li>" in "_site/2013/06/22/pass-a-variable.html"
+    And I should see "<li>layout = default</li>" in "_site/2013/06/22/pass-a-variable.html"

data/features/pagination.feature

@@ -52,3 +52,31 @@ Feature: Site pagination
       | 2     | 1     | 5         |
       | 3     | 1     | 6         |
       | 4     | 1     | 7         |
+
+  Scenario Outline: Setting a custom pagination path without an index.html in it
+    Given I have a configuration file with:
+      | key           | value                          |
+      | paginate      | 1                              |
+      | paginate_path | /blog/page/:num                |
+      | permalink     | /blog/:year/:month/:day/:title |
+    And I have a blog directory
+    And I have an "blog/index.html" page that contains "{{ paginator.posts.size }}"
+    And I have an "index.html" page that contains "Don't pick me!"
+    And I have a _posts directory
+    And I have the following posts:
+      | title     | date       | layout  | content                                |
+      | Wargames  | 2009-03-27 | default | The only winning move is not to play.  |
+      | Wargames2 | 2009-04-27 | default | The only winning move is not to play2. |
+      | Wargames3 | 2009-05-27 | default | The only winning move is not to play3. |
+      | Wargames4 | 2009-06-27 | default | The only winning move is not to play4. |
+    When I run jekyll
+    Then the _site/blog/page/<exist> directory should exist
+    And the "_site/blog/page/<exist>/index.html" file should exist
+    And I should see "<posts>" in "_site/blog/page/<exist>/index.html"
+    And the "_site/blog/page/<not_exist>/index.html" file should not exist
+
+    Examples:
+      | exist | posts | not_exist |
+      | 2     | 1     | 5         |
+      | 3     | 1     | 6         |
+      | 4     | 1     | 7         |

data/features/post_excerpts.feature

@@ -0,0 +1,50 @@
+Feature: Post excerpts
+  As a hacker who likes to blog
+  I want to be able to make a static site
+  In order to share my awesome ideas with the interwebs
+  But some people can only focus for a few moments
+  So just give them a taste
+
+  Scenario: An excerpt without a layout
+    Given I have an "index.html" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
+    And I have a _posts directory
+    And I have the following posts:
+      | title     | date       | layout  | content                                |
+      | entry1    | 2007-12-31 | post    | content for entry1.                    |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see exactly "<p>content for entry1.</p>" in "_site/index.html"
+
+  Scenario: An excerpt from a post with a layout
+    Given I have an "index.html" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
+    And I have a _posts directory
+    And I have a _layouts directory
+    And I have a post layout that contains "{{ page.excerpt }}"
+    And I have the following posts:
+      | title     | date       | layout  | content                                |
+      | entry1    | 2007-12-31 | post    | content for entry1.                    |
+    When I run jekyll
+    Then the _site directory should exist
+    And the _site/2007 directory should exist
+    And the _site/2007/12 directory should exist
+    And the _site/2007/12/31 directory should exist
+    And the "_site/2007/12/31/entry1.html" file should exist
+    And I should see exactly "<p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
+    And I should see exactly "<p>content for entry1.</p>" in "_site/index.html"
+
+  Scenario: An excerpt from a post with a layout which has context
+    Given I have an "index.html" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
+    And I have a _posts directory
+    And I have a _layouts directory
+    And I have a post layout that contains "<html><head></head><body>{{ page.excerpt }}</body></html>"
+    And I have the following posts:
+      | title     | date       | layout  | content                                |
+      | entry1    | 2007-12-31 | post    | content for entry1.                    |
+    When I run jekyll
+    Then the _site directory should exist
+    And the _site/2007 directory should exist
+    And the _site/2007/12 directory should exist
+    And the _site/2007/12/31 directory should exist
+    And the "_site/2007/12/31/entry1.html" file should exist
+    And I should see exactly "<p>content for entry1.</p>" in "_site/index.html"
+    And I should see exactly "<html><head></head><body><p>content for entry1.</p></body></html>" in "_site/2007/12/31/entry1.html"

data/features/step_definitions/jekyll_steps.rb

@@ -4,15 +4,16 @@ Before do
   Dir.chdir(TEST_DIR)
 end
 
-After do
-  Dir.chdir(File.expand_path("..", TEST_DIR))
-  FileUtils.rm_rf(TEST_DIR)
-end
+World(Test::Unit::Assertions)
 
 Given /^I have a blank site in "(.*)"$/ do |path|
   FileUtils.mkdir(path)
 end
 
+Given /^I do not have a "(.*)" directory$/ do |path|
+  File.directory?("#{TEST_DIR}/#{path}")
+end
+
 # Like "I have a foo file" but gives a yaml front matter so jekyll actually processes it
 Given /^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/ do |file, key, value, text|
   File.open(file, 'w') do |f|
@@ -31,14 +32,13 @@ Given /^I have an? "(.*)" file that contains "(.*)"$/ do |file, text|
   end
 end
 
-Given /^I have a (.*) layout that contains "(.*)"$/ do |layout, text|
-  File.open(File.join('_layouts', layout + '.html'), 'w') do |f|
-    f.write(text)
+Given /^I have an? (.*) (layout|theme) that contains "(.*)"$/ do |name, type, text|
+  folder = if type == 'layout'
+    '_layouts'
+  else
+    '_theme'
   end
-end
-
-Given /^I have a (.*) theme that contains "(.*)"$/ do |layout, text|
-  File.open(File.join('_theme', layout + '.html'), 'w') do |f|
+  File.open(File.join(folder, name + '.html'), 'w') do |f|
     f.write(text)
   end
 end
@@ -119,6 +119,10 @@ When /^I run jekyll with drafts$/ do
   run_jekyll(:drafts => true)
 end
 
+When /^I call jekyll new with test_blank --blank$/ do
+  call_jekyll_new(:path => "test_blank", :blank => true)
+end
+
 When /^I debug jekyll$/ do
   run_jekyll(:debug => true)
 end
@@ -129,6 +133,10 @@ When /^I change "(.*)" to contain "(.*)"$/ do |file, text|
   end
 end
 
+When /^I delete the file "(.*)"$/ do |file|
+  File.delete(file)
+end
+
 Then /^the (.*) directory should exist$/ do |dir|
   assert File.directory?(dir), "The directory \"#{dir}\" does not exist"
 end
@@ -137,6 +145,14 @@ Then /^I should see "(.*)" in "(.*)"$/ do |text, file|
   assert Regexp.new(text).match(File.open(file).readlines.join)
 end
 
+Then /^I should see exactly "(.*)" in "(.*)"$/ do |text, file|
+  assert_equal text, File.open(file).readlines.join.strip
+end
+
+Then /^I should not see "(.*)" in "(.*)"$/ do |text, file|
+  assert_no_match Regexp.new(text), File.read(file)
+end
+
 Then /^I should see escaped "(.*)" in "(.*)"$/ do |text, file|
   assert Regexp.new(Regexp.escape(text)).match(File.open(file).readlines.join)
 end

data/features/support/env.rb

@@ -14,6 +14,15 @@ def run_jekyll(opts = {})
   system command
 end
 
+def call_jekyll_new(opts = {})
+  command = JEKYLL_PATH.clone
+  command << " new"
+  command << " #{opts[:path]}" if opts[:path]
+  command << " --blank" if opts[:blank]
+  command << " >> /dev/null 2>&1" if opts[:debug].nil?
+  system command
+end
+
 def slug(title)
   title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
 end

data/jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.0.4'
+  s.version           = '1.1.1'
   s.license           = 'MIT'
-  s.date              = '2013-07-25'
+  s.date              = '2013-07-24'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.executables = ["jekyll"]
 
   s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README.textile LICENSE]
+  s.extra_rdoc_files = %w[README.markdown LICENSE]
 
-  s.add_runtime_dependency('liquid', "~> 2.5.1")
+  s.add_runtime_dependency('liquid', "~> 2.3")
   s.add_runtime_dependency('classifier', "~> 1.3")
   s.add_runtime_dependency('directory_watcher', "~> 1.4.1")
   s.add_runtime_dependency('maruku', "~> 0.5")
@@ -32,6 +32,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_development_dependency('rake', "~> 10.0.3")
   s.add_development_dependency('rdoc', "~> 3.11")
@@ -41,28 +42,30 @@ Gem::Specification.new do |s|
   s.add_development_dependency('cucumber', "~> 1.2.1", '!= 1.2.4')
   s.add_development_dependency('RedCloth', "~> 4.2")
   s.add_development_dependency('rdiscount', "~> 1.6")
-  s.add_development_dependency('redcarpet', "~> 2.2.2")
   s.add_development_dependency('launchy', "~> 2.1.2")
   s.add_development_dependency('simplecov', "~> 0.7")
   s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1")
+  s.add_development_dependency('activesupport', '~> 3.2.13')
 
   # = MANIFEST =
   s.files = %w[
-    CONTRIBUTING.md
+    CONTRIBUTING.markdown
     Gemfile
     History.markdown
     LICENSE
-    README.textile
+    README.markdown
     Rakefile
     bin/jekyll
     cucumber.yml
     features/create_sites.feature
     features/drafts.feature
     features/embed_filters.feature
+    features/include_tag.feature
     features/markdown.feature
     features/pagination.feature
     features/permalinks.feature
     features/post_data.feature
+    features/post_excerpts.feature
     features/site_configuration.feature
     features/site_data.feature
     features/step_definitions/jekyll_steps.rb
@@ -88,6 +91,7 @@ Gem::Specification.new do |s|
     lib/jekyll/deprecator.rb
     lib/jekyll/draft.rb
     lib/jekyll/errors.rb
+    lib/jekyll/excerpt.rb
     lib/jekyll/filters.rb
     lib/jekyll/generator.rb
     lib/jekyll/generators/pagination.rb
@@ -122,11 +126,22 @@ Gem::Specification.new do |s|
     site/_includes/docs_contents_mobile.html
     site/_includes/footer.html
     site/_includes/header.html
+    site/_includes/news_contents.html
+    site/_includes/news_contents_mobile.html
+    site/_includes/news_item.html
     site/_includes/primary-nav-items.html
     site/_includes/section_nav.html
     site/_includes/top.html
     site/_layouts/default.html
     site/_layouts/docs.html
+    site/_layouts/news.html
+    site/_layouts/news_item.html
+    site/_posts/2013-05-06-jekyll-1-0-0-released.markdown
+    site/_posts/2013-05-08-jekyll-1-0-1-released.markdown
+    site/_posts/2013-05-12-jekyll-1-0-2-released.markdown
+    site/_posts/2013-06-07-jekyll-1-0-3-released.markdown
+    site/_posts/2013-07-14-jekyll-1-1-0-released.markdown
+    site/_posts/2013-07-24-jekyll-1-1-1-released.markdown
     site/css/gridism.css
     site/css/normalize.css
     site/css/pygments.css
@@ -134,6 +149,7 @@ Gem::Specification.new do |s|
     site/docs/configuration.md
     site/docs/contributing.md
     site/docs/deployment-methods.md
+    site/docs/drafts.md
     site/docs/extras.md
     site/docs/frontmatter.md
     site/docs/github-pages.md
@@ -147,6 +163,7 @@ Gem::Specification.new do |s|
     site/docs/permalinks.md
     site/docs/plugins.md
     site/docs/posts.md
+    site/docs/quickstart.md
     site/docs/resources.md
     site/docs/sites.md
     site/docs/structure.md
@@ -156,6 +173,8 @@ Gem::Specification.new do |s|
     site/docs/usage.md
     site/docs/variables.md
     site/favicon.png
+    site/feed.xml
+    site/freenode.txt
     site/img/article-footer.png
     site/img/footer-arrow.png
     site/img/footer-logo.png
@@ -165,13 +184,17 @@ 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
     test/fixtures/broken_front_matter1.erb
     test/fixtures/broken_front_matter2.erb
     test/fixtures/broken_front_matter3.erb
     test/fixtures/exploit_front_matter.erb
     test/fixtures/front_matter.erb
     test/helper.rb
+    test/source/+/foo.md
     test/source/.htaccess
+    test/source/_includes/params.html
     test/source/_includes/sig.markdown
     test/source/_layouts/default.html
     test/source/_layouts/simple.html
@@ -207,6 +230,7 @@ Gem::Specification.new do |s|
     test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep
     test/source/_posts/2013-04-11-custom-excerpt.markdown
     test/source/_posts/2013-05-10-number-category.textile
+    test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown
     test/source/_posts/es/2008-11-21-nested.textile
     test/source/about.html
     test/source/category/_posts/2008-9-23-categories.textile
@@ -227,6 +251,7 @@ Gem::Specification.new do |s|
     test/test_configuration.rb
     test/test_convertible.rb
     test/test_core_ext.rb
+    test/test_excerpt.rb
     test/test_filters.rb
     test/test_generated_site.rb
     test/test_kramdown.rb