Merge pull request #73 from sk-/issue64

Print new lines between skipped comments and messages. Fixes #64.

Author: sk-

gitlint/__init__.py

@@ -56,6 +56,10 @@
 
 __VERSION__ = '0.0.6.1'
 
+ERROR = termcolor.colored('ERROR', 'red', attrs=('bold',))
+SKIPPED = termcolor.colored('SKIPPED', 'yellow', attrs=('bold',))
+OK = termcolor.colored('OK', 'green', attrs=('bold',))
+
 
 def find_invalid_filenames(filenames, repository_root):
     """Find files that does not exist, are not in the repo or are directories.
@@ -179,7 +183,7 @@ def main(argv, stdout=sys.stdout, stderr=sys.stderr):
     vcs, repository_root = get_vcs_root()
 
     if vcs is None:
-        stderr.write('fatal: Not a git repository' + os.linesep)
+        stderr.write('fatal: Not a git repository' + linesep)
         return 128
 
     commit = None
@@ -192,7 +196,7 @@ def main(argv, stdout=sys.stdout, stderr=sys.stderr):
         if invalid_filenames:
             invalid_filenames.append(('', ''))
             stderr.write(
-                os.linesep.join(invalid[1] for invalid in invalid_filenames))
+                linesep.join(invalid[1] for invalid in invalid_filenames))
             return 2
 
         changed_files = vcs.modified_files(repository_root,
@@ -213,9 +217,6 @@ def main(argv, stdout=sys.stdout, stderr=sys.stderr):
     gitlint_config = get_config(repository_root)
     json_result = {}
 
-    error = termcolor.colored('ERROR', 'red', attrs=('bold',))
-    skipped = termcolor.colored('SKIPPED', 'yellow', attrs=('bold',))
-
     for filename in sorted(modified_files.keys()):
         rel_filename = os.path.relpath(filename)
         if not json_output:
@@ -233,31 +234,30 @@ def main(argv, stdout=sys.stdout, stderr=sys.stderr):
             filename, modified_lines, gitlint_config)
         result = result[filename]
 
-        output = ''
+        output_lines = []
         if result.get('error'):
-            output += os.linesep.join(
-                '%s: %s' % (error, reason) for reason in result.get('error')
+            output_lines.extend(
+                '%s: %s' % (ERROR, reason) for reason in result.get('error')
             )
             linter_not_found = True
         if result.get('skipped'):
-            output += os.linesep.join(
-                '%s: %s' % (skipped, reason) for reason in result.get('skipped')
+            output_lines.extend(
+                '%s: %s' % (SKIPPED, reason) for reason in result.get('skipped')
             )
         if result.get('comments', []) == []:
-            if not output:
-                output += termcolor.colored('OK', 'green', attrs=('bold',))
+            if not output_lines:
+                output_lines.append(OK)
         else:
             files_with_problems += 1
-            messages = []
             for data in result['comments']:
                 formatted_message = format_comment(data)
-                messages.append(formatted_message)
+                output_lines.append(formatted_message)
                 data['formatted_message'] = formatted_message
-            output += os.linesep.join(messages)
 
         if json_output:
             json_result[filename] = result
         else:
+            output = linesep.join(output_lines)
             stdout.write(output)
             stdout.write(linesep + linesep)
 

test/unittest/test_gitlint.py

@@ -449,6 +449,34 @@ def test_main_with_valid_files_relative(self):
                           self.git_lint_config)]
             self.assertEqual(expected_calls, self.lint.call_args_list)
 
+    def test_main_errors_skipped_comments(self):
+        lint_response = {
+            self.filename: {
+                'error': ['error1', 'error2'],
+                'skipped': ['skipped1', 'skipped2'],
+                'comments': [{'message': 'msg1'}, {'message': 'msg2'}],
+            },
+            self.filename2: {
+                'comments': [],
+            }
+        }
+        self.lint.return_value = lint_response
+
+        with mock.patch('gitlint.find_invalid_filenames', return_value=[]), \
+                mock.patch('os.getcwd', return_value=self.root):
+            self.assertEqual(
+                1, gitlint.main(['git-lint', self.filename, self.filename2],
+                                stdout=self.stdout, stderr=None))
+            expected_output = os.linesep.join([
+                '\x1b[1m\x1b[31mERROR\x1b[0m: error1',
+                '\x1b[1m\x1b[31mERROR\x1b[0m: error2',
+                '\x1b[1m\x1b[33mSKIPPED\x1b[0m: skipped1',
+                '\x1b[1m\x1b[33mSKIPPED\x1b[0m: skipped2',
+                'msg1',
+                'msg2',
+            ])
+            self.assertIn(expected_output, self.stdout.getvalue())
+
     def test_get_config(self):
         git_config = os.path.join(self.root, '.gitlint.yaml')
         config = """python: