upgpkg: ruby-pry 0.14.1-2

4 files changed, 39 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85490bdb92ce..f735ff1c4a6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,13 @@
 pkgbase = ruby-pry
 	pkgdesc = An IRB alternative and runtime developer console
 	pkgver = 0.14.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/pry/pry
 	arch = any
 	license = MIT
+	checkdepends = ruby-bundler
+	checkdepends = ruby-rake
+	checkdepends = ruby-rspec
 	makedepends = git
 	makedepends = rubygems
 	makedepends = ruby-rdoc
@@ -13,7 +16,8 @@ pkgbase = ruby-pry
 	depends = ruby-method_source
 	options = !emptydirs
 	source = git+https://github.com/pry/pry.git?tag=v0.14.1
+	source = disable-broken-test.patch
 	sha256sums = SKIP
+	sha256sums = ea965f6849b4757d8dd0099422da406139af847071a20f10e76366e8d6c576e7
 
 pkgname = ruby-pry
-
diff --git a/.gitignore b/.gitignore
index f71c635dafda..4203ae902541 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
+!disable-broken-test.patch
diff --git a/PKGBUILD b/PKGBUILD
index 6e508bafaf07..c5e09b8634db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,26 @@
 _gemname=pry
 pkgname=ruby-$_gemname
 pkgver=0.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An IRB alternative and runtime developer console"
 arch=(any)
 url=https://github.com/pry/pry
 license=(MIT)
 depends=(ruby ruby-coderay ruby-method_source)
+checkdepends=(ruby-bundler ruby-rake ruby-rspec)
 makedepends=(git rubygems ruby-rdoc)
 options=(!emptydirs)
-source=(git+https://github.com/pry/pry.git?tag=v${pkgver})
-sha256sums=('SKIP')
+source=(git+https://github.com/pry/pry.git?tag=v${pkgver}
+        disable-broken-test.patch)
+sha256sums=('SKIP'
+            'ea965f6849b4757d8dd0099422da406139af847071a20f10e76366e8d6c576e7')
 
 prepare() {
   cd ${_gemname}
   sed -i 's|~>|>=|g' ${_gemname}.gemspec
+
+  # https://github.com/pry/pry/issues/2216
+  patch -p1 -N -i "${srcdir}/disable-broken-test.patch"
 }
 
 build() {
@@ -25,6 +31,13 @@ build() {
   gem build ${_gemname}.gemspec
 }
 
+check() {
+  cd ${_gemname}
+
+  # we need to set an EDITOR environment variable or subject.editor is nil
+  EDITOR=testing rake spec
+}
+
 package() {
   cd ${_gemname}
   local _gemdir="$(gem env gemdir)"
@@ -36,10 +49,11 @@ package() {
     -n "$pkgdir/usr/bin" \
     $_gemname-$pkgver.gem
 
-  rm "$pkgdir/$_gemdir/cache/$_gemname-$pkgver.gem"
+  rm -rf "$pkgdir/$_gemdir/cache"
 
   install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm0644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+  install -Dm0644 CHANGELOG.md "$pkgdir/usr/share/doc/$pkgname/CHANGELOG.md"
 }
 
 # vim: set ts=2 sw=2 et:
diff --git a/disable-broken-test.patch b/disable-broken-test.patch
new file mode 100644
index 000000000000..d3dcd167c15a
--- /dev/null
+++ b/disable-broken-test.patch
@@ -0,0 +1,14 @@
+diff --git a/spec/pry_spec.rb b/spec/pry_spec.rb
+index f5bb0713..691454ce 100644
+--- a/spec/pry_spec.rb
++++ b/spec/pry_spec.rb
+@@ -204,8 +204,7 @@ describe Pry do
+         end
+ 
+         it "should return with error message" do
+-          Process.kill("USR1", Process.pid)
+-          expect(@str_output).to match(/Unable to obtain mutex lock/)
++          skip "doesn't work in makepkg"
+         end
+       end
+