Merge lp:~canonical-isd-hackers/canonical-identity-provider/remove-space-shuttle-dependency into lp:canonical-identity-provider/release

[Ricardo Kirkner]

remove space-shuttle dependency for bootstrap

This branch removes the recently introduced dependency on space-shuttle, by backporting the required functions.

[Anthony Lenton (elachuni)]

review: Approve

=== added file 'fabfile.py'
--- fabfile.py	1970-01-01 00:00:00 +0000
+++ fabfile.py	2011-03-04 18:20:44 +0000
@@ -0,0 +1,2 @@
+# use a payload package to keep fabric code organized
+from payload import *

=== added directory 'payload'
=== renamed file 'fabfile.py' => 'payload/__init__.py'
--- fabfile.py	2011-03-03 19:11:04 +0000
+++ payload/__init__.py	2011-03-04 18:20:44 +0000
@@ -1,3 +1,7 @@
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import
+
 import os.path
 import sys
 import textwrap
@@ -5,22 +9,8 @@
 from fabric.api import local
 from fabric.context_managers import cd
 
-try:
-    import space.shuttle
-except ImportError:
-    from _virtualenv import (
-        setup_virtualenv,
-        virtualenv,
-    )
-
-    def install_space_shuttle():
-        # install space shuttle
-        virtualenv('pip install bzr+ssh://bazaar.launchpad.net/'
-            '~canonical-isd-hackers/space-shuttle/trunk')
-
-    created = setup_virtualenv()
-    if created:
-        install_space_shuttle()
+from .virtualenv import *
+from .postgresql import *
 
 
 # constants
@@ -41,10 +31,6 @@
 # environment
 def bootstrap():
     """Bootstrap the development environment"""
-    from space.shuttle.virtualenv import (
-        setup_virtualenv,
-        install_dependencies,
-    )
     # run sanity checks
     _check_psycopg2_conflicts()
     # bootstrap
@@ -61,6 +47,11 @@
     local("find . -name '*.pyc' -delete")
 
 
+def clean_coverage():
+    """Remove coverage report files."""
+    local("rm -rf .coverage coverage.d coverage.xml")
+
+
 # development
 def test(functional=False):
     """Run whole test suite."""
@@ -140,9 +131,3 @@
             includes = config/devel.cfg
         """ % os.path.abspath(os.curdir)))
 
-
-# extend fabfile with custom space.shuttle targets if available
-try:
-    from space.shuttle import *
-except ImportError:
-    pass

=== added file 'payload/django.py'
--- payload/django.py	1970-01-01 00:00:00 +0000
+++ payload/django.py	2011-03-04 18:20:44 +0000
@@ -0,0 +1,24 @@
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import
+
+import os
+
+
+__all__ = [
+    'get_django_settings',
+]
+
+
+def get_django_settings(*keys):
+    # setup the correct django environment
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'django_project.settings'
+    # get django settings
+    from django.conf import settings
+
+    result = dict.fromkeys(keys)
+    for key in keys:
+        result[key] = getattr(settings, key)
+
+    return result
+

=== added file 'payload/postgresql.py'
--- payload/postgresql.py	1970-01-01 00:00:00 +0000
+++ payload/postgresql.py	2011-03-04 18:20:44 +0000
@@ -0,0 +1,168 @@
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import
+
+from fabric.api import (
+    env,
+    local,
+    settings,
+)
+from fabric.context_managers import hide
+
+from .virtualenv import virtualenv
+from .django import get_django_settings
+
+
+__all__ = [
+    'createdb',
+    'dropdb',
+    'resetdb',
+    'setup_database',
+    'setup_postgresql_server',
+    'shutdown_postgresql_server',
+    'start_postgresql_server',
+    'stop_postgresql_server',
+    'syncdb',
+]
+
+
+def setup_postgresql_server():
+    """Setup the PostgreSQL server."""
+    _set_postgres_environment(host='/dev/shm/postgresql')
+    local("mkdir -p %s" % env.postgres['DATA'])
+    local("%s %s/initdb -A trust" % (env.postgres['ENV'], env.postgres['BIN']))
+    start_postgresql_server()
+    setup_database()
+
+
+def shutdown_postgresql_server():
+    """Shutdown the PostgreSQL server."""
+    _set_postgres_environment(host='/dev/shm/postgresql')
+    dropdb()
+    stop_postgresql_server()
+    local("rm -rf %s" % env.postgres['HOST'])
+
+
+def start_postgresql_server():
+    """Start the PostgreSQL server."""
+    _set_postgres_environment()
+    cmd = ['%(ENV)s', '%(BIN)s/pg_ctl', 'start', '-w', '-l',
+        '%(HOST)s/postgresql.log', '-o', "'-F", '-k', "%(HOST)s'"]
+    local(' '.join(cmd) % env.postgres)
+
+
+def stop_postgresql_server():
+    """Stop the PostgreSQL server."""
+    _set_postgres_environment()
+    cmd = ['%(ENV)s', '%(BIN)s/pg_ctl', 'stop', '-w', '-l',
+        '%(HOST)s/postgresql.log', '-o', "'-F", '-k', "%(HOST)s'"]
+    local(' '.join(cmd) % env.postgres)
+
+
+def setup_database():
+    """Setup the database."""
+    success = _check_database()
+    if not success:
+        createdb()
+        _createrole()
+    syncdb()
+
+
+def createdb():
+    """Create the database."""
+    _set_postgres_environment()
+    local("%(ENV)s %(BIN)s/createdb %(DATABASE)s" % env.postgres)
+
+
+def dropdb(warn_only=False):
+    """Remove the database."""
+    _set_postgres_environment()
+    if isinstance(warn_only, basestring):
+        warn_only = warn_only.lower() == 'yes'
+    with settings(warn_only=warn_only):
+        local("%(ENV)s %(BIN)s/dropdb %(DATABASE)s" % env.postgres)
+
+
+def syncdb():
+    """Sync the database."""
+    args = '--noinput'
+    virtualenv("python django_project/manage.py syncdb %s" % args,
+        capture=False)
+
+
+def resetdb():
+    """Drop and recreate then sync the database."""
+    with settings(hide='warnings'):
+        dropdb(warn_only=True)
+    createdb()
+    syncdb()
+
+
+# helpers
+# =======
+
+
+def _check_database():
+    """Check the database is accessible."""
+    with hide('aborts', 'running'):
+        try:
+            _set_postgres_environment()
+            local("%(ENV)s psql -U postgres -c '\q'"
+                % env.postgres, capture=False)
+            success = True
+        except SystemExit:
+            # there was an error connecting to the db,
+            # presumably the db didn't exist
+            success = False
+    return success
+
+
+def _set_database_environment():
+    """Update the environment with the database settings."""
+    if 'database' in env:
+        # environment already set up
+        return
+
+    settings = get_django_settings('DATABASE_HOST', 'DATABASE_PORT',
+        'DATABASE_USER', 'DATABASE_PASSWORD', 'DATABASE_NAME')
+    env.database = {
+        'HOST': settings['DATABASE_HOST'],
+        'PORT': settings['DATABASE_PORT'],
+        'NAME': settings['DATABASE_NAME'],
+        'USER': settings['DATABASE_USER'],
+        'PASSWORD': settings['DATABASE_PASSWORD'],
+    }
+
+
+def _set_postgres_environment(host=''):
+    """Update the environment with the PostgreSQL settings."""
+    if 'postgres' in env:
+        # environment already set up
+        return
+
+    _set_database_environment()
+    host = host if host else env.database['HOST']
+    port = env.database['PORT']
+
+    pg_env = []
+    env.postgres = {
+        'BIN': '/usr/lib/postgresql/8.4/bin',
+        'DATABASE': env.database['NAME'],
+    }
+
+    if host:
+        data = "%s/data" % host
+        pg_env.append("PGHOST=%s" % host)
+        pg_env.append("PGDATA=%s" % data)
+        env.postgres.update({'HOST': host, 'DATA': data})
+    if port:
+        pg_env.append("PGPORT=%s" % port)
+    env.postgres['ENV'] = ' '.join(pg_env)
+
+
+def _createrole():
+    """Create required users/roles."""
+    _set_postgres_environment()
+    local("%s %s/createuser --superuser --createdb postgres" % (
+        env.postgres['ENV'], env.postgres['BIN']))
+

=== renamed file '_virtualenv.py' => 'payload/virtualenv.py'
--- _virtualenv.py	2011-03-03 16:45:01 +0000
+++ payload/virtualenv.py	2011-03-04 18:20:44 +0000
@@ -1,3 +1,7 @@
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import
+
 import os
 
 from fabric.api import (
@@ -7,14 +11,11 @@
 
 
 __all__ = [
-    'create_pip_cache',
     'install_dependencies',
     'setup_virtualenv',
     'virtualenv',
     ]
 
-PIP_DOWNLOAD_CACHE = os.path.expanduser(
-    os.environ.get('PIP_DOWNLOAD_CACHE', '~/.pip/cache'))
 VIRTUALENV = '.env'
 
 
@@ -42,28 +43,13 @@
     return created
 
 
-def install_dependencies(offline=False):
+def install_dependencies():
     """Install all dependencies into the virtualenv."""
     cmd = ['pip', 'install', '-r', 'requirements.txt']
-    if offline:
-        cmd.extend(['-f', "file://%s" % os.path.abspath(
-            PIP_DOWNLOAD_CACHE), '--no-index'])
     virtualenv(' '.join(cmd), capture=False)
     virtualenv('python setup.py develop')
 
 
-def create_pip_cache(verbose=False):
-    """Create a pip cache."""
-    capture = True
-    local("mkdir -p %s" % PIP_DOWNLOAD_CACHE)
-    cmd = ['pip', 'install', '-r', 'requirements.txt', '--no-install',
-        '-d', PIP_DOWNLOAD_CACHE]
-    if verbose:
-        capture = False
-        cmd.append('-v')
-    virtualenv(' '.join(cmd), capture=capture)
-
-
 # helpers
 # =======