jekyll 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,12 @@
+== 0.1.3 /
+  * Major Features
+    * Markdown support [github.com/vanpelt]
+    * Mephisto and CSV converters [github.com/vanpelt]
+    * Code hilighting [github.com/vanpelt]
+    * Autobuild
+  * Bug Fixes
+    * Accept both \r\n and \n in YAML header [github.com/vanpelt]
+
 == 0.1.2 / 2008-11-22
   * Major Features
     * Add a real "related posts" implementation using Classifier

data/Manifest.txt

@@ -6,15 +6,14 @@ bin/jekyll
 jekyll.gemspec
 lib/jekyll.rb
 lib/jekyll/convertible.rb
+lib/jekyll/converters/csv.rb
+lib/jekyll/converters/mephisto.rb
 lib/jekyll/filters.rb
+lib/jekyll/blocks.rb
 lib/jekyll/layout.rb
 lib/jekyll/page.rb
 lib/jekyll/post.rb
 lib/jekyll/site.rb
-test/dest/2008/10/18/foo-bar.html
-test/dest/2008/11/21/complex.html
-test/dest/css/screen.css
-test/dest/index.html
 test/helper.rb
 test/source/_layouts/default.html
 test/source/_layouts/simple.html

data/README.textile

@@ -27,18 +27,48 @@ My own personal site/blog is generated with Jekyll.
 The proto-site repo ("http://github.com/mojombo/tpw":http://github.com/mojombo/tpw)
 is converted into the actual site ("http://tom.preston-werner.com/":http://tom.preston-werner.com)
 
-h2. Install and Run
+h2. Install
 
-This is beta software. You will need to download the source
-and run the software from there.
+The best way to install Jekyll is via RubyGems:
 
-  $ sudo gem install RedCloth
-  $ sudo gem install liquid
-  $ sudo gem install classifier
+  $ sudo gem install jekyll
+
+h2. Run
+
+  $ cd /path/to/proto/site
+  $ jekyll
+
+This will generate the site and place it in /path/to/proto/site/_site. There is an autobuild feature that will regenerate your site if any of the files change:
+
+  $ jekyll --auto
+
+If you'd like the generated site placed somewhere else:
+
+  $ jekyll /path/to/place/generated/site
+
+And if you don't want to be in the proto site root to run Jekyll:
+
+  $ jekyll /path/to/proto/site /path/to/place/generated/site
   
+The autobuid feature can be used on any of the invocations.
+
+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
-  $ cd jekyll
-  $ bin/jekyll /path/to/proto/site /path/to/place/generated/site
+
+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
+# 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
 

data/Rakefile

@@ -3,13 +3,19 @@ require 'hoe'
 require 'lib/jekyll'
 
 Hoe.new('jekyll', Jekyll::VERSION) do |p|
-  # p.rubyforge_name = 'jekyllx' # if different than lowercase project name
   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']
+  p.extra_deps = ['RedCloth', 'liquid', 'classifier', 'rdiscount', 'directory_watcher']
 end
 
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -r ./lib/jekyll.rb"
 end
+
+namespace :convert do
+  desc "Migrate from mephisto in the current directory"
+  task :mephisto do
+    sh %q(ruby -r './lib/jekyll/converters/mephisto' -e 'Jekyll::Mephisto.postgres(:database => "#{ENV["DB"]}")')
+  end
+end

data/bin/jekyll

@@ -2,20 +2,71 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
+require 'optparse'
 require 'jekyll'
 
+options = {}
+
+opts = OptionParser.new do |opts|
+  opts.banner = DATA.read
+
+  opts.on("--auto", "Auto-regenerate") do
+    options[:auto] = true
+  end
+end
+
+opts.parse!
+
+def clean(dest)
+  FileUtils.rm_rf(dest)
+  FileUtils.mkdir_p(dest)
+end
+
+def globs(source)
+  Dir.chdir(source) do
+    dirs = Dir['*'].select { |x| File.directory?(x) }
+    dirs -= ['_site']
+    dirs = dirs.map { |x| "#{x}/**/*" }
+    dirs += ['*']
+  end
+end
+
+source = nil
+destination = nil
+
 case ARGV.size
   when 0
-    dest = File.join('.', '_site')
-    FileUtils.rm_rf(dest)
-    FileUtils.mkdir_p(dest)
-    Jekyll.process('.', dest)
+    source = '.'
+    destination = File.join('.', '_site')
   when 1
-    Jekyll.process('.', ARGV[0])
+    source = '.'
+    destination = ARGV[0]
   when 2
-    Jekyll.process(ARGV[0], ARGV[1])
+    source = ARGV[0]
+    destination = ARGV[1]
   else
-    puts DATA.read
+    puts "Invalid options. Run `jekyll --help` for assistance."
+    exit(1)
+end
+
+if options[:auto]
+  puts "Auto-regenerating enabled: #{source} -> #{destination}"
+  
+  dw = DirectoryWatcher.new(source)
+  dw.interval = 1
+  dw.glob = globs(source)
+  
+  dw.add_observer do |*args|
+    t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+    puts "[#{t}] regeneration: #{args.size} files changed"
+    Jekyll.process(source, destination)
+  end
+  
+  dw.start
+  
+  loop { sleep 1000 }
+else
+  Jekyll.process(source, destination)
 end
 
 __END__
@@ -24,4 +75,6 @@ Jekyll is a blog-aware, static site generator.
 Basic Command Line Usage:
   jekyll                                                   # . -> ./_site
   jekyll <path to write generated site>                    # . -> <path>
-  jekyll <path to source> <path to write generated site>   # <path> -> <path>
+  jekyll <path to source> <path to write generated site>   # <path> -> <path>
+    
+  Options:

data/jekyll.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name = %q{jekyll}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2008-11-22}
+  s.date = %q{2008-12-06}
   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/convertible.rb", "lib/jekyll/filters.rb", "lib/jekyll/layout.rb", "lib/jekyll/page.rb", "lib/jekyll/post.rb", "lib/jekyll/site.rb", "test/dest/2008/10/18/foo-bar.html", "test/dest/2008/11/21/complex.html", "test/dest/css/screen.css", "test/dest/index.html", "test/helper.rb", "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/css/screen.css", "test/source/index.html", "test/suite.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb"]
+  s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "jekyll.gemspec", "lib/jekyll.rb", "lib/jekyll/convertible.rb", "lib/jekyll/converters/csv.rb", "lib/jekyll/converters/mephisto.rb", "lib/jekyll/filters.rb", "lib/jekyll/blocks.rb", "lib/jekyll/layout.rb", "lib/jekyll/page.rb", "lib/jekyll/post.rb", "lib/jekyll/site.rb", "test/helper.rb", "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/css/screen.css", "test/source/index.html", "test/suite.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb"]
   s.has_rdoc = true
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
@@ -26,17 +26,23 @@ Gem::Specification.new do |s|
       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<rdiscount>, [">= 0"])
+      s.add_runtime_dependency(%q<directory_watcher>, [">= 0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<RedCloth>, [">= 0"])
       s.add_dependency(%q<liquid>, [">= 0"])
       s.add_dependency(%q<classifier>, [">= 0"])
+      s.add_dependency(%q<rdiscount>, [">= 0"])
+      s.add_dependency(%q<directory_watcher>, [">= 0"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<RedCloth>, [">= 0"])
     s.add_dependency(%q<liquid>, [">= 0"])
     s.add_dependency(%q<classifier>, [">= 0"])
+    s.add_dependency(%q<rdiscount>, [">= 0"])
+    s.add_dependency(%q<directory_watcher>, [">= 0"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/lib/jekyll.rb

@@ -12,7 +12,9 @@ require 'time'
 # 3rd party
 require 'liquid'
 require 'redcloth'
+require 'rdiscount' rescue puts "The rdiscount gem is required for markdown support!"
 require 'classifier'
+require 'directory_watcher'
 
 # internal requires
 require 'jekyll/site'
@@ -21,9 +23,10 @@ require 'jekyll/layout'
 require 'jekyll/page'
 require 'jekyll/post'
 require 'jekyll/filters'
+require 'jekyll/blocks'
 
 module Jekyll
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   
   def self.process(source, dest)
     Jekyll::Site.new(source, dest).process

data/lib/jekyll/blocks.rb

@@ -0,0 +1,22 @@
+module Jekyll
+  class Highlight < Liquid::Block
+    include Liquid::StandardFilters
+    
+    def initialize(tag_name, lang, tokens)
+      super
+      @lang = lang.strip
+    end
+  
+    def render(context)
+      #The div is required because RDiscount blows ass
+      <<-HTML
+<div>
+  <pre>
+    <code class='#{@lang}'>#{h(super.to_s).strip}</code>
+  </pre>
+</div>
+      HTML
+    end    
+  end
+end
+Liquid::Template.register_tag('highlight', Jekyll::Highlight)

data/lib/jekyll/converters/csv.rb

@@ -0,0 +1,26 @@
+module Jekyll
+  module CSV
+    #Reads a csv with title, permalink, body, published_at, and filter.
+    #It creates a post file for each row in the csv
+    def self.process(file = "posts.csv")
+      FileUtils.mkdir_p "_posts"
+      posts = 0
+      FasterCSV.foreach(file) do |row|
+        next if row[0] == "title"
+        posts += 1
+        name = row[3].split(" ")[0]+"-"+row[1]+(row[4] =~ /markdown/ ? ".markdown" : ".textile")
+        File.open("_posts/#{name}", "w") do |f|
+          f.puts <<-HEADER
+---
+layout: post
+title: #{row[0]}
+---
+
+          HEADER
+          f.puts row[2]
+        end
+      end
+      "Created #{posts} posts!"
+    end
+  end
+end

data/lib/jekyll/converters/mephisto.rb

@@ -0,0 +1,24 @@
+require 'rubygems'
+require 'fastercsv'
+require 'fileutils'
+require File.join(File.dirname(__FILE__),"csv.rb")
+module Jekyll
+  module Mephisto
+    #Accepts a hash with database config variables, exports mephisto posts into a csv
+    #export PGPASSWORD if you must
+    def self.postgres(c)
+      sql = <<-SQL
+      BEGIN;
+      CREATE TEMP TABLE jekyll AS
+        SELECT title, permalink, body, published_at, filter FROM contents
+        WHERE user_id = 1 AND type = 'Article' ORDER BY published_at;
+      COPY jekyll TO STDOUT WITH CSV HEADER;
+      ROLLBACK;
+      SQL
+      command = %Q(psql -h #{c[:host] || "localhost"} -c "#{sql.strip}" #{c[:database]} #{c[:username]} -o #{c[:filename] || "posts.csv"})
+      puts command
+      `#{command}`
+      CSV.process
+    end
+  end
+end

data/lib/jekyll/convertible.rb

@@ -13,7 +13,7 @@ module Jekyll
     def read_yaml(base, name)
       self.content = File.read(File.join(base, name))
       
-      if self.content =~ /^(---\n.*?)\n---\n/m
+      if self.content =~ /^(---.*\n.*?)\n---.*\n/m
         self.content = self.content[($1.size + 5)..-1]
         
         self.data = YAML.load($1)
@@ -24,9 +24,13 @@ module Jekyll
     #
     # Returns nothing
     def transform
-      if self.ext == ".textile"
+      case self.ext
+      when ".textile":
         self.ext = ".html"
         self.content = RedCloth.new(self.content).to_html
+      when ".markdown":
+        self.ext = ".html"
+        self.content = RDiscount.new(self.content).to_html
       end
     end
     
@@ -41,6 +45,7 @@ module Jekyll
       
       # render content
       self.content = Liquid::Template.parse(self.content).render(payload, [Jekyll::Filters])
+      self.transform
       
       # output keeps track of what will finally be written
       self.output = self.content

data/lib/jekyll/filters.rb

@@ -12,6 +12,10 @@ module Jekyll
     def xml_escape(input)
       input.gsub("<", "&lt;").gsub(">", "&gt;")
     end
+    
+    def number_of_words(input)
+      input.split.length
+    end
   end
   
 end

data/lib/jekyll/page.rb

@@ -21,7 +21,7 @@ module Jekyll
       
       self.process(name)
       self.read_yaml(File.join(base, dir), name)
-      self.transform
+      #self.transform
     end
     
     # Extract information from the post filename

data/lib/jekyll/post.rb

@@ -32,7 +32,8 @@ module Jekyll
       
       self.process(name)
       self.read_yaml(base, name)
-      self.transform
+      #Removed to avoid munging of liquid tags, replaced in convertible.rb#48
+      #self.transform
     end
     
     # Spaceship is based on Post#date
@@ -82,8 +83,10 @@ module Jekyll
     # Returns [<Post>]
     def related_posts(posts)
       self.class.lsi ||= begin
+        puts "Running the classifier... this could take a while."
         lsi = Classifier::LSI.new
-        posts.each { |x| lsi.add_item(x) }
+        posts.each { |x| $stdout.print(".");$stdout.flush;lsi.add_item(x) }
+        puts ""
         lsi
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-22 00:00:00 -08:00
+date: 2008-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rdiscount
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: directory_watcher
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -71,15 +91,14 @@ files:
 - jekyll.gemspec
 - lib/jekyll.rb
 - lib/jekyll/convertible.rb
+- lib/jekyll/converters/csv.rb
+- lib/jekyll/converters/mephisto.rb
 - lib/jekyll/filters.rb
+- lib/jekyll/blocks.rb
 - lib/jekyll/layout.rb
 - lib/jekyll/page.rb
 - lib/jekyll/post.rb
 - lib/jekyll/site.rb
-- test/dest/2008/10/18/foo-bar.html
-- test/dest/2008/11/21/complex.html
-- test/dest/css/screen.css
-- test/dest/index.html
 - test/helper.rb
 - test/source/_layouts/default.html
 - test/source/_layouts/simple.html

data/test/dest/2008/10/18/foo-bar.html

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-   <title>Foo Bar</title>
-   <meta name="author" content="<%= @page.author %>" />
-
-   <!-- CodeRay syntax highlighting CSS -->
-   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
-
-   <!-- Homepage CSS -->
-   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
-</head>
-<body>
-
-<div class="site">
-  <div class="title">
-    Tom Preston-Werner
-  </div>
-  
-  <h1>Foo Bar</h1>
-<p>Best <strong>post</strong> ever</p>
-</div>
-
-</body>
-</html>

data/test/dest/2008/11/21/complex.html

@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-   <title>Complex</title>
-   <meta name="author" content="<%= @page.author %>" />
-
-   <!-- CodeRay syntax highlighting CSS -->
-   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
-
-   <!-- Homepage CSS -->
-   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
-</head>
-<body>
-
-<div class="site">
-  <div class="title">
-    Tom Preston-Werner
-  </div>
-  
-  <p>url: /2008/11/21/complex.html<br />
-date: Fri Nov 21 00:00:00 -0800 2008<br />
-id: /2008/11/21/complex</p>
-</div>
-
-</body>
-</html>

data/test/dest/css/screen.css

@@ -1,76 +0,0 @@
-/*****************************************************************************/
-/*
-/* Common
-/*
-/*****************************************************************************/
-
-/* Global Reset */
-
-* {
-  margin: 0;
-  padding: 0;
-}
-
-html, body {
-  height: 100%;
-}
-
-body {
-  background-color: white;
-  font: 13.34px helvetica, arial, clean, sans-serif;
-  *font-size: small;
-  text-align: center;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  font-size: 100%;
-}
-
-h1 {
-  margin-bottom: 1em;
-}
-
-p {
-  margin: 1em 0;
-}
-
-a {
-  color: #00a;
-}
-
-a:hover {
-  color: black;
-}
-
-a:visited {
-  color: #a0a;
-}
-
-table {
-  font-size: inherit;
-  font: 100%;
-}
-
-/*****************************************************************************/
-/*
-/* Site
-/*
-/*****************************************************************************/
-
-.site {
-  font-size: 110%;
-  text-align: justify;
-  width: 40em;
-  margin: 3em auto 2em auto;
-  line-height: 1.5em;
-}
-
-.title {
-  color: #a00;
-  font-weight: bold;
-  margin-bottom: 2em;
-}
-
-.site .meta {
-  color: #aaa;
-}

data/test/dest/index.html

@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-   <title>Tom Preston-Werner</title>
-   <meta name="author" content="<%= @page.author %>" />
-
-   <!-- CodeRay syntax highlighting CSS -->
-   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
-
-   <!-- Homepage CSS -->
-   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
-</head>
-<body>
-
-<div class="site">
-  <div class="title">
-    Tom Preston-Werner
-  </div>
-  
-  
-h1. Welcome to my site
-
-<ul>
-  
-    <li>Fri Nov 21 00:00:00 -0800 2008 <a href="/2008/11/21/complex.html">Complex</a></li>
-  
-    <li>Sat Oct 18 00:00:00 -0700 2008 <a href="/2008/10/18/foo-bar.html">Foo Bar</a></li>
-  
-</ul>
-</div>
-
-</body>
-</html>