refactoring in fabfile

diff --git a/fabfile.py b/fabfile.py
index 87954e8..b6f3bbb 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -10,18 +10,20 @@ except ImportError:
 env.project_name = 'wolnelektury'
 
 
 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):
 
 
 class Memcached(Service):


@@ -38,8 +40,8 @@ def production():
     env.django_root_path = 'src'
     env.requirements_file = 'requirements/requirements.txt'
     env.pre_collectstatic = [
     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'),
     ]
     env.services = [
         Supervisord('wolnelektury'),


@@ -57,8 +59,8 @@ def beta():
     env.django_root_path = 'src'
     env.requirements_file = 'requirements/requirements.txt'
     env.pre_collectstatic = [
     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'),
     ]
     env.services = [
         Supervisord('beta'),