Merge lp:~barry/bzr-builddeb/609186-urls into lp:bzr-builddeb

[Barry Warsaw]

This branch implements the easy part of bug 609186. It provides ubuntu: and debian: url schemes (and u: and d: shortcuts) for getting at source branches in Launchpad. It doesn't do the fancier stuff suggested in the bug - that's for another time.

Unmerged revisions

483. By Barry Warsaw on 2010-09-27

Typo: forgot to return something ;)

482. By Barry Warsaw on 2010-09-27

LP: #609186

Add ubuntu: u: debian: and d: schemes, along with distroseries support.

=== modified file '__init__.py'
--- __init__.py	2010-09-10 02:46:41 +0000
+++ __init__.py	2010-09-27 20:42:39 +0000
@@ -174,5 +174,9 @@
     SPEC_TYPES.append(RevisionSpec_package)
 
 
+from bzrlib.plugins.builddeb.urls import register_schemes
+register_schemes()
+
+
 def load_tests(standard_tests, module, loader):
     return loader.loadTestsFromModuleNames(['bzrlib.plugins.builddeb.tests'])

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2010-09-10 02:37:09 +0000
+++ tests/__init__.py	2010-09-27 20:42:39 +0000
@@ -128,9 +128,10 @@
             'test_repack_tarball_extra',
             'test_revspec',
             'test_source_distiller',
+            'test_tagging',
             'test_upstream',
+            'test_urls',
             'test_util',
-            'test_tagging',
             ]
     suite.addTest(loader.loadTestsFromModuleNames(["%s.%s" % (__name__, i)
                                             for i in testmod_names]))

=== added file 'tests/test_urls.py'
--- tests/test_urls.py	1970-01-01 00:00:00 +0000
+++ tests/test_urls.py	2010-09-27 20:42:39 +0000
@@ -0,0 +1,216 @@
+#    test_urls.py -- Test url shortcuts for Ubuntu and Debian source branches
+#    Copyright (C) 2010 Canonical Ltd.
+#
+#    This file is part of bzr-builddeb.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from bzrlib import errors
+from bzrlib.tests import TestCase
+from bzrlib.plugins.builddeb import urls
+
+
+class TestExpansion(TestCase):
+    """Test expansions for debuntu schemes."""
+
+    def setUp(self):
+        TestCase.setUp(self)
+        self.directory = urls.DebuntuDirectory()
+
+    # Bogus distro.
+
+    def test_bogus_distro(self):
+        self.assertRaises(errors.InvalidURL,
+                          self.directory._expand, 'gentoo:foo')
+
+    def test_trick_bogus_distro_u(self):
+        self.assertRaises(errors.InvalidURL,
+                          self.directory._expand, 'utube:foo')
+
+    def test_trick_bogus_distro_d(self):
+        self.assertRaises(errors.InvalidURL,
+                          self.directory._expand, 'debuntu:foo')
+
+    def test_missing_ubuntu_distroseries(self):
+        # Launchpad does not hold source packages for Intrepid.  Missing or
+        # bogus distroseries is treated like a project.
+        self.assertEqual(self.directory._expand('ubuntu:intrepid'),
+                         'lp:ubuntu/intrepid')
+
+    def test_missing_debian_distroseries(self):
+        # Launchpad does not hold source packages for unstable.  Missing or
+        # bogus distroseries is treated like a project.
+        self.assertEqual(self.directory._expand('debian:sid'), 'lp:debian/sid')
+
+    # Ubuntu Default distro series.
+
+    def test_ubuntu_default_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:foo'), 'lp:ubuntu/foo')
+
+    def test_u_default_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:foo'), 'lp:ubuntu/foo')
+
+    # Maverick
+
+    def test_ubuntu_maverick_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:maverick/foo'),
+                         'lp:ubuntu/maverick/foo')
+
+    def test_ubuntu_m_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:m/foo'),
+                         'lp:ubuntu/maverick/foo')
+
+    def test_u_maverick_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:maverick/foo'),
+                         'lp:ubuntu/maverick/foo')
+
+    def test_u_m_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:m/foo'),
+                         'lp:ubuntu/maverick/foo')
+
+    # Lucid
+
+    def test_ubuntu_lucid_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:lucid/foo'),
+                         'lp:ubuntu/lucid/foo')
+
+    def test_ubuntu_l_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:l/foo'),
+                         'lp:ubuntu/lucid/foo')
+
+    def test_u_lucid_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:lucid/foo'),
+                         'lp:ubuntu/lucid/foo')
+
+    def test_u_l_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:l/foo'),
+                         'lp:ubuntu/lucid/foo')
+
+    # Karmic
+
+    def test_ubuntu_karmic_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:karmic/foo'),
+                         'lp:ubuntu/karmic/foo')
+
+    def test_ubuntu_k_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:k/foo'),
+                         'lp:ubuntu/karmic/foo')
+
+    def test_u_karmic_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:karmic/foo'),
+                         'lp:ubuntu/karmic/foo')
+
+    def test_u_k_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:k/foo'),
+                         'lp:ubuntu/karmic/foo')
+
+    # Jaunty
+
+    def test_ubuntu_jaunty_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:jaunty/foo'),
+                         'lp:ubuntu/jaunty/foo')
+
+    def test_ubuntu_j_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:j/foo'),
+                         'lp:ubuntu/jaunty/foo')
+
+    def test_u_jaunty_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:jaunty/foo'),
+                         'lp:ubuntu/jaunty/foo')
+
+    def test_u_j_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:j/foo'),
+                         'lp:ubuntu/jaunty/foo')
+
+    # Hardy
+
+    def test_ubuntu_hardy_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:hardy/foo'),
+                         'lp:ubuntu/hardy/foo')
+
+    def test_ubuntu_h_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:h/foo'),
+                         'lp:ubuntu/hardy/foo')
+
+    def test_u_hardy_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:hardy/foo'),
+                         'lp:ubuntu/hardy/foo')
+
+    def test_u_h_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:h/foo'),
+                         'lp:ubuntu/hardy/foo')
+
+    # Dapper
+
+    def test_ubuntu_dapper_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:dapper/foo'),
+                         'lp:ubuntu/dapper/foo')
+
+    def test_ubuntu_d_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('ubuntu:d/foo'),
+                         'lp:ubuntu/dapper/foo')
+
+    def test_u_dapper_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:dapper/foo'),
+                         'lp:ubuntu/dapper/foo')
+
+    def test_u_d_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('u:d/foo'),
+                         'lp:ubuntu/dapper/foo')
+
+    # Debian default distro series.
+
+    def test_debian_default_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('debian:foo'), 'lp:debian/foo')
+
+    def test_d_default_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('d:foo'), 'lp:debian/foo')
+
+    # Squeeze
+
+    def test_debian_squeeze_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('debian:squeeze/foo'),
+                         'lp:debian/squeeze/foo')
+
+    def test_debian_s_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('debian:s/foo'),
+                         'lp:debian/squeeze/foo')
+
+    def test_d_squeeze_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('d:squeeze/foo'),
+                         'lp:debian/squeeze/foo')
+
+    def test_d_s_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('d:s/foo'),
+                         'lp:debian/squeeze/foo')
+
+    # Lenny
+
+    def test_debian_lenny_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('debian:lenny/foo'),
+                         'lp:debian/lenny/foo')
+
+    def test_debian_l_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('debian:l/foo'),
+                         'lp:debian/lenny/foo')
+
+    def test_d_lenny_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('d:lenny/foo'),
+                         'lp:debian/lenny/foo')
+
+    def test_d_l_distroseries_expansion(self):
+        self.assertEqual(self.directory._expand('d:l/foo'),
+                         'lp:debian/lenny/foo')
+

=== added file 'urls.py'
--- urls.py	1970-01-01 00:00:00 +0000
+++ urls.py	2010-09-27 20:42:39 +0000
@@ -0,0 +1,127 @@
+#    urls.py -- url shortcuts for Ubuntu and Debian source branches
+#    Copyright (C) 2010 Canonical Ltd.
+#
+#    This file is part of bzr-builddeb.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+"""ubuntu: and debian: prefixes for Launchpad lookup.
+
+Mappings:
+
+    ubuntu:foo -> lp:ubuntu/foo
+    ubuntu:maverick/foo -> lp:ubuntu/maverick/foo
+    ubuntu:m/foo -> lp:ubuntu/maverick/foo
+    u:foo -> lp:ubuntu/foo
+    u:maverick/foo -> lp:ubuntu/maverick/foo
+    u:m/foo -> lp:ubuntu/maverick/foo
+    debian:foo -> lp:debian/foo
+    debian:squeeze/foo -> lp:debian/squeeze/foo
+    debian:s/foo -> lp:debian/squeeze/foo
+    d:foo -> lp:debian/foo
+    d:squeeze/foo -> lp:debian/squeeze/foo
+    d:s/foo -> lp:debian/squeeze/foo
+"""
+
+# XXX 2010-09-27 barry: This must remain compatible with the same versions of
+# Python that Bazaar is compatible with, which at the time of this writing is
+# 2.4.  Which means we cannot use str.format().
+
+from urlparse import urlsplit
+
+from bzrlib import errors
+from bzrlib.directory_service import directories
+from bzrlib.plugins.launchpad.account import get_lp_login
+from bzrlib.plugins.launchpad.lp_directory import LaunchpadDirectory
+
+
+_ubuntu_series = {
+    'maverick': 'maverick',
+    'lucid': 'lucid',
+    'karmic': 'karmic',
+    'jaunty': 'jaunty',
+    'hardy': 'hardy',
+    'dapper': 'dapper',
+    'm': 'maverick',
+    'l': 'lucid',
+    'k': 'karmic',
+    'j': 'jaunty',
+    'h': 'hardy',
+    'd': 'dapper',
+    }
+
+
+_debian_series = {
+    'lenny': 'lenny',
+    'squeeze': 'squeeze',
+    'l': 'lenny',
+    's': 'squeeze',
+    }
+
+
+def register_schemes():
+    directories.register_lazy(
+        'ubuntu:', 'plugins.builddeb.urls',
+        'DebuntuDirectory',
+        'ubuntu: and debian: shortcuts')
+    directories.register_lazy(
+        'u:', 'plugins.builddeb.urls',
+        'DebuntuDirectory',
+        'ubuntu: and debian: shortcuts')
+    directories.register_lazy(
+        'debian:', 'plugins.builddeb.urls',
+        'DebuntuDirectory',
+        'ubuntu: and debian: shortcuts')
+    directories.register_lazy(
+        'd:', 'plugins.builddeb.urls',
+        'DebuntuDirectory',
+        'ubuntu: and debian: shortcuts')
+
+
+class DebuntuDirectory(object):
+    def _expand(self, url):
+        parts = urlsplit(url)
+        if parts.scheme in ('ubuntu', 'u'):
+            distro = 'ubuntu'
+            distro_series = _ubuntu_series
+        elif parts.scheme in ('debian', 'd'):
+            distro = 'debian'
+            distro_series = _debian_series
+        else:
+            raise errors.InvalidURL(path=url)
+        # Check first part of path to see if it's a known series.  We should
+        # probably ask Launchpad instead of hard-coding these here.
+        path_parts = parts.path.split('/')
+        series = distro_series.get(path_parts[0])
+        # If there's a series, then the project name is the second part of the
+        # path.  Otherwise, it's the latest series, whatever that is.
+        #
+        # XXX 2010-09-27 barry: use str.format() when Python 2.6 is the
+        # minimum compatible version.
+        if series is None:
+            lp_url_template = 'lp:%(distro)s/%(project)s'
+            project = path_parts[0]
+        else:
+            lp_url_template = 'lp:%(distro)s/%(series)s/%(project)s'
+            project = path_parts[1]
+        return lp_url_template % dict(
+            distro=distro,
+            series=series,
+            project=project)
+
+    def look_up(self, name, url):
+        """See DirectoryService.look_up"""
+        lp_url = self._expand(url)
+        return LaunchpadDirectory().look_up(name, lp_url)