X-Git-Url: https://www.nos-oignons.net/gitweb/gestion-adh.git/blobdiff_plain/3e57bb279787236b1349f6b1da2ecf61ed4211e0..4c730203fde2eb1d6fdcbe11542c6730d11124ae:/lib/nos_oignons.rb

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index d377775..694a87b 100644
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -2,15 +2,15 @@
 
 require 'nos_oignons/git'
 require 'nos_oignons/mailman'
-require 'nos_oignons/subscriptions'
+require 'nos_oignons/member'
 
 module NosOignons
   # The following class methods are all meant to be called as command-line scripts
   class << self
     def list_emails!
-      NosOignons::Subscription.all.each do |subscription|
-        if subscription.up_to_date?
-          puts subscription.email
+      NosOignons::Member.all.each do |member|
+        if member.up_to_date?
+          puts member.email
         end
       end
     end
@@ -18,7 +18,7 @@ module NosOignons
     MEMBER_MAILING_LIST = 'ag'
     def update_ag_subscribers!
       current_emails = NosOignons::Mailman.list_members(MEMBER_MAILING_LIST)
-      uptodate_emails = NosOignons::Subscription.all.select(&:up_to_date?).collect(&:email)
+      uptodate_emails = NosOignons::Member.all.select(&:up_to_date?).collect(&:email)
 
       NosOignons::Mailman.add_members(MEMBER_MAILING_LIST, uptodate_emails - current_emails)
       NosOignons::Mailman.remove_members(MEMBER_MAILING_LIST, current_emails - uptodate_emails)
@@ -34,10 +34,10 @@ module NosOignons
 
       IO.popen(['git', 'diff-index', '--cached', '--name-status', against]) do |io|
         NosOignons::Git.handle_modified_files(io) do |file|
-          next unless file.start_with?("#{NosOignons::SUBSCRIPTIONS_ROOT}/")
+          next unless file.start_with?("#{NosOignons::MEMBERS_ROOT}/")
           begin
             # Use empty ref to get the index
-            NosOignons::Subscription.read_from_git('', file)
+            NosOignons::Member.read_from_git('', file)
           rescue ArgumentError
             $stderr.puts "Désolé : #{file} n'a pas le bon format !"
             exit 1
@@ -51,9 +51,9 @@ module NosOignons
         old_value, new_value, ref_name = ref_line.rstrip.split(' ', 3)
         IO.popen(['git', 'diff', '--name-status', "#{old_value}..#{new_value}"]) do |io|
           NosOignons::Git.handle_modified_files(io) do |file|
-            next unless file.start_with?("#{NosOignons::SUBSCRIPTIONS_ROOT}/")
+            next unless file.start_with?("#{NosOignons::MEMBERS_ROOT}/")
             begin
-              NosOignons::Subscription.read_from_git(new_value, file)
+              NosOignons::Member.read_from_git(new_value, file)
             rescue ArgumentError
               $stderr.puts "Désolé : #{file} n'a pas le bon format !"
               exit 1