Deploy: Add root manage.py helper script, use fabric.context_managers.settings instea...

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

diff --git a/fnpdjango/deploy/__init__.py b/fnpdjango/deploy/__init__.py
index 0ba4477..1fbe57c 100644 (file)
--- a/fnpdjango/deploy/__init__.py
+++ b/fnpdjango/deploy/__init__.py
@@ -18,9 +18,11 @@ Then set up some env properties:
         to django_root_path (defaults to project_name/localsettings.py)
     skip_collect_static (optional): if True, Django collectstatic command is not called
 """
         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 *
 from os.path import abspath, dirname, exists, join
 from django.utils.crypto import get_random_string
 from fabric.api import *

+from fabric.context_managers import settings

 from fabric.contrib import files
 from fabric.tasks import Task, execute
 
 from fabric.contrib import files
 from fabric.tasks import Task, execute
 


@@ -41,6 +43,10 @@ def setup():
         for subdir in 'releases', 'packages', 'log', 'samples':
             if not files.exists(subdir):
                 run('mkdir -p %s' % subdir, pty=True)
         for subdir in 'releases', 'packages', 'log', 'samples':
             if not files.exists(subdir):
                 run('mkdir -p %s' % subdir, pty=True)

+        # Install helper manage.py script into root dir.
+        if not files.exists('manage.py'):
+            with settings(full_django_root=get_django_root_path('current')):
+                upload_sample('manage.py', where='', ext='', mode=0755)

     with cd('%(app_path)s/releases' % env):
         if not files.exists('current'):
             run('ln -sfT . current', pty=True)
     with cd('%(app_path)s/releases' % env):
         if not files.exists('current'):
             run('ln -sfT . current', pty=True)


@@ -64,7 +70,7 @@ def deploy():
     require('hosts', 'app_path')
 
     import time
     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()
     if not check_localsettings():
 
     setup()
     if not check_localsettings():


@@ -113,8 +119,7 @@ def deploy_version(version):
 
 @task
 def restart():
 
 @task
 def restart():

-    require('services')
-    for service in env.services:
+    for service in env.services or ():

         execute(service)
 
 
         execute(service)
 
 


@@ -136,7 +141,8 @@ class DebianGunicorn(Service):
         sudo('gunicorn-debian restart %s' % self.name, shell=False)
 
     def upload_sample(self):
         sudo('gunicorn-debian restart %s' % self.name, shell=False)
 
     def upload_sample(self):

-        upload_sample('gunicorn')
+        with settings(full_django_root=get_django_root_path('current')):
+            upload_sample('gunicorn')

 
 class Apache(Service):
     def run(self):
 
 class Apache(Service):
     def run(self):


@@ -173,16 +179,16 @@ def upload_samples():
     for service in env.services:
         service.upload_sample()
 
     for service in env.services:
         service.upload_sample()
 

-def upload_sample(name, where="samples/"):
+def upload_sample(name, where="samples/", ext='.sample', **kwargs):

     require('app_path', 'project_name')
     require('app_path', 'project_name')

-    upload_path = '%s/%s%s.sample' % (env['app_path'], where, name)
+    upload_path = '%s/%s%s%s' % (env['app_path'], where, name, ext)

     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')
     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)
+    files.upload_template(template, upload_path, env, **kwargs)

 
 def upload_localsettings_sample():
     "Fill out localsettings template and upload as a sample."
 
 def upload_localsettings_sample():
     "Fill out localsettings template and upload as a sample."