add utils.pipeline_storage.GzipPipelineCachedStorage

[fnpdjango.git] / fnpdjango / deploy / __init__.py

diff --git a/fnpdjango/deploy/__init__.py b/fnpdjango/deploy/__init__.py
index 2a081ac..eaf5e71 100644 (file)
--- a/fnpdjango/deploy/__init__.py
+++ b/fnpdjango/deploy/__init__.py
@@ -16,7 +16,9 @@ Then set up some env properties:
     localsettings_dst_path (optional): path indicating
         where to copy the localsettings file, relative
         to django_root_path (defaults to project_name/localsettings.py)
+    skip_collect_static (optional): if True, Django collectstatic command is not called
 """
+from subprocess import check_output
 from os.path import abspath, dirname, exists, join
 from django.utils.crypto import get_random_string
 from fabric.api import *
@@ -37,7 +39,7 @@ def setup():
     if not files.exists(env.app_path):
         run('mkdir -p %(app_path)s' % env, pty=True)
     with cd(env.app_path):
-        for subdir in 'releases', 'packages', 'log':
+        for subdir in 'releases', 'packages', 'log', 'samples':
             if not files.exists(subdir):
                 run('mkdir -p %s' % subdir, pty=True)
     with cd('%(app_path)s/releases' % env):
@@ -50,8 +52,7 @@ def setup():
 
 
 def check_localsettings():
-    if not files.exists('%(app_path)s/localsettings.py' % env):
-        abort('localsettings.py file missing.')
+    return files.exists('%(app_path)s/localsettings.py' % env)
 
 
 @task(default=True)
@@ -64,10 +65,12 @@ def deploy():
     require('hosts', 'app_path')
 
     import time
-    env.release = time.strftime('%Y-%m-%dT%H%M')
+    env.release = '%s_%s' % (time.strftime('%Y-%m-%dT%H%M'), check_output(['git', 'rev-parse', 'HEAD']).strip())
 
     setup()
-    check_localsettings()
+    if not check_localsettings():
+        abort('Setup is complete, but\n    %(app_path)s/localsettings.py\n'
+              'is needed for actual deployment.' % env)
     upload_tar_from_git()
     copy_localsettings()
     install_requirements()
@@ -111,8 +114,7 @@ def deploy_version(version):
 
 @task
 def restart():
-    require('services')
-    for service in env.services:
+    for service in env.services or ():
         execute(service)
 
 
@@ -134,7 +136,7 @@ class DebianGunicorn(Service):
         sudo('gunicorn-debian restart %s' % self.name, shell=False)
 
     def upload_sample(self):
-        upload_sample('gunicorn')
+        upload_sample('gunicorn', additional_context = dict(django_root_path = get_django_root_path(env['release'])))
 
 class Apache(Service):
     def run(self):
@@ -171,21 +173,23 @@ def upload_samples():
     for service in env.services:
         service.upload_sample()
 
-def upload_sample(name):
+def upload_sample(name, where="samples/", additional_context=None):
     require('app_path', 'project_name')
-    upload_path = '%(app_path)s/' % env + name + '.sample'
+    upload_path = '%s/%s%s.sample' % (env['app_path'], where, name)
     if files.exists(upload_path):
         return
     print '>>> upload %s template' % name
     template = '%(project_name)s/' % env + name + '.template'
     if not exists(template):
         template = join(dirname(abspath(__file__)), 'templates/' + name + '.template')
-    files.upload_template(template, upload_path, env)
+    template_context = additional_context or dict()
+    template_context.update(env)
+    files.upload_template(template, upload_path, template_context)
 
 def upload_localsettings_sample():
     "Fill out localsettings template and upload as a sample."
     env.secret_key = get_random_string(50)
-    upload_sample('localsettings.py')
+    upload_sample('localsettings.py', where="")
 
 upload_nginx_sample = lambda: upload_sample('nginx')
 
@@ -260,6 +264,9 @@ def pre_collectstatic():
 def collectstatic():
     """Collect static files"""
     print '>>> collectstatic'
+    if env.get('skip_collect_static', False):
+        print '... skipped'
+        return
     require('app_path', 'project_name')
     with cd(get_django_root_path('current')):
         run('%(app_path)s/ve/bin/python manage.py collectstatic --noinput' % env, pty=True)
@@ -270,4 +277,4 @@ def get_django_root_path(release):
     path = '%(app_path)s/releases/%(release)s' % dict(app_path = env['app_path'], release = release)
     if 'django_root_path' in env:
         path = join(path, env['django_root_path'])
-    return path
\ No newline at end of file
+    return path