[arch-commits] Commit in r10k/trunk (PKGBUILD ruby3.patch)

[Tim Meusel]

    Date: Saturday, October 23, 2021 @ 12:26:30
  Author: bastelfreak
Revision: 1032956

update 3.11.0->3.12.1

Added:
  r10k/trunk/ruby3.patch
Modified:
  r10k/trunk/PKGBUILD

-------------+
 PKGBUILD    |   13 +++++++++----
 ruby3.patch |   16 ++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-23 12:19:55 UTC (rev 1032955)
+++ PKGBUILD	2021-10-23 12:26:30 UTC (rev 1032956)
@@ -1,8 +1,8 @@
 # Maintainer: Tim Meusel <tim at bastelfreak.de>
 # Contributor: arakmar
 pkgname=r10k
-pkgver=3.11.0
-pkgrel=2
+pkgver=3.12.1
+pkgrel=1
 pkgdesc='Provides a general purpose toolset for deploying Puppet environments and modules.'
 arch=('any')
 url="https://github.com/puppetlabs/${pkgname}"
@@ -10,8 +10,9 @@
 depends=('ruby' 'ruby-colored2' 'ruby-cri' 'ruby-gettext-setup' 'ruby-log4r' 'ruby-multi_json' 'ruby-semantic_puppet' 'ruby-puppet_forge' 'ruby-rugged' 'ruby-fast_gettext' 'ruby-gettext' 'ruby-faraday' 'ruby-faraday-net_http' 'ruby-jwt')
 makedepends=('ruby-minitar' 'ruby-yard')
 checkdepends=('ruby-rspec')
-source=("${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('c520f6393ed7e51a9e9d714024b71f4e3c7b5161447661bf622af53784909f859e8d957ffcce389ce79fced1cb2391460982a8322c7764c1b36200e489dbaa14')
+source=("${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'ruby3.patch')
+sha512sums=('a46e2b49118977ac93e8f832209f4f01c0ca3b6b293ffd232daf6370473f2dc268d9eed44c1a82d38eca428ececee4d7c299c6b129ee1249075636e24d647f6c'
+            '8bff35f0a42b145105ef492e70e1c62fc41a5309c6c921e96098d7463b4a53f3f5d97d7cc4bd87ef8f1fd26345c2faefcd4f5046e5c84eee8c98f6c4ca089576')
 options=('!emptydirs')
 
 prepare() {
@@ -27,6 +28,10 @@
   sed --in-place "s#, '2.15.10'##" r10k.gemspec
   # drop dev/CI dependencies; they only create package dependecy circles
   sed --in-place '/add_development_dependency/d' "${pkgname}.gemspec"
+
+  # Workaround broken Ruby 3 support
+  # https://github.com/puppetlabs/r10k/pull/1234
+  patch -p1 -N -i "${srcdir}/ruby3.patch"
 }
 
 build() {

Added: ruby3.patch
===================================================================
--- ruby3.patch	                        (rev 0)
+++ ruby3.patch	2021-10-23 12:26:30 UTC (rev 1032956)
@@ -0,0 +1,16 @@
+diff --git a/spec/unit/action/puppetfile/install_spec.rb b/spec/unit/action/puppetfile/install_spec.rb
+index 8604af28..0a3cd565 100644
+--- a/spec/unit/action/puppetfile/install_spec.rb
++++ b/spec/unit/action/puppetfile/install_spec.rb
+@@ -4,9 +4,9 @@ require 'r10k/action/puppetfile/install'
+ describe R10K::Action::Puppetfile::Install do
+   let(:default_opts) { { root: "/some/nonexistent/path" } }
+   let(:loader) {
+-    R10K::ModuleLoader::Puppetfile.new({
++    R10K::ModuleLoader::Puppetfile.new(
+       basedir: '/some/nonexistent/path',
+-      overrides: {force: false}})
++      overrides: {force: false})
+   }
+ 
+   def installer(opts = {}, argv = [], settings = {})