mojombo-jekyll 0.5.1 → 0.5.2

data/features/site_configuration.feature

@@ -0,0 +1,63 @@
+Feature: Site configuration
+  As a hacker who likes to blog
+  I want to be able to configure jekyll
+  In order to make setting up a site easier
+
+  Scenario: Change destination directory
+    Given I have a blank site in "_sourcedir"
+    And I have an "_sourcedir/index.html" file that contains "Changing source directory"
+    And I have a configuration file with "source" set to "_sourcedir"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Changing source directory" in "_site/index.html"
+
+  Scenario: Change destination directory
+    Given I have an "index.html" file that contains "Changing destination directory"
+    And I have a configuration file with "destination" set to "_mysite"
+    When I run jekyll
+    Then the _mysite directory should exist
+    And I should see "Changing destination directory" in "_mysite/index.html"
+
+  Scenario: Exclude files inline
+    Given I have an "Rakefile" file that contains "I want to be excluded"
+    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 "Rakefile", "README"
+    When I run jekyll
+    Then I should see "I want to be included" in "_site/index.html"
+    And the "_site/Rakefile" file should not exist
+    And the "_site/README" file should not exist
+
+  Scenario: Exclude files with YAML array
+    Given I have an "Rakefile" file that contains "I want to be excluded"
+    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    |
+      | README   |
+      | Rakefile |
+    When I run jekyll
+    Then I should see "I want to be included" in "_site/index.html"
+    And the "_site/Rakefile" file should not exist
+    And the "_site/README" file should not exist
+
+  Scenario: Use RDiscount for markup
+    Given I have an "index.markdown" page that contains "[Google](http://google.com)"
+    And I have a configuration file with "markdown" set to "rdiscount"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
+
+  Scenario: Use Maruku for markup
+    Given I have an "index.markdown" page that contains "[Google](http://google.com)"
+    And I have a configuration file with "markdown" set to "maruku"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "<a href='http://google.com'>Google</a>" in "_site/index.html"
+
+  Scenario: Highlight code with pygments
+    Given I have an "index.html" file that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
+    And I have a configuration file with "pygments" set to "true"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "puts 'Hello world!'" in "_site/index.html"

data/features/site_data.feature

@@ -0,0 +1,82 @@
+Feature: Site data
+  As a hacker who likes to blog
+  I want to be able to embed data into my site
+  In order to make the site slightly dynamic
+
+  Scenario: Use page variable in a page
+    Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@me.com"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Contact: email@me.com" in "_site/contact.html"
+
+  Scenario: Use site.time variable
+    Given I have an "index.html" page that contains "{{ site.time }}"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see today's time in "_site/index.html"
+
+  Scenario: Use site.posts variable for latest post
+    Given I have a _posts directory
+    And I have an "index.html" page that contains "{{ site.posts.first.title }}: {{ site.posts.first.url }}"
+    And I have the following posts:
+      | title       | date      | content         |
+      | First Post  | 3/25/2009 | My First Post   |
+      | Second Post | 3/26/2009 | My Second Post  |
+      | Third Post  | 3/27/2009 | My Third Post   |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Third Post: /2009/03/27/third-post.html" in "_site/index.html"
+
+  Scenario: Use site.posts variable in a loop
+    Given I have a _posts directory
+    And I have an "index.html" page that contains "{% for post in site.posts %} {{ post.title }} {% endfor %}"
+    And I have the following posts:
+      | title       | date      | content         |
+      | First Post  | 3/25/2009 | My First Post   |
+      | Second Post | 3/26/2009 | My Second Post  |
+      | Third Post  | 3/27/2009 | My Third Post   |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Third Post  Second Post  First Post" in "_site/index.html"
+
+  Scenario: Use site.categories.code variable
+    Given I have a _posts directory
+    And I have an "index.html" page that contains "{% for post in site.categories.code %} {{ post.title }} {% endfor %}"
+    And I have the following posts:
+      | title          | date      | category | content            |
+      | Awesome Hack   | 3/26/2009 | code     | puts 'Hello World' |
+      | Delicious Beer | 3/26/2009 | food     | 1) Yuengling       |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Awesome Hack" in "_site/index.html"
+
+  Scenario: Use site.tags variable
+    Given I have a _posts directory
+    And I have an "index.html" page that contains "{% for post in site.tags.beer %} {{ post.content }} {% endfor %}"
+    And I have the following posts:
+      | title          | date      | tag  | content            |
+      | Delicious Beer | 3/26/2009 | beer | 1) Yuengling       |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Yuengling" in "_site/index.html"
+
+  Scenario: Order Posts by name when on the same date
+  Given I have a _posts directory
+  And I have an "index.html" page that contains "{% for post in site.posts %}{{ post.title }}:{{ post.previous.title}},{{ post.next.title}} {% endfor %}"
+  And I have the following posts:
+    | title | date      | content |
+    | first | 2/26/2009 | first   |
+    | A     | 3/26/2009 | A       |
+    | B     | 3/26/2009 | B       |
+    | C     | 3/26/2009 | C       |
+    | last  | 4/26/2009 | last    |
+  When I run jekyll
+  Then the _site directory should exist
+  And I should see "last:C, C:B,last B:A,C A:first,B first:,A" in "_site/index.html"
+
+  Scenario: Use configuration date in site payload
+    Given I have an "index.html" page that contains "{{ site.url }}"
+    And I have a configuration file with "url" set to "http://mysite.com"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "http://mysite.com" in "_site/index.html"

data/features/step_definitions/jekyll_steps.rb

@@ -0,0 +1,136 @@
+Before do
+  FileUtils.mkdir(TEST_DIR)
+  Dir.chdir(TEST_DIR)
+end
+
+After do
+  Dir.chdir(TEST_DIR)
+  FileUtils.rm_rf(TEST_DIR)
+end
+
+Given /^I have a blank site in "(.*)"$/ do |path|
+  FileUtils.mkdir(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|
+    f.write <<EOF
+---
+#{key || 'layout'}: #{value || 'nil'}
+---
+#{text}
+EOF
+    f.close
+  end
+end
+
+Given /^I have an "(.*)" file that contains "(.*)"$/ do |file, text|
+  File.open(file, 'w') do |f|
+    f.write(text)
+    f.close
+  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)
+    f.close
+  end
+end
+
+Given /^I have a (.*) directory$/ do |dir|
+  FileUtils.mkdir(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')
+    title = post['title'].downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+
+    if direction && direction == "in"
+      before = folder || '.'
+    elsif direction && direction == "under"
+      after = folder || '.'
+    end
+
+    path = File.join(before || '.', '_posts', after || '.', "#{date}-#{title}.#{post['type'] || 'textile'}")
+
+    matter_hash = {}
+    %w(title layout tag tags category categories published author).each do |key|
+      matter_hash[key] = post[key] if post[key]
+    end
+    matter = matter_hash.map { |k, v| "#{k}: #{v}\n" }.join.chomp
+
+    content = post['content']
+    if post['input'] && post['filter']
+      content = "{{ #{post['input']} | #{post['filter']} }}"
+    end
+
+    File.open(path, 'w') do |f|
+      f.write <<EOF
+---
+#{matter}
+---
+#{content}
+EOF
+      f.close
+    end
+  end
+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.close
+  end
+end
+
+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")
+    end
+    f.close
+  end
+end
+
+
+When /^I run jekyll$/ do
+  run_jekyll
+end
+
+When /^I debug jekyll$/ do
+  run_jekyll(:debug => true)
+end
+
+When /^I change "(.*)" to contain "(.*)"$/ do |file, text|
+  File.open(file, 'a') do |f|
+    f.write(text)
+  end
+end
+
+Then /^the (.*) directory should exist$/ do |dir|
+  assert File.directory?(dir)
+end
+
+Then /^the (.*) file should exist$/ do |file|
+  assert File.file?(file)
+end
+
+Then /^I should see "(.*)" in "(.*)"$/ do |text, file|
+  assert_match Regexp.new(text), File.open(file).readlines.join
+end
+
+Then /^the "(.*)" file should not exist$/ do |file|
+  assert !File.exists?(file)
+end
+
+Then /^I should see today's time in "(.*)"$/ do |file|
+  assert_match Regexp.new(Regexp.escape(Time.now.to_s)), File.open(file).readlines.join
+end
+
+Then /^I should see today's date in "(.*)"$/ do |file|
+  assert_match Regexp.new(Date.today.to_s), File.open(file).readlines.join
+end

data/features/support/env.rb

@@ -0,0 +1,16 @@
+require 'fileutils'
+require 'rr'
+require 'test/unit'
+
+World do
+  include Test::Unit::Assertions
+end
+
+TEST_DIR    = File.join('/', 'tmp', 'jekyll')
+JEKYLL_PATH = File.join(ENV['PWD'], 'bin', 'jekyll')
+
+def run_jekyll(opts = {})
+  command = JEKYLL_PATH
+  command << " >> /dev/null 2>&1" if opts[:debug].nil?
+  system command
+end

data/jekyll.gemspec

@@ -0,0 +1,134 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{jekyll}
+  s.version = "0.5.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tom Preston-Werner"]
+  s.date = %q{2009-06-24}
+  s.default_executable = %q{jekyll}
+  s.description = %q{Jekyll is a simple, blog aware, static site generator.}
+  s.email = %q{tom@mojombo.com}
+  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/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/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-03-12-hash-#1.markdown",
+     "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/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/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_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.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{jekyll}
+  s.rubygems_version = %q{1.3.4}
+  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_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"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    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

data/lib/jekyll.rb

@@ -16,6 +16,7 @@ require 'redcloth'
 
 # internal requires
 require 'jekyll/core_ext'
+require 'jekyll/pager'
 require 'jekyll/site'
 require 'jekyll/convertible'
 require 'jekyll/layout'
@@ -62,14 +63,15 @@ module Jekyll
     source = override['source'] || Jekyll::DEFAULTS['source']
 
     # Get configuration from <source>/_config.yml
-    config = {}
     config_file = File.join(source, '_config.yml')
     begin
       config = YAML.load_file(config_file)
-      puts "Configuration from #{config_file}"
+      raise "Invalid configuration - #{config_file}" if !config.is_a?(Hash)
+      STDOUT.puts "Configuration from #{config_file}"
     rescue => err
-      puts "WARNING: Could not read configuration. Using defaults (and options)."
-      puts "\t" + err
+      STDERR.puts "WARNING: Could not read configuration. Using defaults (and options)."
+      STDERR.puts "\t" + err.to_s
+      config = {}
     end
 
     # Merge DEFAULTS < _config.yml < override