From 5b886e87046967999dbcf7f9509a60785e78266e Mon Sep 17 00:00:00 2001
From: Josh Dady <josh@indecisive.com>
Date: Thu, 25 Dec 2008 09:23:57 -0500
Subject: [PATCH 01/24] Added a strftime filter

---
 lib/jekyll/filters.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 6051626a8ca..f3cd84706da 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -9,6 +9,10 @@ def date_to_long_string(date)
       date.strftime("%d %B %Y")
     end
     
+    def strftime(date, format = '%x')
+        date.strftime(format)
+    end
+    
     def date_to_xmlschema(date)
       date.xmlschema
     end

From 863b0dd990b8b01ce9dbb9b1c00c9b1a061cf877 Mon Sep 17 00:00:00 2001
From: Josh Dady <josh@indecisive.com>
Date: Thu, 25 Dec 2008 09:31:33 -0500
Subject: [PATCH 02/24] Okay, I didn't really need to create a new filter

---
 lib/jekyll/filters.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index f3cd84706da..c05d8c67e79 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -1,18 +1,14 @@
 module Jekyll
   
   module Filters
-    def date_to_string(date)
-      date.strftime("%d %b %Y")
+    def date_to_string(date, format="%d %b %Y")
+      date.strftime(format)
     end
 
     def date_to_long_string(date)
       date.strftime("%d %B %Y")
     end
     
-    def strftime(date, format = '%x')
-        date.strftime(format)
-    end
-    
     def date_to_xmlschema(date)
       date.xmlschema
     end

From 340dd68ee5b579aabecdda82f04698bb5d727f57 Mon Sep 17 00:00:00 2001
From: Josh Dady <josh@indecisive.com>
Date: Thu, 25 Dec 2008 10:00:46 -0500
Subject: [PATCH 03/24] Didn't I try using standard Liquid filters first?

---
 lib/jekyll/filters.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index c05d8c67e79..6051626a8ca 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -1,8 +1,8 @@
 module Jekyll
   
   module Filters
-    def date_to_string(date, format="%d %b %Y")
-      date.strftime(format)
+    def date_to_string(date)
+      date.strftime("%d %b %Y")
     end
 
     def date_to_long_string(date)

From bac34fab3a27a12b35add1ecab409b19941e29a6 Mon Sep 17 00:00:00 2001
From: Josh Dady <josh@indecisive.com>
Date: Thu, 25 Dec 2008 13:49:56 -0500
Subject: [PATCH 04/24] Test and fix the site.categories hash

---
 lib/jekyll/site.rb                                    | 11 ++++-------
 .../foo/_posts/bar/2008-12-12-topical-post.textile    |  8 ++++++++
 test/test_post.rb                                     |  6 ++++++
 test/test_site.rb                                     |  7 +++++--
 4 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 test/source/foo/_posts/bar/2008-12-12-topical-post.textile

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 9c205431204..8238b803349 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -2,7 +2,7 @@ module Jekyll
   
   class Site
     attr_accessor :source, :dest
-    attr_accessor :layouts, :posts
+    attr_accessor :layouts, :posts, :categories
     
     # Initialize the site
     #   +source+ is String path to the source directory containing
@@ -16,6 +16,7 @@ def initialize(source, dest)
       self.dest = dest
       self.layouts = {}
       self.posts = []
+      self.categories = Hash.new { |hash, key| hash[key] = Array.new }
     end
     
     # Do the actual work of processing the site and generating the
@@ -63,6 +64,7 @@ def read_posts(dir)
         if Post.valid?(f)
           post = Post.new(self.source, dir, f)
           self.posts << post
+          post.categories.each { |c| self.categories[c] << post }
         end
       end
       
@@ -72,6 +74,7 @@ def read_posts(dir)
       end
       
       self.posts.sort!
+      self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
     rescue Errno::ENOENT => e
       # ignore missing layout dir
     end
@@ -133,12 +136,6 @@ def transform_pages(dir = '')
     #
     # Returns {"site" => {"time" => <Time>, "posts" => [<Post>]}}
     def site_payload
-      # Build the category hash map of category ( names => arrays of posts )
-      # then sort each array in reverse order
-      categories = Hash.new { |hash, key| hash[key] = Array.new }
-      self.posts.each { |p| p.categories.each { |c| categories[c] << p } }
-      categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
-      
       {"site" => {
         "time" => Time.now, 
         "posts" => self.posts.sort { |a,b| b <=> a },
diff --git a/test/source/foo/_posts/bar/2008-12-12-topical-post.textile b/test/source/foo/_posts/bar/2008-12-12-topical-post.textile
new file mode 100644
index 00000000000..813db112c73
--- /dev/null
+++ b/test/source/foo/_posts/bar/2008-12-12-topical-post.textile
@@ -0,0 +1,8 @@
+---
+layout: default
+title: Topical Post
+---
+
+h1. {{ page.title }}
+
+This post has a topic.
diff --git a/test/test_post.rb b/test/test_post.rb
index 01e1dd8b5f6..46a259e70cf 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -88,6 +88,12 @@ def test_data
     assert_equal "<<< <p>url: /2008/11/21/complex.html<br />\ndate: #{Time.parse("2008-11-21")}<br />\nid: /2008/11/21/complex</p> >>>", p.output
   end
   
+  def test_categories_and_topics
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), 'foo', 'bar/2008-12-12-topical-post.textile')
+    assert_equal ['foo'], p.categories
+    assert_equal ['bar'], p.topics
+  end    
+  
   def test_include
     Jekyll.source = File.join(File.dirname(__FILE__), *%w[source])
     p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2008-12-13-include.markdown")
diff --git a/test/test_site.rb b/test/test_site.rb
index 52c1ca83a37..fa25617773d 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -22,9 +22,12 @@ def test_read_posts
     assert_equal 4, @s.posts.size
   end
   
-  def test_write_posts
+  def test_site_payload
     clear_dest
-    
     @s.process
+    
+    assert_equal 5, @s.posts.length
+    assert_equal ['foo'], @s.categories.keys
+    assert_equal 1, @s.categories['foo'].length
   end
 end

From d63f1f92a2f859b631d1d26ef87840fb56c60f33 Mon Sep 17 00:00:00 2001
From: jcon <james.d.connell@gmail.com>
Date: Thu, 22 Jan 2009 14:38:04 -0500
Subject: [PATCH 05/24] Added line number capabilities to highlight blocks

---
 README.textile               | 17 ++++++++++++++++-
 lib/jekyll/tags/highlight.rb | 18 +++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/README.textile b/README.textile
index 4fa4c4061dc..b192b00697e 100644
--- a/README.textile
+++ b/README.textile
@@ -331,11 +331,26 @@ The argument to <code>highlight</code> is the language identifier. To find the
 appropriate identifier to use for your favorite language, look for the "short
 name" on the "Lexers":http://pygments.org/docs/lexers/ page.
 
+There is a second argument to <code>highlight</code> called 
+<code>linenos</code> that is optional.  Including the <code>linenos</code> 
+argument will force the highlighted code to include line numbers.  For instance,
+the following code block would include line numbers next to each line:
+
+<pre>
+{% highlight ruby linenos %}
+def foo
+  puts 'foo'
+end
+{% endhighlight %}
+</pre>
+
 In order for the highlighting to show up, you'll need to include a
 highlighting stylesheet. For an example stylesheet you can look at
 "syntax.css":http://github.com/mojombo/tpw/tree/master/css/syntax.css. These
 are the same styles as used by GitHub and you are free to use them for your
-own site.
+own site.  If you use linenos, you might want to include an additional CSS class 
+definition for <code>lineno</code> in syntax.css to distinguish the line numbers
+from the highlighted code.
 
 h2. Categories
 
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index cd4121ae20e..597ceaed204 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -2,10 +2,22 @@ module Jekyll
   
   class HighlightBlock < Liquid::Block
     include Liquid::StandardFilters
+    # we need a language, but the linenos argument is optional.
+    Syntax = /(\w+)\s?(:?linenos)?\s?/
     
-    def initialize(tag_name, lang, tokens)
+    def initialize(tag_name, markup, tokens)
       super
-      @lang = lang.strip
+      if markup =~ Syntax
+        @lang = $1
+        if defined? $2
+          # additional options to pass to Albino.
+          @options = { 'O' => 'linenos=inline' }
+        else
+          @options = {}
+        end
+      else
+        raise SyntaxError.new("Syntax Error in 'highlight' - Valid syntax: highlight <lang> [lineno]")
+      end
     end
   
     def render(context)
@@ -17,7 +29,7 @@ def render(context)
     end
     
     def render_pygments(context, code)
-      "<notextile>" + Albino.new(code, @lang).to_s + "</notextile>"
+      "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>"
     end
     
     def render_codehighlighter(context, code)

From d9b183f99826df630eedeae29f70005993da3d64 Mon Sep 17 00:00:00 2001
From: Chad Ingram <chad.ingram@me.com>
Date: Fri, 23 Jan 2009 04:48:43 -0800
Subject: [PATCH 06/24] Fix site payload available to files

---
 lib/jekyll/site.rb                            | 40 +++++++++++--------
 .../_posts/2008-9-23-categories.textile       |  6 +++
 .../_posts/2008-9-23-categories.textile       |  6 +++
 test/test_generated_site.rb                   |  1 +
 4 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 test/source/category/_posts/2008-9-23-categories.textile
 create mode 100644 test/source/z_category/_posts/2008-9-23-categories.textile

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 97b7b677950..187effbe7e3 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -2,7 +2,7 @@ module Jekyll
   
   class Site
     attr_accessor :source, :dest
-    attr_accessor :layouts, :posts
+    attr_accessor :layouts, :posts, :categories
     
     # Initialize the site
     #   +source+ is String path to the source directory containing
@@ -16,6 +16,7 @@ def initialize(source, dest)
       self.dest = dest
       self.layouts = {}
       self.posts = []
+      self.categories = Hash.new { |hash, key| hash[key] = Array.new }
     end
     
     # Do the actual work of processing the site and generating the
@@ -63,6 +64,7 @@ def read_posts(dir)
         if Post.valid?(f)
           post = Post.new(self.source, dir, f)
           self.posts << post
+          post.categories.each { |c| self.categories[c] << post }
         end
       end
       
@@ -72,6 +74,7 @@ def read_posts(dir)
       end
       
       self.posts.sort!
+      self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
     rescue Errno::ENOENT => e
       # ignore missing layout dir
     end
@@ -101,6 +104,8 @@ def transform_pages(dir = '')
       entries = entries.reject do |e|
         (e != '_posts') and ['.', '_'].include?(e[0..0]) unless ['.htaccess'].include?(e)
       end
+      directories = entries.select { |e| File.directory?(File.join(base, e)) }
+      files = entries.reject { |e| File.directory?(File.join(base, e)) }
 
       # we need to make sure to process _posts *first* otherwise they 
       # might not be available yet to other templates as {{ site.posts }}
@@ -108,23 +113,24 @@ def transform_pages(dir = '')
         entries.delete('_posts')
         read_posts(dir)
       end
-
-      entries.each do |f|
-        if File.directory?(File.join(base, f))
-          next if self.dest.sub(/\/$/, '') == File.join(base, f)
-          transform_pages(File.join(dir, f))
-        else
-          first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
-
-          if first3 == "---"
-            # file appears to have a YAML header so process it as a page
-            page = Page.new(self.source, dir, f)
-            page.render(self.layouts, site_payload)
-            page.write(self.dest)
+      [directories, files].each do |entries|
+        entries.each do |f|
+          if File.directory?(File.join(base, f))
+            next if self.dest.sub(/\/$/, '') == File.join(base, f)
+            transform_pages(File.join(dir, f))
           else
-            # otherwise copy the file without transforming it
-            FileUtils.mkdir_p(File.join(self.dest, dir))
-            FileUtils.cp(File.join(self.source, dir, f), File.join(self.dest, dir, f))
+            first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
+        
+            if first3 == "---"
+              # file appears to have a YAML header so process it as a page
+              page = Page.new(self.source, dir, f)
+              page.render(self.layouts, site_payload)
+              page.write(self.dest)
+            else
+              # otherwise copy the file without transforming it
+              FileUtils.mkdir_p(File.join(self.dest, dir))
+              FileUtils.cp(File.join(self.source, dir, f), File.join(self.dest, dir, f))
+            end
           end
         end
       end
diff --git a/test/source/category/_posts/2008-9-23-categories.textile b/test/source/category/_posts/2008-9-23-categories.textile
new file mode 100644
index 00000000000..7b5bc39cccf
--- /dev/null
+++ b/test/source/category/_posts/2008-9-23-categories.textile
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Categories
+---
+
+Categories _should_ work
\ No newline at end of file
diff --git a/test/source/z_category/_posts/2008-9-23-categories.textile b/test/source/z_category/_posts/2008-9-23-categories.textile
new file mode 100644
index 00000000000..6a5e00908bf
--- /dev/null
+++ b/test/source/z_category/_posts/2008-9-23-categories.textile
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Categories
+---
+
+Categories _should_ work. Even if ordered after index.
\ No newline at end of file
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 56e5e422749..24e5ef1a3e9 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -11,6 +11,7 @@ def setup
   
   def test_site_posts_in_index
     # confirm that {{ site.posts }} is working
+    puts @s.posts.size
     assert @index.include?("#{@s.posts.size} Posts")
   end
 

From 6968c00c2398693b268140712d91d013141e6507 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Fri, 23 Jan 2009 14:25:04 -0800
Subject: [PATCH 07/24] update readme

---
 History.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.txt b/History.txt
index 5d2d1edbdd5..5453c201a21 100644
--- a/History.txt
+++ b/History.txt
@@ -12,6 +12,7 @@
     * Fix permalink behavior [github.com/cavalle]
     * Fixed an issue with pygments, markdown, and newlines [github.com/zpinter]
     * Ampersands need to be escaped [github.com/pufuwozu, github.com/ap]
+    * Test and fix the site.categories hash [github.com/zzot]
 
 == 0.3.0 / 2008-12-24
   * Major Enhancements

From a6c236bf01752285553176bef802b69fac19e33a Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Fri, 23 Jan 2009 14:26:11 -0800
Subject: [PATCH 08/24] update manifest and gemspec

---
 Manifest.txt   | 1 +
 jekyll.gemspec | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Manifest.txt b/Manifest.txt
index 33947aedf61..4c1351629fc 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -30,6 +30,7 @@ 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/css/screen.css
+test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 test/source/index.html
 test/suite.rb
 test/test_filters.rb
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 50df1e29028..12f5d6d4fef 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -4,12 +4,12 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-01-21}
+  s.date = %q{2009-01-23}
   s.default_executable = %q{jekyll}
   s.email = ["tom@mojombo.com"]
   s.executables = ["jekyll"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "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/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-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/css/screen.css", "test/source/index.html", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
+  s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "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/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-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/css/screen.css", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
   s.has_rdoc = true
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]

From d644d1df325dbae59c2cf13e7ed34587433ca798 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Fri, 23 Jan 2009 14:32:53 -0800
Subject: [PATCH 09/24] update manifest and gemspec

---
 Manifest.txt   | 2 ++
 jekyll.gemspec | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Manifest.txt b/Manifest.txt
index 4c1351629fc..178dc344a98 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -29,9 +29,11 @@ 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/category/_posts/2008-9-23-categories.textile
 test/source/css/screen.css
 test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 test/source/index.html
+test/source/z_category/_posts/2008-9-23-categories.textile
 test/suite.rb
 test/test_filters.rb
 test/test_generated_site.rb
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 12f5d6d4fef..f9992c73385 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email = ["tom@mojombo.com"]
   s.executables = ["jekyll"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "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/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-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/css/screen.css", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
+  s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "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/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-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/category/_posts/2008-9-23-categories.textile", "test/source/css/screen.css", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/source/z_category/_posts/2008-9-23-categories.textile", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
   s.has_rdoc = true
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]

From 04a283f618d6c0fb99a4a976f9353238821876c0 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Fri, 23 Jan 2009 14:33:14 -0800
Subject: [PATCH 10/24] prevent equivalent array from breaking tests

---
 test/test_site.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_site.rb b/test/test_site.rb
index fa25617773d..03bf16692c9 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -26,8 +26,8 @@ def test_site_payload
     clear_dest
     @s.process
     
-    assert_equal 5, @s.posts.length
-    assert_equal ['foo'], @s.categories.keys
+    assert_equal 7, @s.posts.length
+    assert_equal ["category", "foo", "z_category"].sort, @s.categories.keys.sort
     assert_equal 1, @s.categories['foo'].length
   end
 end

From 4cf6b6ae8008dbb6f4c4e1a1cd61adfb8ed404fa Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Fri, 23 Jan 2009 14:33:55 -0800
Subject: [PATCH 11/24] update history

---
 History.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.txt b/History.txt
index 5453c201a21..e1d15ec4b7e 100644
--- a/History.txt
+++ b/History.txt
@@ -13,6 +13,7 @@
     * Fixed an issue with pygments, markdown, and newlines [github.com/zpinter]
     * Ampersands need to be escaped [github.com/pufuwozu, github.com/ap]
     * Test and fix the site.categories hash [github.com/zzot]
+    * Fix site payload available to files [github.com/matrix9180]
 
 == 0.3.0 / 2008-12-24
   * Major Enhancements

From fae092854d2ae4f9397659f3bf3035194336f518 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Fri, 23 Jan 2009 14:38:50 -0800
Subject: [PATCH 12/24] refine and move contribution section of readme to
 bottom

---
 README.textile | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/README.textile b/README.textile
index f2c52a04679..c08efb6b378 100644
--- a/README.textile
+++ b/README.textile
@@ -380,25 +380,6 @@ This would list all the posts in the category 'foo' by date and title.
 
 The posts within each category are sorted in reverse chronological order.
 
-h2. Contribute
-
-If you'd like to hack on Jekyll, grab the source from GitHub. To get
-all of the dependencies, install the gem first.
-
-  $ git clone git://github.com/mojombo/jekyll
-
-The best way to get your changes merged back into core is as follows:
-
-# Fork mojombo/jekyll on GitHub
-# Clone down your fork
-# Create a topic branch to contain your change
-# Hack away
-# If you are adding new functionality, document it in README.textile
-# Do not change the version number, I will do that on my end
-# If necessary, rebase your commits into logical chunks, without errors
-# Push the branch up to GitHub
-# Send me (mojombo) a pull request for your branch
-
 h2. Blog migrations
 
 h3. Movable Type
@@ -449,6 +430,25 @@ The hostname defaults to _localhost_, all other variables are needed
 You may need to adjust the code used to filter entries. Left alone,
 it will attempt to pull all entries that are live or sticky.
 
+h2. Contribute
+
+If you'd like to hack on Jekyll, start by forking my repo on GitHub:
+
+http://github.com/mojombo/jekyll
+
+To get all of the dependencies, install the gem first. The best way to get
+your changes merged back into core is as follows:
+
+# Clone down your fork
+# Create a topic branch to contain your change
+# Hack away
+# Add tests and make sure everything still passes by running `rake`
+# If you are adding new functionality, document it in README.textile
+# Do not change the version number, I will do that on my end
+# If necessary, rebase your commits into logical chunks, without errors
+# Push the branch up to GitHub
+# Send me (mojombo) a pull request for your branch
+
 h2. License
 
 (The MIT License)

From 2b820aee63e11f4bc21fe5eee711536daff17f26 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Tue, 3 Feb 2009 12:08:42 -0800
Subject: [PATCH 13/24] switch to Jeweler for packaging

---
 History.txt    |  2 ++
 Manifest.txt   | 43 -----------------------------------
 Rakefile       | 61 +++++++++++++++++++++++++++++++++++++++++++-------
 VERSION.yml    |  4 ++++
 jekyll.gemspec | 55 +++++++++++++++++++++------------------------
 5 files changed, 85 insertions(+), 80 deletions(-)
 delete mode 100644 Manifest.txt
 create mode 100644 VERSION.yml

diff --git a/History.txt b/History.txt
index e1d15ec4b7e..0981a6c92f0 100644
--- a/History.txt
+++ b/History.txt
@@ -1,4 +1,6 @@
 ==
+  * Major Enhancements
+    * Switch to Jeweler for packaging tasks
   * Minor Enhancements
     * Type importer [github.com/codeslinger]
     * site.topics accessor [github.com/baz]
diff --git a/Manifest.txt b/Manifest.txt
deleted file mode 100644
index 178dc344a98..00000000000
--- a/Manifest.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-History.txt
-Manifest.txt
-README.textile
-Rakefile
-bin/jekyll
-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/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-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/category/_posts/2008-9-23-categories.textile
-test/source/css/screen.css
-test/source/foo/_posts/bar/2008-12-12-topical-post.textile
-test/source/index.html
-test/source/z_category/_posts/2008-9-23-categories.textile
-test/suite.rb
-test/test_filters.rb
-test/test_generated_site.rb
-test/test_jekyll.rb
-test/test_post.rb
-test/test_site.rb
-test/test_tags.rb
diff --git a/Rakefile b/Rakefile
index 3f301a77197..c178316fc84 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,18 +1,63 @@
-require 'rubygems'
-require 'hoe'
-require 'lib/jekyll'
-
-Hoe.new('jekyll', Jekyll::VERSION) do |p|
-  p.developer('Tom Preston-Werner', 'tom@mojombo.com')
-  p.summary = "Jekyll is a simple, blog aware, static site generator."
-  p.extra_deps = ['RedCloth', 'liquid', 'classifier', 'maruku', 'directory_watcher', 'open4']
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "jekyll"
+    s.summary = %Q{Jekyll is a simple, blog aware, static site generator.}
+    s.email = "tom@mojombo.com"
+    s.homepage = "http://github.com/mojombo/jekyll"
+    s.description = "Jekyll is a simple, blog aware, static site generator."
+    s.authors = ["Tom Preston-Werner"]
+    s.rubyforge_project = "jekyll"
+    s.add_dependency('RedCloth', '>= 4.0.4')
+    s.add_dependency('liquid', '>= 1.9.0')
+    s.add_dependency('classifier', '>= 1.3.1')
+    s.add_dependency('maruku', '>= 0.5.9')
+    s.add_dependency('directory_watcher', '>= 1.1.1')
+    s.add_dependency('open4', '>= 0.9.6')
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/test_*.rb'
+  t.verbose = false
+end
+
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'jekyll'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |t|
+    t.libs << 'test'
+    t.test_files = FileList['test/**/test_*.rb']
+    t.verbose = true
+  end
+rescue LoadError
+end
+
+task :default => :test
+
+# console
+
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -r ./lib/jekyll.rb"
 end
 
+# converters
+
 namespace :convert do
   desc "Migrate from mephisto in the current directory"
   task :mephisto do
diff --git a/VERSION.yml b/VERSION.yml
new file mode 100644
index 00000000000..3075864f368
--- /dev/null
+++ b/VERSION.yml
@@ -0,0 +1,4 @@
+--- 
+:minor: 3
+:patch: 0
+:major: 0
diff --git a/jekyll.gemspec b/jekyll.gemspec
index f9992c73385..38673fe588c 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -1,51 +1,48 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{jekyll}
   s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-01-23}
-  s.default_executable = %q{jekyll}
-  s.email = ["tom@mojombo.com"]
-  s.executables = ["jekyll"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "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/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-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/category/_posts/2008-9-23-categories.textile", "test/source/css/screen.css", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/source/z_category/_posts/2008-9-23-categories.textile", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
+  s.date = %q{2009-02-03}
+  s.description = %q{Jekyll is a simple, blog aware, static site generator.}
+  s.email = %q{tom@mojombo.com}
+  s.files = ["History.txt", "Manifest.txt", "README.textile", "VERSION.yml", "bin/jekyll", "lib/jekyll", "lib/jekyll/albino.rb", "lib/jekyll/converters", "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/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "lib/jekyll.rb", "test/dest", "test/dest/2008", "test/dest/2008/10", "test/dest/2008/10/18", "test/dest/2008/10/18/foo-bar.html", "test/dest/2008/11", "test/dest/2008/11/21", "test/dest/2008/11/21/complex.html", "test/dest/2008/12", "test/dest/2008/12/13", "test/dest/2008/12/13/include.html", "test/dest/_posts", "test/dest/_posts/2008-10-18-foo-bar.html", "test/dest/_posts/2008-11-21-complex.html", "test/dest/_posts/2008-12-03-permalinked-post.html", "test/dest/_posts/2008-12-13-include.html", "test/dest/category", "test/dest/category/2008", "test/dest/category/2008/09", "test/dest/category/2008/09/23", "test/dest/category/2008/09/23/categories.html", "test/dest/category/_posts", "test/dest/category/_posts/2008-9-23-categories.html", "test/dest/css", "test/dest/css/screen.css", "test/dest/foo", "test/dest/foo/2008", "test/dest/foo/2008/12", "test/dest/foo/2008/12/12", "test/dest/foo/2008/12/12/topical-post.html", "test/dest/foo/_posts", "test/dest/foo/_posts/bar", "test/dest/foo/_posts/bar/2008-12-12-topical-post.html", "test/dest/index.html", "test/dest/my_category", "test/dest/my_category/permalinked-post", "test/dest/z_category", "test/dest/z_category/2008", "test/dest/z_category/2008/09", "test/dest/z_category/2008/09/23", "test/dest/z_category/2008/09/23/categories.html", "test/dest/z_category/_posts", "test/dest/z_category/_posts/2008-9-23-categories.html", "test/helper.rb", "test/source", "test/source/_includes", "test/source/_includes/sig.markdown", "test/source/_layouts", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts", "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/category", "test/source/category/_posts", "test/source/category/_posts/2008-9-23-categories.textile", "test/source/css", "test/source/css/screen.css", "test/source/foo", "test/source/foo/_posts", "test/source/foo/_posts/bar", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/source/z_category", "test/source/z_category/_posts", "test/source/z_category/_posts/2008-9-23-categories.textile", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
   s.has_rdoc = true
-  s.rdoc_options = ["--main", "README.txt"]
+  s.homepage = %q{http://github.com/mojombo/jekyll}
+  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{jekyll}
   s.rubygems_version = %q{1.3.0}
   s.summary = %q{Jekyll is a simple, blog aware, static site generator.}
-  s.test_files = ["test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.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 = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<RedCloth>, [">= 0"])
-      s.add_runtime_dependency(%q<liquid>, [">= 0"])
-      s.add_runtime_dependency(%q<classifier>, [">= 0"])
-      s.add_runtime_dependency(%q<maruku>, [">= 0"])
-      s.add_runtime_dependency(%q<directory_watcher>, [">= 0"])
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_runtime_dependency(%q<RedCloth>, [">= 4.0.4"])
+      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>, [">= 0"])
-      s.add_dependency(%q<liquid>, [">= 0"])
-      s.add_dependency(%q<classifier>, [">= 0"])
-      s.add_dependency(%q<maruku>, [">= 0"])
-      s.add_dependency(%q<directory_watcher>, [">= 0"])
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_dependency(%q<RedCloth>, [">= 4.0.4"])
+      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>, [">= 0"])
-    s.add_dependency(%q<liquid>, [">= 0"])
-    s.add_dependency(%q<classifier>, [">= 0"])
-    s.add_dependency(%q<maruku>, [">= 0"])
-    s.add_dependency(%q<directory_watcher>, [">= 0"])
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+    s.add_dependency(%q<RedCloth>, [">= 4.0.4"])
+    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

From a02ba8bbd14efaea03e17f38808b6c7188a061fb Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Tue, 3 Feb 2009 12:14:36 -0800
Subject: [PATCH 14/24] Version bump to 0.4.0

---
 VERSION.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.yml b/VERSION.yml
index 3075864f368..03ac3026a54 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -1,4 +1,4 @@
 --- 
-:minor: 3
+:minor: 4
 :patch: 0
 :major: 0

From 39f47d90b7db1daa8cfdf845738f9d675782938a Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Tue, 3 Feb 2009 12:15:11 -0800
Subject: [PATCH 15/24] update history

---
 History.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/History.txt b/History.txt
index 0981a6c92f0..267207b031e 100644
--- a/History.txt
+++ b/History.txt
@@ -1,4 +1,4 @@
-==
+== 0.4.0 / 2009-02-03
   * Major Enhancements
     * Switch to Jeweler for packaging tasks
   * Minor Enhancements

From 215da13b26b9ef1c755c665940db8e406b29ef39 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Tue, 3 Feb 2009 12:16:40 -0800
Subject: [PATCH 16/24] Regenerated gemspec for version 0.4.0

---
 jekyll.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 38673fe588c..36183ca18fc 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jekyll}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
   s.date = %q{2009-02-03}
   s.description = %q{Jekyll is a simple, blog aware, static site generator.}
   s.email = %q{tom@mojombo.com}
-  s.files = ["History.txt", "Manifest.txt", "README.textile", "VERSION.yml", "bin/jekyll", "lib/jekyll", "lib/jekyll/albino.rb", "lib/jekyll/converters", "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/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "lib/jekyll.rb", "test/dest", "test/dest/2008", "test/dest/2008/10", "test/dest/2008/10/18", "test/dest/2008/10/18/foo-bar.html", "test/dest/2008/11", "test/dest/2008/11/21", "test/dest/2008/11/21/complex.html", "test/dest/2008/12", "test/dest/2008/12/13", "test/dest/2008/12/13/include.html", "test/dest/_posts", "test/dest/_posts/2008-10-18-foo-bar.html", "test/dest/_posts/2008-11-21-complex.html", "test/dest/_posts/2008-12-03-permalinked-post.html", "test/dest/_posts/2008-12-13-include.html", "test/dest/category", "test/dest/category/2008", "test/dest/category/2008/09", "test/dest/category/2008/09/23", "test/dest/category/2008/09/23/categories.html", "test/dest/category/_posts", "test/dest/category/_posts/2008-9-23-categories.html", "test/dest/css", "test/dest/css/screen.css", "test/dest/foo", "test/dest/foo/2008", "test/dest/foo/2008/12", "test/dest/foo/2008/12/12", "test/dest/foo/2008/12/12/topical-post.html", "test/dest/foo/_posts", "test/dest/foo/_posts/bar", "test/dest/foo/_posts/bar/2008-12-12-topical-post.html", "test/dest/index.html", "test/dest/my_category", "test/dest/my_category/permalinked-post", "test/dest/z_category", "test/dest/z_category/2008", "test/dest/z_category/2008/09", "test/dest/z_category/2008/09/23", "test/dest/z_category/2008/09/23/categories.html", "test/dest/z_category/_posts", "test/dest/z_category/_posts/2008-9-23-categories.html", "test/helper.rb", "test/source", "test/source/_includes", "test/source/_includes/sig.markdown", "test/source/_layouts", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts", "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/category", "test/source/category/_posts", "test/source/category/_posts/2008-9-23-categories.textile", "test/source/css", "test/source/css/screen.css", "test/source/foo", "test/source/foo/_posts", "test/source/foo/_posts/bar", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/source/z_category", "test/source/z_category/_posts", "test/source/z_category/_posts/2008-9-23-categories.textile", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
+  s.files = ["History.txt", "README.textile", "VERSION.yml", "bin/jekyll", "lib/jekyll", "lib/jekyll/albino.rb", "lib/jekyll/converters", "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/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "lib/jekyll.rb", "test/dest", "test/dest/2008", "test/dest/2008/10", "test/dest/2008/10/18", "test/dest/2008/10/18/foo-bar.html", "test/dest/2008/11", "test/dest/2008/11/21", "test/dest/2008/11/21/complex.html", "test/dest/2008/12", "test/dest/2008/12/13", "test/dest/2008/12/13/include.html", "test/dest/_posts", "test/dest/_posts/2008-10-18-foo-bar.html", "test/dest/_posts/2008-11-21-complex.html", "test/dest/_posts/2008-12-03-permalinked-post.html", "test/dest/_posts/2008-12-13-include.html", "test/dest/category", "test/dest/category/2008", "test/dest/category/2008/09", "test/dest/category/2008/09/23", "test/dest/category/2008/09/23/categories.html", "test/dest/category/_posts", "test/dest/category/_posts/2008-9-23-categories.html", "test/dest/css", "test/dest/css/screen.css", "test/dest/foo", "test/dest/foo/2008", "test/dest/foo/2008/12", "test/dest/foo/2008/12/12", "test/dest/foo/2008/12/12/topical-post.html", "test/dest/foo/_posts", "test/dest/foo/_posts/bar", "test/dest/foo/_posts/bar/2008-12-12-topical-post.html", "test/dest/index.html", "test/dest/my_category", "test/dest/my_category/permalinked-post", "test/dest/z_category", "test/dest/z_category/2008", "test/dest/z_category/2008/09", "test/dest/z_category/2008/09/23", "test/dest/z_category/2008/09/23/categories.html", "test/dest/z_category/_posts", "test/dest/z_category/_posts/2008-9-23-categories.html", "test/helper.rb", "test/source", "test/source/_includes", "test/source/_includes/sig.markdown", "test/source/_layouts", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts", "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/category", "test/source/category/_posts", "test/source/category/_posts/2008-9-23-categories.textile", "test/source/css", "test/source/css/screen.css", "test/source/foo", "test/source/foo/_posts", "test/source/foo/_posts/bar", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/source/z_category", "test/source/z_category/_posts", "test/source/z_category/_posts/2008-9-23-categories.textile", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/mojombo/jekyll}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]

From c489c1c2b2836da14589296019c25f9b8f868940 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Tue, 3 Feb 2009 14:49:22 -0800
Subject: [PATCH 17/24] fix rake console task

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index c178316fc84..0d743cfcf2c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -53,7 +53,7 @@ task :default => :test
 
 desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -rubygems -r ./lib/jekyll.rb"
+  sh "irb -rubygems -I lib -r jekyll.rb"
 end
 
 # converters

From bb4d1ee119b7f75706a0963528df99cda1ba8177 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Tue, 3 Feb 2009 18:43:53 -0800
Subject: [PATCH 18/24] add --version

---
 bin/jekyll    | 6 +++++-
 lib/jekyll.rb | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bin/jekyll b/bin/jekyll
index 9ed9b90b8f2..5f6640e196b 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -51,7 +51,11 @@ opts = OptionParser.new do |opts|
   opts.on("--permalink [TYPE]", "Use 'date' (default) for YYYY/MM/DD") do |style| 
     Jekyll.permalink_style = (style || 'date').to_sym
   end
-
+  
+  opts.on("--version", "Display current version") do
+    puts "Jekyll " + Jekyll.version
+    exit 0
+  end
 end
 
 opts.parse!
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 7125a95c616..eff1d5d29a1 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -43,8 +43,6 @@
 require 'jekyll/albino'
 
 module Jekyll
-  VERSION = '0.3.0'
-  
   class << self
     attr_accessor :source, :dest, :lsi, :pygments, :markdown_proc, :content_type, :permalink_style
   end
@@ -61,4 +59,9 @@ def self.process(source, dest)
     Jekyll.dest = dest
     Jekyll::Site.new(source, dest).process
   end
+  
+  def self.version
+    yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
+    "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
+  end
 end

From 36183cbcfbdb6c3612e29814383ce03b40f581c1 Mon Sep 17 00:00:00 2001
From: Tim Dysinger <tim@dysinger.net>
Date: Sun, 8 Feb 2009 16:07:59 -1000
Subject: [PATCH 19/24] added jekyll to exec list - otherwise it wont show up
 in PATH

---
 jekyll.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 36183ca18fc..d0871838f5c 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Jekyll is a simple, blog aware, static site generator.}
   s.email = %q{tom@mojombo.com}
   s.files = ["History.txt", "README.textile", "VERSION.yml", "bin/jekyll", "lib/jekyll", "lib/jekyll/albino.rb", "lib/jekyll/converters", "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/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "lib/jekyll.rb", "test/dest", "test/dest/2008", "test/dest/2008/10", "test/dest/2008/10/18", "test/dest/2008/10/18/foo-bar.html", "test/dest/2008/11", "test/dest/2008/11/21", "test/dest/2008/11/21/complex.html", "test/dest/2008/12", "test/dest/2008/12/13", "test/dest/2008/12/13/include.html", "test/dest/_posts", "test/dest/_posts/2008-10-18-foo-bar.html", "test/dest/_posts/2008-11-21-complex.html", "test/dest/_posts/2008-12-03-permalinked-post.html", "test/dest/_posts/2008-12-13-include.html", "test/dest/category", "test/dest/category/2008", "test/dest/category/2008/09", "test/dest/category/2008/09/23", "test/dest/category/2008/09/23/categories.html", "test/dest/category/_posts", "test/dest/category/_posts/2008-9-23-categories.html", "test/dest/css", "test/dest/css/screen.css", "test/dest/foo", "test/dest/foo/2008", "test/dest/foo/2008/12", "test/dest/foo/2008/12/12", "test/dest/foo/2008/12/12/topical-post.html", "test/dest/foo/_posts", "test/dest/foo/_posts/bar", "test/dest/foo/_posts/bar/2008-12-12-topical-post.html", "test/dest/index.html", "test/dest/my_category", "test/dest/my_category/permalinked-post", "test/dest/z_category", "test/dest/z_category/2008", "test/dest/z_category/2008/09", "test/dest/z_category/2008/09/23", "test/dest/z_category/2008/09/23/categories.html", "test/dest/z_category/_posts", "test/dest/z_category/_posts/2008-9-23-categories.html", "test/helper.rb", "test/source", "test/source/_includes", "test/source/_includes/sig.markdown", "test/source/_layouts", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts", "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/category", "test/source/category/_posts", "test/source/category/_posts/2008-9-23-categories.textile", "test/source/css", "test/source/css/screen.css", "test/source/foo", "test/source/foo/_posts", "test/source/foo/_posts/bar", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/source/z_category", "test/source/z_category/_posts", "test/source/z_category/_posts/2008-9-23-categories.textile", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
+  s.executables << 'jekyll'
   s.has_rdoc = true
   s.homepage = %q{http://github.com/mojombo/jekyll}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]

From a3c18fb095c79c27854dd5c159843f00875935f6 Mon Sep 17 00:00:00 2001
From: Tim Dysinger <tim@dysinger.net>
Date: Sun, 8 Feb 2009 18:37:59 -1000
Subject: [PATCH 20/24] changed date format on wordpress converter
 (zeropadding)

---
 lib/jekyll/converters/wordpress.rb | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/converters/wordpress.rb b/lib/jekyll/converters/wordpress.rb
index 1074655ab8b..69f906e052f 100644
--- a/lib/jekyll/converters/wordpress.rb
+++ b/lib/jekyll/converters/wordpress.rb
@@ -10,8 +10,8 @@
 
 module Jekyll
   module WordPress
-    
-    # Reads a MySQL database via Sequel and creates a post file for each 
+
+    # Reads a MySQL database via Sequel and creates a post file for each
     # post in wp_posts that has post_status = 'publish'.
     # This restriction is made because 'draft' posts are not guaranteed to
     # have valid dates.
@@ -19,20 +19,21 @@ module WordPress
 
     def self.process(dbname, user, pass, host = 'localhost')
       db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
-      
+
       FileUtils.mkdir_p "_posts"
-            
+
       db[QUERY].each do |post|
         # Get required fields and construct Jekyll compatible name
         title = post[:post_title]
         slug = post[:post_name]
         date = post[:post_date]
         content = post[:post_content]
-        
-        name = [date.year, date.month, date.day, slug].join('-') + ".markdown"
+
+        name = "%02d-%02d-%02d-%s.markdown" % [date.year, date.month, date.day,
+                                               slug]
 
         # Get the relevant fields as a hash, delete empty fields and convert
-        # to YAML for the header        
+        # to YAML for the header
         data = {
            'layout' => 'post',
            'title' => title.to_s,
@@ -51,4 +52,4 @@ def self.process(dbname, user, pass, host = 'localhost')
 
     end
   end
-end
\ No newline at end of file
+end

From d0f46c2120852d826937a97d3241088d8dfce43d Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Mon, 9 Feb 2009 19:16:59 -0800
Subject: [PATCH 21/24] update history

---
 History.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/History.txt b/History.txt
index 267207b031e..a43f5b8291c 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,9 @@
+==
+  * Minor Enhancements
+    * Changed date format on wordpress converter (zeropadding) [github.com/dysinger]
+  * Bug Fixes
+    * Add jekyll binary as executable to gemspec [github.com/dysinger]
+
 == 0.4.0 / 2009-02-03
   * Major Enhancements
     * Switch to Jeweler for packaging tasks

From 8147c317d7ea40007274da4a691872cbca4d127f Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Tue, 10 Feb 2009 20:36:52 -0800
Subject: [PATCH 22/24] gemspec tweak

---
 jekyll.gemspec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index d0871838f5c..dc2d30b3060 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -6,11 +6,12 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-02-03}
+  s.date = %q{2009-02-10}
+  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.files = ["History.txt", "README.textile", "VERSION.yml", "bin/jekyll", "lib/jekyll", "lib/jekyll/albino.rb", "lib/jekyll/converters", "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/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "lib/jekyll.rb", "test/dest", "test/dest/2008", "test/dest/2008/10", "test/dest/2008/10/18", "test/dest/2008/10/18/foo-bar.html", "test/dest/2008/11", "test/dest/2008/11/21", "test/dest/2008/11/21/complex.html", "test/dest/2008/12", "test/dest/2008/12/13", "test/dest/2008/12/13/include.html", "test/dest/_posts", "test/dest/_posts/2008-10-18-foo-bar.html", "test/dest/_posts/2008-11-21-complex.html", "test/dest/_posts/2008-12-03-permalinked-post.html", "test/dest/_posts/2008-12-13-include.html", "test/dest/category", "test/dest/category/2008", "test/dest/category/2008/09", "test/dest/category/2008/09/23", "test/dest/category/2008/09/23/categories.html", "test/dest/category/_posts", "test/dest/category/_posts/2008-9-23-categories.html", "test/dest/css", "test/dest/css/screen.css", "test/dest/foo", "test/dest/foo/2008", "test/dest/foo/2008/12", "test/dest/foo/2008/12/12", "test/dest/foo/2008/12/12/topical-post.html", "test/dest/foo/_posts", "test/dest/foo/_posts/bar", "test/dest/foo/_posts/bar/2008-12-12-topical-post.html", "test/dest/index.html", "test/dest/my_category", "test/dest/my_category/permalinked-post", "test/dest/z_category", "test/dest/z_category/2008", "test/dest/z_category/2008/09", "test/dest/z_category/2008/09/23", "test/dest/z_category/2008/09/23/categories.html", "test/dest/z_category/_posts", "test/dest/z_category/_posts/2008-9-23-categories.html", "test/helper.rb", "test/source", "test/source/_includes", "test/source/_includes/sig.markdown", "test/source/_layouts", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts", "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/category", "test/source/category/_posts", "test/source/category/_posts/2008-9-23-categories.textile", "test/source/css", "test/source/css/screen.css", "test/source/foo", "test/source/foo/_posts", "test/source/foo/_posts/bar", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/source/z_category", "test/source/z_category/_posts", "test/source/z_category/_posts/2008-9-23-categories.textile", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
-  s.executables << 'jekyll'
   s.has_rdoc = true
   s.homepage = %q{http://github.com/mojombo/jekyll}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]

From 023b1d50bde5ee3e5e21697f8af8f10e2ba8881c Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Tue, 10 Feb 2009 20:37:03 -0800
Subject: [PATCH 23/24] Version bump to 0.4.1

---
 VERSION.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.yml b/VERSION.yml
index 03ac3026a54..7affc69611e 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -1,4 +1,4 @@
 --- 
 :minor: 4
-:patch: 0
+:patch: 1
 :major: 0

From 9a8125572974cdcd513252815ebad4073c099793 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Tue, 10 Feb 2009 20:37:09 -0800
Subject: [PATCH 24/24] Regenerated gemspec for version 0.4.1

---
 jekyll.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index dc2d30b3060..f1407d4c6e9 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jekyll}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]