From 6108010e9aae2dad2049286d43a77640f833116f Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Tue, 16 Feb 2016 11:39:19 +0100 Subject: [PATCH] refactoring in fabfile --- fabfile.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/fabfile.py b/fabfile.py index 87954e834..b6f3bbb33 100644 --- a/fabfile.py +++ b/fabfile.py @@ -10,18 +10,20 @@ except ImportError: env.project_name = 'wolnelektury' -def update_counters(): - print '>>> updating counters' - require('app_path', 'project_name') - with cd(get_django_root_path('current')): - run('%(ve)s/bin/python manage.py update_counters' % env, pty=True) +class ManageTask(Task): + def __init__(self, name, params='', **kwargs): + super(ManageTask, self).__init__(**kwargs) + self.name = name + self.params = params - -def compile_messages(): - print '>>> compiling messages' - require('app_path', 'project_name') - with cd(get_django_root_path('current')): - run('source %(ve)s/bin/activate && python manage.py localepack -c' % env, pty=True) + def run(self): + require('app_path', 'project_name') + with cd(get_django_root_path('current')): + run('source %(ve)s/bin/activate && python manage.py %(task)s %(params)s' % { + 've': env.ve, + 'task': self.name, + 'params': self.params, + }, pty=True) class Memcached(Service): @@ -38,8 +40,8 @@ def production(): env.django_root_path = 'src' env.requirements_file = 'requirements/requirements.txt' env.pre_collectstatic = [ - update_counters, - compile_messages, + ManageTask('update_counters'), + ManageTask('localepack', '-c'), ] env.services = [ Supervisord('wolnelektury'), @@ -57,8 +59,8 @@ def beta(): env.django_root_path = 'src' env.requirements_file = 'requirements/requirements.txt' env.pre_collectstatic = [ - update_counters, - compile_messages, + ManageTask('update_counters'), + ManageTask('localepack', '-c'), ] env.services = [ Supervisord('beta'), -- 2.20.1