Bump to 3.6.0, thanks to Tim Meusel for the work !

3 files changed, 96 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7b9380c0e2d5..c41e183cfc85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,59 @@
-
+# Maintainer: arakmar
+# Contributor: Tim Meusel <tim@bastelfreak.de>
 pkgname=r10k
-pkgver=3.3.3
+pkgver=3.6.0
 pkgrel=1
-pkgdesc="R10K provides a general purpose toolset for deploying Puppet environments and modules."
-arch=('i686' 'x86_64')
-url="https://github.com/puppetlabs/r10k"
+pkgdesc='Provides a general purpose toolset for deploying Puppet environments and modules.'
+arch=('any')
+url='https://github.com/puppetlabs/r10k'
 license=('Apache')
-depends=('ruby' 'ruby-colored' 'ruby-cri' 'ruby-gettext-setup' 'ruby-log4r' 'ruby-minitar' 'ruby-multi_json' 'ruby-semantic_puppet')
-makedepends=('rubygems')
-source=(https://rubygems.org/downloads/$pkgname-$pkgver.gem)
-noextract=($pkgname-$pkgver.gem)
-sha256sums=('4306e4e230aa3e18e6248b9d11fe776f84d1c5dd727fba74cd804c9213899f94')
+depends=('ruby' 'ruby-colored2' 'ruby-cri' 'ruby-gettext-setup' 'ruby-log4r' 'ruby-multi_json' 'ruby-semantic_puppet' 'ruby-puppet_forge' 'ruby-rugged')
+makedepends=('ruby-minitar')
+checkdepends=('ruby-rspec' 'git')
+source=("${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'disable-sha256-test.patch' 'disable-insync-module-test.patch')
+sha512sums=('c5220881705129c6c183556936e4d7b5dd42379499e854151c60cd8122e544db8353404068105d22e173b67448baf69af4e44e5c70194bdbf70118308f754913'
+            '2c88172bda8110e5ab527992ae48c45f98643b2df68b0bf701f76900f0cfdbd8c915707128feac56014c9ddb1fcc81adab88b871d0746d5bbc2c2d097252ea18'
+            '0e9e8b5ef2911a97ec8db151f7955652d82245a5f51a59f783d4c5df525106562409b6f1427312154ffb3146c0825f8f388e3b4c67136a304c85ae9eade33356')
+options=('!emptydirs')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # update the gemspec to allow newer versions
+  sed --in-place 's|~>|>=|g' "${pkgname}.gemspec"
+  # don't use git to detect files for the package
+  sed --in-place 's|git ls-files|find|g' "${pkgname}.gemspec"
+  # allow newer gettext versions
+  sed --in-place 's|< 3.3.0|< 4.0.0|' "${pkgname}.gemspec"
+
+  # disable broken tests
+  patch --verbose -p1 -N -i "${srcdir}/disable-sha256-test.patch"
+  patch --verbose -p1 -N -i "${srcdir}/disable-insync-module-test.patch"
+  echo 'applied patch'
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  gem build "${pkgname}.gemspec"
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # two tests currently fail https://github.com/puppetlabs/r10k/issues/1095
+  rspec --color --format documentation spec/unit
+}
 
 package() {
-  cd "$srcdir"
-  local _gemdir="$(ruby -e'puts Gem.default_dir')"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  local _gemdir="$(gem env gemdir)"
+  gem install --verbose --ignore-dependencies --no-user-install --install-dir "${pkgdir}/${_gemdir}" --bindir "${pkgdir}/usr/bin" "${pkgname}-${pkgver}.gem"
 
-  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" "$pkgname-$pkgver.gem"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dm 644 CHANGELOG.mkd README.mkd CONTRIBUTING.mkd -t "${pkgdir}/usr/share/doc/${pkgname}"
+  mv doc "${pkgdir}/usr/share/doc/${pkgname}/"
+
+  rm -rf "${pkgdir}/${_gemdir}/gems/${pkgname}-${pkgver}/ext"
+  rm -rf "${pkgdir}/${_gemdir}/cache"
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/disable-insync-module-test.patch b/disable-insync-module-test.patch
new file mode 100644
index 000000000000..6a0314395da2
--- /dev/null
+++ b/disable-insync-module-test.patch
@@ -0,0 +1,23 @@
+diff --git a/spec/unit/module/forge_spec.rb b/spec/unit/module/forge_spec.rb
+index 777c028..59d707a 100644
+--- a/spec/unit/module/forge_spec.rb
++++ b/spec/unit/module/forge_spec.rb
+@@ -63,19 +63,6 @@ describe R10K::Module::Forge do
+   context "when a module is deprecated" do
+     subject { described_class.new('puppetlabs/corosync', fixture_modulepath, :latest) }
+
+-    it "warns on sync if module is not already insync" do
+-      allow(subject).to receive(:status).and_return(:absent)
+-
+-      allow(R10K::Forge::ModuleRelease).to receive(:new).and_return(double('mod_release', install: true))
+-
+-      logger_dbl = double(Log4r::Logger)
+-      allow_any_instance_of(described_class).to receive(:logger).and_return(logger_dbl)
+-
+-      expect(logger_dbl).to receive(:warn).with(/puppet forge module.*puppetlabs-corosync.*has been deprecated/i)
+-
+-      subject.sync
+-    end
+-
+     it "does not warn on sync if module is already insync" do
+       allow(subject).to receive(:status).and_return(:insync)
diff --git a/disable-sha256-test.patch b/disable-sha256-test.patch
new file mode 100644
index 000000000000..9d480ed981d7
--- /dev/null
+++ b/disable-sha256-test.patch
@@ -0,0 +1,21 @@
+diff --git a/spec/unit/forge/module_release_spec.rb b/spec/unit/forge/module_release_spec.rb
+index ca6b722..f7f81f2 100644
+--- a/spec/unit/forge/module_release_spec.rb
++++ b/spec/unit/forge/module_release_spec.rb
+@@ -72,16 +72,6 @@ describe R10K::Forge::ModuleRelease do
+       subject.verify
+     end
+
+-    it "verifies using the forge file_sha256, if no sha256 file exists" do
+-      allow(sha256_digest_class).to receive(:file).and_return(sha256_digest)
+-      allow(sha256_digest).to receive(:hexdigest).and_return(sha256_of_tarball)
+-      allow(sha256_file_path).to receive(:exist?).and_return(false)
+-      allow(subject.forge_release).to receive(:respond_to?).and_return(true)
+-      allow(subject.forge_release).to receive(:sha256_file).and_return(sha256_of_tarball)
+-      expect(subject).to receive(:verify_from_forge)
+-      subject.verify
+-    end
+-
+     it "falls back to md5 verification when not in FIPS mode and no sha256 available" do
+       expect(R10K::Util::Platform).to receive(:fips?).and_return(false)
+       # failed sha256 verification