[arch-commits] Commit in (7 files)

[Tim Meusel]

    Date: Tuesday, August 3, 2021 @ 08:49:26
  Author: bastelfreak
Revision: 993477

iadd ruby-log4r

Added:
  ruby-log4r/
  ruby-log4r/repos/
  ruby-log4r/trunk/
  ruby-log4r/trunk/PKGBUILD
  ruby-log4r/trunk/disable-broken-test.patch
  ruby-log4r/trunk/e64ed5143aae17fef85fe191c967765409061266.patch
  ruby-log4r/trunk/fix-broken-test.patch

------------------------------------------------+
 PKGBUILD                                       |   62 +++++++++++++++++++++++
 disable-broken-test.patch                      |   15 +++++
 e64ed5143aae17fef85fe191c967765409061266.patch |   38 ++++++++++++++
 fix-broken-test.patch                          |   30 +++++++++++
 4 files changed, 145 insertions(+)

Added: ruby-log4r/trunk/PKGBUILD
===================================================================
--- ruby-log4r/trunk/PKGBUILD	                        (rev 0)
+++ ruby-log4r/trunk/PKGBUILD	2021-08-03 08:49:26 UTC (rev 993477)
@@ -0,0 +1,62 @@
+# Maintainer: Tim Meusel <tim at bastelfreak.de>
+_gemname=log4r
+pkgname="ruby-${_gemname}"
+pkgver=1.1.10
+pkgrel=3
+pkgdesc='Log4r, logging framework for ruby'
+arch=(any)
+url="https://github.com/colbygk/${_gemname}"
+license=('LGPL')
+depends=('ruby')
+makedepends=('git' 'rake' 'ruby-bundler')
+checkdepends=('ruby-test-unit' 'ruby-builder')
+options=(!emptydirs)
+source=("git+${url}#commit=40e2c2edd657a21b34f09dec7de238f348b6f428" 'disable-broken-test.patch' 'e64ed5143aae17fef85fe191c967765409061266.patch')
+noextract=($_gemname-$pkgver.gem)
+sha512sums=('SKIP'
+            'e5c5a2b587af405b4b434c6db95a615ccb161c7e2f794c20e4c7203c7bace53beb26ba1a1d35b5acbeef71c97c3ecb4fca4354d289275bda6f513c451afb59f8'
+            '7efd5d5eedbc9c94e70180d9e66e73430d3272f3ddad771bca37f1941ca5d2adac150c82680e66963dc0c48af4163034c6beddaedc0915d2de31351d16d59c20')
+
+prepare() {
+  cd "${srcdir}/${_gemname}"
+  sed --in-place 's|~>|>=|g' "${_gemname}.gemspec"
+  # add missing license to gemspec, to please bundler during build
+  sed --in-place '22s/^$/  gem.license = "LGPL-3.0-or-later"/' "${_gemname}.gemspec"
+  # manipulate the broken LOADPATH so the tests can find tests/tests_helper.rb
+  for file in $(find tests/*.rb -type f ! -name '*_*'); do
+    sed --in-place 's|require.*|require "#{File.dirname(__FILE__)}/test_helper"|' "${file}"
+  done
+  # remove broken test - https://github.com/colbygk/log4r/issues/37
+  rm tests/testxmlconf.rb
+  # remove deprecated gemcutter to please rubygems
+  sed --in-place 's|:gemcutter|"https://rubygems.org"|' Gemfile
+  # one particular test needs to be disabled.
+  # It assumes that the test is executed with pure ruby, not wrapped with rake
+  # it fails upstream as well
+  patch -p1 -N -i "${srcdir}/disable-broken-test.patch"
+  # fix deprecated YAML lib method name
+  sed --in-place 's|YAML.load_documents|YAML.load_stream|' lib/log4r/yamlconfigurator.rb
+  # create directory where tests can write data
+  # path is hardcoded in the tests, but they don't create the directory
+  mkdir junk
+  # apply commit e64ed5143aae17fef85fe191c967765409061266
+  # it fixes broken tests. the fix is not yet released
+  patch -p1 -N -i "${srcdir}/e64ed5143aae17fef85fe191c967765409061266.patch"
+}
+
+build() {
+  cd "${srcdir}/${_gemname}"
+  gem build "${_gemname}.gemspec"
+}
+
+check() {
+  cd "${srcdir}/${_gemname}"
+  rake test --trace
+}
+
+package() {
+  cd "${srcdir}/${_gemname}"
+  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"
+}

Added: ruby-log4r/trunk/disable-broken-test.patch
===================================================================
--- ruby-log4r/trunk/disable-broken-test.patch	                        (rev 0)
+++ ruby-log4r/trunk/disable-broken-test.patch	2021-08-03 08:49:26 UTC (rev 993477)
@@ -0,0 +1,15 @@
+diff --git a/tests/testGDC.rb b/tests/testGDC.rb
+index 460d6e1..01ffa56 100644
+--- a/tests/testGDC.rb
++++ b/tests/testGDC.rb
+@@ -3,10 +3,6 @@ require 'test_helper'
+ class TestGDC < TestCase
+   include Log4r
+ 
+-  def test_gdc_default
+-    assert(GDC.get() == "testGDC.rb", "Expected 'testGDC.rb' got '#{GDC.get()}'" )
+-  end
+-
+   def test_gdc_set
+     assert_nothing_raised() { GDC.set("testGDCset") }
+     assert(GDC.get() == "testGDCset", "Expected 'testGDCset' got '#{GDC.get()}'" )

Added: ruby-log4r/trunk/e64ed5143aae17fef85fe191c967765409061266.patch
===================================================================
--- ruby-log4r/trunk/e64ed5143aae17fef85fe191c967765409061266.patch	                        (rev 0)
+++ ruby-log4r/trunk/e64ed5143aae17fef85fe191c967765409061266.patch	2021-08-03 08:49:26 UTC (rev 993477)
@@ -0,0 +1,38 @@
+commit e64ed5143aae17fef85fe191c967765409061266
+Author: Vít Ondruch <vondruch at redhat.com>
+Date:   Tue Jan 9 13:56:33 2018 +0100
+
+    First parameter of assert is always what is expected.
+    
+    The other parameter is object which is asserted.
+
+diff --git a/tests/testformatter.rb b/tests/testformatter.rb
+index 673c8dd..4ff70a1 100644
+--- a/tests/testformatter.rb
++++ b/tests/testformatter.rb
+@@ -12,7 +12,7 @@ class TestFormatter < TestCase
+     sf = SimpleFormatter.new
+     f = Logger.new('simple formatter')
+     event = LogEvent.new(0, f, nil, "some data")
+-    assert_match(sf.format(event), /simple formatter/)
++    assert_match(/simple formatter/, sf.format(event))
+   end
+   def test_basic_formatter
+     b = BasicFormatter.new
+@@ -20,12 +20,12 @@ class TestFormatter < TestCase
+     event = LogEvent.new(0, f, caller, "fake formatter")
+     event2 = LogEvent.new(0, f, nil, "fake formatter")
+     # this checks for tracing
+-    assert_match(b.format(event), /in/)
+-    assert_not_match(b.format(event2), /in/)
++    assert_match(/in/, b.format(event))
++    assert_not_match(/in/, b.format(event2))
+     e = ArgumentError.new("argerror")
+     e.set_backtrace ['backtrace']
+     event3 = LogEvent.new(0, f, nil, e)
+-    assert_match(b.format(event3), /ArgumentError/)
+-    assert_match(b.format(LogEvent.new(0,f,nil,[1,2,3])), /Array/)
++    assert_match(/ArgumentError/, b.format(event3))
++    assert_match(/Array/, b.format(LogEvent.new(0,f,nil,[1,2,3])))
+   end
+ end

Added: ruby-log4r/trunk/fix-broken-test.patch
===================================================================
--- ruby-log4r/trunk/fix-broken-test.patch	                        (rev 0)
+++ ruby-log4r/trunk/fix-broken-test.patch	2021-08-03 08:49:26 UTC (rev 993477)
@@ -0,0 +1,30 @@
+diff --git a/tests/testformatter.rb b/tests/testformatter.rb
+index 673c8dd..4ff70a1 100644
+--- a/tests/testformatter.rb
++++ b/tests/testformatter.rb
+@@ -12,7 +12,7 @@ class TestFormatter < TestCase
+     sf = SimpleFormatter.new
+     f = Logger.new('simple formatter')
+     event = LogEvent.new(0, f, nil, "some data")
+-    assert_match(sf.format(event), /simple formatter/)
++    assert_match(/simple formatter/, sf.format(event))
+   end
+   def test_basic_formatter
+     b = BasicFormatter.new
+@@ -20,12 +20,12 @@ class TestFormatter < TestCase
+     event = LogEvent.new(0, f, caller, "fake formatter")
+     event2 = LogEvent.new(0, f, nil, "fake formatter")
+     # this checks for tracing
+-    assert_match(b.format(event), /in/)
+-    assert_not_match(b.format(event2), /in/)
++    assert_match(/in/, b.format(event))
++    assert_not_match(/in/, b.format(event2))
+     e = ArgumentError.new("argerror")
+     e.set_backtrace ['backtrace']
+     event3 = LogEvent.new(0, f, nil, e)
+-    assert_match(b.format(event3), /ArgumentError/)
+-    assert_match(b.format(LogEvent.new(0,f,nil,[1,2,3])), /Array/)
++    assert_match(/ArgumentError/, b.format(event3))
++    assert_match(/Array/, b.format(LogEvent.new(0,f,nil,[1,2,3])))
+   end
+ end