Commit 36f5d0af83b4eeb71ddb6fc0d4fb976c3d31af72
1 parent
6085d8b4
Exists in
master
and in
18 other branches
Don't fail if rake not loaded [skip ci]
Showing
2 changed files
with
7 additions
and
5 deletions
Show diff stats
lib/searchkick.rb
| @@ -11,11 +11,17 @@ require "searchkick/results" | @@ -11,11 +11,17 @@ require "searchkick/results" | ||
| 11 | require "searchkick/query" | 11 | require "searchkick/query" |
| 12 | require "searchkick/multi_search" | 12 | require "searchkick/multi_search" |
| 13 | require "searchkick/model" | 13 | require "searchkick/model" |
| 14 | -require "searchkick/tasks" | ||
| 15 | require "searchkick/middleware" | 14 | require "searchkick/middleware" |
| 16 | require "searchkick/logging" if defined?(ActiveSupport::Notifications) | 15 | require "searchkick/logging" if defined?(ActiveSupport::Notifications) |
| 17 | require "active_support/core_ext/hash/deep_merge" | 16 | require "active_support/core_ext/hash/deep_merge" |
| 18 | 17 | ||
| 18 | +begin | ||
| 19 | + require "rake" | ||
| 20 | +rescue LoadError | ||
| 21 | + # do nothing | ||
| 22 | +end | ||
| 23 | +require "searchkick/tasks" if defined?(Rake) | ||
| 24 | + | ||
| 19 | # background jobs | 25 | # background jobs |
| 20 | begin | 26 | begin |
| 21 | require "active_job" | 27 | require "active_job" |
lib/searchkick/tasks.rb
| 1 | -require "rake" | ||
| 2 | - | ||
| 3 | namespace :searchkick do | 1 | namespace :searchkick do |
| 4 | desc "reindex model" | 2 | desc "reindex model" |
| 5 | task reindex: :environment do | 3 | task reindex: :environment do |
| @@ -16,7 +14,6 @@ namespace :searchkick do | @@ -16,7 +14,6 @@ namespace :searchkick do | ||
| 16 | end | 14 | end |
| 17 | 15 | ||
| 18 | if defined?(Rails) | 16 | if defined?(Rails) |
| 19 | - | ||
| 20 | namespace :reindex do | 17 | namespace :reindex do |
| 21 | desc "reindex all models" | 18 | desc "reindex all models" |
| 22 | task all: :environment do | 19 | task all: :environment do |
| @@ -28,6 +25,5 @@ namespace :searchkick do | @@ -28,6 +25,5 @@ namespace :searchkick do | ||
| 28 | puts "Reindex complete" | 25 | puts "Reindex complete" |
| 29 | end | 26 | end |
| 30 | end | 27 | end |
| 31 | - | ||
| 32 | end | 28 | end |
| 33 | end | 29 | end |