upgpkg: ruby-sshkit 1.21.4-1

upstream release

2 files changed, 73 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c465f40679c..25fdeb49fb1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = ruby-sshkit
 	pkgdesc = Toolkit for deploying code and assets to servers
-	pkgver = 1.21.2
+	pkgver = 1.21.4
 	pkgrel = 1
 	url = https://github.com/capistrano/sshkit
 	arch = any
 	license = MIT
-	makedepends = git
-	makedepends = rubygems
 	makedepends = ruby-rdoc
+	makedepends = rubygems
 	depends = ruby
 	depends = ruby-net-scp
 	depends = ruby-net-ssh
 	options = !emptydirs
-	source = git+https://github.com/capistrano/sshkit.git?tag=v1.21.2
-	sha256sums = SKIP
+	source = https://github.com/capistrano/sshkit/archive/v1.21.4/sshkit-1.21.4.tar.gz
+	sha256sums = 7741afa8ec2d726289daeb106df4554713bb5f719f3099356d1dec9319a2f1ad
 
 pkgname = ruby-sshkit
-
diff --git a/PKGBUILD b/PKGBUILD
index 57d4567c2449..aceb4a2915a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,43 +2,94 @@
 
 _gemname=sshkit
 pkgname=ruby-$_gemname
-pkgver=1.21.2
+pkgver=1.21.4
 pkgrel=1
 pkgdesc="Toolkit for deploying code and assets to servers"
 arch=(any)
 url=https://github.com/capistrano/sshkit
 license=(MIT)
-depends=(ruby ruby-net-scp ruby-net-ssh)
-makedepends=(git rubygems ruby-rdoc)
 options=(!emptydirs)
-source=(git+https://github.com/capistrano/sshkit.git?tag=v$pkgver)
-sha256sums=('SKIP')
+depends=(ruby ruby-net-scp ruby-net-ssh)
+# checkdepends=(rubocop ruby-bcrypt_pbkdf ruby-bundler ruby-ed25519 ruby-minitest
+#               ruby-minitest-reporters ruby-mocha ruby-public_suffix
+#               ruby-rainbow ruby-rake)
+makedepends=(ruby-rdoc rubygems)
+source=(${url}/archive/v${pkgver}/$_gemname-$pkgver.tar.gz)
+sha256sums=('7741afa8ec2d726289daeb106df4554713bb5f719f3099356d1dec9319a2f1ad')
 
 prepare() {
-  cd ${_gemname}
+  cd $_gemname-$pkgver
   sed -i 's|~>|>=|g' ${_gemname}.gemspec
-}
 
-build() {
-  cd ${_gemname}
-  gem build ${_gemname}.gemspec
+  # we use an archive not a git checkout
+  sed -i 's|git ls-files -- bin/\*|find bin|' ${_gemname}.gemspec
+  sed -i 's|git ls-files -- test/\*|find test|' ${_gemname}.gemspec
+  sed -i 's|git ls-files|find|' ${_gemname}.gemspec
+
+  sed -i '/danger/d' ${_gemname}.gemspec
 }
 
-package() {
-  cd ${_gemname}
+build() {
+  cd $_gemname-$pkgver
   local _gemdir="$(gem env gemdir)"
 
+  gem build "${_gemname}.gemspec"
+
   gem install \
+    --local \
+    --verbose \
     --ignore-dependencies \
     --no-user-install \
-    -i "$pkgdir/$_gemdir" \
-    -n "$pkgdir/usr/bin" \
-    $_gemname-$pkgver.gem
+    --install-dir "tmp_install/${_gemdir}" \
+    --bindir "tmp_install/usr/bin" \
+    "${_gemname}-${pkgver}.gem"
+
+  # remove unrepreducible files
+  rm --force --recursive --verbose \
+    "tmp_install/${_gemdir}/cache/" \
+    "tmp_install/${_gemdir}/gems/${_gemname}-${pkgver}/vendor/" \
+    "tmp_install/${_gemdir}/doc/${_gemname}-${pkgver}/ri/ext/"
+
+  find "tmp_install/${_gemdir}/gems/" \
+    -type f \
+    \( \
+      -iname "*.o" -o \
+      -iname "*.c" -o \
+      -iname "*.so" -o \
+      -iname "*.time" -o \
+      -iname "gem.build_complete" -o \
+      -iname "Makefile" \
+    \) \
+    -delete
+
+  find "tmp_install/${_gemdir}/extensions/" \
+    -type f \
+    \( \
+      -iname "mkmf.log" -o \
+      -iname "gem_make.out" \
+    \) \
+    -delete
+}
+
+# check() {
+#   cd $_gemname-$pkgver
+
+#   local _gemdir="$(gem env gemdir)"
+
+#   # depends on spinning up vagrant vms
+#   vagrant up --provider=virtualbox
+#   GEM_HOME="tmp_install/${_gemdir}" rake test:units
+#   GEM_HOME="tmp_install/${_gemdir}" rake test:functional
+# }
+
+package() {
+  cd $_gemname-$pkgver
 
-  rm "$pkgdir/$_gemdir/cache/$_gemname-$pkgver.gem"
+  cp --archive --verbose tmp_install/* "${pkgdir}"
 
-  install -Dm0644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm0644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+  install -v -Dm0644 LICENSE* "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -v -Dm0644 EXAMPLES.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -v -Dm0644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
 
 # vim: set ts=2 sw=2 et: