jekyll 0.12.1 → 1.0.0.beta1

data/CONTRIBUTING.md

@@ -0,0 +1,67 @@
+Contribute
+==========
+
+So you've got an awesome idea to throw into Jekyll. Great! Please keep the
+following in mind:
+
+* **Contributions will not be accepted without tests.**
+* If you're creating a small fix or patch to an existing feature, just a simple
+  test will do. Please stay in the confines of the current test suite and use
+  [Shoulda](http://github.com/thoughtbot/shoulda/tree/master) and
+  [RR](http://github.com/btakita/rr/tree/master).
+* If it's a brand new feature, make sure to create a new
+  [Cucumber](https://github.com/cucumber/cucumber/) feature and reuse steps
+  where appropriate. Also, whipping up some documentation in your fork's wiki
+  would be appreciated, and once merged it will be transferred over to the main
+  wiki.
+* If your contribution changes any Jekyll behavior, make sure to update the
+  documentation. It lives in site/_posts. If the docs are missing information,
+  please feel free to add it in. Great docs make a great project!
+* Please follow the [Github Ruby Styleguide](https://github.com/styleguide/ruby) when modifying Ruby code.
+
+Test Dependencies
+-----------------
+
+To run the test suite and build the gem you'll need to install Jekyll's
+dependencies. Jekyll uses Bundler, so a quick run of the bundle command and
+you're all set!
+
+    $ bundle
+
+Before you start, run the tests and make sure that they pass (to confirm your
+environment is configured properly):
+
+    $ rake test
+    $ rake features
+
+Workflow
+--------
+
+Here's the most direct way to get your work merged into the project:
+
+* Fork the project.
+* Clone down your fork ( `git clone git://github.com/<username>/jekyll.git` ).
+* Create a topic branch to contain your change ( `git checkout -b my_awesome_feature` ).
+* Hack away, add tests. Not necessarily in that order.
+* Make sure everything still passes by running `rake`.
+* If necessary, rebase your commits into logical chunks, without errors.
+* Push the branch up ( `git push origin my_awesome_feature` ).
+* Create a pull request against mojombo/jekyll and describe what your change
+  does and the why you think it should be merged.
+
+Gotchas
+-------
+
+* If you want to bump the gem version, please put that in a separate commit.
+  This way, the maintainers can control when the gem gets released.
+* Try to keep your patch(es) based from the latest commit on mojombo/jekyll.
+  The easier it is to apply your work, the less work the maintainers have to do,
+  which is always a good thing.
+* Please don't tag your GitHub issue with [fix], [feature], etc. The maintainers
+  actively read the issues and will label it once they come across it.
+
+Finally...
+----------
+
+Thanks! Hacking on Jekyll should be fun. If you find any of this hard to figure
+out, let us know so we can improve our process or documentation!

data/Gemfile

@@ -1,2 +1,2 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 gemspec

data/History.txt

@@ -1,10 +1,53 @@
-== 0.12.1 / 2013-02-19
+== HEAD
+  * Major Enhancements
+    * Refactored jekyll commands into subcommands: build, serve, and migrate. (#690)
+    * Removed importers/migrators from main project, migrated to jekyll-import sub-gem (#793)
+    * Added ability to render drafts in _drafts folder via command line (#833)
   * Minor Enhancements
-    * Update Kramdown version to 0.14 (#744, #808)
-  * Test Enhancements
-    * Update Rake version to 10.0.3 (#744)
-    * Update Shoulda version to 3.3.2 (#744)
-    * Update Redcarpet version to 2.2.2 (#744)
+    * Load in Apache MIME Types on `jekyll serve` (#847)
+    * Improve debugability of error message for a malformed highlight tag (#785)
+    * Allow symlinked files in unsafe mode (#824)
+    * Add 'gist' liquid tag to core (#822)
+    * New format of Jekyll output (#795)
+    * Reinstate --limit_posts and --future switches (#788)
+    * Remove ambiguity from command descriptions (#815)
+    * Fix SafeYAML Warnings (#807)
+    * Relaxed Kramdown version to 0.14 (#808)
+    * Aliased `jekyll server` to `jekyll serve`. (#792)
+    * Updated gem versions for Kramdown, Rake, Shoulda, Cucumber, and RedCarpet. (#744)
+    * Refactored jekyll subcommands into Jekyll::Commands submodule, which now contains them (#768)
+    * Rescue from import errors in Wordpress.com migrator (#671)
+    * Massively accelerate LSI performance (#664)
+    * Truncate post slugs when importing from Tumblr (#496)
+    * Add glob support to include, exclude option (#743)
+    * Layout of Page or Post defaults to 'page' or 'post', respectively (#580)
+    * "Keep files" feature (#685)
+    * Output full path & name for files that don't parse (#745)
+    * Add source and destination directory protection (#535)
+    * Better YAML error message (#718)
+  * Bug Fixes
+    * Fixed Page#dir and Page#url for edge cases (#536)
+    * Fix broken post_url with posts with a time in their YAML Front-Matter (#831)
+    * Look for plugins under the source directory (#654)
+    * Tumblr Migrator: finds _posts dir correctly, fixes truncation of long
+      post names (#775)
+    * Force Categories to be Strings (#767)
+    * Safe YAML plugin to prevent vulnerability (#777)
+    * Add SVG support to Jekyll/WEBrick. (#407, #406)
+    * Prevent custom destination from causing continuous regen on watch (#528, #820)
+  * Site Enhancements
+    * Bring site into master branch with better preview/deploy (#709)
+    * Redesigned site (#583)
+  * Development fixes
+    * Added "features:html" rake task for debugging purposes, cleaned up
+      cucumber profiles (#832)
+    * Explicitly require HTTPS rubygems source in Gemfile (#826)
+    * Changed Ruby version for development to 1.9.3-p374 from p362 (#801)
+    * Including a link to the GitHub Ruby style guide in CONTRIBUTING.md (#806)
+    * Added script/bootstrap (#776)
+    * Running Simplecov under 2 conditions: ENV(COVERAGE)=true and with Ruby version
+      of greater than 1.9 (#771)
+    * Switch to Simplecov for coverage report (#765)
 
 == 0.12.0 / 2012-12-22
   * Minor Enhancements
@@ -15,6 +58,7 @@
     * Allow multiple plugin dirs to be specified (#438)
     * Inline TOC token support for RDiscount (#333)
     * Add the option to specify the paginated url format (#342)
+    * Swap out albino for pygments.rb (#569)
     * Support Redcarpet 2 and fenced code blocks (#619)
     * Better reporting of Liquid errors (#624)
   * Bug Fixes

data/README.textile

@@ -1,5 +1,7 @@
 h1. Jekyll
 
+!https://travis-ci.org/mojombo/jekyll.png?branch=master!:https://travis-ci.org/mojombo/jekyll
+
 By Tom Preston-Werner, Nick Quaranto, and many awesome contributors!
 
 Jekyll is a simple, blog aware, static site generator. It takes a template directory (representing the raw form of a website), runs it through Textile or Markdown and Liquid converters, and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind "GitHub Pages":http://pages.github.com, which you can use to host your project's page or blog right here from GitHub.
@@ -19,22 +21,24 @@ h2. Diving In
 * Put information on your site with "Template Data":http://wiki.github.com/mojombo/jekyll/template-data
 * Customize the "Permalinks":http://wiki.github.com/mojombo/jekyll/permalinks your posts are generated with
 * Use the built-in "Liquid Extensions":http://wiki.github.com/mojombo/jekyll/liquid-extensions to make your life easier
+* Use custom "Plugins":http://wiki.github.com/mojombo/jekyll/Plugins to generate content specific to your site
 
 h2. Runtime Dependencies
 
-* RedCloth: Textile support (Ruby)
-* Liquid: Templating system (Ruby)
 * Classifier: Generating related posts (Ruby)
-* Maruku: Default markdown engine (Ruby)
 * Directory Watcher: Auto-regeneration of sites (Ruby)
+* Kramdown: Markdown-superset converter (Ruby)
+* Liquid: Templating system (Ruby)
+* Maruku: Default markdown engine (Ruby)
 * Pygments: Syntax highlighting (Python)
 
 h2. Developer Dependencies
 
-* Shoulda: Test framework (Ruby)
-* RR: Mocking (Ruby)
-* RedGreen: Nicer test output (Ruby)
 * RDiscount: Discount Markdown Processor (Ruby)
+* RedCloth: Textile support (Ruby)
+* RedGreen: Nicer test output (Ruby)
+* RR: Mocking (Ruby)
+* Shoulda: Test framework (Ruby)
 
 h2. License
 

data/Rakefile

@@ -55,14 +55,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-desc "Generate RCov test coverage and open in your browser"
-task :coverage do
-  require 'rcov'
-  sh "rm -fr coverage"
-  sh "rcov test/test_*.rb"
-  sh "open coverage/index.html"
-end
-
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -71,6 +63,21 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features) do |t|
+    t.profile = "travis"
+  end
+  Cucumber::Rake::Task.new(:"features:html", "Run Cucumber features and produce HTML output") do |t|
+    t.profile = "html_report"
+  end
+rescue LoadError
+  desc 'Cucumber rake task not available'
+  task :features do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end
+
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -r ./lib/#{name}.rb"
@@ -78,34 +85,67 @@ end
 
 #############################################################################
 #
-# Custom tasks (add your own tasks here)
+# Site tasks - http://jekyllrb.com
 #
 #############################################################################
 
-namespace :migrate do
-  desc "Migrate from mephisto in the current directory"
-  task :mephisto do
-    sh %q(ruby -r './lib/jekyll/migrators/mephisto' -e 'Jekyll::Mephisto.postgres(:database => "#{ENV["DB"]}")')
-  end
-  desc "Migrate from Movable Type in the current directory"
-  task :mt do
-    sh %q(ruby -r './lib/jekyll/migrators/mt' -e 'Jekyll::MT.process("#{ENV["DB"]}", "#{ENV["USER"]}", "#{ENV["PASS"]}")')
-  end
-  desc "Migrate from Typo in the current directory"
-  task :typo do
-    sh %q(ruby -r './lib/jekyll/migrators/typo' -e 'Jekyll::Typo.process("#{ENV["DB"]}", "#{ENV["USER"]}", "#{ENV["PASS"]}")')
+namespace :site do
+  desc "Generate and view the site locally"
+  task :preview do
+    require "launchy"
+
+    # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and
+    # then open it in a browser. Someday we can do better than this, I hope.
+    Thread.new do
+      sleep 4
+      puts "Opening in browser..."
+      Launchy.open("http://localhost:4000")
+    end
+
+    # Generate the site in server mode.
+    puts "Running Jekyll..."
+    Dir.chdir("site") do
+      sh "#{File.expand_path('bin/jekyll', File.dirname(__FILE__))} serve --watch"
+    end
   end
-end
 
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = "--format progress"
-  end
-rescue LoadError
-  desc 'Cucumber rake task not available'
-  task :features do
-    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
+  task :publish do
+    # Failsafe. Remove this once it has been done.
+    puts "Make sure to merge #583 into gh-pages before deploying."
+    exit(1)
+
+    # Ensure the gh-pages dir exists so we can generate into it.
+    puts "Checking for gh-pages dir..."
+    unless File.exist?("./gh-pages")
+      puts "No gh-pages directory found. Run the following commands first:"
+      puts "  `git clone git@github.com:mojombo/jekyll gh-pages"
+      puts "  `cd gh-pages"
+      puts "  `git checkout gh-pages`"
+      exit(1)
+    end
+
+    # Ensure gh-pages branch is up to date.
+    Dir.chdir('gh-pages') do
+      sh "git pull origin gh-pages"
+    end
+
+    # Copy to gh-pages dir.
+    puts "Copying site to gh-pages branch..."
+    Dir.glob("site/*") do |path|
+      next if path == "_site"
+      sh "cp -R #{path} gh-pages/"
+    end
+
+    # Commit and push.
+    puts "Committing and pushing to GitHub Pages..."
+    sha = `git log`.match(/[a-z0-9]{40}/)[0]
+    Dir.chdir('gh-pages') do
+      sh "git add ."
+      sh "git commit -m 'Updating to #{sha}.'"
+      sh "git push origin gh-pages"
+    end
+    puts 'Done.'
   end
 end
 
@@ -116,15 +156,13 @@ end
 #############################################################################
 
 task :release => :build do
-  branch = if `git branch` =~ /^\* (.+)$/
-    $1
-  else
-    puts "Doesn't look like you're on any branch. It's too unsafe to release."
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
     exit!
   end
   sh "git commit --allow-empty -m 'Release #{version}'"
   sh "git tag v#{version}"
-  sh "git push origin #{branch}"
+  sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
 end

data/bin/jekyll

@@ -1,299 +1,101 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+$:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
 
-help = <<HELP
-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 import <importer name> <options>                  # imports posts using named import script
-  
-  Configuration is read from '<source>/_config.yml' but can be overriden
-  using the following options:
-
-HELP
-
-require 'optparse'
+require 'commander/import'
 require 'jekyll'
 
-
-exec = {}
-options = {}
-opts = OptionParser.new do |opts|
-  opts.banner = help
-
-  opts.on("--file [PATH]", "File to import from") do |import_file|
-    options['file'] = import_file
-  end
-  
-  opts.on("--dbname [TEXT]", "DB to import from") do |import_dbname|
-    options['dbname'] = import_dbname
-  end
-  
-  opts.on("--user [TEXT]", "Username to use when importing") do |import_user|
-    options['user'] = import_user
-  end
-  
-  opts.on("--pass [TEXT]", "Password to use when importing") do |import_pass|
-    options['pass'] = import_pass
-  end
-  
-  opts.on("--host [HOST ADDRESS]", "Host to import from") do |import_host|
-    options['host'] = import_host
-  end
-  
-  opts.on("--site [SITE NAME]", "Site to import from") do |import_site|
-    options['site'] = import_site
-  end
-  
-
-  opts.on("--[no-]safe", "Safe mode (default unsafe)") do |safe|
-    options['safe'] = safe
-  end
-
-  opts.on("--[no-]auto", "Auto-regenerate") do |auto|
-    options['auto'] = auto
-  end
-
-  opts.on("--server [PORT]", "Start web server (default port 4000)") do |port|
-    options['server'] = true
-    options['server_port'] = port unless port.nil?
-  end
-
-  opts.on("--no-server", "Do not start a web server") do |part|
-    options['server'] = false
-  end
-
-  opts.on("--base-url [BASE_URL]", "Serve website from a given base URL (default '/'") do |baseurl|
-      options['baseurl'] = baseurl
-  end
-
-  opts.on("--default-mimetype [MT]", "Mimetype to use when no file extension (if --server)") do |mt|
-      options['default-mimetype'] = mt
-  end
-
-  opts.on("--[no-]lsi", "Use LSI for better related posts") do |lsi|
-    options['lsi'] = lsi
-  end
-
-  opts.on("--[no-]pygments", "Use pygments to highlight code") do |pygments|
-    options['pygments'] = pygments
-  end
-
-  opts.on("--rdiscount", "Use rdiscount gem for Markdown") do
-    options['markdown'] = 'rdiscount'
-  end
-  
-  opts.on("--redcarpet", "Use redcarpet gem for Markdown") do
-    options['markdown'] = 'redcarpet'
-  end
-
-  opts.on("--kramdown", "Use kramdown gem for Markdown") do
-    options['markdown'] = 'kramdown'
-  end
-
-  opts.on("--time [TIME]", "Time to generate the site for") do |time|
-    options['time'] = Time.parse(time)
-  end
-
-  opts.on("--[no-]future", "Render future dated posts") do |future|
-    options['future'] = future
-  end
-
-  opts.on("--permalink [TYPE]", "Use 'date' (default) for YYYY/MM/DD") do |style|
-    options['permalink'] = style unless style.nil?
-  end
-
-  opts.on("--paginate [POSTS_PER_PAGE]", "Paginate a blog's posts") do |per_page|
-    begin
-      options['paginate'] = per_page.to_i
-      raise ArgumentError if options['paginate'] == 0
-    rescue
-      puts 'you must specify a number of posts by page bigger than 0'
-      exit 0
-    end
-  end
-
-  opts.on("--paginate_path [PAGINATED_URL_FORMAT]", "Leave blank for /page<num>") do |paginate_path|
-    begin
-      options['paginate_path'] = paginate_path
-      raise ArgumentError if options['paginate_path'].nil?
-    rescue
-      puts 'You must specify a pagination url format'
-      exit 0
-    end
-  end
-
-  opts.on("--limit_posts [MAX_POSTS]", "Limit the number of posts to publish") do |limit_posts|
-    begin
-      options['limit_posts'] = limit_posts.to_i
-      raise ArgumentError if options['limit_posts'] < 1
-    rescue
-      puts 'you must specify a number of posts by page bigger than 0'
-      exit 0
-    end
-  end
-
-  opts.on("--url [URL]", "Set custom site.url") do |url|
-    options['url'] = url
-  end
-
-  opts.on("--version", "Display current version") do
-    puts "Jekyll " + Jekyll::VERSION
-    exit 0
-  end
-end
-
-# Read command line options into `options` hash
-opts.parse!
-
-
-# Check for import stuff
-if ARGV.size > 0
-  if ARGV[0] == 'import'
-    migrator = ARGV[1]
-
-    if migrator.nil?
-      puts "Invalid options. Run `jekyll --help` for assistance."
-      exit(1)
-    else
-      migrator = migrator.downcase
-    end
-
-    cmd_options = []
-    ['file', 'dbname', 'user', 'pass', 'host', 'site'].each do |p|
-      cmd_options << "\"#{options[p]}\"" unless options[p].nil?
-    end
-
-    # It's import time
-    puts "Importing..."
-    
-    # Ideally, this shouldn't be necessary. Maybe parse the actual
-    # src files for the migrator name?
-    migrators = {
-      :posterous => 'Posterous',
-      :wordpressdotcom => 'WordpressDotCom',
-      :wordpress => 'WordPress',
-      :csv => 'CSV',
-      :drupal => 'Drupal',
-      :enki => 'Enki',
-      :mephisto => 'Mephisto',
-      :mt => 'MT',
-      :textpattern => 'TextPattern',
-      :tumblr => 'Tumblr',
-      :typo => 'Typo'
-    }
-    
-    app_root = File.join(File.dirname(__FILE__), '..')
-    
-    require "#{app_root}/lib/jekyll/migrators/#{migrator}"
-    
-    if Jekyll.const_defined?(migrators[migrator.to_sym])
-      migrator_class = Jekyll.const_get(migrators[migrator.to_sym])
-      migrator_class.process(*cmd_options)
-    else
-      puts "Invalid migrator. Run `jekyll --help` for assistance."
-      exit(1)
-    end
-    
-    exit(0)
-  end
+program :name, 'jekyll'
+program :version, Jekyll::VERSION
+program :description, 'Jekyll is a blog-aware, static site generator in Ruby'
+
+default_command :help
+
+global_option '-s', '--source [DIR]', 'Source directory (defaults to ./)'
+global_option '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
+global_option '--safe', 'Safe mode (defaults to false)'
+global_option '--plugins', 'Plugins directory (defaults to ./_plugins)'
+global_option '--layouts', 'Layouts directory (defaults to ./_layouts)'
+
+# Option names don't always directly match the configuration value we'd like.
+# This method will rename options to match what Jekyll configuration expects.
+#
+# options - The Hash of options from Commander.
+#
+# Returns the normalized Hash.
+def normalize_options(options)
+  if drafts_state = options.delete(:drafts)
+    options[:show_drafts] = drafts_state
+  end
+  options
 end
 
+command :build do |c|
+  c.syntax = 'jekyll build [options]'
+  c.description = 'Build your site'
 
+  c.option '--future', 'Publishes posts with a future date'
+  c.option '--limit_posts MAX_POSTS', 'Limits the number of posts to parse and publish'
+  c.option '-w', '--watch', 'Watch for changes and rebuild'
+  c.option '--lsi', 'Use LSI for improved related posts'
+  c.option '--drafts', 'Render posts in the _drafts folder'
 
-# Get source and destination from command line
-case ARGV.size
-  when 0
-  when 1
-    options['destination'] = ARGV[0]
-  when 2
-    options['source']      = ARGV[0]
-    options['destination'] = ARGV[1]
-  else
-    puts "Invalid options. Run `jekyll --help` for assistance."
-    exit(1)
-end
-
-options = Jekyll.configuration(options)
-
-# Get source and destination directories (possibly set by config file)
-source      = options['source']
-destination = options['destination']
-
-# Files to watch
-def globs(source)
-  Dir.chdir(source) do
-    dirs = Dir['*'].select { |x| File.directory?(x) }
-    dirs -= ['_site']
-    dirs = dirs.map { |x| "#{x}/**/*" }
-    dirs += ['*']
+  c.action do |args, options|
+    options.defaults :serving => false
+    options = normalize_options(options.__hash__)
+    options = Jekyll.configuration(options)
+    Jekyll::Commands::Build.process(options)
   end
 end
 
-# Create the Site
-site = Jekyll::Site.new(options)
-
-# Run the directory watcher for auto-generation, if required
-if options['auto']
-  require 'directory_watcher'
+command :serve do |c|
+  c.syntax = 'jekyll serve [options]'
+  c.description = 'Serve your site locally'
 
-  puts "Auto-regenerating enabled: #{source} -> #{destination}"
+  c.option '--future', 'Publishes posts with a future date'
+  c.option '--limit_posts MAX_POSTS', 'Limits the number of posts to parse and publish'
+  c.option '-w', '--watch', 'Watch for changes and rebuild'
+  c.option '--lsi', 'Use LSI for improved related posts'
+  c.option '--drafts', 'Render posts in the _drafts folder'
 
-  dw = DirectoryWatcher.new(source)
-  dw.interval = 1
-  dw.glob = globs(source)
+  c.option '-p', '--port [PORT]', 'Port to listen on'
+  c.option '-h', '--host [HOST]', 'Host to bind to'
+  c.option '-b', '--baseurl [URL]', 'Base URL'
 
-  dw.add_observer do |*args|
-    t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-    puts "[#{t}] regeneration: #{args.size} files changed"
-    site.process
-  end
+  c.action do |args, options|
+    options.default :port => '4000',
+                    :host => '0.0.0.0',
+                    :baseurl => '/',
+                    :serving => true
 
-  dw.start
-
-  unless options['server']
-    loop { sleep 1000 }
-  end
-else
-  puts "Building site: #{source} -> #{destination}"
-  begin
-    site.process
-  rescue Jekyll::FatalException => e
-    puts
-    puts "ERROR: YOUR SITE COULD NOT BE BUILT:"
-    puts "------------------------------------"
-    puts e.message
-    exit(1)
+    options = normalize_options(options.__hash__)
+    options = Jekyll.configuration(options)
+    Jekyll::Commands::Build.process(options)
+    Jekyll::Commands::Serve.process(options)
   end
-  puts "Successfully generated site: #{source} -> #{destination}"
 end
+alias_command :server, :serve
 
-# Run the server on the specified port, if required
-if options['server']
-  require 'webrick'
-  include WEBrick
+command :import do |c|
+  c.syntax = 'jekyll import <platform> [options]'
+  c.description = 'Import your old blog to Jekyll'
 
-  FileUtils.mkdir_p(destination)
+  c.option '--source', 'Source file or URL to migrate from'
+  c.option '--file', 'File to migrate from'
+  c.option '--dbname', 'Database name to migrate from'
+  c.option '--user', 'Username to use when migrating'
+  c.option '--pass', 'Password to use when migrating'
+  c.option '--host', 'Host address to use when migrating'
 
-  mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
-  mime_types.store 'js', 'application/javascript'
-  if options['default-mimetype']
-    mime_types.store(nil, options['default-mimetype'])
+  c.action do |args, options|
+    begin
+      require 'jekyll-import'
+    rescue LoadError
+      msg  = "You must install the 'jekyll-import' gem before continuing.\n"
+      msg += "* Do this by running `gem install jekyll-import`.\n"
+      msg += "* Or if you need root privileges, run `sudo gem install jekyll-import`."
+      abort msg
+    end
+    Jekyll::Commands::Import.process(args.first, options)
   end
-
-  s = HTTPServer.new(
-    :Port            => options['server_port'],
-    :MimeTypes       => mime_types
-  )
-  s.mount(options['baseurl'], HTTPServlet::FileHandler, destination)
-  t = Thread.new {
-    s.start
-  }
-
-  trap("INT") { s.shutdown }
-  t.join()
 end