Merge lp:~dholbach/developer-ubuntu-com/1510904 into lp:developer-ubuntu-com

[Daniel Holbach]

Let us import docs branches from git:// and lp: URLs.

Let us import docs branches from git:// and lp: URLs.

As test-data use:

sqlite> select * from developer_portal_externaldocsbranch;
1|git://github.com/ubuntu-core/snapcraft|snappy/build-apps|intro.md
2|lp:snappy/15.04|snappy/guides/current|
3|git://github.com/ubuntu-core/snappy|snappy/guides/devel|
sqlite>

[Daniel Holbach (dholbach)]

Oh, and we should ensure that git is available in staging and prod.

[lp:~dholbach/developer-ubuntu-com/1510904]

159. By Daniel Holbach on 2015-10-29

fail gracefully if bzr or git are not installed

[lp:~dholbach/developer-ubuntu-com/1510904]

160. By Daniel Holbach on 2015-10-30

fix URL, thanks for pointing it out David Callé

=== modified file 'developer_portal/management/commands/import-external-docs-branches.py'
--- developer_portal/management/commands/import-external-docs-branches.py	2015-10-29 14:50:24 +0000
+++ developer_portal/management/commands/import-external-docs-branches.py	2015-10-30 08:50:39 +0000
@@ -151,11 +151,6 @@
     return os.path.basename(filename).replace('.md', '')
 
 
-def get_branch_from_lp(origin, alias):
-    return subprocess.call([
-        'bzr', 'checkout', '--lightweight', origin, alias])
-
-
 class LocalBranch:
     titles = {}
 
@@ -307,10 +302,12 @@
             docs_namespace__regex=selection):
         checkout_location = os.path.join(
             tempdir, os.path.basename(branch.docs_namespace))
-        if get_branch_from_lp(branch.lp_origin, checkout_location) != 0:
+        sourcecode = SourceCode(branch.lp_origin, checkout_location)
+        if sourcecode.get() != 0:
             logging.error(
                 'Could not check out branch "%s".' % branch.lp_origin)
-            shutil.rmtree(checkout_location)
+            if os.path.exists(checkout_location):
+                shutil.rmtree(checkout_location)
             break
         if branch.lp_origin.startswith('lp:snappy'):
             local_branch = SnappyLocalBranch(checkout_location, branch,
@@ -324,6 +321,27 @@
     db_actions.run()
 
 
+class SourceCode():
+    def __init__(self, branch_origin, checkout_location):
+        self.branch_origin = branch_origin
+        self.checkout_location = checkout_location
+
+    def get(self):
+        if self.branch_origin.startswith('lp:') and \
+           os.path.exists('/usr/bin/bzr'):
+            return subprocess.call([
+                'bzr', 'checkout', '--lightweight', self.branch_origin,
+                self.checkout_location])
+        if self.branch_origin.startswith('git://') and \
+           os.path.exists('/usr/bin/git'):
+            return subprocess.call([
+                'git', 'clone', '-q', self.branch_origin,
+                self.checkout_location])
+        logging.error(
+            'Branch format "{}" not understood.'.format(self.branch_origin))
+        return 1
+
+
 class Command(BaseCommand):
     help = "Import external branches for documentation."
 

=== modified file 'developer_portal/models.py'
--- developer_portal/models.py	2015-10-21 14:41:23 +0000
+++ developer_portal/models.py	2015-10-30 08:50:39 +0000
@@ -21,9 +21,13 @@
 
 
 class ExternalDocsBranch(models.Model):
+    # We originally assumed that branches would also live in LP,
+    # well, we were wrong, but let's keep the name around. It's
+    # no use having a schema/data migration just for this.
     lp_origin = models.CharField(
         max_length=200,
-        help_text=_('Launchpad branch location, ie: lp:snappy/15.04'))
+        help_text=_('External branch location, ie: lp:snappy/15.04 or '
+                    'git://github.com/ubuntu-core/snappy'))
     docs_namespace = models.CharField(
         max_length=120,
         help_text=_('Path alias we want to use for the docs, '