From 8e9644a8a26bbf55bc929586486f9888a00a9ab3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 16 Mar 2014 01:18:39 -0400
Subject: [PATCH] Have a list of blessed gems to require and load.

---
 bin/jekyll | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/bin/jekyll b/bin/jekyll
index 9a34ae1f..194295c8 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -6,6 +6,13 @@ $:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
 require 'jekyll'
 require 'mercenary'
 
+%w[jekyll-import].each do |blessed_gem|
+  begin
+    require blessed_gem
+  rescue LoadError
+  end
+end
+
 Jekyll::Deprecator.process(ARGV)
 
 Mercenary.program(:jekyll) do |p|
@@ -30,29 +37,4 @@ Mercenary.program(:jekyll) do |p|
       end
     end
   end
-
-  p.command(:import) do |c|
-    c.syntax 'import <platform> [options]'
-    c.description 'Import your old blog to Jekyll'
-    importers = []
-
-    begin
-      require 'jekyll-import'
-      importers = JekyllImport.add_importer_commands(c)
-    rescue LoadError
-    end
-
-    c.action do |args, options|
-      unless Object.const_defined?(:JekyllImport)
-        msg  = "You must install the 'jekyll-import' gem before continuing.\n"
-        msg += "* Please see the documentation at http://jekyllrb.com/docs/migrations/ for instructions.\n"
-        abort msg
-      end
-      if args.empty?
-        Jekyll.logger.warn "You must specify an importer."
-        Jekyll.logger.info "Valid options are:"
-        importers.each { |i| Jekyll.logger.info "*", "#{i}" }
-      end
-    end
-  end
 end