version 3.2.0

3 files changed, 82 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7c7753156520..79626159a7db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,21 @@
 pkgbase = ruby-xpath
-	pkgdesc = A Ruby DSL for generating XPath expressions
-	pkgver = 2.0.0
+	pkgdesc = XPath is a Ruby DSL for generating XPath expressions
+	pkgver = 3.2.0
 	pkgrel = 1
-	url = http://github.com/jnicklas/xpath
+	url = https://github.com/teamcapybara/xpath
 	arch = any
-	license = unknown
+	license = MIT
+	checkdepends = ruby-pry
+	makedepends = ruby-bundler
+	makedepends = ruby-rake
+	makedepends = ruby-rspec
 	depends = ruby
 	depends = ruby-nokogiri
 	options = !emptydirs
-	source = https://rubygems.org/downloads/xpath-2.0.0.gem
-	sha256sums = 9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12
+	source = ruby-xpath-3.2.0.tar.gz::https://github.com/teamcapybara/xpath/archive/3.2.0.tar.gz
+	source = remove_yard_dependency.patch
+	sha512sums = 432fd92c66aefa1ef13f276dffbd6d196e0a38f1d3337a9aaf8356f25d61884616fb140bc74b425466634648533dc221c5b369810bc344a9d48968bd51d6af31
+	sha512sums = 2a77db41ff6652a10149b9a188f6cced85dac66504b82234f4b0b7e0bc73bb71fb79849485fc56253674c039ec087c0bad76007082b54e359ac73e39ad171ef2
 
 pkgname = ruby-xpath
 
diff --git a/PKGBUILD b/PKGBUILD
index c2b0900b8633..98cae034589d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,55 @@
-# Maintainer: Christopher Loen <christopherloen at gmail dot com>
+# Maintainer: Andreas 'Segaja' Schleifer <archlinux at segaja dot de>
 
-_gemname_='xpath'
-pkgname="ruby-${_gemname_}"
-pkgver='2.0.0'
+_gemname='xpath'
+pkgname="ruby-${_gemname}"
+pkgver=3.2.0
 pkgrel=1
-pkgdesc='A Ruby DSL for generating XPath expressions'
+pkgdesc="XPath is a Ruby DSL for generating XPath expressions"
 arch=('any')
-url='http://github.com/jnicklas/xpath'
-license=('unknown')
+url='https://github.com/teamcapybara/xpath'
+license=('MIT')
+options=(!emptydirs)
 depends=('ruby' 'ruby-nokogiri')
-options=('!emptydirs')
-source=("https://rubygems.org/downloads/${_gemname_}-${pkgver}.gem")
-sha256sums=('9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12')
+makedepends=('ruby-bundler' 'ruby-rake' 'ruby-rspec')
+checkdepends=('ruby-pry')
+source=(
+    "${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
+    remove_yard_dependency.patch
+)
+sha512sums=('432fd92c66aefa1ef13f276dffbd6d196e0a38f1d3337a9aaf8356f25d61884616fb140bc74b425466634648533dc221c5b369810bc344a9d48968bd51d6af31'
+            '2a77db41ff6652a10149b9a188f6cced85dac66504b82234f4b0b7e0bc73bb71fb79849485fc56253674c039ec087c0bad76007082b54e359ac73e39ad171ef2')
+
+prepare() {
+  cd "${_gemname}-${pkgver}"
+
+  # update gemspec/Gemfile to allow newer version of the dependencies
+  sed --in-place --regexp-extended 's|~>|>=|g' "${_gemname}.gemspec"
+
+  # remove unneeded dependencies
+  patch --strip=1 --input=../remove_yard_dependency.patch
+}
+
+build() {
+  cd "${_gemname}-${pkgver}"
+
+  rake build
+}
+
+check() {
+  cd "${_gemname}-${pkgver}"
+
+  rake spec
+}
 
 package() {
-  local _gemdir="$(ruby -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies --no-user-install -i "${pkgdir}/${_gemdir}" -n "${pkgdir}/usr/bin" "${_gemname_}-${pkgver}.gem"
-  rm "${pkgdir}/${_gemdir}/cache/${_gemname_}-${pkgver}.gem"
+  cd "${_gemname}-${pkgver}"
+
+  local _gemdir="$(gem env gemdir)"
+
+  gem install --ignore-dependencies --no-user-install --install-dir "${pkgdir}/${_gemdir}" --bindir "${pkgdir}/usr/bin" "pkg/${_gemname}-${pkgver}.gem"
+
+  rm "${pkgdir}/${_gemdir}/cache/${_gemname}-${pkgver}.gem"
+
+  install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 CHANGELOG.md README.md --target-directory "${pkgdir}/usr/share/doc/${pkgname}"
 }
diff --git a/remove_yard_dependency.patch b/remove_yard_dependency.patch
new file mode 100644
index 000000000000..657560af4f85
--- /dev/null
+++ b/remove_yard_dependency.patch
@@ -0,0 +1,22 @@
+diff --git a/Rakefile b/Rakefile
+index 55ed35f..9e4ec90 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -2,7 +2,6 @@
+ 
+ require 'bundler/gem_tasks'
+ require 'rspec/core/rake_task'
+-require 'yard'
+ 
+ desc 'Run all examples'
+ RSpec::Core::RakeTask.new(:spec) do |t|
+@@ -10,9 +9,4 @@ RSpec::Core::RakeTask.new(:spec) do |t|
+   t.rspec_opts = %w[--color]
+ end
+ 
+-YARD::Rake::YardocTask.new do |t|
+-  t.files = ['lib/**/*.rb', 'README.md']
+-  # t.options = ['--any', '--extra', '--opts'] # optional
+-end
+-
+ task default: :spec