Last step in pre-commit hook implementation

[gestion-adh.git] / bin / pre-commit-hook

diff --git a/bin/pre-commit-hook b/bin/pre-commit-hook
index 7d3d0e8f4c8fdbf30c3090afb9944b3191c190fd..317e5c55700322c4a3ffc3fea3c9620701d6bea4 100755 (executable)
--- a/bin/pre-commit-hook
+++ b/bin/pre-commit-hook
@@ -8,6 +8,8 @@ Bundler.setup
 require 'safe_yaml'
 SafeYAML::OPTIONS[:default_mode] = :safe
 
 require 'safe_yaml'
 SafeYAML::OPTIONS[:default_mode] = :safe
 

+SUBSCRIPTIONS_ROOT = 'Membres'
+

 if system('git rev-parse --quiet --verify HEAD >/dev/null')
   against = 'HEAD'
 else
 if system('git rev-parse --quiet --verify HEAD >/dev/null')
   against = 'HEAD'
 else


@@ -19,12 +21,15 @@ def is_valid_subscription?(content)
   return false if content.length == 0
   return false unless content.start_with?("---\n")
   begin
   return false if content.length == 0
   return false unless content.start_with?("---\n")
   begin

-    YAML.load(content)
-    true
+    data = YAML.load(content)

   rescue ArgumentError
     # Parse error
   rescue ArgumentError
     # Parse error

-    false
+    return false
+  end
+  ['name', 'email'].each do |key|
+    return false unless data.include?(key)

   end
   end

+  true

 end
 
 def is_valid_subscription_file?(file)
 end
 
 def is_valid_subscription_file?(file)


@@ -40,6 +45,7 @@ IO.popen(['git', 'diff-index', '--cached', '--name-status', against]) do |f|
     # Has file been added or modified?
     if ['A', 'M'].include?(status)
       modified << file
     # Has file been added or modified?
     if ['A', 'M'].include?(status)
       modified << file

+      next unless file.start_with?("#{SUBSCRIPTIONS_ROOT}/")

       if !is_valid_subscription_file?(file)
         $stderr.puts "Désolé : #{file} n'a pas le bon format !"
         exit 1
       if !is_valid_subscription_file?(file)
         $stderr.puts "Désolé : #{file} n'a pas le bon format !"
         exit 1