X-Git-Url: https://nos-oignons.net/gitweb/gestion-adh.git/blobdiff_plain/9d982cb5d7f9abe598c8df3eefabe10501056110..6257d0524bfb1247f04538b9fde2a7ddb7b15d2a:/lib/nos_oignons.rb diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb index 26ffdc6..2a5d414 100644 --- a/lib/nos_oignons.rb +++ b/lib/nos_oignons.rb @@ -26,8 +26,10 @@ module NosOignons current_emails = NosOignons::Mailman.list_members(list) uptodate_emails = NosOignons::Member.all.select(&:up_to_date?).collect(&:email) - NosOignons::Mailman.add_members(list, uptodate_emails - current_emails) - NosOignons::Mailman.remove_members(list, current_emails - uptodate_emails) + emails_to_add = uptodate_emails - current_emails + NosOignons::Mailman.add_members(list, emails_to_add) unless emails_to_add.empty? + emails_to_remove = current_emails - uptodate_emails + NosOignons::Mailman.remove_members(list, emails_to_remove) unless emails_to_remove.empty? end def send_membership_reminders! @@ -62,7 +64,7 @@ module NosOignons begin # Use empty ref to get the index NosOignons::Member.read_from_git('', file) - rescue ArgumentError + rescue ArgumentError, Psych::SyntaxError $stderr.puts "Désolé : #{file} n'a pas le bon format !" exit 1 end @@ -78,7 +80,7 @@ module NosOignons next unless file.start_with?("#{NosOignons::MEMBERS_DB_DIR}/") begin NosOignons::Member.read_from_git(new_value, file) - rescue ArgumentError + rescue ArgumentError, Psych::SyntaxError $stderr.puts "Désolé : #{file} n'a pas le bon format !" exit 1 end