Merge lp:~jelmer/bzr-builddeb/tarfilesource into lp:bzr-builddeb

[Jelmer Vernooij]

This adds a TarfileSource class which is used for simple tar/zip/etc upstream files. This should make tar files a bit less special in merge-upstream.

TarfileSource does a repack, like merge-upstream. The other UpstreamSource subclasses also already do repacks if necessary. In my next branch I'm going to move the repacks completely into the UpstreamSource classes, to simplify merge-upstream further.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-01-31 18:47:05 +0000
+++ cmds.py	2011-02-02 13:35:33 +0000
@@ -93,7 +93,7 @@
         GetOrigSourceSource,
         PristineTarSource,
         SelfSplitSource,
-        StackedUpstreamSource,
+        TarfileSource,
         UScanSource,
         UpstreamProvider,
         UpstreamBranchSource,
@@ -535,7 +535,6 @@
 
     v3_opt = Option('v3', help='Use dpkg-source format v3.')
 
-
     takes_options = [package_opt, version_opt,
             distribution_opt, directory_opt, last_version_opt,
             force_opt, v3_opt, 'revision', 'merge-type',
@@ -566,8 +565,7 @@
         from bzrlib.plugins.builddeb.repack_tarball import repack_tarball
         format = None
         if v3:
-            if (location.endswith(".tar.bz2")
-                    or location.endswith(".tbz2")):
+            if location.endswith(".tar.bz2") or location.endswith(".tbz2"):
                 format = "bz2"
         dest_name = tarball_name(package, version, format=format)
         tarball_filename = os.path.join(orig_dir, dest_name)
@@ -675,12 +673,12 @@
                     primary_upstream_source = UpstreamBranchSource(
                         Branch.open(location), config=config)
                 except NotBranchError:
-                    primary_upstream_source = None
+                    primary_upstream_source = TarfileSource(location, version)
             else:
                 if snapshot:
                     if upstream_branch_source is None:
-                        raise BzrCommandError("--snapshot requires an upstream "
-                            "branch source")
+                        raise BzrCommandError("--snapshot requires an upstream"
+                            " branch source")
                     primary_upstream_source = upstream_branch_source
                 else:
                     primary_upstream_source = UScanSource(tree, larstiq)
@@ -705,10 +703,6 @@
             elif version is None and primary_upstream_source is not None:
                 version = primary_upstream_source.get_latest_version(
                     package, current_version)
-                target_dir = tempfile.mkdtemp() # FIXME: Cleanup?
-                if need_upstream_tarball:
-                    location = primary_upstream_source.fetch_tarball(
-                        package, version, target_dir)
             if version is None:
                 raise BzrCommandError("You must specify the version number using --version.")
             note("Using version string %s." % (version))
@@ -717,6 +711,9 @@
                 upstream_revision = upstream_branch_source.version_as_revision(
                     package, version)
             if need_upstream_tarball:
+                target_dir = tempfile.mkdtemp() # FIXME: Cleanup?
+                location = primary_upstream_source.fetch_tarball(
+                    package, version, target_dir)
                 tarball_filename = self._get_tarball(config, tree, package,
                     version, upstream_branch, upstream_revision, v3,
                     location)
 
=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-01-24 05:46:47 +0000
+++ tests/test_upstream.py	2011-02-02 13:35:33 +0000
@@ -24,6 +24,8 @@
 
 
 import os
+import tarfile
+import zipfile
 
 from bzrlib.tests import (
     TestCase,
@@ -40,8 +42,10 @@
 from bzrlib.plugins.builddeb.upstream import (
     AptSource,
     StackedUpstreamSource,
+    TarfileSource,
     UpstreamBranchSource,
     UpstreamProvider,
+    UpstreamSource,
     UScanSource,
     Version,
     )
@@ -180,7 +184,7 @@
         self.assertEqual("target", caller.target_dir)
 
 
-class RecordingSource(object):
+class RecordingSource(UpstreamSource):
 
     def __init__(self, succeed, latest=None):
         self._succeed = succeed
@@ -194,6 +198,7 @@
         self._specific_versions.append((package, version, target_dir))
         if not self._succeed:
             raise PackageVersionNotPresent(package, version, self)
+        return self._tarball_path(package, version, target_dir)
 
     def __repr__(self):
         return "%s()" % self.__class__.__name__
@@ -328,6 +333,41 @@
         self.assertEquals(revid1, source.version_as_revision("foo", "2.1"))
 
 
+class TarfileSourceTests(TestCaseWithTransport):
+    """Tests for TarfileSource."""
+
+    def setUp(self):
+        super(TarfileSourceTests, self).setUp()
+        tar = tarfile.open("foo-1.0.tar.gz", "w:gz")
+        tar.close()
+
+    def test_version(self):
+        source = TarfileSource("foo-1.0.tar.gz", "1.0")
+        self.assertEquals("1.0", source.get_latest_version("foo", "0.9"))
+
+    def test_fetch_tarball(self):
+        source = TarfileSource("foo-1.0.tar.gz", "1.0")
+        os.mkdir("bar")
+        self.assertEquals("bar/foo_1.0.orig.tar.gz",
+            source.fetch_tarball("foo", "1.0", "bar"))
+        self.failUnlessExists("bar/foo_1.0.orig.tar.gz")
+
+    def test_fetch_tarball_repack(self):
+        zf = zipfile.ZipFile("bla-2.0.zip", "w")
+        zf.close()
+        source = TarfileSource("bla-2.0.zip", "2.0")
+        os.mkdir("bar")
+        self.assertEquals("bar/foo_2.0.orig.tar.gz",
+            source.fetch_tarball("foo", "2.0", "bar"))
+        self.failUnlessExists("bar/foo_2.0.orig.tar.gz")
+
+    def test_fetch_tarball_not_present(self):
+        source = TarfileSource("foo-1.0.tar.gz", "1.0")
+        os.mkdir("bar")
+        self.assertRaises(PackageVersionNotPresent,
+            source.fetch_tarball, "foo", "0.9", "bar")
+
+
 class _MissingUpstreamProvider(UpstreamProvider):
     """For tests"""
 
 
=== modified file 'upstream.py'
--- upstream.py	2011-01-31 23:15:42 +0000
+++ upstream.py	2011-02-02 13:35:33 +0000
@@ -511,4 +511,22 @@
                 tarball_name(self.package, self.version.upstream_version, format='lzma')]
 
 
-
+class TarfileSource(UpstreamSource):
+    """Source that uses a single local tarball."""
+
+    def __init__(self, path, version=None):
+        self.path = path
+        # TODO: Parse self.path for version is version is None?
+        self.version = version
+
+    def fetch_tarball(self, package, version, target_dir):
+        if version != self.version:
+            raise PackageVersionNotPresent(package, version, self)
+        dest_name = tarball_name(package, version)
+        repack_tarball(self.path, dest_name, target_dir=target_dir)
+        target_filename = self._tarball_path(package, version, target_dir)
+        shutil.copy(self.path, target_filename)
+        return target_filename
+
+    def get_latest_version(self, package, version):
+        return self.version