Coding style overhaul for Python files (PEP8 conformant). Removed buggy csstidy pytho...

[redakcja.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 1180e6f..587821b 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -1,4 +1,4 @@
-from __future__ import with_statement # needed for python 2.5
+from __future__ import with_statement  # needed for python 2.5

 from fabric.api import *
 from fabric.contrib import files
 
 from fabric.api import *
 from fabric.contrib import files
 


@@ -10,24 +10,26 @@ import os
 # ==========
 # Globals
 env.project_name = 'platforma'
 # ==========
 # Globals
 env.project_name = 'platforma'

-env.use_south = False
+env.use_south = True
+

 
 # Servers
 def staging():
     """Use staging server"""
     env.hosts = ['stigma.nowoczesnapolska.org.pl:2222']
 
 # Servers
 def staging():
     """Use staging server"""
     env.hosts = ['stigma.nowoczesnapolska.org.pl:2222']

-    env.user = 'zuber'
+    env.user = 'platforma'

     env.path = '/var/services/platforma'
     env.python = '/usr/bin/python'
     env.virtualenv = '/usr/bin/virtualenv'
     env.pip = '/usr/bin/pip'
     env.path = '/var/services/platforma'
     env.python = '/usr/bin/python'
     env.virtualenv = '/usr/bin/virtualenv'
     env.pip = '/usr/bin/pip'

-    
+
+

 def production():
     """Use production server"""
 def production():
     """Use production server"""

-    env.hosts = ['wolnelektury.pl:22123']
-    env.user = 'fundacja'
+    env.hosts = ['szo.nowoczesnapolska.org.pl:2225']
+    env.user = 'librarian'

     env.path = '/opt/lektury/platforma'
     env.path = '/opt/lektury/platforma'

-    env.python = '/opt/lektury/basevirtualenv/bin/python'
+    env.python = '/srv/library-in-a-box/sandbox/env/redakcja/bin/python'

     env.virtualenv = '/opt/lektury/basevirtualenv/bin/virtualenv'
     env.pip = '/opt/lektury/basevirtualenv/bin/pip'
 
     env.virtualenv = '/opt/lektury/basevirtualenv/bin/virtualenv'
     env.pip = '/opt/lektury/basevirtualenv/bin/pip'
 


@@ -40,6 +42,7 @@ def test():
     require('hosts', 'path', provided_by=[staging, production])
     result = run('cd %(path)s/%(project_name)s; %(python)s manage.py test' % env)
 
     require('hosts', 'path', provided_by=[staging, production])
     result = run('cd %(path)s/%(project_name)s; %(python)s manage.py test' % env)
 

+

 def setup():
     """
     Setup a fresh virtualenv as well as a few useful directories, then run
 def setup():
     """
     Setup a fresh virtualenv as well as a few useful directories, then run


@@ -52,10 +55,11 @@ def setup():
     run('cd %(path)s/releases; ln -s . current; ln -s . previous' % env, pty=True)
     deploy()
 
     run('cd %(path)s/releases; ln -s . current; ln -s . previous' % env, pty=True)
     deploy()
 

+

 def deploy():
     """
 def deploy():
     """

-    Deploy the latest version of the site to the servers, 
-    install any required third party modules, 
+    Deploy the latest version of the site to the servers,
+    install any required third party modules,

     install the virtual host and then restart the webserver
     """
     require('hosts', 'path', provided_by=[staging, production])
     install the virtual host and then restart the webserver
     """
     require('hosts', 'path', provided_by=[staging, production])


@@ -70,17 +74,20 @@ def deploy():
     copy_localsettings()
     symlink_current_release()
     migrate()
     copy_localsettings()
     symlink_current_release()
     migrate()

+    django_compress()

     restart_webserver()
 
     restart_webserver()
 

+

 def deploy_version(version):
     "Specify a specific version to be made live"
 def deploy_version(version):
     "Specify a specific version to be made live"

-    require('hosts', 'path', provided_by=[localhost,webserver])
+    require('hosts', 'path', provided_by=[localhost, webserver])

     env.version = version
     with cd(env.path):
         run('rm releases/previous; mv releases/current releases/previous;', pty=True)
         run('ln -s %(version)s releases/current' % env, pty=True)
     restart_webserver()
 
     env.version = version
     with cd(env.path):
         run('rm releases/previous; mv releases/current releases/previous;', pty=True)
         run('ln -s %(version)s releases/current' % env, pty=True)
     restart_webserver()
 

+

 def rollback():
     """
     Limited rollback capability. Simple loads the previously current
 def rollback():
     """
     Limited rollback capability. Simple loads the previously current


@@ -109,23 +116,27 @@ def upload_tar_from_git():
     run('cd %(path)s/releases/%(release)s && tar zxf ../../packages/%(release)s.tar.gz' % env, pty=True)
     local('rm %(release)s.tar.gz' % env)
 
     run('cd %(path)s/releases/%(release)s && tar zxf ../../packages/%(release)s.tar.gz' % env, pty=True)
     local('rm %(release)s.tar.gz' % env)
 

+

 def upload_vhost_sample():
     "Create and upload Apache virtual host configuration sample"
     print ">>> upload vhost sample"
     files.upload_template('%(project_name)s.vhost.template' % env, '%(path)s/%(project_name)s.vhost.sample' % env, context=env)
 
 def upload_vhost_sample():
     "Create and upload Apache virtual host configuration sample"
     print ">>> upload vhost sample"
     files.upload_template('%(project_name)s.vhost.template' % env, '%(path)s/%(project_name)s.vhost.sample' % env, context=env)
 

+

 def upload_wsgi_script():
     "Create and upload a wsgi script sample"
     print ">>> upload wsgi script sample"
     files.upload_template('%(project_name)s.wsgi.template' % env, '%(path)s/%(project_name)s.wsgi' % env, context=env)
     run('chmod ug+x %(path)s/%(project_name)s.wsgi' % env)
 
 def upload_wsgi_script():
     "Create and upload a wsgi script sample"
     print ">>> upload wsgi script sample"
     files.upload_template('%(project_name)s.wsgi.template' % env, '%(path)s/%(project_name)s.wsgi' % env, context=env)
     run('chmod ug+x %(path)s/%(project_name)s.wsgi' % env)
 

+

 def install_requirements():
     "Install the required packages from the requirements file using pip"
     print '>>> install requirements'
     require('release', provided_by=[deploy])
     run('cd %(path)s; %(pip)s install -E . -r %(path)s/releases/%(release)s/requirements.txt' % env, pty=True)
 def install_requirements():
     "Install the required packages from the requirements file using pip"
     print '>>> install requirements'
     require('release', provided_by=[deploy])
     run('cd %(path)s; %(pip)s install -E . -r %(path)s/releases/%(release)s/requirements.txt' % env, pty=True)

-    
+
+

 def copy_localsettings():
     "Copy localsettings.py from root directory to release directory (if this file exists)"
     print ">>> copy localsettings"
 def copy_localsettings():
     "Copy localsettings.py from root directory to release directory (if this file exists)"
     print ">>> copy localsettings"


@@ -135,6 +146,7 @@ def copy_localsettings():
     with settings(warn_only=True):
         run('cp %(path)s/localsettings.py %(path)s/releases/%(release)s/%(project_name)s' % env)
 
     with settings(warn_only=True):
         run('cp %(path)s/localsettings.py %(path)s/releases/%(release)s/%(project_name)s' % env)
 

+

 def symlink_current_release():
     "Symlink our current release"
     print '>>> symlink current release'
 def symlink_current_release():
     "Symlink our current release"
     print '>>> symlink current release'


@@ -144,6 +156,7 @@ def symlink_current_release():
         run('rm releases/previous; mv releases/current releases/previous')
         run('ln -s %(release)s releases/current' % env)
 
         run('rm releases/previous; mv releases/current releases/previous')
         run('ln -s %(release)s releases/current' % env)
 

+

 def migrate():
     "Update the database"
     print '>>> migrate'
 def migrate():
     "Update the database"
     print '>>> migrate'


@@ -153,6 +166,15 @@ def migrate():
         if env.use_south:
             run('../../../bin/python manage.py migrate' % env, pty=True)
 
         if env.use_south:
             run('../../../bin/python manage.py migrate' % env, pty=True)
 

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

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