résolution conflit

[gestion-adh.git] / bin / update-ag-subscribers

diff --git a/bin/update-ag-subscribers b/bin/update-ag-subscribers
index f10978ebc0fb26a5c657a4d6f722e48bf4a49281..643e86223a3ccf4ddc5ff3dad8da8797a21dd86d 100755 (executable)
--- a/bin/update-ag-subscribers
+++ b/bin/update-ag-subscribers
@@ -1,17 +1,26 @@
-#!/usr/bin/ruby1.9.1
+#!/usr/bin/ruby
 #-*- coding: utf-8 -*-
+#
+# Système de gestion des adhésions de Nos oignons
+# Copyright © 2013-2014 Nos oignons <contact@nos-oignons.net>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-require 'nos_oignons/mailman'
-require 'nos_oignons/subscriptions'
+require 'nos_oignons'
 
-LIST = 'ag'
-
-current_emails = NosOignons::Mailman.list_members(LIST)
-uptodate_emails = NosOignons::Subscription.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)
+NosOignons.update_ag_subscribers!