Fix top directory issue (again)

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

diff --git a/fnpdjango/deploy/__init__.py b/fnpdjango/deploy/__init__.py
index 2a081ac..0ba4477 100644 (file)
--- a/fnpdjango/deploy/__init__.py
+++ b/fnpdjango/deploy/__init__.py
@@ -16,6 +16,7 @@ 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)
     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 os.path import abspath, dirname, exists, join
 from django.utils.crypto import get_random_string
 """
 from os.path import abspath, dirname, exists, join
 from django.utils.crypto import get_random_string


@@ -37,7 +38,7 @@ def setup():
     if not files.exists(env.app_path):
         run('mkdir -p %(app_path)s' % env, pty=True)
     with cd(env.app_path):
     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):
             if not files.exists(subdir):
                 run('mkdir -p %s' % subdir, pty=True)
     with cd('%(app_path)s/releases' % env):


@@ -50,8 +51,7 @@ def setup():
 
 
 def check_localsettings():
 
 
 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)
 
 
 @task(default=True)


@@ -67,7 +67,9 @@ def deploy():
     env.release = time.strftime('%Y-%m-%dT%H%M')
 
     setup()
     env.release = time.strftime('%Y-%m-%dT%H%M')
 
     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()
     upload_tar_from_git()
     copy_localsettings()
     install_requirements()


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

-def upload_sample(name):
+def upload_sample(name, where="samples/"):

     require('app_path', 'project_name')
     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
     if files.exists(upload_path):
         return
     print '>>> upload %s template' % name


@@ -185,7 +187,7 @@ def upload_sample(name):
 def upload_localsettings_sample():
     "Fill out localsettings template and upload as a sample."
     env.secret_key = get_random_string(50)
 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')
 
 
 upload_nginx_sample = lambda: upload_sample('nginx')
 


@@ -260,6 +262,9 @@ def pre_collectstatic():
 def collectstatic():
     """Collect static files"""
     print '>>> 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)
     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 +275,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'])
     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