Merge lp:~mvo/pkgme/not-native-by-default into lp:pkgme

[Michael Vogt]

Build 3.0 (quilt) packages with an orig.tar.gz.

This branch make pkgme create non-native branches by default.

The reason I suggest this is:
- Its conceptually cleaner to split the package into the orig and the debian part. Now that is not very relevant.
- If the packaging needs tweaking or updating this way the packager just needs to update and upload debian changes instead of the entire package. For large packages this is a significant win. This will not be relevant anymore when pkgme is perfect.

[Michael Vogt (mvo)]

<mvo> james_w: cool, so test+docstring+better place and we are good to go?
<james_w> mvo, I think so

I will work on this tomorrow morning.

review: Needs Fixing

[Michael Vogt (mvo)]

I added a docstring and a (functional) test now. I also switched from source format 1.0 back to 3.0, but quilt this time. Please have a look at let me know what you think.

[Jonathan Lange (jml)]

Code looks great, and thanks to your update I understand why we want to do this. Thank you!

review: Approve

[Michael Vogt (mvo)]

After merging this broke the world^Wpkgme-service I modified it so that now build_orig_tar_gz() run as part of build_source_package() which is ok I think. Alternatively I can change pkgme-service if that is a preferable way to fix this problem.

review: Needs Resubmitting

[lp:~mvo/pkgme/not-native-by-default]

126. By Michael Vogt on 2012-07-20

merge trunk

[Michael Vogt (mvo)]

Re-merged trunk now.

[James Westby (james-w)]

review: Approve

=== modified file 'pkgme/debuild.py'
--- pkgme/debuild.py	2012-07-20 13:12:24 +0000
+++ pkgme/debuild.py	2012-07-20 19:25:25 +0000
@@ -1,6 +1,8 @@
 import os
 import re
 
+from debian.changelog import Changelog
+
 from pkgme.run_script import run_subprocess
 
 
@@ -14,9 +16,39 @@
 
 
 def build_source_package(directory, sign=True):
+    """Build a source package using debuild"""
+    build_orig_tar_gz(directory)
     cmd = ['debuild', '--no-lintian', '-S']
     if not sign:
         cmd.extend(['-uc', '-us'])
     output = run_subprocess(cmd, cwd=directory)
     changes_file = find_changes_file(output)
     return os.path.abspath(os.path.join(directory, changes_file))
+
+
+def build_orig_tar_gz(target_dir):
+    """Build a pkgname_version.orig.tar.gz from the target_dir.
+    
+    This is usually run as part of build_source_package and does
+    rarely need to be run on its own.
+
+    Note that this will expect a debian/ directory in the target_dir
+    to gather pkgname/version but it will (of course) exclude debian/
+    from the resulting .orig.tar.gz
+    """
+    changelog = Changelog(
+        open(os.path.join(target_dir, "debian", "changelog")))
+    pkgname = changelog.get_package()
+    version = changelog.get_version()
+    target_file = os.path.join(
+        target_dir, "..", "%s_%s.orig.tar.gz" % (pkgname, version))
+    cmd = ["tar", 
+           "-c", 
+           "-z",
+           "--exclude", "debian",
+           "--transform", "s,.,%s-%s," % (pkgname, version),
+           "-f", target_file,
+           ".",
+           ]
+    run_subprocess(cmd, cwd=target_dir)
+    return target_file

=== modified file 'pkgme/package_files.py'
--- pkgme/package_files.py	2012-07-20 13:12:24 +0000
+++ pkgme/package_files.py	2012-07-20 19:25:25 +0000
@@ -249,7 +249,7 @@
     filename = "source/format"
 
     def get_contents(self):
-        return "1.0\n"
+        return "3.0 (quilt)\n"
 
 
 default_package_file_group.add_file_cls(SourceFormat)

=== added file 'pkgme/tests/test_debuild.py'
--- pkgme/tests/test_debuild.py	1970-01-01 00:00:00 +0000
+++ pkgme/tests/test_debuild.py	2012-07-20 19:25:25 +0000
@@ -0,0 +1,38 @@
+import os
+import tarfile
+
+from testtools import TestCase
+
+from pkgme.debuild import build_orig_tar_gz
+from pkgme.testing import (
+    TempdirFixture,
+    )
+
+class DebuildTestCase(TestCase):
+
+    def test_build_orig_tar_gz(self):
+        tempdir = self.useFixture(TempdirFixture())
+        pkgdir = os.path.join(tempdir.path, "testpkg")
+        # setup fake env
+        os.makedirs(os.path.join(pkgdir, "debian"))
+        changelog_path = os.path.join(pkgdir, "debian", "changelog")
+        with open(changelog_path, "w") as f:
+            f.write("""
+testpkg (0.1) unstable; urgency=low
+
+  * some changes
+
+ -- Some Guy <[e-mail]>  Thu, 19 Apr 2012 10:53:30 +0200
+""")
+        with open(os.path.join(pkgdir, "canary"), "w") as f:
+            f.write("pieep")
+        # build it
+        result_path = build_orig_tar_gz(pkgdir)
+        # verify
+        self.assertEqual(
+            "testpkg_0.1.orig.tar.gz", os.path.basename(result_path))
+        with tarfile.open(result_path) as f:
+            self.assertEqual(
+                ["testpkg-0.1", "testpkg-0.1/canary"], 
+                [m.name for m in f.getmembers()])
+

=== modified file 'pkgme/tests/test_package_files.py'
--- pkgme/tests/test_package_files.py	2012-07-20 13:12:24 +0000
+++ pkgme/tests/test_package_files.py	2012-07-20 19:25:25 +0000
@@ -444,7 +444,7 @@
 
     def test_contents(self):
         package_file = self.get_object()
-        self.assertEqual("1.0\n", package_file.get_contents())
+        self.assertEqual("3.0 (quilt)\n", package_file.get_contents())
 
     def test_overwrite(self):
         package_file = self.get_object()

=== modified file 'pkgme/tests/test_script.py'
--- pkgme/tests/test_script.py	2012-07-20 13:12:24 +0000
+++ pkgme/tests/test_script.py	2012-07-20 19:25:25 +0000
@@ -73,7 +73,8 @@
         self.create_marker_file(tempdir, prefix="foo")
         self.run_script(tempdir.abspath('foo'))
         self.assertThat(tempdir.path, DirContains(
-            ["foo_0.0.0.tar.gz",
+            ["foo_0.0.0.orig.tar.gz",
+             "foo_0.0.0.debian.tar.gz",
              "foo_0.0.0.dsc",
              "foo_0.0.0_source.build",
              "foo_0.0.0_source.changes",