From 35ef90ac66a075b32abde6d0b8727d153fcbc66f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 8 Nov 2013 17:42:37 -0500
Subject: [PATCH] Check if JekyllImport is defined using Object#const_defined?

---
 bin/jekyll | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/jekyll b/bin/jekyll
index 47b613fb..977f72f2 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -121,12 +121,12 @@ Mercenary.program(:jekyll) do |p|
 
     begin
       require 'jekyll-import'
-    rescue LoadError
       JekyllImport.add_importer_commands(c)
+    rescue LoadError
     end
 
     c.action do |args, options|
-      if defined?(JekyllImport)
+      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