Remove dependency on plumbum

This commit is contained in:
Anthony Sottile 2015-03-20 13:52:21 -07:00
parent c9b6161fab
commit 713fab4bc7
12 changed files with 99 additions and 55 deletions

View file

@ -4,9 +4,8 @@ from __future__ import unicode_literals
import argparse
from plumbum import local
from pre_commit_hooks.util import added_files
from pre_commit_hooks.util import cmd_output
def lower_set(iterable):
@ -14,7 +13,7 @@ def lower_set(iterable):
def find_conflicting_filenames(filenames):
repo_files = set(local['git']('ls-files').splitlines())
repo_files = set(cmd_output('git', 'ls-files').splitlines())
relevant_files = set(filenames) | added_files()
repo_files -= relevant_files
retv = 0

View file

@ -4,7 +4,7 @@ import argparse
import fileinput
import sys
from plumbum import local
from pre_commit_hooks.util import cmd_output
def _fix_file(filename):
@ -17,9 +17,9 @@ def fix_trailing_whitespace(argv=None):
parser.add_argument('filenames', nargs='*', help='Filenames to fix')
args = parser.parse_args(argv)
bad_whitespace_files = local['grep'][
('-l', '[[:space:]]$') + tuple(args.filenames)
](retcode=None).strip().splitlines()
bad_whitespace_files = cmd_output(
'grep', '-l', '[[:space:]]$', *args.filenames, retcode=None
).strip().splitlines()
if bad_whitespace_files:
for bad_whitespace_file in bad_whitespace_files:

View file

@ -2,10 +2,26 @@ from __future__ import absolute_import
from __future__ import print_function
from __future__ import unicode_literals
from plumbum import local
import subprocess
class CalledProcessError(RuntimeError):
pass
def added_files():
return set(local['git'](
'diff', '--staged', '--name-only', '--diff-filter', 'A',
return set(cmd_output(
'git', 'diff', '--staged', '--name-only', '--diff-filter', 'A',
).splitlines())
def cmd_output(*cmd, **kwargs):
retcode = kwargs.pop('retcode', 0)
popen_kwargs = {'stdout': subprocess.PIPE, 'stderr': subprocess.PIPE}
popen_kwargs.update(kwargs)
proc = subprocess.Popen(cmd, **popen_kwargs)
stdout, stderr = proc.communicate()
stdout, stderr = stdout.decode('UTF-8'), stderr.decode('UTF-8')
if retcode is not None and proc.returncode != retcode:
raise CalledProcessError(cmd, retcode, proc.returncode, stdout, stderr)
return stdout