collect static in fab

diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py
index ff9184e..b323edc 100644 (file)
--- a/apps/catalogue/management/commands/importbooks.py
+++ b/apps/catalogue/management/commands/importbooks.py
@@ -21,7 +21,7 @@ class Command(BaseCommand):
         make_option('-q', '--quiet', action='store_false', dest='verbose', default=True,
             help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
         make_option('-f', '--force', action='store_true', dest='force', default=False,
         make_option('-q', '--quiet', action='store_false', dest='verbose', default=True,
             help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
         make_option('-f', '--force', action='store_true', dest='force', default=False,

-            help='Print status messages to stdout'),
+            help='Overwrite works already in the catalogue'),

         make_option('-E', '--no-build-epub', action='store_false', dest='build_epub', default=True,
             help='Don\'t build EPUB file'),
         make_option('-M', '--no-build-mobi', action='store_false', dest='build_mobi', default=True,
         make_option('-E', '--no-build-epub', action='store_false', dest='build_epub', default=True,
             help='Don\'t build EPUB file'),
         make_option('-M', '--no-build-mobi', action='store_false', dest='build_mobi', default=True,


@@ -31,7 +31,7 @@ class Command(BaseCommand):
         make_option('-P', '--no-build-pdf', action='store_false', dest='build_pdf', default=True,
             help='Don\'t build PDF file'),
         make_option('-S', '--no-search-index', action='store_false', dest='search_index', default=True,
         make_option('-P', '--no-build-pdf', action='store_false', dest='build_pdf', default=True,
             help='Don\'t build PDF file'),
         make_option('-S', '--no-search-index', action='store_false', dest='search_index', default=True,

-            help='Don\'t build PDF file'),
+            help='Skip indexing imported works for search'),

         make_option('-w', '--wait-until', dest='wait_until', metavar='TIME',
             help='Wait until specified time (Y-M-D h:m:s)'),
         make_option('-p', '--picture', action='store_true', dest='import_picture', default=False,
         make_option('-w', '--wait-until', dest='wait_until', metavar='TIME',
             help='Wait until specified time (Y-M-D h:m:s)'),
         make_option('-p', '--picture', action='store_true', dest='import_picture', default=False,

diff --git a/fabfile.py b/fabfile.py
index 84605a2..7a333c9 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -70,6 +70,7 @@ def deploy():
     copy_localsettings()
     symlink_current_release()
     migrate()
     copy_localsettings()
     symlink_current_release()
     migrate()

+    collectstatic()

     restart_webserver()
 
 def deploy_version(version):
     restart_webserver()
 
 def deploy_version(version):


@@ -160,6 +161,13 @@ def migrate():
         if env.use_south:
             run('../../../ve/bin/python manage.py migrate' % env, pty=True)
 
         if env.use_south:
             run('../../../ve/bin/python manage.py migrate' % env, pty=True)
 

+def collectstatic():
+    """Collect static files"""
+    print '>>> collectstatic'
+    require('project_name', provided_by=[staging, production])
+    with cd('%(path)s/releases/current/%(project_name)s' % env):
+        run('../../../ve/bin/python manage.py collectstatic --noinput' % env, pty=True)
+

 def restart_webserver():
     "Restart the web server"
     print '>>> restart webserver'
 def restart_webserver():
     "Restart the web server"
     print '>>> restart webserver'