From 17816d1bec863ca4156d79a9ff19eed23a26c614 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 1 Mar 2018 17:45:13 -0800 Subject: [PATCH] Don't fail if rake not loaded [skip ci] --- lib/searchkick.rb | 8 +++++++- lib/searchkick/tasks.rb | 4 ---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/searchkick.rb b/lib/searchkick.rb index f1c2dc7..99850a5 100644 --- a/lib/searchkick.rb +++ b/lib/searchkick.rb @@ -11,11 +11,17 @@ require "searchkick/results" require "searchkick/query" require "searchkick/multi_search" require "searchkick/model" -require "searchkick/tasks" require "searchkick/middleware" require "searchkick/logging" if defined?(ActiveSupport::Notifications) require "active_support/core_ext/hash/deep_merge" +begin + require "rake" +rescue LoadError + # do nothing +end +require "searchkick/tasks" if defined?(Rake) + # background jobs begin require "active_job" diff --git a/lib/searchkick/tasks.rb b/lib/searchkick/tasks.rb index e80d151..b118fd8 100644 --- a/lib/searchkick/tasks.rb +++ b/lib/searchkick/tasks.rb @@ -1,5 +1,3 @@ -require "rake" - namespace :searchkick do desc "reindex model" task reindex: :environment do @@ -16,7 +14,6 @@ namespace :searchkick do end if defined?(Rails) - namespace :reindex do desc "reindex all models" task all: :environment do @@ -28,6 +25,5 @@ namespace :searchkick do puts "Reindex complete" end end - end end -- libgit2 0.21.0