From 975bcdec3a484960259e88c5d0b4d33c0e60da30 Mon Sep 17 00:00:00 2001 From: Benjamin Meichsner Date: Wed, 25 Sep 2013 11:57:22 +0200 Subject: [PATCH] Avoid send messages so STDOUT in rake silen mode. --- lib/tasks/foodsoft.rake | 11 ++++++++--- lib/tasks/multicoops.rake | 10 ++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/tasks/foodsoft.rake b/lib/tasks/foodsoft.rake index 04db66f9..df05c1fd 100644 --- a/lib/tasks/foodsoft.rake +++ b/lib/tasks/foodsoft.rake @@ -5,12 +5,12 @@ namespace :foodsoft do task :notify_upcoming_tasks => :environment do tasks = Task.where(done: false, due_date: 1.day.from_now.to_date) for task in tasks - puts "Send notifications for #{task.name} to .." + say "Send notifications for #{task.name} to .." for user in task.users begin Mailer.upcoming_tasks(user, task).deliver if user.settings.notify['upcoming_tasks'] == 1 rescue - puts "deliver aborted for #{user.email}.." + say "deliver aborted for #{user.email}.." end end end @@ -27,7 +27,7 @@ namespace :foodsoft do begin Mailer.not_enough_users_assigned(task, user).deliver rescue - puts "deliver aborted for #{user.email}" + say "deliver aborted for #{user.email}" end end end @@ -47,3 +47,8 @@ namespace :foodsoft do end end end + +# Helper +def say(message) + puts message unless Rake.application.options.silent +end diff --git a/lib/tasks/multicoops.rake b/lib/tasks/multicoops.rake index 621a0d54..130daf40 100644 --- a/lib/tasks/multicoops.rake +++ b/lib/tasks/multicoops.rake @@ -8,7 +8,7 @@ namespace :multicoops do task :run => :environment do task_to_run = ENV['TASK'] FoodsoftConfig.each_coop do |coop| - puts "Run '#{task_to_run}' for #{coop}" + say "Run '#{task_to_run}' for #{coop}" Rake::Task[task_to_run].execute end end @@ -17,8 +17,14 @@ namespace :multicoops do task :run_single => :environment do task_to_run = ENV['TASK'] FoodsoftConfig.select_foodcoop ENV['FOODCOOP'] - puts "Run '#{task_to_run}' for #{ENV['FOODCOOP']}" + say "Run '#{task_to_run}' for #{ENV['FOODCOOP']}" Rake::Task[task_to_run].execute end end + + +# Helper +def say(message) + puts message unless Rake.application.options.silent +end