Merge ~lucaskanashiro/+git/ruby-puppet-syntax:fix-ftbfs-in-ubuntu into ~lucaskanashiro/+git/ruby-puppet-syntax:v2.6.1-2

[Lucas Kanashiro]

Fix FTBFS in Groovy. In version 2.6.1-2 of ruby-puppet-syntax was added a patch to workaround some tests which were failing because of puppet throwing some warnings due to a ruby 2.7 deprecation:

https://salsa.debian.org/ruby-team/ruby-puppet-syntax/-/commit/55edc3783c6a79

This puppet issue was fixed in Ubuntu and upstream via this patch:

https://github.com/puppetlabs/puppet/pull/8060

The new patch added to ruby-puppet-syntax was written in a way that it'd fail when puppet is fixed to warn maintainers to remove the patch. Since it is already fixed in Ubuntu now ruby-puppet-syntax FTBFS. This MP drops this patch.

Without the patch it builds fine in amd64 (arch:all) and autopkgtest is happy:

autopkgtest [09:35:22]: @@@@@@@@@@@@@@@@@@@@ summary
gem2deb-test-runner PASS

[Lucas Kanashiro (lucaskanashiro)]

FYI I was discussing with vorlon about this solution I am proposing here and he agreed with it. However, I'd be happy to get a +1 from the team.

[Sergio Durigan Junior (sergiodj)]

I'm reviewing this one.

[Sergio Durigan Junior (sergiodj)]

Aside from the suggestion to reword the changelog entry, everything else is OK. I also double checked that the dep8 test is now passing. +1 from me, thanks!

review: Approve

74f749b... by Lucas Kanashiro on 2020-09-14

d/changelog: reword changelog entry

[Lucas Kanashiro (lucaskanashiro)]

Thank you Sergio, applied what you suggested. I am going to upload it.

[Lucas Kanashiro (lucaskanashiro)]

$ dput ubuntu ../build-area/ruby-puppet-syntax_2.6.1-2ubuntu1_source.changes
Checking signature on .changes
gpg: ../build-area/ruby-puppet-syntax_2.6.1-2ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../build-area/ruby-puppet-syntax_2.6.1-2ubuntu1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ruby-puppet-syntax_2.6.1-2ubuntu1.dsc: done.
  Uploading ruby-puppet-syntax_2.6.1-2ubuntu1.debian.tar.xz: done.
  Uploading ruby-puppet-syntax_2.6.1-2ubuntu1_source.changes: done.
Successfully uploaded packages.

Unmerged commits

74f749b... by Lucas Kanashiro on 2020-09-14

d/changelog: reword changelog entry

5019363... by Lucas Kanashiro on 2020-09-14

Update maintainer

fbf185c... by Lucas Kanashiro on 2020-09-14

Update changelog

45c609c... by Lucas Kanashiro on 2020-09-14

d/p/0002-marks-tests-pending.patch: dropped

This patch add a workaround for a puppet issue already fixed in Ubuntu
and upstream. This is the fix we have in the puppet Ubuntu package and
upstream:

https://github.com/puppetlabs/puppet/pull/8060

diff --git a/debian/changelog b/debian/changelog
index 9bbbb17..588c05d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-puppet-syntax (2.6.1-2ubuntu1) groovy; urgency=medium
+
+  * d/p/0002-marks-tests-pending.patch: dropped. This patch added a workaround
+    for a puppet issue that has since been fixed in Ubuntu and upstream.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 14 Sep 2020 09:27:46 -0300
+
 ruby-puppet-syntax (2.6.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 792d8de..a87440c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ruby-puppet-syntax
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Ruby Extras Maintainers <[e-mail]>
 Uploaders: Gaudenz Steinlin <[e-mail]>,
            Georg Faerber <[e-mail]>,
            Sebastien Badia <[e-mail]>
diff --git a/debian/patches/0002-marks-tests-pending.patch b/debian/patches/0002-marks-tests-pending.patch
deleted file mode 100644
index 0017569..0000000
--- a/debian/patches/0002-marks-tests-pending.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Daniel Leidert <[e-mail]>
-Date: Thu, 23 Apr 2020 00:47:31 +0200
-Subject: Mark tests as pending which fail by a puppet Ruby warning
-
-Some tests in spec/puppet-syntax/templates_spec.rb fail because Ruby prints
-a warning for puppet and this causes output, where output is not expected.
-/usr/lib/ruby/vendor_ruby/puppet/file_system/file_impl.rb:80: warning: Using the last argument as keyword parameters is deprecate
-Marking these tests as pending will cause them to fail again when puppet
-has been fixed. Then this patch can be safely removed.
-
-Bug-Debian: https://bugs.debian.org/952022
----
- spec/puppet-syntax/templates_spec.rb | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/spec/puppet-syntax/templates_spec.rb b/spec/puppet-syntax/templates_spec.rb
-index e349c2c..32727d0 100644
---- a/spec/puppet-syntax/templates_spec.rb
-+++ b/spec/puppet-syntax/templates_spec.rb
-@@ -100,6 +100,7 @@ describe PuppetSyntax::Templates do
-         files = fixture_templates('pass.epp')
-         res = subject.check(files)
- 
-+        pending("puppet is causing a ruby warning and fails the purpose of this test")
-         expect(res).to match([])
-       end
- 
-@@ -107,6 +108,7 @@ describe PuppetSyntax::Templates do
-         files = fixture_templates('fail_error.epp')
-         res = subject.check(files)
- 
-+        pending("puppet is causing a ruby warning and fails the purpose of this test")
-         expect(res.size).to eq(1)
-         expect(res[0]).to match(/This Type-Name has no effect/)
-       end
-@@ -115,6 +117,7 @@ describe PuppetSyntax::Templates do
-         files = fixture_templates(['pass.epp', 'pass_also.epp'])
-         res = subject.check(files)
- 
-+        pending("puppet is causing a ruby warning and fails the purpose of this test")
-         expect(res).to match([])
-       end
- 
-@@ -122,6 +125,7 @@ describe PuppetSyntax::Templates do
-         files = fixture_templates(['fail_error.epp', 'fail_error_also.epp'])
-         res = subject.check(files)
- 
-+        pending("puppet is causing a ruby warning and fails the purpose of this test")
-         expect(res.size).to eq(2)
-         expect(res[0]).to match(/This Type-Name has no effect/)
-         expect(res[1]).to match(/Syntax error at '}' \(file: \S*\/fail_error_also.epp, line: 2, column: 4\)/)
-@@ -136,6 +140,7 @@ describe PuppetSyntax::Templates do
-           files = fixture_templates('pass.erb')
-           res = subject.check(files)
- 
-+          pending("puppet is causing a ruby warning and fails the purpose of this test")
-           expect(res.size).to eq(1)
-         end
-       end
diff --git a/debian/patches/series b/debian/patches/series
index a370ef9..0b40ace 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-gemspec-drop-puppet.patch
-0002-marks-tests-pending.patch