spulec · January 13, 2023 02:26 · Mar 10, 2014 · Oct 22, 2012 · Nov 15, 2011 · Nov 14, 2011
diff --git a/pre-commit b/pre-commit
@@ -5,7 +5,7 @@ import re
 import subprocess
 import sys
 
-modified = re.compile('^(?:M|A)(\s+)(?P<name>.*)')
+modified = re.compile('^[MA]\s+(?P<name>.*)$')
 
 CHECKS = [
     {

diff --git a/pre-commit b/pre-commit
@@ -122,7 +122,7 @@ def main(all_files):
 
     # Unstash changes to the working tree that we had stashed
     subprocess.call(['git', 'reset', '--hard'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    subprocess.call(['git', 'stash', 'pop', '-q'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    subprocess.call(['git', 'stash', 'pop', '--quiet', '--index'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     sys.exit(result)
 
 

diff --git a/pre-commit b/pre-commit
@@ -121,6 +121,7 @@ def main(all_files):
         result = check_files(files, check) or result
 
     # Unstash changes to the working tree that we had stashed
+    subprocess.call(['git', 'reset', '--hard'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     subprocess.call(['git', 'stash', 'pop', '-q'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     sys.exit(result)
 

diff --git a/pre-commit b/pre-commit
@@ -95,6 +95,7 @@ def check_files(files, check):
 
 
 def main(all_files):
+    # Stash any changes to the working tree that are not going to be committed
     subprocess.call(['git', 'stash', '-u', '--keep-index'], stdout=subprocess.PIPE)
 
     files = []
@@ -119,6 +120,7 @@ def main(all_files):
     for check in CHECKS:
         result = check_files(files, check) or result
 
+    # Unstash changes to the working tree that we had stashed
     subprocess.call(['git', 'stash', 'pop', '-q'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     sys.exit(result)
 

diff --git a/pre-commit b/pre-commit
@@ -95,7 +95,7 @@ def check_files(files, check):
 
 
 def main(all_files):
-    subprocess.check_call(['git', 'stash', '-u', '--keep-index'], stdout=subprocess.PIPE)
+    subprocess.call(['git', 'stash', '-u', '--keep-index'], stdout=subprocess.PIPE)
 
     files = []
     if all_files:
@@ -119,7 +119,7 @@ def main(all_files):
     for check in CHECKS:
         result = check_files(files, check) or result
 
-    subprocess.check_call(['git', 'stash', 'pop', '-q'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    subprocess.call(['git', 'stash', 'pop', '-q'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     sys.exit(result)
 
 

diff --git a/pre-commit b/pre-commit
@@ -0,0 +1,130 @@
+#!/usr/bin/env python
+
+import os
+import re
+import subprocess
+import sys
+
+modified = re.compile('^(?:M|A)(\s+)(?P<name>.*)')
+
+CHECKS = [
+    {
+        'output': 'Checking for pdbs...',
+        'command': 'grep -n "import pdb" %s',
+        'ignore_files': ['.*pre-commit'],
+        'print_filename': True,
+    },
+    {
+        'output': 'Checking for ipdbs...',
+        'command': 'grep -n "import ipdb" %s',
+        'ignore_files': ['.*pre-commit'],
+        'print_filename': True,
+    },
+    {
+        'output': 'Checking for print statements...',
+        'command': 'grep -n print %s',
+        'match_files': ['.*\.py$'],
+        'ignore_files': ['.*migrations.*', '.*management/commands.*', '.*manage.py', '.*/scripts/.*'],
+        'print_filename': True,
+    },
+    {
+        'output': 'Checking for console.log()...',
+        'command': 'grep -n console.log %s',
+        'match_files': ['.*yipit/.*\.js$'],
+        'print_filename': True,
+    },
+    {
+        'output': 'Checking for debugger...',
+        'command': 'grep -n debugger %s',
+        'match_files': ['.*\.js$'],
+        'print_filename': True,
+    },
+    {
+       'output': 'Running Jshint...',
+       # By default, jshint prints 'Lint Free!' upon success. We want to filter this out.
+       'command': 'jshint %s | grep -v "Lint Free!"',
+       'match_files': ['.*yipit/.*\.js$'],
+       'print_filename': False,
+    },
+    {
+        'output': 'Running Pyflakes...',
+        'command': 'pyflakes %s',
+        'match_files': ['.*\.py$'],
+        'ignore_files': ['.*settings/.*', '.*manage.py', '.*migrations.*', '.*/terrain/.*'],
+        'print_filename': False,
+    },
+    {
+        'output': 'Running pep8...',
+        'command': 'pep8 -r --ignore=E501,W293 %s',
+        'match_files': ['.*\.py$'],
+        'ignore_files': ['.*migrations.*'],
+        'print_filename': False,
+    },
+    {
+        'output': 'Checking for Sass changes...',
+        'command': 'sass --quiet --update %s',
+        'match_files': ['.*\.scss$'],
+        'print_filename': True,
+    },
+]
+
+
+def matches_file(file_name, match_files):
+    return any(re.compile(match_file).match(file_name) for match_file in match_files)
+
+
+def check_files(files, check):
+    result = 0
+    print check['output']
+    for file_name in files:
+        if not 'match_files' in check or matches_file(file_name, check['match_files']):
+            if not 'ignore_files' in check or not matches_file(file_name, check['ignore_files']):
+                process = subprocess.Popen(check['command'] % file_name, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+                out, err = process.communicate()
+                if out or err:
+                    if check['print_filename']:
+                        prefix = '\t%s:' % file_name
+                    else:
+                        prefix = '\t'
+                    output_lines = ['%s%s' % (prefix, line) for line in out.splitlines()]
+                    print '\n'.join(output_lines)
+                    if err:
+                        print err
+                    result = 1
+    return result
+
+
+def main(all_files):
+    subprocess.check_call(['git', 'stash', '-u', '--keep-index'], stdout=subprocess.PIPE)
+
+    files = []
+    if all_files:
+        for root, dirs, file_names in os.walk('.'):
+            for file_name in file_names:
+                files.append(os.path.join(root, file_name))
+    else:
+        p = subprocess.Popen(['git', 'status', '--porcelain'], stdout=subprocess.PIPE)
+        out, err = p.communicate()
+        for line in out.splitlines():
+            match = modified.match(line)
+            if match:
+                files.append(match.group('name'))
+
+    result = 0
+
+    print 'Running Django Code Validator...'
+    return_code = subprocess.call('$VIRTUAL_ENV/bin/python manage.py validate', shell=True)
+    result = return_code or result
+
+    for check in CHECKS:
+        result = check_files(files, check) or result
+
+    subprocess.check_call(['git', 'stash', 'pop', '-q'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    sys.exit(result)
+
+
+if __name__ == '__main__':
+    all_files = False
+    if len(sys.argv) > 1 and sys.argv[1] == '--all-files':
+        all_files = True
+    main(all_files)