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

[Sergio Schvezov]

Adding support for mercurial sources (includes debian/control dependency change).

[Michael Terry (mterry)]

Running ./runtests.sh reveals some pep8 failures.

Also, you should expand the unit tests in snapcraft/tests/test_base_plugin.py for this.

review: Needs Fixing

[Sergio Schvezov (sergiusens)]

> Running ./runtests.sh reveals some pep8 failures.

Fixed.

> Also, you should expand the unit tests in snapcraft/tests/test_base_plugin.py
> for this.

I expanded the unit tests to be on par with git (which is only checking for tag + branch)

[Sergio Schvezov (sergiusens)]

El miércoles, 5 de agosto de 2015 15h'15:49 ART, Sergio Schvezov escribió:
>> Running ./runtests.sh reveals some pep8 failures.
>
> Fixed.
>
>> Also, you should expand the unit tests in
>> snapcraft/tests/test_base_plugin.py
>> for this.
>
> I expanded the unit tests to be on par with git (which is only
> checking for tag + branch)

The merge proposal should be now

--
Sent using Dekko from my Ubuntu device

[Leo Arias (elopio)]

Looks good. And all the code you added is covered by tests, so get yourself a smiley sticker.

review: Approve (reviewed, tested)

[Leo Arias (elopio)]

oh wait, holding the top-approval. I think that the mercurial dependency should be added as a package dependency.
Also, if you don't mention it on the commit message you'll get a grumpy ogra. A grumpier ogra ;)

[lp:~sergiusens/snapcraft/mercury]

128. By Sergio Schvezov on 2015-08-06

Adding a runtime dep for mercurial

=== modified file 'debian/control'
--- debian/control	2015-08-05 20:50:45 +0000
+++ debian/control	2015-08-06 00:21:03 +0000
@@ -7,6 +7,7 @@
                debhelper (>= 9),
                dh-python,
                git,
+               mercurial,
                pep8,
                plainbox,
                pyflakes,
@@ -32,6 +33,7 @@
          git,
          python3-apt,
          python3-yaml,
+         mercurial,
          sudo,
          ubuntu-snappy-cli,
          wget,

=== added directory 'integration-tests/data/hg-branch'
=== added file 'integration-tests/data/hg-branch/snapcraft.yaml'
--- integration-tests/data/hg-branch/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ integration-tests/data/hg-branch/snapcraft.yaml	2015-08-06 00:21:03 +0000
@@ -0,0 +1,6 @@
+parts:
+    mercurial:
+        plugin: make-project
+        source: .
+        source-type: hg
+        source-branch: second

=== added directory 'integration-tests/data/hg-head'
=== added file 'integration-tests/data/hg-head/snapcraft.yaml'
--- integration-tests/data/hg-head/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ integration-tests/data/hg-head/snapcraft.yaml	2015-08-06 00:21:03 +0000
@@ -0,0 +1,5 @@
+parts:
+    mercurial:
+        plugin: make-project
+        source: .
+        source-type: hg

=== added directory 'integration-tests/data/hg-tag'
=== added file 'integration-tests/data/hg-tag/snapcraft.yaml'
--- integration-tests/data/hg-tag/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ integration-tests/data/hg-tag/snapcraft.yaml	2015-08-06 00:21:03 +0000
@@ -0,0 +1,6 @@
+parts:
+    mercurial:
+        plugin: make-project
+        source: .
+        source-type: hg
+        source-tag: initial

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-08-05 14:38:33 +0000
+++ integration-tests/units/jobs.pxu	2015-08-06 00:21:03 +0000
@@ -247,3 +247,54 @@
     test "$(git -C parts/git/src log -2 --oneline | cut -d' ' -f2 | tr '\n' ' ')" = "3 1 "
     ${SNAPCRAFT} pull
     test "$(git -C parts/git/src log -2 --oneline | cut -d' ' -f2 | tr '\n' ' ')" = "3 1 "
+
+id: snapcraft/normal/hg-head
+plugin: shell
+estimated_duration: 0.3
+command:
+    set -ex
+    cp -rT $PLAINBOX_PROVIDER_DATA/hg-head .
+    hg init .
+    touch 1
+    hg commit -m "1" --user "Example Dev" -A 1
+    touch 2
+    hg commit -m "2" --user "Example Dev" -A 2
+    ${SNAPCRAFT} pull
+    test "$(hg log --cwd parts/mercurial/src --template "{desc}" -r -1)" = "2"
+    ${SNAPCRAFT} pull
+    test "$(hg log --cwd parts/mercurial/src --template "{desc}" -r -1)" = "2"
+
+id: snapcraft/normal/hg-tag
+plugin: shell
+estimated_duration: 0.3
+command:
+    set -ex
+    cp -rT $PLAINBOX_PROVIDER_DATA/hg-tag .
+    hg init .
+    touch 1
+    hg commit -m "1" --user "Example Dev" -A 1
+    hg tag initial --user "Example Dev"
+    touch 2
+    hg commit -m "2" --user "Example Dev" -A 2
+    ${SNAPCRAFT} pull
+    test "$(ls -1 parts/mercurial/src/ | wc -l )" = "1"
+    ${SNAPCRAFT} pull
+    test "$(ls -1 parts/mercurial/src/ | wc -l )" = "1"
+
+id: snapcraft/normal/hg-branch
+plugin: shell
+estimated_duration: 0.3
+command:
+    set -ex
+    cp -rT $PLAINBOX_PROVIDER_DATA/hg-branch .
+    hg init .
+    hg branch second
+    touch second
+    hg commit -m "second" --user "Example Dev" -A second
+    hg branch default
+    touch default
+    hg commit -m "default" --user "Example Dev" -A default
+    ${SNAPCRAFT} pull
+    test -e parts/mercurial/src/second
+    ${SNAPCRAFT} pull
+    test -e parts/mercurial/src/second

=== modified file 'snapcraft/__init__.py'
--- snapcraft/__init__.py	2015-08-04 15:16:11 +0000
+++ snapcraft/__init__.py	2015-08-06 00:21:03 +0000
@@ -75,6 +75,25 @@
             os.rmdir(self.sourcedir)
             return self.run(['bzr', 'branch'] + tag_opts + [source, self.sourcedir], cwd=os.getcwd())
 
+    def pull_hg(self, source, source_tag=None, source_branch=None):
+        if source_tag and source_branch:
+            logger.error("You can't specify both source-tag and source-branch for a mercurial source (part '%s')." % self.name)
+            snapcraft.common.fatal()
+
+        if os.path.exists(os.path.join(self.sourcedir, ".hg")):
+            ref = []
+            if source_tag:
+                ref = ['-r', source_tag]
+            elif source_branch:
+                ref = ['-b', source_branch]
+            return self.run(['hg', 'pull'] + ref + [source, ], cwd=os.getcwd())
+        else:
+            ref = []
+            if source_tag or source_branch:
+                ref = ['-u', source_tag or source_branch]
+
+            return self.run(['hg', 'clone'] + ref + [source, self.sourcedir], cwd=os.getcwd())
+
     def pull_git(self, source, source_tag=None, source_branch=None):
         if source_tag and source_branch:
             logger.error("You can't specify both source-tag and source-branch for a git source (part '%s')." % self.name)
@@ -164,6 +183,11 @@
                 return False
             if not self.run(['cp', '-Trfa', self.sourcedir, self.builddir]):
                 return False
+        elif source_type == 'hg' or source_type == 'mercurial':
+            if not self.pull_hg(source, source_tag=source_tag, source_branch=source_branch):
+                return False
+            if not self.run(['cp', '-Trfa', self.sourcedir, self.builddir]):
+                return False
         elif source_type == 'tar':
             if source_branch:
                 logger.error("You can't specify source-branch for a tar source (part '%s')." % self.name)

=== modified file 'snapcraft/tests/test_base_plugin.py'
--- snapcraft/tests/test_base_plugin.py	2015-08-04 15:16:11 +0000
+++ snapcraft/tests/test_base_plugin.py	2015-08-06 00:21:03 +0000
@@ -49,22 +49,6 @@
         self.assertFalse(plugin.isurl('/foo'))
         self.assertFalse(plugin.isurl('/fo:o'))
 
-    def test_pull_git_with_tag_and_branch_must_raise_error(self):
-        fake_logger = fixtures.FakeLogger(level=logging.ERROR)
-        self.useFixture(fake_logger)
-
-        plugin = snapcraft.BasePlugin('test_plugin', 'dummy_options')
-        with self.assertRaises(SystemExit) as raised:
-            plugin.pull_git(
-                'dummy_source', source_tag='test_tag',
-                source_branch='test_branch')
-
-        self.assertEqual(raised.exception.code, 1, 'Wrong exit code returned.')
-        expected = (
-            "You can't specify both source-tag and source-branch for a git "
-            "source (part 'test_plugin').\n")
-        self.assertEqual(expected, fake_logger.output)
-
     def test_pull_tarball_must_download_to_sourcedir(self):
         server = http.server.HTTPServer(('', 0), FakeTarballHTTPRequestHandler)
         server_thread = threading.Thread(target=server.serve_forever)
@@ -111,6 +95,38 @@
         self.assertTrue(os.path.exists(path))
 
 
+class GetSourceWithBranches(tests.TestCase):
+
+    scenarios = [
+        ('git with source branch and tag', {
+            'source_type': 'git',
+            'source_branch': 'test_branch',
+            'source_tag': 'tag',
+        }),
+        ('hg with source branch and tag', {
+            'source_type': 'mercurial',
+            'source_branch': 'test_branch',
+            'source_tag': 'tag',
+        }),
+    ]
+
+    def test_get_source_with_branch_and_tag_must_raise_error(self):
+        fake_logger = fixtures.FakeLogger(level=logging.ERROR)
+        self.useFixture(fake_logger)
+
+        plugin = snapcraft.BasePlugin('test_plugin', 'dummy_options')
+        with self.assertRaises(SystemExit) as raised:
+            plugin.get_source(
+                'dummy_source', source_type=self.source_type,
+                source_branch=self.source_branch, source_tag=self.source_tag)
+
+        self.assertEqual(raised.exception.code, 1, 'Wrong exit code returned.')
+        expected = (
+            "You can't specify both source-tag and source-branch for a {} "
+            "source (part 'test_plugin').\n".format(self.source_type))
+        self.assertEqual(expected, fake_logger.output)
+
+
 class GetSourceTestCase(tests.TestCase):
 
     scenarios = [