Finish implementing list-emails

diff --git a/bin/list-emails b/bin/list-emails
index 4c8a286f627792b0e12b0b64520abd8c2c7c9eb0..935bcd021a4b25043690fe547f64e7c8b6deda44 100755 (executable)
--- a/bin/list-emails
+++ b/bin/list-emails
@@ -10,7 +10,7 @@ require 'nos_oignons/subscriptions'
 subscriptions = read_subscriptions
 now = Time.now
 last_year = Time.new(now.year - 1, now.month, now.day).to_date
 subscriptions = read_subscriptions
 now = Time.now
 last_year = Time.new(now.year - 1, now.month, now.day).to_date

-subscriptions.each_pair do |subscription_id, data|
+subscriptions.sort.each do |subscription_id, data|

   if data['membership_fee_paid_on'] && last_year < data['membership_fee_paid_on']
     puts data['email']
   end
   if data['membership_fee_paid_on'] && last_year < data['membership_fee_paid_on']
     puts data['email']
   end

diff --git a/features/step_definitions/subscriptions.rb b/features/step_definitions/subscriptions.rb
index 571a2c2176fcd1aea20d4173a7ef8a92f4236d1f..a4827f51ca8446c6228a503605f353487e58ad21 100644 (file)
--- a/features/step_definitions/subscriptions.rb
+++ b/features/step_definitions/subscriptions.rb
@@ -4,7 +4,7 @@ Given /une base de membres vide$/ do
   create_dir 'Membres'
 end
 
   create_dir 'Membres'
 end
 

-Given /^une base avec (\w+)(, à jour de cotisation| qui n'a pas payé sa cotisation cette année)$/ do |name, uptodate|
+Given /^(?:une base )?avec (\w+)(, à jour de cotisation| qui n'a pas payé sa cotisation cette année)$/ do |name, uptodate|

   case uptodate
   when ', à jour de cotisation'
     # ± 1 month ago
   case uptodate
   when ', à jour de cotisation'
     # ± 1 month ago