Fix spec testsuite failure with namespace collision

0.9.37

.gitignore

@@ -1,2 +1,3 @@
 /yard-*.gem
 /yard-*-spec.txz
+/yard-*-test-missing-files.tar.gz

rubygem-yard.spec

@@ -1,32 +1,48 @@
-%global gem_name yard
+%global	gem_name	yard
 
-Name: rubygem-%{gem_name}
-Version: 0.9.26
-Release: 5%{?dist}
-Summary: Documentation tool for consistent and usable documentation in Ruby
-License: MIT and (BSD or Ruby)
-URL: http://yardoc.org
-Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-# The test suite is not shipped with the gem. You may check it out like so:
-# git clone http://github.com/lsegal/yard
-# cd yard && git archive -v -o yard-0.9.26-spec.txz v0.9.26 spec/
-Source1: %{gem_name}-%{version}-spec.txz
+Name:		rubygem-%{gem_name}
+Version:	0.9.38
+Release:	2%{?dist}
+
+Summary:	Documentation tool for consistent and usable documentation in Ruby
+
+# lib/yard/parser/ruby/legacy/ruby_lex.rb: under GPL-2.0-only OR Ruby
+# lib/yard/rubygems/backports/: MIT OR Ruby
+# lib/yard/server/http_utils.rb: BSD 2-Clause
+# lib/yard/server/templates/default/fulldoc/html/js/autocomplete.js:
+#   MIT OR GPL(version 2??), as this is OR, use MIT for now
+# Others are MIT
+# SPDX confirmed
+License:	MIT AND (MIT OR Ruby) AND BSD-2-Clause AND (GPL-2.0-only OR Ruby)
+
+URL:		http://yardoc.org
+Source0:	https://rubygems.org/gems/%{gem_name}-%{version}.gem
+Source1:	%{gem_name}-%{version}-test-missing-files.tar.gz
+# Source1 is created by $ bash %%SOURCE2 %%version
+Source2:	yard-create-missing-test-files.sh
+# https://github.com/lsegal/yard/issues/1637
+# Fix spec testsuite with namespace collision
+Patch0:	yard-0.9.38-issue1637-spec-namespace-collision.patch
 
 # The 'irb/notifier' might be required for parsing of some old Ruby code.
 # https://github.com/lsegal/yard/blob/v0.9.24/lib/yard/parser/ruby/legacy/irb/slex.rb#L13
-Recommends: rubygem(irb)
-BuildRequires: ruby(release)
-BuildRequires: rubygems-devel
-BuildRequires: ruby
-BuildRequires: rubygem(RedCloth)
-BuildRequires: rubygem(asciidoctor)
-BuildRequires: rubygem(bundler)
-BuildRequires: rubygem(irb)
-BuildRequires: rubygem(rspec)
-BuildRequires: rubygem(redcarpet)
-BuildRequires: rubygem(rack)
-BuildRequires: rubygem(webrick)
-BuildArch: noarch
+Recommends:	rubygem(irb)
+
+BuildRequires:	ruby(release)
+BuildRequires:	rubygems-devel
+BuildRequires:	ruby
+BuildRequires:	rubygem(RedCloth)
+BuildRequires:	rubygem(asciidoctor)
+BuildRequires:	rubygem(bundler)
+BuildRequires:	rubygem(irb)
+BuildRequires:	rubygem(rack)
+BuildRequires:	/usr/bin/rackup
+BuildRequires:	rubygem(rake)
+BuildRequires:	rubygem(redcarpet)
+BuildRequires:	rubygem(rspec)
+BuildRequires:	rubygem(webrick)
+
+BuildArch:		noarch
 
 %description
 YARD is a documentation generation tool for the Ruby programming language.
@@ -35,88 +51,132 @@ exported to a number of formats very easily, and also supports extending for
 custom Ruby constructs such as custom class level definitions.
 
 
-%package doc
-Summary: Documentation for %{name}
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
+%package	doc
+Summary:	Documentation for %{name}
+Requires:	%{name} = %{version}-%{release}
+BuildArch:		noarch
 
 %description doc
 Documentation for %{name}.
 
 %prep
 %setup -q -n %{gem_name}-%{version} -b1
+%patch -P0 -p1
+mv ../%{gem_name}-%{version}.gemspec .
 
 %build
-# Create the gem as gem install only works on a gem file
-gem build ../%{gem_name}-%{version}.gemspec
-
-# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
-# by default, so that we can move it into the buildroot in %%install
+gem build ./%{gem_name}-%{version}.gemspec
 %gem_install
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* \
-        %{buildroot}%{gem_dir}/
+	%{buildroot}%{gem_dir}/
 
+pushd %{buildroot}%{gem_instdir}
+rm -rf .yardopts* \
+	%{nil}
+popd
 
 mkdir -p %{buildroot}%{_bindir}
 cp -a .%{_bindir}/* \
-        %{buildroot}%{_bindir}/
+	%{buildroot}%{_bindir}/
 
-# Some files in 0.9.24 release has still executable bit set :/
-# https://github.com/lsegal/yard/issues/1147
-find %{buildroot}%{gem_instdir} -type f | xargs chmod a-x
-
-find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
+find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod 0755
+rm -f %{buildroot}%{gem_cache}
 
 %check
-pushd .%{gem_instdir}
-# Copy the test suite into place
-cp -r %{_builddir}/spec .
-
-# There are quite some test mocking File functionality which makes running the
-# test suite without Bundler hard. Since the test suite includes Bundler test
-# cases, just remove the unnecessary dependencies and run the test suite via
-# Bundler.
-sed -r -i "/(coveralls|gettext|samus|simplecov)/ s/^/#/" Gemfile
-
-rspec -Ispec spec
-popd
+# FIXME
+# investigate this: was okay with yard 0.9.28
+sed -i spec/cli/diff_spec.rb \
+	-e '\@"searches for .gem file"@s|\([ \t]it \)|\txit |'
+rspec -r spec_helper spec
 
 %files
-%dir %{gem_instdir}
+%dir	%{gem_instdir}
+%license	%{gem_instdir}/LEGAL
+%license	%{gem_instdir}/LICENSE
+%doc	%{gem_instdir}/CHANGELOG.md
+%doc	%{gem_instdir}/README.md
+
 %{_bindir}/yard
 %{_bindir}/yardoc
 %{_bindir}/yri
-%exclude %{gem_instdir}/.*
-%license %{gem_instdir}/LEGAL
-%license %{gem_instdir}/LICENSE
+
+%{gem_libdir}/
 %{gem_instdir}/bin
-%{gem_libdir}
-%{gem_instdir}/po
-%{gem_instdir}/templates
-%exclude %{gem_cache}
+%{gem_instdir}/po/
+%{gem_instdir}/templates/
+
 %{gem_spec}
+%{?gem_plugin}
 
 %files doc
-%doc %{gem_docdir}
-%doc %{gem_instdir}/CHANGELOG.md
-%doc %{gem_instdir}/CODE_OF_CONDUCT.md
-%doc %{gem_instdir}/CONTRIBUTING.md
-%{gem_instdir}/Dockerfile.samus
-%{gem_instdir}/Gemfile
-%doc %{gem_instdir}/README.md
-%{gem_instdir}/Rakefile
-%doc %{gem_instdir}/SECURITY.md
-%{gem_instdir}/benchmarks
-%{gem_instdir}/tasks
-%{gem_plugin}
-%doc %{gem_instdir}/docs
-%{gem_instdir}/samus.json
-%{gem_instdir}/%{gem_name}.gemspec
+%doc	%{gem_docdir}
+%doc	%{gem_instdir}/docs/
 
 %changelog
+* Fri Jan 02 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.38-2
+- Fix spec testsuite failure with namespace collision
+
+* Mon Dec 08 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.38-1
+- 0.9.38
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.37-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Jun 10 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.37-3
+- BR: /usr/bin/rackup for rack / rackup gem split (bug 2371181)
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.37-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Sep 05 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.37-1
+- 0.9.37
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Mar 01 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.36-1
+- 0.9.36 (Fixes CVE-2024-27285)
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.34-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Nov 10 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.34-4
+- Testsuite: remove invalid yield usage from spec (for ruby3.3)
+
+* Mon Sep 25 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.34-3
+- Backport upstream patch for BOM detection change in ruby33
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.34-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Apr 13 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.34-1
+- 0.9.34
+
+* Wed Apr 12 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.33-1
+- 0.9.33
+
+* Mon Apr 10 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.32-1
+- 0.9.32
+
+* Sun Apr  9 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.29-1
+- 0.9.29
+- Whitespace cleanup
+- SPDX migration
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.28-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Aug 08 2022 Vít Ondruch <vondruch@redhat.com> - 0.9.28-1
+- Update to YARD 0.9.28.
+  Resolves: rhbz#2027537
+  Resolves: rhbz#2113713
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.26-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.26-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (yard-0.9.26.gem) = fc56f2170d40869252d4c81dc3bf4333c489328ae92ff0c290f84bcd772fbf30c75df0a874026b2d0f0d30deeaa55d2e9531f0c81c10a29eb610becee3568e46
-SHA512 (yard-0.9.26-spec.txz) = 157d940ed4f808a7df86f5bc31419620e1a325a8b7b7ed5847ed0f0cc5ab92760accc80d3efb6ae170246e296f578cf1da7f943bed40ca9d0548e84242a5964a
+SHA512 (yard-0.9.38.gem) = af69f50fb7ce065adc8b387c93327ee9001fd2526ddce9381d883c4aa9f1518e895a2128623956210509c2c0528700cab91c4fcb30c0c88802e9007d5c5b43f2
+SHA512 (yard-0.9.38-test-missing-files.tar.gz) = 08084b435ebbccf7fb85707c243d7a6e5be21f09188b05ebe50e41b897e34cb32d2310423567a89aef205ef2db5bfdfa7e334a1f2f61013132112331bce6df08

yard-0.9.38-issue1637-spec-namespace-collision.patch

@@ -0,0 +1,16 @@
+diff --git a/spec/tags/types_explainer_spec.rb b/spec/tags/types_explainer_spec.rb
+index de7454d3..5eb72d47 100644
+--- a/spec/tags/types_explainer_spec.rb
++++ b/spec/tags/types_explainer_spec.rb
+@@ -5,10 +5,9 @@ RSpec.describe YARD::Tags::TypesExplainer do
+   CollectionType = YARD::Tags::TypesExplainer::CollectionType
+   FixedCollectionType = YARD::Tags::TypesExplainer::FixedCollectionType
+   HashCollectionType = YARD::Tags::TypesExplainer::HashCollectionType
+-  Parser = YARD::Tags::TypesExplainer::Parser
+ 
+   def parse(types)
+-    Parser.new(types).parse
++    YARD::Tags::TypesExplainer::Parser.new(types).parse
+   end
+ 
+   def parse_fail(types)

yard-create-missing-test-files.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+usage() {
+	echo "$0 <VERSION>"
+}
+
+set -e
+set -x
+
+if [ $# -lt 1 ] ; then
+	usage
+	exit 1
+fi
+
+VERSION=$1
+
+GEMNAME=yard
+TMPDIR=$(mktemp -d /tmp/${GEMNAME}-XXXXXX)
+CURDIR=$(pwd)
+GITTOPDIR=${GEMNAME}-${VERSION}
+
+pushd $TMPDIR
+
+git clone http://github.com/lsegal/${GEMNAME} ${GITTOPDIR}
+cd ${GEMNAME}-$VERSION
+
+git checkout -b fedora-$VERSION v$VERSION
+cd ..
+
+tar czf $CURDIR/${GEMNAME}-${VERSION}-test-missing-files.tar.gz \
+	${GITTOPDIR}/spec/ \
+
+popd
+rm -rf $TMPDIR
+