-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15 from miki725/class-based
Modular refactor
- Loading branch information
Showing
10 changed files
with
518 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,3 +52,5 @@ coverage.xml | |
# Sphinx documentation | ||
docs/_build/ | ||
|
||
# IDEs | ||
.idea/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
from __future__ import unicode_literals, print_function | ||
|
||
|
||
class Flake8NotInstalledError(Exception): | ||
""" | ||
Exception when run_flake8 installation cannot be found. | ||
""" | ||
message = ('flake8 installation could not be found. ' | ||
'Is it on $PATH?') | ||
|
||
|
||
class NotLocatableVCSError(Exception): | ||
""" | ||
Exceptions for when VCS cannot be determined automatically | ||
""" | ||
message = 'VCS could not be determined automatically' | ||
|
||
|
||
class UnsupportedVCSError(Exception): | ||
""" | ||
Exception for handling unknown VCS | ||
""" | ||
|
||
def __init__(self, vcs=None): | ||
msg = '{0} VCS is not unsupported' | ||
self.message = msg.format(vcs) | ||
|
||
|
||
class VCSNotInstalledError(Exception): | ||
""" | ||
Exception for when particular vcs installation | ||
cannot be found. | ||
""" | ||
|
||
def __init__(self, vcs=None): | ||
msg = ('VCS "{0}" installation could not be found. ' | ||
'Is it on $PATH?') | ||
self.message = msg.format(vcs) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,192 @@ | ||
from __future__ import unicode_literals, print_function | ||
import logging | ||
import re | ||
from blessings import Terminal | ||
|
||
from .exceptions import ( | ||
Flake8NotInstalledError, | ||
NotLocatableVCSError, | ||
UnsupportedVCSError, | ||
) | ||
from .utils import _execute | ||
from .vcs import SUPPORTED_VCS | ||
|
||
|
||
terminal = Terminal() | ||
identity = lambda x: x | ||
|
||
logger = logging.getLogger(__name__) | ||
|
||
# Constants | ||
FLAKE8_OUTPUT = '{filename}:{line}:{char}: {code} {description}' | ||
HEADER_STRING = 'Found violations' | ||
HEADER_OUTPUT = '{header}: {filename}' | ||
SIMPLE_OUTPUT = '\t{code} @ {line}:{char} - {description}' | ||
|
||
# Regexes | ||
FLAKE8_LINE = re.compile( | ||
r'^(?P<filename>[^\s]+)' | ||
r':' | ||
r'(?P<line_number>[\d]+)' | ||
r':' | ||
r'(?P<char_number>[\d]+)' | ||
r': ' | ||
r'(?P<error_code>[\w\d]*) ' | ||
r'(?P<description>.*)', | ||
) | ||
|
||
# Color themes | ||
COLORS = { | ||
'off': dict( | ||
header=identity, | ||
filename=identity, | ||
code=identity, | ||
line=identity, | ||
char=identity, | ||
description=identity, | ||
), | ||
'nocolor': dict( | ||
header=terminal.bold_underline, | ||
filename=terminal.standout, | ||
code=terminal.bold, | ||
line=identity, | ||
char=identity, | ||
description=identity, | ||
), | ||
'colorful': dict( | ||
header=terminal.bold, | ||
filename=identity, | ||
code=terminal.bold_red, | ||
line=terminal.magenta, | ||
char=terminal.magenta, | ||
description=terminal.cyan, | ||
), | ||
'dark': dict( | ||
header=terminal.bold, | ||
filename=identity, | ||
code=terminal.bold_red, | ||
line=terminal.magenta, | ||
char=terminal.magenta, | ||
description=terminal.yellow, | ||
), | ||
'light': dict( | ||
header=terminal.bold, | ||
filename=identity, | ||
code=terminal.bold_red, | ||
line=terminal.magenta, | ||
char=terminal.magenta, | ||
description=terminal.blue, | ||
), | ||
} | ||
COLORS['boring'] = COLORS['off'].copy() | ||
|
||
|
||
class Flake8Diff(object): | ||
""" | ||
Main class implementing flake8-diff functionality | ||
""" | ||
|
||
def __init__(self, commits, options=None): | ||
self.commits = commits | ||
self.options = options | ||
|
||
try: | ||
self.flake8 = _execute('which flake8', strict=True).strip() | ||
except: | ||
raise Flake8NotInstalledError() | ||
|
||
def get_vcs(self): | ||
""" | ||
Get appropriate VCS engine | ||
""" | ||
if self.options.get('vcs'): | ||
vcs = self.options.get('vcs') | ||
if vcs not in SUPPORTED_VCS: | ||
raise UnsupportedVCSError(vcs) | ||
return SUPPORTED_VCS.get(vcs)(self.commits, self.options) | ||
|
||
for vcs in SUPPORTED_VCS.values(): | ||
vcs = vcs(self.commits, self.options) | ||
if vcs.is_used(): | ||
return vcs | ||
|
||
raise NotLocatableVCSError | ||
|
||
def run_flake8(self, filename): | ||
""" | ||
Run flake8 on a file | ||
""" | ||
command = filter( | ||
None, | ||
[self.flake8] | ||
+ self.options.get('flake8_options', []) | ||
+ [filename] | ||
) | ||
return _execute(' '.join(command)) | ||
|
||
def color_getter(self, component): | ||
""" | ||
Get color formatting function for selected theme via options. | ||
If function is not present in the themes, | ||
identity function is returned. | ||
""" | ||
theme = COLORS.get(self.options.get('color_theme'), {}) | ||
return theme.get(component, identity) | ||
|
||
def get_color_kwargs(self, details): | ||
""" | ||
Get string formatting kwargs from violation details | ||
""" | ||
get = lambda i: details.get(i, '') | ||
return dict( | ||
line=self.color_getter('line')(get('line_number')), | ||
char=self.color_getter('char')(get('char_number')), | ||
code=self.color_getter('code')(get('error_code')), | ||
description=self.color_getter('description')(get('description')), | ||
filename=self.color_getter('filename')(get('filename')), | ||
header=self.color_getter('header')(get('header')), | ||
) | ||
|
||
def process(self): | ||
""" | ||
Perform the magic | ||
""" | ||
overall_violations = 0 | ||
vcs = self.get_vcs() | ||
|
||
for filename in vcs.changed_files(): | ||
violated_lines = vcs.changed_lines(filename) | ||
|
||
logger.info("checking {0} lines {1}".format( | ||
filename, | ||
', '.join(violated_lines)), | ||
) | ||
|
||
violations = [] | ||
for violation in self.run_flake8(filename).splitlines(): | ||
matches = FLAKE8_LINE.match(violation) | ||
if matches: | ||
violation_details = matches.groupdict() | ||
if violation_details['line_number'] in violated_lines: | ||
violations.append(violation_details) | ||
if self.options.get('standard_flake8_output'): | ||
print(FLAKE8_OUTPUT.format( | ||
**self.get_color_kwargs(violation_details) | ||
)) | ||
|
||
overall_violations += len(violations) | ||
|
||
if violations and not self.options.get('standard_flake8_output'): | ||
print(HEADER_OUTPUT.format( | ||
**self.get_color_kwargs(dict( | ||
filename=filename, | ||
header=HEADER_STRING | ||
)) | ||
)) | ||
|
||
for line in violations: | ||
print(SIMPLE_OUTPUT.format( | ||
**self.get_color_kwargs(line) | ||
)) | ||
|
||
return overall_violations == 0 |
Oops, something went wrong.