jekyll 0.10.0 → 0.11.0

data/doc/output/stylesheets/scribe.css

@@ -0,0 +1,177 @@
+/* ---------------------------------------------------------------------------
+   Bare AsciiDoc styles
+   Ryan Tomayko <r@tomayko.com>
+--------------------------------------------------------------------------- */
+
+body {
+	font-family:verdana,helvetica,arial,sans-serif;
+	font-size:81.25%;   /* 13px */
+	line-height:1.538;  /* 20px */
+	margin:40px auto 50px auto;
+	max-width:53.8461538462em; /* 790px */
+	color:#333;
+}
+
+em {
+	font-style:italic;
+}
+
+strong {
+	font-weight:bold;
+	color:#000;
+}
+
+tt {
+	font-family:consolas, 'lucida console', 'bitstream vera sans mono',
+	           'courier new', monospace;
+	color:#000;
+}
+
+p, ul, ol, dl {
+	margin:10px 0
+}
+
+dl {
+	margin-left:40px
+}
+
+dt {
+	font-weight:normal;
+	color:#000;
+}
+
+h1, h2, h3, h4, h5 {
+	font-family:'lucida grande',georgia,verdana,helvetica,arial,sans-serif;
+	font-weight:normal;
+	color:#000;
+}
+
+h1 {
+	font-size:40px;
+	line-height:1.428;
+	margin:20px 0;
+}
+
+h2 {
+	font-size:30px;
+	line-height:1.36363636; /* repeating, of course */
+	margin:60px 0 20px 0;
+}
+
+h2 + .sectionbody {}
+
+h3 {
+	font-size:24px;
+	line-height:1.1;
+	margin:30px 0 10px 0;
+}
+
+h4 {
+	font-size:18px;
+	line-height:1.1;
+	margin:20px 0 5px 0;
+}
+
+h5 {
+	font-size:13px;
+	font-style:italic;
+	line-height:1.1;
+}
+
+#header { 
+	text-align:center;
+	margin-bottom:30px;
+}
+
+#header h1 { margin-bottom:0 }
+
+.title, .sidebar-title {
+	font-weight:normal;
+	color:#000;
+	margin-bottom:0;
+}
+
+.admonitionblock .title {
+	font-weight:bold;
+}
+
+.admonitionblock {
+	margin:30px 0px;
+	color:#555;
+}
+
+.admonitionblock td.icon {
+	width:30px;
+	padding-right:20px;
+	padding-left:20px;
+	text-transform:uppercase;
+	font-weight:bold;
+	color:#888;
+}
+
+.listingblock {
+  margin: 13px 0;
+}
+
+.listingblock .content {
+	border:1px solid silver;
+	background:#eee;
+	padding:5px;
+}
+
+.listingblock .content pre {
+	margin:0;
+}
+
+.literalblock .content {
+	margin-left:40px;
+}
+
+.verseblock .content {
+	white-space:pre
+}
+
+.sidebarblock .sidebar-content {
+	border:1px solid silver;
+	background:#FFFFEE;
+	padding:0 10px;
+	color:#222;
+	font-size:smaller;
+	line-height:1.5;
+}
+
+.sidebar-title {
+	margin:10px 0;
+	font-weight:bold;
+	color:#442;
+}
+
+.quoteblock-content {
+	font-style:italic;
+	color:#444;
+	margin-left:40px;
+}
+
+.quoteblock-content .attribution {
+	font-style:normal;
+	text-align:right;
+	color:#000;
+}
+
+.exampleblock-content *:first-child { margin-top:0 }
+.exampleblock-content {
+	border-left:2px solid silver;
+	padding-left:8px;
+}
+
+#footer {
+	font-size:11px;
+	margin-top:40px;
+	border-top:1px solid silver;
+	color:#555;
+}
+
+#author {
+	color:#000;
+	text-transform:uppercase
+}

data/features/post_data.feature

@@ -31,10 +31,10 @@ Feature: Post data
     And I have the following post:
       | title     | date      | layout | content                 |
       | Star Wars | 3/27/2009 | simple | Luke, I am your father. |
-    And I have a simple layout that contains "Post date: {{ page.date }}"
+    And I have a simple layout that contains "Post date: {{ page.date | date_to_string }}"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "Post date: Fri Mar 27" in "_site/2009/03/27/star-wars.html"
+    And I should see "Post date: 27 Mar 2009" in "_site/2009/03/27/star-wars.html"
 
   Scenario: Use post.id variable
     Given I have a _posts directory

data/features/site_configuration.feature

@@ -55,6 +55,13 @@ Feature: Site configuration
     Then the _site directory should exist
     And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
 
+  Scenario: Use Redcarpet 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 "redcarpet"
+    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"

data/features/support/env.rb

@@ -14,3 +14,6 @@ def run_jekyll(opts = {})
   command << " >> /dev/null 2>&1" if opts[:debug].nil?
   system command
 end
+
+# work around "invalid option: --format" cucumber bug (see #296)
+Test::Unit.run = true if RUBY_VERSION < '1.9'

data/g.pl

@@ -0,0 +1,48 @@
+#!/usr/bin/perl
+#fetch Gravatars
+
+use strict;
+use warnings;
+
+use LWP::Simple;
+use Digest::MD5 qw(md5_hex);
+
+my $size       = 90;
+my $output_dir = '.git/avatar';
+
+die("no .git/ directory found in current path\n") unless -d '.git';
+
+mkdir($output_dir) unless -d $output_dir;
+
+open(GITLOG, q/git log --pretty=format:"%ae|%an" |/) or die("failed to read git-log: $!\n");
+
+my %processed_authors;
+
+while(<GITLOG>) {
+    chomp;
+    my($email, $author) = split(/\|/, $_);
+
+    next if $processed_authors{$author}++;
+
+    my $author_image_file = $output_dir . '/' . $author . '.png';
+
+    #skip images we have
+    next if -e $author_image_file;
+
+    #try and fetch image
+
+    my $grav_url = "http://www.gravatar.com/avatar/".md5_hex(lc $email)."?d=404&size=".$size; 
+
+    warn "fetching image for '$author' $email ($grav_url)...\n";
+
+    my $rc = getstore($grav_url, $author_image_file);
+
+    sleep(1);
+
+    if($rc != 200) {
+        unlink($author_image_file);
+        next;
+    }
+}
+
+close GITLOG;

data/jekyll.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '0.10.0'
-  s.date              = '2010-12-16'
+  s.version           = '0.11.0'
+  s.date              = '2011-07-10'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -18,31 +18,42 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.executables = ["jekyll"]
-  s.default_executable = 'jekyll'
 
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.textile LICENSE]
 
-  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"])
-
-  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"])
-  s.add_development_dependency('kramdown', [">= 0.12.0"])
+  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")
+  s.add_runtime_dependency('kramdown', ">= 0.13.2")
+  s.add_runtime_dependency('albino', ">= 1.3.2")
 
+  s.add_development_dependency('redgreen', ">= 1.2.2")
+  s.add_development_dependency('shoulda', ">= 2.11.3")
+  s.add_development_dependency('rr', ">= 1.0.2")
+  s.add_development_dependency('cucumber', ">= 0.10.3")
+  s.add_development_dependency('RedCloth', ">= 4.2.1")
+  s.add_development_dependency('rdiscount', ">= 1.6.5")
+  s.add_development_dependency('redcarpet', ">= 1.9.0")
+  
   # = MANIFEST =
   s.files = %w[
+    Gemfile
     History.txt
     LICENSE
     README.textile
     Rakefile
     bin/jekyll
     cucumber.yml
+    doc/output/book.html
+    doc/output/ch00-preface.asc
+    doc/output/ch01-quick-start.asc
+    doc/output/ch02-directory-layout.asc
+    doc/output/stylesheets/handbookish-quirks.css
+    doc/output/stylesheets/handbookish.css
+    doc/output/stylesheets/scribe-quirks.css
+    doc/output/stylesheets/scribe.css
     features/create_sites.feature
     features/embed_filters.feature
     features/markdown.feature
@@ -53,9 +64,9 @@ Gem::Specification.new do |s|
     features/site_data.feature
     features/step_definitions/jekyll_steps.rb
     features/support/env.rb
+    g.pl
     jekyll.gemspec
     lib/jekyll.rb
-    lib/jekyll/albino.rb
     lib/jekyll/converter.rb
     lib/jekyll/converters/identity.rb
     lib/jekyll/converters/markdown.rb
@@ -69,13 +80,16 @@ Gem::Specification.new do |s|
     lib/jekyll/layout.rb
     lib/jekyll/migrators/csv.rb
     lib/jekyll/migrators/drupal.rb
+    lib/jekyll/migrators/enki.rb
     lib/jekyll/migrators/marley.rb
     lib/jekyll/migrators/mephisto.rb
     lib/jekyll/migrators/mt.rb
+    lib/jekyll/migrators/posterous.rb
     lib/jekyll/migrators/textpattern.rb
+    lib/jekyll/migrators/tumblr.rb
     lib/jekyll/migrators/typo.rb
-    lib/jekyll/migrators/wordpress.com.rb
     lib/jekyll/migrators/wordpress.rb
+    lib/jekyll/migrators/wordpressdotcom.rb
     lib/jekyll/page.rb
     lib/jekyll/plugin.rb
     lib/jekyll/post.rb
@@ -83,6 +97,8 @@ Gem::Specification.new do |s|
     lib/jekyll/static_file.rb
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
+    output/stylesheets/scribe-quirks.css
+    output/stylesheets/scribe.css
     test/helper.rb
     test/source/.htaccess
     test/source/_includes/sig.markdown
@@ -111,6 +127,8 @@ Gem::Specification.new do |s|
     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/_posts/2011-04-12-md-extension.md
+    test/source/_posts/2011-04-12-text-extension.text
     test/source/about.html
     test/source/category/_posts/2008-9-23-categories.textile
     test/source/contacts.html
@@ -131,6 +149,7 @@ Gem::Specification.new do |s|
     test/test_pager.rb
     test/test_post.rb
     test/test_rdiscount.rb
+    test/test_redcarpet.rb
     test/test_site.rb
     test/test_tags.rb
   ]

data/lib/jekyll.rb

@@ -19,10 +19,12 @@ require 'rubygems'
 require 'fileutils'
 require 'time'
 require 'yaml'
+require 'English'
 
 # 3rd party
 require 'liquid'
 require 'maruku'
+require 'albino'
 
 # internal requires
 require 'jekyll/core_ext'
@@ -32,7 +34,6 @@ require 'jekyll/layout'
 require 'jekyll/page'
 require 'jekyll/post'
 require 'jekyll/filters'
-require 'jekyll/albino'
 require 'jekyll/static_file'
 require 'jekyll/errors'
 
@@ -45,7 +46,7 @@ require_all 'jekyll/generators'
 require_all 'jekyll/tags'
 
 module Jekyll
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 
   # Default options. Overriden by values in _config.yml or command-line opts.
   # (Strings rather symbols used for compatability with YAML).
@@ -64,6 +65,9 @@ module Jekyll
     'pygments'     => false,
     'markdown'     => 'maruku',
     'permalink'    => 'date',
+    
+    'markdown_ext' => 'markdown,mkd,mkdn,md',
+    'textile_ext'  => 'textile',
 
     'maruku'       => {
       'use_tex'    => false,
@@ -75,6 +79,9 @@ module Jekyll
     'rdiscount'    => {
       'extensions' => []
     },
+    'redcarpet'    => {
+      'extensions' => []
+    },
     'kramdown'        => {
       'auto_ids'      => true,
       'footnote_nr'   => 1,
@@ -93,8 +100,8 @@ module Jekyll
     }
   }
 
-  # Generate a Jekyll configuration Hash by merging the default options
-  # with anything in _config.yml, and adding the given options on top.
+  # Public: Generate a Jekyll configuration Hash by merging the default
+  # options with anything in _config.yml, and adding the given options on top.
   #
   # override - A Hash of config directives that override any options in both
   #            the defaults and the config file. See Jekyll::DEFAULTS for a

data/lib/jekyll/converters/markdown.rb

@@ -10,6 +10,15 @@ module Jekyll
       return if @setup
       # Set the Markdown interpreter (and Maruku self.config, if necessary)
       case @config['markdown']
+        when 'redcarpet'
+          begin
+            require 'redcarpet'
+            @redcarpet_extensions = @config['redcarpet']['extensions'].map { |e| e.to_sym }
+          rescue LoadError
+            STDERR.puts 'You are missing a library required for Markdown. Please run:'
+            STDERR.puts '  $ [sudo] gem install redcarpet'
+            raise FatalException.new("Missing dependency: redcarpet")
+          end
         when 'kramdown'
           begin
             require 'kramdown'
@@ -65,9 +74,10 @@ module Jekyll
       end
       @setup = true
     end
-
+    
     def matches(ext)
-      ext =~ /(markdown|mkdn?|md)/i
+      rgx = '(' + @config['markdown_ext'].gsub(',','|') +')'
+      ext =~ Regexp.new(rgx, Regexp::IGNORECASE)
     end
 
     def output_ext(ext)
@@ -77,6 +87,8 @@ module Jekyll
     def convert(content)
       setup
       case @config['markdown']
+        when 'redcarpet'
+          Redcarpet.new(content, *@redcarpet_extensions).to_html
         when 'kramdown'
           # Check for use of coderay
           if @config['kramdown']['use_coderay']