jekyll 0.5.7 → 0.6.0

data/cucumber.yml

@@ -0,0 +1 @@
+default: --format progress

data/features/create_sites.feature

@@ -39,11 +39,11 @@ Feature: Create sites
 
   Scenario: Basic site with layouts, pages, posts and files
     Given I have a _layouts directory
-    And I have a page layout that contains "Page Layout: {{ site.posts.size }}"
-    And I have a post layout that contains "Post Layout: {{ content }}"
-    And I have an "index.html" page with layout "page" that contains "site index page"
+    And I have a page layout that contains "Page {{ page.title }}: {{ content }}"
+    And I have a post layout that contains "Post {{ page.title }}: {{ content }}"
+    And I have an "index.html" page with layout "page" that contains "Site contains {{ site.pages.size }} pages and {{ site.posts.size }} posts"
     And I have a blog directory
-    And I have a "blog/index.html" page with layout "page" that contains "category index page"
+    And I have a "blog/index.html" page with layout "page" that contains "blog category index page"
     And I have an "about.html" file that contains "No replacement {{ site.posts.size }}"
     And I have an "another_file" file that contains ""
     And I have a _posts directory
@@ -58,14 +58,14 @@ Feature: Create sites
       | entry4    | 6/27/2009 | post    | content for entry4.                    |
     When I run jekyll
     Then the _site directory should exist
-    And I should see "Page Layout: 4" in "_site/index.html"
+    And I should see "Page : Site contains 2 pages and 4 posts" in "_site/index.html"
     And I should see "No replacement \{\{ site.posts.size \}\}" in "_site/about.html"
     And I should see "" in "_site/another_file"
-    And I should see "Page Layout: 4" in "_site/blog/index.html"
-    And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2009/03/27/entry1.html"
-    And I should see "Post Layout: <p>content for entry2.</p>" in "_site/2009/04/27/entry2.html"
-    And I should see "Post Layout: <p>content for entry3.</p>" in "_site/category/2009/05/27/entry3.html"
-    And I should see "Post Layout: <p>content for entry4.</p>" in "_site/category/2009/06/27/entry4.html"
+    And I should see "Page : blog category index page" in "_site/blog/index.html"
+    And I should see "Post entry1: <p>content for entry1.</p>" in "_site/2009/03/27/entry1.html"
+    And I should see "Post entry2: <p>content for entry2.</p>" in "_site/2009/04/27/entry2.html"
+    And I should see "Post entry3: <p>content for entry3.</p>" in "_site/category/2009/05/27/entry3.html"
+    And I should see "Post entry4: <p>content for entry4.</p>" in "_site/category/2009/06/27/entry4.html"
 
   Scenario: Basic site with include tag
     Given I have a _includes directory
@@ -74,3 +74,21 @@ Feature: Create sites
     When I run jekyll
     Then the _site directory should exist
     And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
+
+  Scenario: Basic site with subdir include tag
+    Given I have a _includes directory
+    And I have an "_includes/about.textile" file that contains "Generated by Jekyll"
+    And I have an info directory
+    And I have an "info/index.html" page that contains "Basic Site with subdir include tag: {% include about.textile %}"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Basic Site with subdir include tag: Generated by Jekyll" in "_site/info/index.html"
+
+  Scenario: Basic site with nested include tag
+    Given I have a _includes directory
+    And I have an "_includes/about.textile" file that contains "Generated by {% include jekyll.textile %}"
+    And I have an "_includes/jekyll.textile" file that contains "Jekyll"
+    And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"

data/features/post_data.feature

@@ -82,17 +82,17 @@ Feature: Post data
     And I should see "Post tags: twist" in "_site/2009/05/18/star-wars.html"
 
   Scenario: Use post.categories variable when categories are in folders
-    Given I have a movies directory
-    And I have a movies/scifi directory
-    And I have a movies/scifi/_posts directory
+    Given I have a scifi directory
+    And I have a scifi/movies directory
+    And I have a scifi/movies/_posts directory
     And I have a _layouts directory
-    And I have the following post in "movies/scifi":
+    And I have the following post in "scifi/movies":
       | title     | date      | layout | content                 |
       | Star Wars | 3/27/2009 | simple | Luke, I am your father. |
     And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "Post categories: movies and scifi" in "_site/movies/scifi/2009/03/27/star-wars.html"
+    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when category is in YAML
     Given I have a _posts directory
@@ -110,11 +110,11 @@ Feature: Post data
     And I have a _layouts directory
     And I have the following post:
       | title     | date      | layout | categories          | content                 |
-      | Star Wars | 3/27/2009 | simple | ['movies', 'scifi'] | Luke, I am your father. |
+      | Star Wars | 3/27/2009 | simple | ['scifi', 'movies'] | Luke, I am your father. |
     And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "Post categories: movies and scifi" in "_site/movies/scifi/2009/03/27/star-wars.html"
+    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
 
   Scenario: Disable a post from being published
     Given I have a _posts directory

data/features/site_configuration.feature

@@ -33,7 +33,7 @@ Feature: Site configuration
     And I have an "README" file that contains "I want to be excluded"
     And I have an "index.html" file that contains "I want to be included"
     And I have a configuration file with "exclude" set to:
-      | Value    |
+      | value    |
       | README   |
       | Rakefile |
     When I run jekyll
@@ -61,3 +61,43 @@ Feature: Site configuration
     When I run jekyll
     Then the _site directory should exist
     And I should see "puts 'Hello world!'" in "_site/index.html"
+
+  Scenario: Set time and no future dated posts
+    Given I have a _layouts directory
+    And I have a page layout that contains "Page Layout: {{ site.posts.size }} on {{ site.time | date: "%Y-%m-%d" }}"
+    And I have a post layout that contains "Post Layout: {{ content }}"
+    And I have an "index.html" page with layout "page" that contains "site index page"
+    And I have a configuration file with:
+      | key         | value        |
+      | time        | 2010-01-01   |
+      | future      | false        |
+    And I have a _posts directory
+    And I have the following posts:
+      | title     | date       | layout  | content                                |
+      | entry1    | 12/31/2007 | post    | content for entry1.                    |
+      | entry2    | 01/31/2020 | post    | content for entry2.                    |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Page Layout: 1 on 2010-01-01" in "_site/index.html"
+    And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
+    And the "_site/2020/01/31/entry2.html" file should not exist
+
+  Scenario: Set time and future dated posts allowed
+    Given I have a _layouts directory
+    And I have a page layout that contains "Page Layout: {{ site.posts.size }} on {{ site.time | date: "%Y-%m-%d" }}"
+    And I have a post layout that contains "Post Layout: {{ content }}"
+    And I have an "index.html" page with layout "page" that contains "site index page"
+    And I have a configuration file with:
+      | key         | value        |
+      | time        | 2010-01-01   |
+      | future      | true         |
+    And I have a _posts directory
+    And I have the following posts:
+      | title     | date       | layout  | content                                |
+      | entry1    | 12/31/2007 | post    | content for entry1.                    |
+      | entry2    | 01/31/2020 | post    | content for entry2.                    |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html"
+    And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
+    And I should see "Post Layout: <p>content for entry2.</p>" in "_site/2020/01/31/entry2.html"

data/features/step_definitions/jekyll_steps.rb

@@ -39,13 +39,13 @@ Given /^I have a (.*) layout that contains "(.*)"$/ do |layout, text|
   end
 end
 
-Given /^I have a (.*) directory$/ do |dir|
+Given /^I have an? (.*) directory$/ do |dir|
   FileUtils.mkdir_p(dir)
 end
 
 Given /^I have the following posts?(?: (.*) "(.*)")?:$/ do |direction, folder, table|
   table.hashes.each do |post|
-    date = Date.parse(post['date']).strftime('%Y-%m-%d')
+    date = Date.strptime(post['date'], '%m/%d/%Y').strftime('%Y-%m-%d')
     title = post['title'].downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
 
     if direction && direction == "in"
@@ -81,7 +81,16 @@ end
 
 Given /^I have a configuration file with "(.*)" set to "(.*)"$/ do |key, value|
   File.open('_config.yml', 'w') do |f|
-    f.write("#{key}: #{value}")
+    f.write("#{key}: #{value}\n")
+    f.close
+  end
+end
+
+Given /^I have a configuration file with:$/ do |table|
+  File.open('_config.yml', 'w') do |f|
+    table.hashes.each do |row|
+      f.write("#{row["key"]}: #{row["value"]}\n")
+    end
     f.close
   end
 end
@@ -90,7 +99,7 @@ Given /^I have a configuration file with "([^\"]*)" set to:$/ do |key, table|
   File.open('_config.yml', 'w') do |f|
     f.write("#{key}:\n")
     table.hashes.each do |row|
-      f.write("- #{row["Value"]}\n")
+      f.write("- #{row["value"]}\n")
     end
     f.close
   end

data/jekyll.gemspec

@@ -1,150 +1,132 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = %q{jekyll}
-  s.version = "0.5.7"
-
+  s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2010-01-12}
-  s.default_executable = %q{jekyll}
-  s.description = %q{Jekyll is a simple, blog aware, static site generator.}
-  s.email = %q{tom@mojombo.com}
+  s.rubygems_version = '1.3.5'
+
+  s.name              = 'jekyll'
+  s.version           = '0.6.0'
+  s.date              = '2010-06-22'
+  s.rubyforge_project = 'jekyll'
+
+  s.summary     = "A simple, blog aware, static site generator."
+  s.description = "Jekyll is a simple, blog aware, static site generator."
+
+  s.authors  = ["Tom Preston-Werner"]
+  s.email    = 'tom@mojombo.com'
+  s.homepage = 'http://github.com/mojombo/jekyll'
+
+  s.require_paths = %w[lib]
+
   s.executables = ["jekyll"]
-  s.extra_rdoc_files = [
-    "README.textile"
-  ]
-  s.files = [
-    ".gitignore",
-     "History.txt",
-     "README.textile",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/jekyll",
-     "features/create_sites.feature",
-     "features/embed_filters.feature",
-     "features/markdown.feature",
-     "features/pagination.feature",
-     "features/permalinks.feature",
-     "features/post_data.feature",
-     "features/site_configuration.feature",
-     "features/site_data.feature",
-     "features/step_definitions/jekyll_steps.rb",
-     "features/support/env.rb",
-     "jekyll.gemspec",
-     "lib/jekyll.rb",
-     "lib/jekyll/albino.rb",
-     "lib/jekyll/converters/csv.rb",
-     "lib/jekyll/converters/mephisto.rb",
-     "lib/jekyll/converters/mt.rb",
-     "lib/jekyll/converters/textpattern.rb",
-     "lib/jekyll/converters/typo.rb",
-     "lib/jekyll/converters/wordpress.rb",
-     "lib/jekyll/convertible.rb",
-     "lib/jekyll/core_ext.rb",
-     "lib/jekyll/filters.rb",
-     "lib/jekyll/layout.rb",
-     "lib/jekyll/page.rb",
-     "lib/jekyll/pager.rb",
-     "lib/jekyll/post.rb",
-     "lib/jekyll/site.rb",
-     "lib/jekyll/static_file.rb",
-     "lib/jekyll/tags/highlight.rb",
-     "lib/jekyll/tags/include.rb",
-     "test/helper.rb",
-     "test/source/_includes/sig.markdown",
-     "test/source/_layouts/default.html",
-     "test/source/_layouts/simple.html",
-     "test/source/_posts/2008-02-02-not-published.textile",
-     "test/source/_posts/2008-02-02-published.textile",
-     "test/source/_posts/2008-10-18-foo-bar.textile",
-     "test/source/_posts/2008-11-21-complex.textile",
-     "test/source/_posts/2008-12-03-permalinked-post.textile",
-     "test/source/_posts/2008-12-13-include.markdown",
-     "test/source/_posts/2009-01-27-array-categories.textile",
-     "test/source/_posts/2009-01-27-categories.textile",
-     "test/source/_posts/2009-01-27-category.textile",
-     "test/source/_posts/2009-01-27-empty-categories.textile",
-     "test/source/_posts/2009-01-27-empty-category.textile",
-     "test/source/_posts/2009-03-12-hash-#1.markdown",
-     "test/source/_posts/2009-05-18-empty-tag.textile",
-     "test/source/_posts/2009-05-18-empty-tags.textile",
-     "test/source/_posts/2009-05-18-tag.textile",
-     "test/source/_posts/2009-05-18-tags.textile",
-     "test/source/_posts/2009-06-22-empty-yaml.textile",
-     "test/source/_posts/2009-06-22-no-yaml.textile",
-     "test/source/_posts/2010-01-08-triple-dash.markdown",
-     "test/source/_posts/2010-01-09-date-override.textile",
-     "test/source/_posts/2010-01-09-time-override.textile",
-     "test/source/about.html",
-     "test/source/category/_posts/2008-9-23-categories.textile",
-     "test/source/contacts.html",
-     "test/source/css/screen.css",
-     "test/source/foo/_posts/bar/2008-12-12-topical-post.textile",
-     "test/source/index.html",
-     "test/source/sitemap.xml",
-     "test/source/win/_posts/2009-05-24-yaml-linebreak.markdown",
-     "test/source/z_category/_posts/2008-9-23-categories.textile",
-     "test/suite.rb",
-     "test/test_configuration.rb",
-     "test/test_core_ext.rb",
-     "test/test_filters.rb",
-     "test/test_generated_site.rb",
-     "test/test_page.rb",
-     "test/test_pager.rb",
-     "test/test_post.rb",
-     "test/test_site.rb",
-     "test/test_tags.rb"
-  ]
-  s.homepage = %q{http://github.com/mojombo/jekyll}
+  s.default_executable = 'jekyll'
+
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{jekyll}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Jekyll is a simple, blog aware, static site generator.}
-  s.test_files = [
-    "test/helper.rb",
-     "test/suite.rb",
-     "test/test_configuration.rb",
-     "test/test_core_ext.rb",
-     "test/test_filters.rb",
-     "test/test_generated_site.rb",
-     "test/test_page.rb",
-     "test/test_pager.rb",
-     "test/test_post.rb",
-     "test/test_site.rb",
-     "test/test_tags.rb"
-  ]
+  s.extra_rdoc_files = %w[README.textile LICENSE]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_runtime_dependency('liquid', [">= 1.9.0"])
+  s.add_runtime_dependency('classifier', [">= 1.3.1"])
+  s.add_runtime_dependency('directory_watcher', [">= 1.1.1"])
+  s.add_runtime_dependency('maruku', [">= 0.5.9"])
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<RedCloth>, [">= 4.2.1"])
-      s.add_runtime_dependency(%q<liquid>, [">= 1.9.0"])
-      s.add_runtime_dependency(%q<classifier>, [">= 1.3.1"])
-      s.add_runtime_dependency(%q<maruku>, [">= 0.5.9"])
-      s.add_runtime_dependency(%q<directory_watcher>, [">= 1.1.1"])
-      s.add_runtime_dependency(%q<open4>, [">= 0.9.6"])
-    else
-      s.add_dependency(%q<RedCloth>, [">= 4.2.1"])
-      s.add_dependency(%q<liquid>, [">= 1.9.0"])
-      s.add_dependency(%q<classifier>, [">= 1.3.1"])
-      s.add_dependency(%q<maruku>, [">= 0.5.9"])
-      s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
-      s.add_dependency(%q<open4>, [">= 0.9.6"])
-    end
-  else
-    s.add_dependency(%q<RedCloth>, [">= 4.2.1"])
-    s.add_dependency(%q<liquid>, [">= 1.9.0"])
-    s.add_dependency(%q<classifier>, [">= 1.3.1"])
-    s.add_dependency(%q<maruku>, [">= 0.5.9"])
-    s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
-    s.add_dependency(%q<open4>, [">= 0.9.6"])
-  end
-end
+  s.add_development_dependency('redgreen', [">= 4.2.1"])
+  s.add_development_dependency('shoulda', [">= 4.2.1"])
+  s.add_development_dependency('rr', [">= 4.2.1"])
+  s.add_development_dependency('cucumber', [">= 4.2.1"])
+  s.add_development_dependency('RedCloth', [">= 4.2.1"])
 
+  # = MANIFEST =
+  s.files = %w[
+    History.txt
+    LICENSE
+    README.textile
+    Rakefile
+    bin/jekyll
+    cucumber.yml
+    features/create_sites.feature
+    features/embed_filters.feature
+    features/markdown.feature
+    features/pagination.feature
+    features/permalinks.feature
+    features/post_data.feature
+    features/site_configuration.feature
+    features/site_data.feature
+    features/step_definitions/jekyll_steps.rb
+    features/support/env.rb
+    jekyll.gemspec
+    lib/jekyll.rb
+    lib/jekyll/albino.rb
+    lib/jekyll/converter.rb
+    lib/jekyll/converters/identity.rb
+    lib/jekyll/converters/markdown.rb
+    lib/jekyll/converters/textile.rb
+    lib/jekyll/convertible.rb
+    lib/jekyll/core_ext.rb
+    lib/jekyll/errors.rb
+    lib/jekyll/filters.rb
+    lib/jekyll/generator.rb
+    lib/jekyll/generators/pagination.rb
+    lib/jekyll/layout.rb
+    lib/jekyll/migrators/csv.rb
+    lib/jekyll/migrators/mephisto.rb
+    lib/jekyll/migrators/mt.rb
+    lib/jekyll/migrators/textpattern.rb
+    lib/jekyll/migrators/typo.rb
+    lib/jekyll/migrators/wordpress.rb
+    lib/jekyll/page.rb
+    lib/jekyll/plugin.rb
+    lib/jekyll/post.rb
+    lib/jekyll/site.rb
+    lib/jekyll/static_file.rb
+    lib/jekyll/tags/highlight.rb
+    lib/jekyll/tags/include.rb
+    test/helper.rb
+    test/source/_includes/sig.markdown
+    test/source/_layouts/default.html
+    test/source/_layouts/simple.html
+    test/source/_posts/2008-02-02-not-published.textile
+    test/source/_posts/2008-02-02-published.textile
+    test/source/_posts/2008-10-18-foo-bar.textile
+    test/source/_posts/2008-11-21-complex.textile
+    test/source/_posts/2008-12-03-permalinked-post.textile
+    test/source/_posts/2008-12-13-include.markdown
+    test/source/_posts/2009-01-27-array-categories.textile
+    test/source/_posts/2009-01-27-categories.textile
+    test/source/_posts/2009-01-27-category.textile
+    test/source/_posts/2009-01-27-empty-categories.textile
+    test/source/_posts/2009-01-27-empty-category.textile
+    test/source/_posts/2009-03-12-hash-#1.markdown
+    test/source/_posts/2009-05-18-empty-tag.textile
+    test/source/_posts/2009-05-18-empty-tags.textile
+    test/source/_posts/2009-05-18-tag.textile
+    test/source/_posts/2009-05-18-tags.textile
+    test/source/_posts/2009-06-22-empty-yaml.textile
+    test/source/_posts/2009-06-22-no-yaml.textile
+    test/source/_posts/2010-01-08-triple-dash.markdown
+    test/source/_posts/2010-01-09-date-override.textile
+    test/source/_posts/2010-01-09-time-override.textile
+    test/source/_posts/2010-01-09-timezone-override.textile
+    test/source/_posts/2010-01-16-override-data.textile
+    test/source/about.html
+    test/source/category/_posts/2008-9-23-categories.textile
+    test/source/contacts.html
+    test/source/css/screen.css
+    test/source/foo/_posts/bar/2008-12-12-topical-post.textile
+    test/source/index.html
+    test/source/sitemap.xml
+    test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
+    test/source/z_category/_posts/2008-9-23-categories.textile
+    test/suite.rb
+    test/test_configuration.rb
+    test/test_core_ext.rb
+    test/test_filters.rb
+    test/test_generated_site.rb
+    test/test_page.rb
+    test/test_pager.rb
+    test/test_post.rb
+    test/test_site.rb
+    test/test_tags.rb
+  ]
+  # = MANIFEST =
+
+  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
+end