Merge lp:~brunogirin/charms/precise/python-django/python-hooks-repos-options into lp:~patrick-hetu/charms/precise/python-django/python-hooks

[Bruno Girin]

Added support for the following options:
- repos_username
- repos_password
- repos_branch
- application_path

See config.yaml for details of what the options do.

[Patrick Hetu (patrick-hetu)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-04-11 16:47:39 +0000
+++ config.yaml	2013-04-12 19:02:28 +0000
@@ -22,12 +22,19 @@
         description: |
           The repo branch to pull out from. If empty, it will pull out the
           default branch or trunk (such as origin/master with git).
-          Note that this setting is ignored for bzr and svn as the branch is
-          specified in the URL for both of them.
+          Note that this setting only applies to git. This option is not
+          supported for hg. For svn and bzr, specify the branch name as
+          part of the URL.
     install_root:
         type: string
         default: "/srv/"
-        description: The vcs url to checkout.
+        description: The root directory to checkout to.
+    application_path:
+        type: string
+        default: ""
+        description: |
+          The relative path to install_root where the manage.py
+          script is located.
     additional_distro_packages:
         type: string
         default: ""

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-04-11 16:48:57 +0000
+++ hooks/hooks.py	2013-04-12 19:02:28 +0000
@@ -322,6 +322,19 @@
     this_host = run("unit-get private-address")
     return this_host.strip()
 
+def process_template(template_name, template_vars, destination):
+    # --- exported service configuration file
+    from jinja2 import Environment, FileSystemLoader
+    template_env = Environment(
+        loader=FileSystemLoader(os.path.join(os.environ['CHARM_DIR'],
+        'templates')))
+
+    template = \
+        template_env.get_template(template_name).render(template_vars)
+
+    with open(destination, 'w') as inject_file:
+        inject_file.write(str(template))
+
 ###############################################################################
 # Hook functions
 ###############################################################################
@@ -339,17 +352,32 @@
         for package in extra_pip_pkgs.split(','):
             pip_install(package)
 
+    if repos_username:
+        m = re.match(".*://([^/]+)/.*", repos_url)
+        if m is not None:
+            repos_domain = m.group(1)
+            template_vars = {
+                'repos_domain': repos_domain,
+                'repos_username': repos_username,
+                'repos_password': repos_password
+            }
+            from os.path import expanduser
+            process_template('netrc.tmpl', template_vars, expanduser('~/.netrc'))
+        else:
+            juju_log(MSG_ERROR, '''Failed to process repos_username and repos_password:\n
+                                   cannot identify domain in URL {0}'''.format(repos_url))
+        
     if vcs == 'hg' or vcs == 'mercurial':
-        run('hg clone %s %s' % (repos_url, working_dir))
+        run('hg clone %s %s' % (repos_url, vcs_clone_dir))
     elif vcs == 'git' or vcs == 'git-core':
         if repos_branch:
-            run('git clone %s -b %s %s' % (repos_url, repos_branch, working_dir))
+            run('git clone %s -b %s %s' % (repos_url, repos_branch, vcs_clone_dir))
         else:
-            run('git clone %s %s' % (repos_url, working_dir))
+            run('git clone %s %s' % (repos_url, vcs_clone_dir))
     elif vcs == 'bzr' or vcs == 'bazaar':
-        run('bzr branch %s %s' % (repos_url, working_dir))
+        run('bzr branch %s %s' % (repos_url, vcs_clone_dir))
     elif vcs == 'svn' or vcs == 'subversion':
-        run('svn co %s %s' % (repos_url, working_dir))
+        run('svn co %s %s' % (repos_url, vcs_clone_dir))
     elif vcs == '' and repos_url == '':
         juju_log(MSG_INFO, "No version control using local template")
         run('cp -r %s %s' % (os.path.join(os.environ['CHARM_DIR'],'template_site'),
@@ -455,9 +483,9 @@
 config_data = config_get()
 vcs = config_data['vcs']
 repos_url = config_data['repos_url']
-repos_branch = config_data['repos_branch']
 repos_username = config_data['repos_username']
 repos_password = config_data['repos_password']
+repos_branch = config_data['repos_branch']
 
 extra_deb_pkgs = config_data['additional_distro_packages']
 extra_pip_pkgs = config_data['additional_pip_packages']
@@ -465,9 +493,14 @@
 wsgi_user = config_data['wsgi_user']
 wsgi_group = config_data['wsgi_group']
 install_root = config_data['install_root']
+application_path = config_data['application_path']
 
 unit_name = os.environ['JUJU_UNIT_NAME'].split('/')[0]
-working_dir = os.path.join(install_root, unit_name)
+vcs_clone_dir = os.path.join(install_root, unit_name)
+if application_path:
+    working_dir = os.path.join(vcs_clone_dir, application_path)
+else:
+    working_dir = vcs_clone_dir
 manage_path = os.path.join(working_dir, 'manage.py')
 django_run_dir = os.path.join(working_dir, "run/")
 django_logs_dir = os.path.join(working_dir, "logs/")

=== added file 'templates/netrc.tmpl'
--- templates/netrc.tmpl	1970-01-01 00:00:00 +0000
+++ templates/netrc.tmpl	2013-04-12 19:02:28 +0000
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# This file is managed by Juju
+#------------------------------------------------------------------------------
+
+# Netrc configuration for VCS repo
+
+machine {{ repos_domain }}
+    login {{ repos_username }}
+    password {{ repos_password }}
+