Commit 17816d1bec863ca4156d79a9ff19eed23a26c614
1 parent
33816459
Exists in
master
and in
19 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 | require "searchkick/query" |
12 | 12 | require "searchkick/multi_search" |
13 | 13 | require "searchkick/model" |
14 | -require "searchkick/tasks" | |
15 | 14 | require "searchkick/middleware" |
16 | 15 | require "searchkick/logging" if defined?(ActiveSupport::Notifications) |
17 | 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 | 25 | # background jobs |
20 | 26 | begin |
21 | 27 | require "active_job" | ... | ... |
lib/searchkick/tasks.rb
1 | -require "rake" | |
2 | - | |
3 | 1 | namespace :searchkick do |
4 | 2 | desc "reindex model" |
5 | 3 | task reindex: :environment do |
... | ... | @@ -16,7 +14,6 @@ namespace :searchkick do |
16 | 14 | end |
17 | 15 | |
18 | 16 | if defined?(Rails) |
19 | - | |
20 | 17 | namespace :reindex do |
21 | 18 | desc "reindex all models" |
22 | 19 | task all: :environment do |
... | ... | @@ -28,6 +25,5 @@ namespace :searchkick do |
28 | 25 | puts "Reindex complete" |
29 | 26 | end |
30 | 27 | end |
31 | - | |
32 | 28 | end |
33 | 29 | end | ... | ... |