Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Custom cmd #14

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Custom cmd #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef9749d
Adding the ability to use a custom test command against the repo/files.
Aug 22, 2014
8646db3
Covering the default parameter from the command line arg.
Aug 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.pyc
*.swp
25 changes: 17 additions & 8 deletions tdaemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import subprocess

SPECIAL_CHARS_REGEX_PATTERN = r'[#&;`|*?~<>^()\[\]{}$\\]+'
IGNORE_EXTENSIONS = ('pyc', 'pyo')
IGNORE_EXTENSIONS = ('pyc', 'pyo', 'swp')
IGNORE_DIRS = ('.bzr', '.git', '.hg', '.darcs', '.svn', '.tox')
IMPLEMENTED_TEST_PROGRAMS = ('nose', 'nosetests', 'django', 'py', 'symfony',
'jelix', 'phpunit', 'sphinx', 'tox'
'jelix', 'phpunit', 'sphinx', 'tox', 'cmd'
)

# -------- Exceptions
Expand Down Expand Up @@ -63,7 +63,7 @@ class Watcher(object):
file_list = {}
debug = False

def __init__(self, file_path, test_program, debug=False, custom_args='',
def __init__(self, file_path, test_program, cmd='', debug=False, custom_args='',
ignore_dirs=None, quiet=False):
# Safe filter
custom_args = escapearg(custom_args)
Expand All @@ -77,12 +77,13 @@ def __init__(self, file_path, test_program, debug=False, custom_args='',
self.custom_args = custom_args
self.quiet = quiet

self.cmd = self.get_cmd(cmd)

# check configuration
self.check_configuration(file_path, test_program, custom_args)

self.check_dependencies()
self.debug = debug
self.cmd = self.get_cmd()


def check_configuration(self, file_path, test_program, custom_args):
Expand All @@ -97,11 +98,12 @@ def check_configuration(self, file_path, test_program, custom_args):
raise InvalidTestProgram('The `%s` is unknown, or not yet implemented. Please chose another one.' % test_program)

if custom_args:
if not self.quiet and not ask("WARNING!!!\nYou are about to run the following command\n\n $ %s\n\nAre you sure you still want to proceed [y/N]? " % self.get_cmd()):
if not self.quiet and not ask("WARNING!!!\nYou are about to run the following command\n\n $ %s\n\nAre you sure you still want to proceed [y/N]? " % self.cmd):
raise CancelDueToUserRequest('Test cancelled...')

def check_dependencies(self):
"Checks if the test program is available in the python environnement"
return # This is because we aren't using any of those
if self.test_program == 'nose':
try:
import nose
Expand Down Expand Up @@ -129,7 +131,7 @@ def check_dependencies(self):
sys.exit('tox is not available on your system. Please install it and try to run it again')


def get_cmd(self):
def get_cmd(self, test_cmd=None):
"""Returns the full command to be executed at runtime"""

cmd = None
Expand All @@ -154,6 +156,10 @@ def get_cmd(self):
cmd = 'make html'
elif self.test_program == 'tox':
cmd = 'tox'
elif self.test_program == 'cmd':
cmd = test_cmd
if not cmd or cmd is "":
raise InvalidTestProgram("There was no test command specified. Please provide a command to execute.")

if not cmd:
raise InvalidTestProgram("The test program %s is unknown. Valid options are: `nose`, `django` and `py`" % self.test_program)
Expand Down Expand Up @@ -244,7 +250,10 @@ def main(prog_args=None):
parser.add_option("-t", "--test-program", dest="test_program",
default="nose", help="specifies the test-program to use. Valid values"
" include `nose` (or `nosetests`), `django`, `py` (for `py.test`), "
'`symfony`, `jelix` `phpunit` and `tox`')
'`symfony`, `jelix` `phpunit`, `tox` and `cmd`')
parser.add_option("-c", "--cmd", dest="cmd", default='',
type="str",
help="Custom command to trigger.")
parser.add_option("-d", "--debug", dest="debug", action="store_true",
default=False)
parser.add_option('-s', '--size-max', dest='size_max', default=25,
Expand All @@ -268,7 +277,7 @@ def main(prog_args=None):


try:
watcher = Watcher(path, opt.test_program, opt.debug, opt.custom_args,
watcher = Watcher(path, opt.test_program, opt.cmd, opt.debug, opt.custom_args,
opt.ignore_dirs, opt.quiet)
watcher_file_size = watcher.file_sizes()
if watcher_file_size > opt.size_max:
Expand Down