Fabfile updates.

fabfile.py

@@ -13,79 +13,35 @@ from settings_local import AMAZON_API_KEY, AMAZON_API_SECRET, ENV_HOST
 
 env.hosts = [ENV_HOST]
 env.site_path = '/var/www/snipt'
-env.venv_path = '/home/nick/.virtualenvs/snipt'
-
-def _display_message(message, extra_line=True):
-    if extra_line:
-        msg = '\n{}\n========================\n\n'.format(message)
-    else:
-        msg = '{}\n========================\n\n'.format(message)
-    try:
-        from fabric.colors import cyan
-        sys.stderr.write(cyan(msg))
-    except ImportError:
-        print(msg)
-
-def _python(cmd):
-    return env.venv_path.rstrip('/') + '/bin/python ' + cmd
 
 
 def dep():
-
-    _display_message('Collect static (local)')
-    ################
-
     local('python manage.py collectstatic --ignore cache --noinput')
 
-    _display_message('Git push')
-    ################
-
     try:
         local('git push')
-
-        _display_message('Get last commit info')
-        ################
-
     except:
         pass
 
-    print('')
-
     with cd(env.site_path):
-
-        _display_message('Git pull')
-        ################
-
         run('git pull')
-
-        _display_message('Collect static (remote)', False)
-        ################
-
-        run(_python('manage.py collectstatic --ignore cache --noinput'))
+        run('/home/nick/snipt/.docker/control.sh collectstatic')
+        run('/home/nick/snipt/.docker/control.sh deploy')
 
 def db_backup():
-
     filename = datetime.datetime.now().strftime('%h-%d-%y__%I-%M-%S_%p.pgdump')
-
     local('pg_dump snipt > {}'.format(filename))
-
     conn = S3Connection(AMAZON_API_KEY, AMAZON_API_SECRET)
     snipt_bucket = conn.get_bucket('snipt')
-
     k = Key(snipt_bucket)
     k.key = filename
     k.set_contents_from_filename(filename)
-
     local('rm {}'.format(filename))
 
 def db():
     with cd(env.site_path):
-
-        _display_message('Sync DB and migrate')
-        ################
-
-        run(_python('manage.py syncdb'))
-        run(_python('manage.py migrate'))
+        run('/home/nick/snipt/.docker/control.sh syncdb')
+        run('/home/nick/snipt/.docker/control.sh migrate')
 
 def gravatars():
 
@@ -96,14 +52,8 @@ def gravatars():
 
     import requests
 
-    _display_message('Updating all users\' Gravatar flags')
-    ################
-
     for user in User.objects.all().order_by('id'):
 
-        _display_message('{}. {}'.format(user.pk, user.username.encode('ascii', 'ignore')))
-        ################
-
         email_md5 = hashlib.md5(user.email.lower()).hexdigest()
 
         print 'Email MD5: {}'.format(email_md5)
@@ -132,14 +82,4 @@ def gravatars():
 
 def re():
     with cd(env.site_path):
-
-        _display_message('Kill gunicorn process')
-        ################
-
-        sudo('supervisorctl stop snipt')
-
-        _display_message('Restart gunicorn process')
-        ################
-
-        sudo('supervisorctl start snipt')
-
+        run('/home/nick/snipt/.docker/control.sh restart')