[arch-commits] Commit in ruby-thor/trunk (PKGBUILD tests.patch)

[Andreas Schleifer]

    Date: Thursday, February 17, 2022 @ 19:30:06
  Author: segaja
Revision: 1133806

upgpkg: ruby-thor 1.2.1-1; add check()

Added:
  ruby-thor/trunk/tests.patch
Modified:
  ruby-thor/trunk/PKGBUILD

-------------+
 PKGBUILD    |   49 +++++++++++++++++++++++++++++-------------
 tests.patch |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-17 19:24:32 UTC (rev 1133805)
+++ PKGBUILD	2022-02-17 19:30:06 UTC (rev 1133806)
@@ -1,9 +1,10 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Andreas 'Segaja' Schleifer <segaja at archlinux dot org>
 
-_gemname=thor
-pkgname=ruby-thor
-pkgver=1.1.0
-pkgrel=2
+_gemname='thor'
+pkgname="ruby-${_gemname}"
+pkgver=1.2.1
+pkgrel=1
 pkgdesc='Toolkit for building powerful command-line interfaces'
 url='https://github.com/erikhuda/thor'
 arch=('any')
@@ -10,27 +11,45 @@
 license=('MIT')
 depends=('ruby')
 makedepends=('ruby-rdoc')
+checkdepends=('ruby-bundler' 'ruby-rake' 'ruby-rspec' 'ruby-webmock')
 options=('!emptydirs')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/erikhuda/thor/archive/v${pkgver}.tar.gz)
-sha256sums=('ef285b4fedcb7ed48283198678bcc6d633dc26ac77ba01d7609ba81c2f10e130')
-sha512sums=('d1872a834478c5a2054dde6f55e93f6765fd628536f99f888bd7495436c88658537d48c44ef1e5ad6d1388edfa294ea2a3f3cbde32c19b7d2253b78bc62bf9d0')
+source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        tests.patch)
+sha512sums=('88e58b6ca6c812cb84ab59e0ee8afcd8fa70b6c24d403cd5ea05d1d40ac30e85f2c7412611cc176eb541d16878e309d25c7e4284f64c760475925ffe359250b9'
+            'd327cbff295092c46ec693003b5b3ec1a20fcbff943dbb9519f650c38b52e17168ef71c59deae222f1ecace19e139e8eecfea1c6d58f7871d2cc7ec1426ee87c')
 
 prepare() {
-  cd ${_gemname}-${pkgver}
-  sed -r 's|~>|>=|g' -i ${_gemname}.gemspec # don't give a fuck about rubys bla bla
+  cd "${_gemname}-${pkgver}"
+
+  # remove unused parts from tests and replace git usages
+  patch --verbose --strip=1 --input=../tests.patch
+
+  # update gemspec to allow newer version of the deps
+  sed --in-place --regexp-extended 's|~>|>=|g' "${_gemname}.gemspec"
 }
 
 build() {
-  cd ${_gemname}-${pkgver}
-  gem build ${_gemname}.gemspec
+  cd "${_gemname}-${pkgver}"
+
+  gem build "${_gemname}.gemspec"
 }
 
+check() {
+  cd "${_gemname}-${pkgver}"
+
+  rspec spec
+}
+
 package() {
-  cd ${_gemname}-${pkgver}
+  cd "${_gemname}-${pkgver}"
+
   local _gemdir="$(gem env gemdir)"
-  gem install --ignore-dependencies --no-user-install -i "${pkgdir}${_gemdir}" -n "${pkgdir}/usr/bin" ${_gemname}-${pkgver}.gem
-  install -Dm 644 README.md CHANGELOG.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-  install -Dm 644 LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  gem install --ignore-dependencies --no-user-install --install-dir "${pkgdir}${_gemdir}" --bindir "${pkgdir}/usr/bin" ${_gemname}-${pkgver}.gem
+
+  install -D --mode=644 *.md --target-directory "${pkgdir}/usr/share/doc/${pkgname}"
+  install -D --mode=644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
   rm "${pkgdir}/${_gemdir}/cache/${_gemname}-${pkgver}.gem"
 }
 

Added: tests.patch
===================================================================
--- tests.patch	                        (rev 0)
+++ tests.patch	2022-02-17 19:30:06 UTC (rev 1133806)
@@ -0,0 +1,67 @@
+diff --git a/Gemfile b/Gemfile
+index bc5f7c5..3101ce2 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -9,11 +9,9 @@ end
+ 
+ group :test do
+   gem "childlabor"
+-  gem "coveralls", ">= 0.8.19"
+   gem "rspec", ">= 3.2"
+   gem "rspec-mocks", ">= 3"
+   gem "rubocop", "~> 0.50.0"
+-  gem "simplecov", ">= 0.13"
+   gem "webmock"
+ end
+ 
+diff --git a/spec/helper.rb b/spec/helper.rb
+index c19dd6f..6d32258 100644
+--- a/spec/helper.rb
++++ b/spec/helper.rb
+@@ -1,15 +1,5 @@
+ $TESTING = true
+ 
+-require "simplecov"
+-require "coveralls"
+-
+-SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
+-
+-SimpleCov.start do
+-  add_filter "/spec"
+-  minimum_coverage(90)
+-end
+-
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+ require "thor"
+ require "thor/group"
+@@ -20,8 +10,6 @@ require "rspec"
+ require "diff/lcs" # You need diff/lcs installed to run specs (but not to run Thor).
+ require "webmock/rspec"
+ 
+-WebMock.disable_net_connect!(:allow => "coveralls.io")
+-
+ # Set shell to basic
+ ENV["THOR_COLUMNS"] = "10000"
+ $0 = "thor"
+diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb
+index a6ceb3e..da0c500 100644
+--- a/spec/quality_spec.rb
++++ b/spec/quality_spec.rb
+@@ -40,7 +40,7 @@ describe "The library itself" do
+     exempt = /\.gitmodules|\.marshal|fixtures|vendor|spec|ssl_certs|LICENSE|.devcontainer/
+     error_messages = []
+     Dir.chdir(File.expand_path("../..", __FILE__)) do
+-      `git ls-files`.split("\n").each do |filename|
++      `find -type f -not -path '*/\.git/*' -not -path '*.gem'`.split("\n").each do |filename|
+         next if filename =~ exempt
+         error_messages << check_for_tab_characters(filename)
+         error_messages << check_for_extra_spaces(filename)
+@@ -53,7 +53,7 @@ describe "The library itself" do
+     included = /spec/
+     error_messages = []
+     Dir.chdir(File.expand_path("../", __FILE__)) do
+-      `git ls-files`.split("\n").each do |filename|
++      `find -type f -not -path '*/\.git/* -not -path '*.gem''`.split("\n").each do |filename|
+         next unless filename =~ included
+         error_messages << check_for_spec_defs_with_single_quotes(filename)
+       end