From 3c0cead47b0ff495952790eb6c09609b1e6d63fa Mon Sep 17 00:00:00 2001 From: Artem Rashev Date: Sat, 26 Jan 2019 13:00:15 +0300 Subject: [PATCH] Try app: task prefix on migration annotaiton Since Rails full engines run as non-namespaced applications but all their app-related tasks still prefixed with app:. --- lib/tasks/annotate_models_migrate.rake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/tasks/annotate_models_migrate.rake b/lib/tasks/annotate_models_migrate.rake index f5a259b22..e16e8820f 100644 --- a/lib/tasks/annotate_models_migrate.rake +++ b/lib/tasks/annotate_models_migrate.rake @@ -5,16 +5,21 @@ # run after doing db:migrate. namespace :db do + annotation_options_task = if Rake::Task.task_defined?('app:set_annotation_options') + 'app:set_annotation_options' + else + 'set_annotation_options' + end [:migrate, :rollback].each do |cmd| task cmd do - Rake::Task['set_annotation_options'].invoke + Rake::Task[annotation_options_task].invoke Annotate::Migration.update_annotations end namespace cmd do [:change, :up, :down, :reset, :redo].each do |t| task t do - Rake::Task['set_annotation_options'].invoke + Rake::Task[annotation_options_task].invoke Annotate::Migration.update_annotations end end @@ -46,6 +51,8 @@ module Annotate def self.update_routes if Rake::Task.task_defined?("annotate_routes") Rake::Task["annotate_routes"].invoke + elsif Rake::Task.task_defined?("app:annotate_routes") + Rake::Task["app:annotate_routes"].invoke end end end