Merge lp:~sergiusens/snapcraft/1500726 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Auto detect tar sources

[lp:~sergiusens/snapcraft/1500726]

214. By Sergio Schvezov on 2015-09-29

Detect tars in sources automatically

Unmerged revisions

=== added file 'integration-tests/data/simple-tar/readonly-files.tar.gz'
Binary files integration-tests/data/simple-tar/readonly-files.tar.gz	1970-01-01 00:00:00 +0000 and integration-tests/data/simple-tar/readonly-files.tar.gz	2015-09-29 08:13:32 +0000 differ
=== modified file 'integration-tests/data/simple-tar/snapcraft.yaml'
--- integration-tests/data/simple-tar/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/simple-tar/snapcraft.yaml	2015-09-29 08:13:32 +0000
@@ -27,6 +27,9 @@
   evil-slash:
     type: tar-content
     source: evil-slash.tar.gz
+  readonly-files:
+    type: tar-content
+    source: readonly-files.tar.gz
   project:
     type: make-project
     source: project.tar.xz

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-23 13:42:57 +0000
+++ integration-tests/units/jobs.pxu	2015-09-29 08:13:32 +0000
@@ -93,7 +93,10 @@
     test -e stage/notopdir
     test -e stage/parent
     test -e stage/slash
+    test -e stage/readonly_file
     test "$(./stage/bin/test)" = "tarproject"
+    # Regression test for https://bugs.launchpad.net/snapcraft/+bug/1500728
+    ${SNAPCRAFT} pull --force
 flags: simple has-leftovers
 
 id: snapcraft/normal/pypi-config

=== modified file 'snapcraft/__init__.py'
--- snapcraft/__init__.py	2015-09-23 13:42:57 +0000
+++ snapcraft/__init__.py	2015-09-29 08:13:32 +0000
@@ -16,6 +16,7 @@
 
 import logging
 import os
+import re
 
 import snapcraft.common
 import snapcraft.sources
@@ -150,6 +151,8 @@
         source_type = 'bzr'
     elif source.startswith("git:"):
         source_type = 'git'
+    elif re.compile(r'.*\.((tar\.(xz|gz|bz|bz2)$)|tgz$)').match(source):
+        source_type = 'tar'
     elif snapcraft.common.isurl(source):
         raise ValueError()
 

=== modified file 'snapcraft/sources.py'
--- snapcraft/sources.py	2015-09-15 05:17:14 +0000
+++ snapcraft/sources.py	2015-09-29 08:13:32 +0000
@@ -17,6 +17,7 @@
 import logging
 import os
 import os.path
+import shutil
 import tarfile
 import re
 
@@ -130,13 +131,17 @@
         else:
             return True
 
-    def provision(self, dst):
+    def provision(self, dst, clean_target=True):
         # TODO add unit tests.
         if snapcraft.common.isurl(self.source):
             tarball = os.path.join(self.source_dir, os.path.basename(self.source))
         else:
             tarball = os.path.abspath(self.source)
 
+        if clean_target:
+            shutil.rmtree(dst)
+            os.makedirs(dst)
+
         with tarfile.open(tarball) as tar:
             def filter_members(tar):
                 """Filters members and member names:
@@ -163,6 +168,7 @@
                         m.name = m.name[len(common + "/"):]
                     # strip leading "/", "./" or "../" as many times as needed
                     m.name = re.sub(r'^(\.{0,2}/)*', r'', m.name)
+                    m.mode = m.mode | 0o222
                     yield m
 
             tar.extractall(members=filter_members(tar), path=dst)

=== modified file 'snapcraft/tests/test_base_plugin.py'
--- snapcraft/tests/test_base_plugin.py	2015-08-28 20:26:41 +0000
+++ snapcraft/tests/test_base_plugin.py	2015-09-29 08:13:32 +0000
@@ -57,6 +57,19 @@
         plugin.makedirs(path)
         self.assertTrue(os.path.exists(path))
 
+    def test_get_tar_source_from_uri(self):
+        sources = [
+            'https://golang.tar.gz',
+            'https://golang.tar.xz',
+            'https://golang.tar.bz2',
+            'https://golang.tar.tgz',
+        ]
+
+        for source in sources:
+            with self.subTest(key=source):
+                self.assertEqual(
+                    snapcraft._get_source_type_from_uri(source), 'tar')
+
 
 class GetSourceWithBranches(tests.TestCase):