From 52745685ec69357975b1852ec47fccc555506d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Mon, 3 Aug 2009 06:31:52 +0000 Subject: [PATCH 01/83] Initialize branch F-10 for rubygem-flexmock --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From c97bb3e45b4a392d3434f5ca2e4cb83bb74b68b8 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 3 Aug 2009 07:45:37 +0000 Subject: [PATCH 02/83] Initial import --- .cvsignore | 1 + rubygem-flexmock.spec | 175 ++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 177 insertions(+) create mode 100644 rubygem-flexmock.spec diff --git a/.cvsignore b/.cvsignore index e69de29..eb72f79 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +flexmock-0.8.6.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec new file mode 100644 index 0000000..c97c09a --- /dev/null +++ b/rubygem-flexmock.spec @@ -0,0 +1,175 @@ +%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%global rubyabi 1.8 + +%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%global gemname flexmock +%global geminstdir %{gemdir}/gems/%{gemname}-%{version} + +Summary: Mock object library for ruby +Name: rubygem-%{gemname} +Version: 0.8.6 +Release: 1%{?dist} +Group: Development/Languages +License: Copyright only +URL: http://flexmock.rubyforge.org +Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby(rubygems) +BuildRequires(check): rubygem(rake) +Requires: ruby(abi) = %{rubyabi} +Requires: ruby(rubygems) +Provides: ruby(%{gemname}) = %{name}-%{version} +BuildArch: noarch + +%description +FlexMock is a simple, but flexible, mock object library for Ruby unit +testing. + +%package doc +Summary: Documentation for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description doc +This package contains documentation for %{name}. + +%package -n ruby-%{gemname} +Summary: Non-Gem support package for %{gemname} +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Provides: ruby(%{gemname}) = %{version}-%{release} + +%description -n ruby-%{gemname} +This package provides non-Gem support for %{gemname}. + +%prep +%setup -q -c -T + +mkdir -p .%{gemdir} +gem install \ + --local \ + --install-dir .%{gemdir} \ + --force --rdoc -V \ + %{SOURCE0} + +find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' +find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 + +%build + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{gemdir} +cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ + +# Create symlinks +# Copied from rubygem-getetxt.spec +## +## Note that before switching to gem %%{ruby_sitelib}/%%{gemname} +## already existed as a directory, so this cannot be replaced +## by symlink (cpio fails) +## Similarly, all directories under %%{ruby_sitelib} cannot be +## replaced by symlink +# + +create_symlink_rec(){ + +ORIGBASEDIR=$1 +TARGETBASEDIR=$2 + +## First calculate relative path of ORIGBASEDIR +## from TARGETBASEDIR +TMPDIR=$TARGETBASEDIR +BACKDIR= +DOWNDIR= +num=0 +nnum=0 +while true +do + num=$((num+1)) + TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||') + DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||") + if [ x$DOWNDIR != x$ORIGBASEDIR ] + then + nnum=0 + while [ $nnum -lt $num ] + do + BACKDIR="../$BACKDIR" + nnum=$((nnum+1)) + done + break + fi +done + +RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' ) + +## Next actually create symlink +pushd %{buildroot}/$ORIGBASEDIR +find . -type f | while read f +do + DIRNAME=$(dirname $f) + BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g') + %{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME + LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \ + %{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \ + %{__sed} -e 's|/\./|/|' ) + %{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f +done +popd + +} + +create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} + +%clean +rm -rf %{buildroot} + +%check +pushd .%{geminstdir} +rake test_all --trace + +%files +%defattr(-,root,root,-) +%dir %{geminstdir} +%doc %{geminstdir}/[A-Z]* +%exclude %{geminstdir}/Rakefile +%exclude %{geminstdir}/install.rb +%{geminstdir}/lib/ +%{gemdir}/cache/%{gemname}-%{version}.gem +%{gemdir}/specifications/%{gemname}-%{version}.gemspec + +%files doc +%defattr(-,root,root,-) +%{geminstdir}/Rakefile +%{geminstdir}/flexmock.blurb +%{geminstdir}/doc/ +%{geminstdir}/test/ +%{gemdir}/doc/%{gemname}-%{version}/ + +%files -n ruby-%{gemname} +%defattr(-,root,root,-) +%{ruby_sitelib}/%{gemname}.rb +%{ruby_sitelib}/%{gemname}/ + +%changelog +* Thu Jul 30 2009 Mamoru Tasaka - 0.8.6-1 +- Switch to gem, repackage + +* Sun Jul 26 2009 Fedora Release Engineering - 0.7.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Nov 08 2007 Paul Nasrat - 0.7.1-3 +- Fix repoid + +* Wed Nov 07 2007 Paul Nasrat - 0.7.1-2 +- Spec cleanups in response to review +- Fix license +- strip out shebangs + +* Sun Sep 09 2007 Paul Nasrat - 0.7.1-1 +- Initial vesion diff --git a/sources b/sources index e69de29..6dfb5a0 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b087a648c5051e44e1d16fd886a7ce20 flexmock-0.8.6.gem From b82e99c61678bf00568a45f71099709b50bc9b94 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 3 Aug 2009 07:45:39 +0000 Subject: [PATCH 03/83] Initial import --- .cvsignore | 1 + rubygem-flexmock.spec | 175 ++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 177 insertions(+) create mode 100644 rubygem-flexmock.spec diff --git a/.cvsignore b/.cvsignore index e69de29..eb72f79 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +flexmock-0.8.6.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec new file mode 100644 index 0000000..c97c09a --- /dev/null +++ b/rubygem-flexmock.spec @@ -0,0 +1,175 @@ +%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%global rubyabi 1.8 + +%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%global gemname flexmock +%global geminstdir %{gemdir}/gems/%{gemname}-%{version} + +Summary: Mock object library for ruby +Name: rubygem-%{gemname} +Version: 0.8.6 +Release: 1%{?dist} +Group: Development/Languages +License: Copyright only +URL: http://flexmock.rubyforge.org +Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby(rubygems) +BuildRequires(check): rubygem(rake) +Requires: ruby(abi) = %{rubyabi} +Requires: ruby(rubygems) +Provides: ruby(%{gemname}) = %{name}-%{version} +BuildArch: noarch + +%description +FlexMock is a simple, but flexible, mock object library for Ruby unit +testing. + +%package doc +Summary: Documentation for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description doc +This package contains documentation for %{name}. + +%package -n ruby-%{gemname} +Summary: Non-Gem support package for %{gemname} +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Provides: ruby(%{gemname}) = %{version}-%{release} + +%description -n ruby-%{gemname} +This package provides non-Gem support for %{gemname}. + +%prep +%setup -q -c -T + +mkdir -p .%{gemdir} +gem install \ + --local \ + --install-dir .%{gemdir} \ + --force --rdoc -V \ + %{SOURCE0} + +find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' +find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 + +%build + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{gemdir} +cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ + +# Create symlinks +# Copied from rubygem-getetxt.spec +## +## Note that before switching to gem %%{ruby_sitelib}/%%{gemname} +## already existed as a directory, so this cannot be replaced +## by symlink (cpio fails) +## Similarly, all directories under %%{ruby_sitelib} cannot be +## replaced by symlink +# + +create_symlink_rec(){ + +ORIGBASEDIR=$1 +TARGETBASEDIR=$2 + +## First calculate relative path of ORIGBASEDIR +## from TARGETBASEDIR +TMPDIR=$TARGETBASEDIR +BACKDIR= +DOWNDIR= +num=0 +nnum=0 +while true +do + num=$((num+1)) + TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||') + DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||") + if [ x$DOWNDIR != x$ORIGBASEDIR ] + then + nnum=0 + while [ $nnum -lt $num ] + do + BACKDIR="../$BACKDIR" + nnum=$((nnum+1)) + done + break + fi +done + +RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' ) + +## Next actually create symlink +pushd %{buildroot}/$ORIGBASEDIR +find . -type f | while read f +do + DIRNAME=$(dirname $f) + BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g') + %{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME + LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \ + %{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \ + %{__sed} -e 's|/\./|/|' ) + %{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f +done +popd + +} + +create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} + +%clean +rm -rf %{buildroot} + +%check +pushd .%{geminstdir} +rake test_all --trace + +%files +%defattr(-,root,root,-) +%dir %{geminstdir} +%doc %{geminstdir}/[A-Z]* +%exclude %{geminstdir}/Rakefile +%exclude %{geminstdir}/install.rb +%{geminstdir}/lib/ +%{gemdir}/cache/%{gemname}-%{version}.gem +%{gemdir}/specifications/%{gemname}-%{version}.gemspec + +%files doc +%defattr(-,root,root,-) +%{geminstdir}/Rakefile +%{geminstdir}/flexmock.blurb +%{geminstdir}/doc/ +%{geminstdir}/test/ +%{gemdir}/doc/%{gemname}-%{version}/ + +%files -n ruby-%{gemname} +%defattr(-,root,root,-) +%{ruby_sitelib}/%{gemname}.rb +%{ruby_sitelib}/%{gemname}/ + +%changelog +* Thu Jul 30 2009 Mamoru Tasaka - 0.8.6-1 +- Switch to gem, repackage + +* Sun Jul 26 2009 Fedora Release Engineering - 0.7.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Nov 08 2007 Paul Nasrat - 0.7.1-3 +- Fix repoid + +* Wed Nov 07 2007 Paul Nasrat - 0.7.1-2 +- Spec cleanups in response to review +- Fix license +- strip out shebangs + +* Sun Sep 09 2007 Paul Nasrat - 0.7.1-1 +- Initial vesion diff --git a/sources b/sources index e69de29..6dfb5a0 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b087a648c5051e44e1d16fd886a7ce20 flexmock-0.8.6.gem From a6d3392053612b967b409d0c45869c9ff949c882 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:13:23 +0000 Subject: [PATCH 04/83] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c72d2e4..a16976a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := rubygem-flexmock SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From eaf012d5e51be323a0de75b99b4ff5340404290e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:06 +0000 Subject: [PATCH 05/83] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c72d2e4..a16976a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := rubygem-flexmock SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 77145b6a7a68461e6c549d27c0431b5b4e9103ac Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 22 Jul 2010 17:34:35 +0000 Subject: [PATCH 06/83] - 0.8.7 --- .cvsignore | 2 +- rubygem-flexmock.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index eb72f79..e625cff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -flexmock-0.8.6.gem +flexmock-0.8.7.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index c97c09a..f258dbd 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -7,7 +7,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gemname} -Version: 0.8.6 +Version: 0.8.7 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -154,6 +154,9 @@ rake test_all --trace %{ruby_sitelib}/%{gemname}/ %changelog +* Fri Jul 23 2010 Mamoru Tasaka - 0.8.7-1 +- 0.8.7 + * Thu Jul 30 2009 Mamoru Tasaka - 0.8.6-1 - Switch to gem, repackage diff --git a/sources b/sources index 6dfb5a0..89dd474 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b087a648c5051e44e1d16fd886a7ce20 flexmock-0.8.6.gem +1fa75d05558c2daa98c99d1cd27fd563 flexmock-0.8.7.gem From 082aea9da4ad1fcadec2fac89e9e7b442ec1308a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:50:23 +0000 Subject: [PATCH 07/83] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a16976a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: rubygem-flexmock -# $Id$ -NAME := rubygem-flexmock -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 From 53c106ae8852dc24cb177e2af1f4a0d6327c1916 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:50:24 +0000 Subject: [PATCH 08/83] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a16976a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: rubygem-flexmock -# $Id$ -NAME := rubygem-flexmock -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 2a44eac5c0f74adc0e0798888aaffc7ad77ae2be Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 17 Oct 2010 01:56:26 +0900 Subject: [PATCH 09/83] - 0.8.11 --- .gitignore | 1 + rubygem-flexmock.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e625cff..706ada7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ flexmock-0.8.7.gem +/flexmock-0.8.11.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index f258dbd..8575af3 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -7,7 +7,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gemname} -Version: 0.8.7 +Version: 0.8.11 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -154,6 +154,9 @@ rake test_all --trace %{ruby_sitelib}/%{gemname}/ %changelog +* Sun Oct 17 2010 Mamoru Tasaka - 0.8.11-1 +- 0.8.11 + * Fri Jul 23 2010 Mamoru Tasaka - 0.8.7-1 - 0.8.7 diff --git a/sources b/sources index 89dd474..eb10065 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1fa75d05558c2daa98c99d1cd27fd563 flexmock-0.8.7.gem +8c86088c7a3c85178149c5f005b6fcfc flexmock-0.8.11.gem From 744768ce88c2ea8421080f68fad317cc52f70f56 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 17 Oct 2010 02:29:30 +0900 Subject: [PATCH 10/83] Add memo --- rubygem-flexmock.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 8575af3..9271538 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -5,6 +5,10 @@ %global gemname flexmock %global geminstdir %{gemdir}/gems/%{gemname}-%{version} +# Note +# 0.8.11 seems to work only with ruby 1.8.7+ +# (test fails with 1.8.6.x (i.e. F-13)) + Summary: Mock object library for ruby Name: rubygem-%{gemname} Version: 0.8.11 From 97b2a16f159f240f0c90ca8a3ca6ec30aedfdbeb Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 2 Feb 2011 04:57:26 +0900 Subject: [PATCH 11/83] - Fix typo Provides on main package (bug 674413) --- rubygem-flexmock.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 9271538..a7d31eb 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -12,19 +12,18 @@ Summary: Mock object library for ruby Name: rubygem-%{gemname} Version: 0.8.11 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: ruby(rubygems) -BuildRequires(check): rubygem(rake) +BuildRequires: rubygem(rake) Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) -Provides: ruby(%{gemname}) = %{name}-%{version} +Provides: rubygem(%{gemname}) = %{version}-%{release} BuildArch: noarch %description @@ -64,7 +63,6 @@ find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 %build %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ @@ -127,9 +125,6 @@ popd create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} -%clean -rm -rf %{buildroot} - %check pushd .%{geminstdir} rake test_all --trace @@ -158,6 +153,9 @@ rake test_all --trace %{ruby_sitelib}/%{gemname}/ %changelog +* Wed Feb 2 2011 Mamoru Tasaka - 2.9.0-1 +- Fix typo Provides on main package (bug 674413) + * Sun Oct 17 2010 Mamoru Tasaka - 0.8.11-1 - 0.8.11 From b9a95b0141c18f20d19e2e474026d39f196b4860 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 03:51:30 -0600 Subject: [PATCH 12/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index a7d31eb..31c9a33 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -12,7 +12,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gemname} Version: 0.8.11 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -153,6 +153,9 @@ rake test_all --trace %{ruby_sitelib}/%{gemname}/ %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 0.8.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Feb 2 2011 Mamoru Tasaka - 2.9.0-1 - Fix typo Provides on main package (bug 674413) From ca05fcdb80b5af22a1dc29d99dc09f765a51995e Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 28 Feb 2011 04:38:22 +0900 Subject: [PATCH 13/83] 0.9.0 --- .gitignore | 1 + rubygem-flexmock.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 706ada7..db09b4a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ flexmock-0.8.7.gem /flexmock-0.8.11.gem +/flexmock-0.9.0.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 31c9a33..1188d21 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -11,8 +11,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gemname} -Version: 0.8.11 -Release: 3%{?dist} +Version: 0.9.0 +Release: 1%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -153,10 +153,13 @@ rake test_all --trace %{ruby_sitelib}/%{gemname}/ %changelog +* Mon Feb 28 2011 Mamoru Tasaka - 0.9.0-1 +- 0.9.0 + * Wed Feb 09 2011 Fedora Release Engineering - 0.8.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Wed Feb 2 2011 Mamoru Tasaka - 2.9.0-1 +* Wed Feb 2 2011 Mamoru Tasaka - 0.8.11-2 - Fix typo Provides on main package (bug 674413) * Sun Oct 17 2010 Mamoru Tasaka - 0.8.11-1 diff --git a/sources b/sources index eb10065..d74f4b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c86088c7a3c85178149c5f005b6fcfc flexmock-0.8.11.gem +aa2dcce220002cedd08001e5bad0961b flexmock-0.9.0.gem From f67d06a8978d8835def7b53258a11af4d03c7a64 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 21:09:46 -0600 Subject: [PATCH 14/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 1188d21..5f0c8e3 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -12,7 +12,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gemname} Version: 0.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -153,6 +153,9 @@ rake test_all --trace %{ruby_sitelib}/%{gemname}/ %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 28 2011 Mamoru Tasaka - 0.9.0-1 - 0.9.0 From dd7a80a9fd192909daab4520b1451f9c06b61f88 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 29 Jan 2012 01:28:57 +0900 Subject: [PATCH 15/83] F-17: rebuild against ruby 1.9 --- rubygem-flexmock.spec | 80 ++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 5f0c8e3..5ce06ee 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -1,30 +1,31 @@ %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") -%global rubyabi 1.8 +%global rubyabi 1.9.1 -%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%global gemname flexmock -%global geminstdir %{gemdir}/gems/%{gemname}-%{version} +%global gem_name flexmock # Note # 0.8.11 seems to work only with ruby 1.8.7+ # (test fails with 1.8.6.x (i.e. F-13)) Summary: Mock object library for ruby -Name: rubygem-%{gemname} +Name: rubygem-%{gem_name} Version: 0.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org -Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem +Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem BuildRequires: ruby(abi) = %{rubyabi} -BuildRequires: ruby(rubygems) +BuildRequires: rubygems-devel BuildRequires: rubygem(rake) Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) -Provides: rubygem(%{gemname}) = %{version}-%{release} +Provides: rubygem(%{gem_name}) = %{version}-%{release} BuildArch: noarch +%if 0%{?fedora} >= 17 +Obsoletes: ruby-%{gem_name} < 0.9.0-3 +%endif %description FlexMock is a simple, but flexible, mock object library for Ruby unit @@ -38,22 +39,22 @@ Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. -%package -n ruby-%{gemname} -Summary: Non-Gem support package for %{gemname} +%package -n ruby-%{gem_name} +Summary: Non-Gem support package for %{gem_name} Group: Development/Languages Requires: %{name} = %{version}-%{release} -Provides: ruby(%{gemname}) = %{version}-%{release} +Provides: ruby(%{gem_name}) = %{version}-%{release} -%description -n ruby-%{gemname} -This package provides non-Gem support for %{gemname}. +%description -n ruby-%{gem_name} +This package provides non-Gem support for %{gem_name}. %prep %setup -q -c -T -mkdir -p .%{gemdir} +mkdir -p .%{gem_dir} gem install \ --local \ - --install-dir .%{gemdir} \ + --install-dir .%{gem_dir} \ --force --rdoc -V \ %{SOURCE0} @@ -63,13 +64,13 @@ find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 %build %install -mkdir -p %{buildroot}%{gemdir} -cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ +mkdir -p %{buildroot}%{gem_dir} +cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ # Create symlinks # Copied from rubygem-getetxt.spec ## -## Note that before switching to gem %%{ruby_sitelib}/%%{gemname} +## Note that before switching to gem %%{ruby_sitelib}/%%{gem_name} ## already existed as a directory, so this cannot be replaced ## by symlink (cpio fails) ## Similarly, all directories under %%{ruby_sitelib} cannot be @@ -123,36 +124,43 @@ popd } -create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} +%if 0%{?fedora} < 17 +create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib} +%endif %check -pushd .%{geminstdir} +pushd .%{gem_instdir} rake test_all --trace %files %defattr(-,root,root,-) -%dir %{geminstdir} -%doc %{geminstdir}/[A-Z]* -%exclude %{geminstdir}/Rakefile -%exclude %{geminstdir}/install.rb -%{geminstdir}/lib/ -%{gemdir}/cache/%{gemname}-%{version}.gem -%{gemdir}/specifications/%{gemname}-%{version}.gemspec +%dir %{gem_instdir} +%doc %{gem_instdir}/[A-Z]* +%exclude %{gem_instdir}/Rakefile +%exclude %{gem_instdir}/install.rb +%{gem_libdir} +%{gem_cache} +%{gem_spec} %files doc %defattr(-,root,root,-) -%{geminstdir}/Rakefile -%{geminstdir}/flexmock.blurb -%{geminstdir}/doc/ -%{geminstdir}/test/ -%{gemdir}/doc/%{gemname}-%{version}/ +%{gem_instdir}/Rakefile +%{gem_instdir}/flexmock.blurb +%{gem_instdir}/doc/ +%{gem_instdir}/test/ +%{gem_dir}/doc/%{gem_name}-%{version}/ -%files -n ruby-%{gemname} +%if 0%{?fedora} < 17 +%files -n ruby-%{gem_name} %defattr(-,root,root,-) -%{ruby_sitelib}/%{gemname}.rb -%{ruby_sitelib}/%{gemname}/ +%{ruby_sitelib}/%{gem_name}.rb +%{ruby_sitelib}/%{gem_name}/ +%endif %changelog +* Sun Jan 29 2012 Mamoru Tasaka - 0.9.0-3 +- F-17: rebuild against ruby 1.9 + * Sat Jan 14 2012 Fedora Release Engineering - 0.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From d9fc456103565ab9918cef26e801d78a526e9c6e Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 29 Jan 2012 01:46:27 +0900 Subject: [PATCH 16/83] add BR --- rubygem-flexmock.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 5ce06ee..b7e923c 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -18,6 +18,7 @@ Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: rubygems-devel +BuildRequires: rubygem(minitest) BuildRequires: rubygem(rake) Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) From e1fb10cf18a67348a32f6faa5c9a9bfed0de83c2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 12:52:30 -0500 Subject: [PATCH 17/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index b7e923c..8c334a6 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -10,7 +10,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 0.9.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -159,6 +159,9 @@ rake test_all --trace %endif %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 0.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sun Jan 29 2012 Mamoru Tasaka - 0.9.0-3 - F-17: rebuild against ruby 1.9 From 641f6ecb13df8ba03118e83feb7d0216c9282200 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Fri, 14 Sep 2012 15:52:19 +0900 Subject: [PATCH 18/83] 1.0.2 --- .gitignore | 1 + rubygem-flexmock.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db09b4a..74d4429 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ flexmock-0.8.7.gem /flexmock-0.8.11.gem /flexmock-0.9.0.gem +/flexmock-1.0.2.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 8c334a6..e34ce4c 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -9,8 +9,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 0.9.0 -Release: 4%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -159,6 +159,9 @@ rake test_all --trace %endif %changelog +* Fri Sep 14 2012 Mamoru Tasaka - 1.0.2-1 +- 1.0.2 + * Sat Jul 21 2012 Fedora Release Engineering - 0.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index d74f4b2..61c1620 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa2dcce220002cedd08001e5bad0961b flexmock-0.9.0.gem +ce53007e05c249d13717833f53b128e9 flexmock-1.0.2.gem From 5490c021593412f412e26dc27e8fab1c6cdd63e8 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Fri, 14 Sep 2012 15:52:37 +0900 Subject: [PATCH 19/83] 1.0.2 --- .gitignore | 1 + rubygem-flexmock.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db09b4a..74d4429 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ flexmock-0.8.7.gem /flexmock-0.8.11.gem /flexmock-0.9.0.gem +/flexmock-1.0.2.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 8c334a6..e34ce4c 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -9,8 +9,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 0.9.0 -Release: 4%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -159,6 +159,9 @@ rake test_all --trace %endif %changelog +* Fri Sep 14 2012 Mamoru Tasaka - 1.0.2-1 +- 1.0.2 + * Sat Jul 21 2012 Fedora Release Engineering - 0.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index d74f4b2..61c1620 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa2dcce220002cedd08001e5bad0961b flexmock-0.9.0.gem +ce53007e05c249d13717833f53b128e9 flexmock-1.0.2.gem From c68e7ef1d145f54f5ce359bb6848356e2381f3da Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 11 Oct 2012 14:15:47 +0900 Subject: [PATCH 20/83] 1.0.3 --- .gitignore | 1 + rubygem-flexmock.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 74d4429..2597598 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ flexmock-0.8.7.gem /flexmock-0.8.11.gem /flexmock-0.9.0.gem /flexmock-1.0.2.gem +/flexmock-1.0.3.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index e34ce4c..3aba8d4 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -9,7 +9,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -159,6 +159,9 @@ rake test_all --trace %endif %changelog +* Thu Oct 11 2012 Mamoru Tasaka - 1.0.3-1 +- 1.0.3 + * Fri Sep 14 2012 Mamoru Tasaka - 1.0.2-1 - 1.0.2 diff --git a/sources b/sources index 61c1620..26291f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce53007e05c249d13717833f53b128e9 flexmock-1.0.2.gem +2454df79dadd065bb207a6840fb1a549 flexmock-1.0.3.gem From c81b9811716e3be74c9f43a258cc20795c27e4eb Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 11 Oct 2012 14:16:00 +0900 Subject: [PATCH 21/83] 1.0.3 --- .gitignore | 1 + rubygem-flexmock.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 74d4429..2597598 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ flexmock-0.8.7.gem /flexmock-0.8.11.gem /flexmock-0.9.0.gem /flexmock-1.0.2.gem +/flexmock-1.0.3.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index e34ce4c..3aba8d4 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -9,7 +9,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -159,6 +159,9 @@ rake test_all --trace %endif %changelog +* Thu Oct 11 2012 Mamoru Tasaka - 1.0.3-1 +- 1.0.3 + * Fri Sep 14 2012 Mamoru Tasaka - 1.0.2-1 - 1.0.2 diff --git a/sources b/sources index 61c1620..26291f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce53007e05c249d13717833f53b128e9 flexmock-1.0.2.gem +2454df79dadd065bb207a6840fb1a549 flexmock-1.0.3.gem From b3e723030fc9ad4ff1ba6d7f5f58fdcb77f38211 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 4 Nov 2012 02:53:10 +0900 Subject: [PATCH 22/83] 1.1.0 --- .gitignore | 1 + rubygem-flexmock.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2597598..e28bcfb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ flexmock-0.8.7.gem /flexmock-0.9.0.gem /flexmock-1.0.2.gem /flexmock-1.0.3.gem +/flexmock-1.1.0.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 3aba8d4..ac7a410 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -9,7 +9,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 1.0.3 +Version: 1.1.0 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -159,6 +159,9 @@ rake test_all --trace %endif %changelog +* Sun Nov 4 2012 Mamoru Tasaka - 1.1.0-1 +- 1.1.0 + * Thu Oct 11 2012 Mamoru Tasaka - 1.0.3-1 - 1.0.3 diff --git a/sources b/sources index 26291f2..e1802df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2454df79dadd065bb207a6840fb1a549 flexmock-1.0.3.gem +d9096ebf9dc84de3ed0aed721cc728e2 flexmock-1.1.0.gem From be09d7a941d2d6105fd67fa0a04eee505444009f Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 1 Jan 2013 17:48:47 +0900 Subject: [PATCH 23/83] 1.2.0 --- .gitignore | 1 + rubygem-flexmock.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e28bcfb..48f457a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ flexmock-0.8.7.gem /flexmock-1.0.2.gem /flexmock-1.0.3.gem /flexmock-1.1.0.gem +/flexmock-1.2.0.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index ac7a410..74ea8a1 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -9,7 +9,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -159,6 +159,9 @@ rake test_all --trace %endif %changelog +* Tue Jan 1 2013 Mamoru TASAKA - 1.2.0-1 +- 1.2.0 + * Sun Nov 4 2012 Mamoru Tasaka - 1.1.0-1 - 1.1.0 diff --git a/sources b/sources index e1802df..fea29d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9096ebf9dc84de3ed0aed721cc728e2 flexmock-1.1.0.gem +685fe64a30ed98aca50d16c240a582f6 flexmock-1.2.0.gem From f638416bd6843aefffffb7e33aca70ac64701199 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Mon, 4 Feb 2013 12:18:27 +0900 Subject: [PATCH 24/83] 1.3.0 --- .gitignore | 1 + rubygem-flexmock.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 48f457a..3ffa6c6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ flexmock-0.8.7.gem /flexmock-1.0.3.gem /flexmock-1.1.0.gem /flexmock-1.2.0.gem +/flexmock-1.3.0.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 74ea8a1..5e1eca9 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -9,7 +9,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 1.2.0 +Version: 1.3.0 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -159,6 +159,9 @@ rake test_all --trace %endif %changelog +* Mon Feb 4 2013 Mamoru TASAKA - 1.3.0-1 +- 1.3.0 + * Tue Jan 1 2013 Mamoru TASAKA - 1.2.0-1 - 1.2.0 diff --git a/sources b/sources index fea29d4..a8a7f59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -685fe64a30ed98aca50d16c240a582f6 flexmock-1.2.0.gem +ebfe6046a370536939ed11ad14e8297e flexmock-1.3.0.gem From 850f369217098d86d95f2f93016afafb850a515c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 27 Feb 2013 16:52:48 +0100 Subject: [PATCH 25/83] Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 --- rubygem-flexmock.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 5e1eca9..65bfa36 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -1,5 +1,4 @@ %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") -%global rubyabi 1.9.1 %global gem_name flexmock @@ -10,17 +9,17 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem -BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: rubygem(minitest) BuildRequires: rubygem(rake) -Requires: ruby(abi) = %{rubyabi} +Requires: ruby(release) Requires: ruby(rubygems) Provides: rubygem(%{gem_name}) = %{version}-%{release} BuildArch: noarch @@ -52,12 +51,7 @@ This package provides non-Gem support for %{gem_name}. %prep %setup -q -c -T -mkdir -p .%{gem_dir} -gem install \ - --local \ - --install-dir .%{gem_dir} \ - --force --rdoc -V \ - %{SOURCE0} +%gem_install -n %{SOURCE0} find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 @@ -159,6 +153,9 @@ rake test_all --trace %endif %changelog +* Wed Feb 27 2013 Josef Stribny - 1.3.0-2 +- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 + * Mon Feb 4 2013 Mamoru TASAKA - 1.3.0-1 - 1.3.0 From 89be5e7ce54c9b0e1da4e8aa598d2d50869fdce0 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 28 Feb 2013 13:07:26 +0900 Subject: [PATCH 26/83] Macro / BR / Requires cleanup --- rubygem-flexmock.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 65bfa36..d24bc52 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -1,5 +1,9 @@ %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%if 0%{?fedora} < 19 +%global rubyabi 1.9.1 +%endif + %global gem_name flexmock # Note @@ -9,17 +13,24 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 1.3.0 -Release: 2%{?dist} +Release: 4%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem +%if 0%{?fedora} >= 19 +Requires: ruby(release) BuildRequires: ruby(release) +%else +Requires: ruby(abi) = %{rubyabi} +Requires: ruby +BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby +%endif BuildRequires: rubygems-devel BuildRequires: rubygem(minitest) BuildRequires: rubygem(rake) -Requires: ruby(release) Requires: ruby(rubygems) Provides: rubygem(%{gem_name}) = %{version}-%{release} BuildArch: noarch @@ -153,6 +164,9 @@ rake test_all --trace %endif %changelog +* Wed Feb 27 2013 Mamoru TASAKA - 1.3.0-3 +- Macro / BR / Requires cleanup + * Wed Feb 27 2013 Josef Stribny - 1.3.0-2 - Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 From 23f9e64e425fd8bf716c5759a2c69600d41b89a0 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Wed, 3 Apr 2013 14:02:01 +0900 Subject: [PATCH 27/83] 1.3.1 --- .gitignore | 1 + rubygem-flexmock.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3ffa6c6..8b363e8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ flexmock-0.8.7.gem /flexmock-1.1.0.gem /flexmock-1.2.0.gem /flexmock-1.3.0.gem +/flexmock-1.3.1.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index d24bc52..83d596f 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -12,8 +12,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 1.3.0 -Release: 4%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -142,6 +142,7 @@ rake test_all --trace %defattr(-,root,root,-) %dir %{gem_instdir} %doc %{gem_instdir}/[A-Z]* +%exclude %{gem_instdir}/TAGS %exclude %{gem_instdir}/Rakefile %exclude %{gem_instdir}/install.rb %{gem_libdir} @@ -164,6 +165,9 @@ rake test_all --trace %endif %changelog +* Wed Apr 3 2013 Mamoru TASAKA - 1.3.1-1 +- 1.3.1 + * Wed Feb 27 2013 Mamoru TASAKA - 1.3.0-3 - Macro / BR / Requires cleanup diff --git a/sources b/sources index a8a7f59..b052747 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebfe6046a370536939ed11ad14e8297e flexmock-1.3.0.gem +1f99f96d1dee2131ca44fb7f9d14bba9 flexmock-1.3.1.gem From cc77c1ca37f4ccd9b89334ef886a2c16a8733df1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 08:52:51 -0500 Subject: [PATCH 28/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 83d596f..039f5f3 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -13,7 +13,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -165,6 +165,9 @@ rake test_all --trace %endif %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Apr 3 2013 Mamoru TASAKA - 1.3.1-1 - 1.3.1 From d5d07cfa768c46b02b6f11e30e21175e9e9ce602 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Aug 2013 15:43:44 +0900 Subject: [PATCH 29/83] 1.3.2 --- .gitignore | 1 + rubygem-flexmock.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b363e8..7a83c93 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ flexmock-0.8.7.gem /flexmock-1.2.0.gem /flexmock-1.3.0.gem /flexmock-1.3.1.gem +/flexmock-1.3.2.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 039f5f3..2624004 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -12,8 +12,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -165,6 +165,9 @@ rake test_all --trace %endif %changelog +* Wed Aug 6 2013 Mamoru TASAKA - 1.3.2-1 +- 1.3.2 + * Sun Aug 04 2013 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index b052747..06f0a1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f99f96d1dee2131ca44fb7f9d14bba9 flexmock-1.3.1.gem +12949cb3f5d1f20aae591cbd637dc9a7 flexmock-1.3.2.gem From 011992bee45f993bc4947bbaea02cfb3d622614b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 4 May 2014 14:21:35 +0900 Subject: [PATCH 30/83] 1.3.3 --- .gitignore | 1 + rubygem-flexmock.spec | 81 +++---------------------------------------- sources | 2 +- 3 files changed, 7 insertions(+), 77 deletions(-) diff --git a/.gitignore b/.gitignore index 7a83c93..134ecff 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ flexmock-0.8.7.gem /flexmock-1.3.0.gem /flexmock-1.3.1.gem /flexmock-1.3.2.gem +/flexmock-1.3.3.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 2624004..9a20eb5 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -1,33 +1,18 @@ %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") -%if 0%{?fedora} < 19 -%global rubyabi 1.9.1 -%endif - %global gem_name flexmock -# Note -# 0.8.11 seems to work only with ruby 1.8.7+ -# (test fails with 1.8.6.x (i.e. F-13)) - Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem -%if 0%{?fedora} >= 19 Requires: ruby(release) BuildRequires: ruby(release) -%else -Requires: ruby(abi) = %{rubyabi} -Requires: ruby -BuildRequires: ruby(abi) = %{rubyabi} -BuildRequires: ruby -%endif BuildRequires: rubygems-devel BuildRequires: rubygem(minitest) BuildRequires: rubygem(rake) @@ -73,66 +58,6 @@ find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ -# Create symlinks -# Copied from rubygem-getetxt.spec -## -## Note that before switching to gem %%{ruby_sitelib}/%%{gem_name} -## already existed as a directory, so this cannot be replaced -## by symlink (cpio fails) -## Similarly, all directories under %%{ruby_sitelib} cannot be -## replaced by symlink -# - -create_symlink_rec(){ - -ORIGBASEDIR=$1 -TARGETBASEDIR=$2 - -## First calculate relative path of ORIGBASEDIR -## from TARGETBASEDIR -TMPDIR=$TARGETBASEDIR -BACKDIR= -DOWNDIR= -num=0 -nnum=0 -while true -do - num=$((num+1)) - TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||') - DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||") - if [ x$DOWNDIR != x$ORIGBASEDIR ] - then - nnum=0 - while [ $nnum -lt $num ] - do - BACKDIR="../$BACKDIR" - nnum=$((nnum+1)) - done - break - fi -done - -RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' ) - -## Next actually create symlink -pushd %{buildroot}/$ORIGBASEDIR -find . -type f | while read f -do - DIRNAME=$(dirname $f) - BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g') - %{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME - LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \ - %{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \ - %{__sed} -e 's|/\./|/|' ) - %{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f -done -popd - -} - -%if 0%{?fedora} < 17 -create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib} -%endif %check pushd .%{gem_instdir} @@ -142,6 +67,7 @@ rake test_all --trace %defattr(-,root,root,-) %dir %{gem_instdir} %doc %{gem_instdir}/[A-Z]* +%exclude %{gem_instdir}/Gemfile* %exclude %{gem_instdir}/TAGS %exclude %{gem_instdir}/Rakefile %exclude %{gem_instdir}/install.rb @@ -165,6 +91,9 @@ rake test_all --trace %endif %changelog +* Sun May 4 2014 Mamoru TASAKA - 1.3.3-1 +- 1.3.3 + * Wed Aug 6 2013 Mamoru TASAKA - 1.3.2-1 - 1.3.2 diff --git a/sources b/sources index 06f0a1a..a290b93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12949cb3f5d1f20aae591cbd637dc9a7 flexmock-1.3.2.gem +7307ec90dc58d55224acab53c3bfb90e flexmock-1.3.3.gem From d5362b78bcb8cecbedb321a5b3e7d53c118977a3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:00:49 -0500 Subject: [PATCH 31/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 9a20eb5..6608baa 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -5,7 +5,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 1.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -91,6 +91,9 @@ rake test_all --trace %endif %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun May 4 2014 Mamoru TASAKA - 1.3.3-1 - 1.3.3 From 1522abb6bd6ace5e8a3a66b30b78d00a12b877e3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 19 Jun 2014 18:08:01 +0900 Subject: [PATCH 32/83] Force to use minitest ver4 for now --- rubygem-flexmock.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 6608baa..14150d8 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -2,10 +2,16 @@ %global gem_name flexmock +%if 0%{?fedora} >= 21 +%global gem_minitest rubygem(minitest4) +%else +%global gem_minitest rubygem(minitest) +%endif + Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 1.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -14,8 +20,7 @@ Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem Requires: ruby(release) BuildRequires: ruby(release) BuildRequires: rubygems-devel -BuildRequires: rubygem(minitest) -BuildRequires: rubygem(rake) +BuildRequires: %gem_minitest Requires: ruby(rubygems) Provides: rubygem(%{gem_name}) = %{version}-%{release} BuildArch: noarch @@ -61,7 +66,7 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ %check pushd .%{gem_instdir} -rake test_all --trace +ruby -Ilib:. -e 'gem "minitest", "~>4"; Dir.glob("test/*_test.rb").each {|f| require f}' %files %defattr(-,root,root,-) @@ -91,6 +96,9 @@ rake test_all --trace %endif %changelog +* Thu Jun 19 2014 Mamoru TASAKA - 1.3.3-3 +- Force to use minitest ver4 for now + * Sun Jun 08 2014 Fedora Release Engineering - 1.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From f7bdcb111d959ddbe18155f645a54992422b8364 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 23:05:06 +0000 Subject: [PATCH 33/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 14150d8..7ee32f2 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -11,7 +11,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 1.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -96,6 +96,9 @@ ruby -Ilib:. -e 'gem "minitest", "~>4"; Dir.glob("test/*_test.rb").each {|f| req %endif %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 1.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Jun 19 2014 Mamoru TASAKA - 1.3.3-3 - Force to use minitest ver4 for now From 1e60ea56739f6e53aed215b4b59f191ccfbe3fbe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Aug 2015 17:05:21 +0900 Subject: [PATCH 34/83] Fix two failing tests, and omit one test currently --- flexmock-1.3.3-assert_raise_with_regex.patch | 40 ++++++++++++++++++++ rubygem-flexmock.spec | 26 ++++++++++++- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 flexmock-1.3.3-assert_raise_with_regex.patch diff --git a/flexmock-1.3.3-assert_raise_with_regex.patch b/flexmock-1.3.3-assert_raise_with_regex.patch new file mode 100644 index 0000000..97721f0 --- /dev/null +++ b/flexmock-1.3.3-assert_raise_with_regex.patch @@ -0,0 +1,40 @@ +--- flexmock-1.3.3/test/based_partials_test.rb.regex 2015-08-13 11:31:55.254160727 +0900 ++++ flexmock-1.3.3/test/based_partials_test.rb 2015-08-14 16:13:11.475229271 +0900 +@@ -37,9 +37,10 @@ + + def test_based_partials_disallow_stubbing_undefined_methods + dog = Dog.new +- assert_raise(NoMethodError, /cannot stub.*wag.*explicitly/) do ++ e = assert_raise NoMethodError do + flexmock(dog).should_receive(:wag => :mock_value) + end ++ assert_match(/cannot stub.*wag.*explicitly/i, e.message.delete("\n")) + end + + def test_based_partials_allow_explicitly_stubbing_undefined_methods +--- flexmock-1.3.3/test/partial_mock_test.rb.regex 2015-08-13 11:31:55.258160751 +0900 ++++ flexmock-1.3.3/test/partial_mock_test.rb 2015-08-14 16:14:28.983671985 +0900 +@@ -44,9 +44,10 @@ + obj = Object.new + flexmock(obj) + obj.instance_eval { @flexmock_proxy = nil } +- assert_raises(RuntimeError, /missing.*proxy/i) do ++ e = assert_raise RuntimeError do + obj.should_receive(:hi).and_return(:stub_hi) + end ++ assert_match(/missing.*proxy/i, e.message.delete("\n")) + end + + def test_stub_command_add_behavior_to_arbitrary_objects_via_flexmock +@@ -426,9 +427,10 @@ + def test_partial_mocks_disallow_stubbing_undefined_methods_when_using_on + dog = Dog.new + flexmock(dog, :on, Dog) +- assert_raise(NoMethodError, /meow.*explicitly/) do ++ e = assert_raise NoMethodError do + dog.should_receive(:meow).and_return(:something) + end ++ assert_match(/meow.*explicitly/i, e.message.delete("\n")) + end + + # The following test was suggested by Pat Maddox for the RSpec diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 7ee32f2..5179913 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -11,16 +11,18 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 1.3.3 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem +Patch0: flexmock-1.3.3-assert_raise_with_regex.patch Requires: ruby(release) BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: %gem_minitest +BuildRequires: rubygem(test-unit) Requires: ruby(rubygems) Provides: rubygem(%{gem_name}) = %{version}-%{release} BuildArch: noarch @@ -57,6 +59,10 @@ This package provides non-Gem support for %{gem_name}. find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 +pushd .%{gem_instdir} +%patch0 -p1 +popd + %build %install @@ -66,7 +72,20 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ %check pushd .%{gem_instdir} -ruby -Ilib:. -e 'gem "minitest", "~>4"; Dir.glob("test/*_test.rb").each {|f| require f}' +ruby -Ilib:. \ + -e 'gem "minitest", "~>4"; Dir.glob("test/*_test.rb").each {|f| require f}' \ + || true + +# Omit one failing test +sed -i.fail test/tu_integration_test.rb \ + -e "\@flexmock('m')\.should_receive(:hi)\.once@s@\([^ \t].*\)\$@return; \1@" + +ruby -Ilib:. \ + -e 'gem "minitest", "~>4"; Dir.glob("test/*_test.rb").each {|f| require f}' + +find . -name \*.fail | while read f ; do mv $f ${f%.fail} ; done +popd + %files %defattr(-,root,root,-) @@ -96,6 +115,9 @@ ruby -Ilib:. -e 'gem "minitest", "~>4"; Dir.glob("test/*_test.rb").each {|f| req %endif %changelog +* Fri Aug 14 2015 Mamoru TASAKA - 1.3.3-5 +- Fix two failing tests, and omit one test currently + * Thu Jun 18 2015 Fedora Release Engineering - 1.3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 242eb131d321a1bb530e5fca4f668f7494f62788 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 24 Sep 2015 00:28:00 +0900 Subject: [PATCH 35/83] 2.0.0 --- .gitignore | 1 + flexmock-1.3.3-assert_raise_with_regex.patch | 40 ------------ flexmock-create-missing-test-files.sh | 32 +++++++++ rubygem-flexmock.spec | 68 ++++++++------------ sources | 2 +- 5 files changed, 62 insertions(+), 81 deletions(-) delete mode 100644 flexmock-1.3.3-assert_raise_with_regex.patch create mode 100644 flexmock-create-missing-test-files.sh diff --git a/.gitignore b/.gitignore index 134ecff..b29fdf9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ flexmock-0.8.7.gem /flexmock-1.3.1.gem /flexmock-1.3.2.gem /flexmock-1.3.3.gem +/flexmock-2.0.0.gem diff --git a/flexmock-1.3.3-assert_raise_with_regex.patch b/flexmock-1.3.3-assert_raise_with_regex.patch deleted file mode 100644 index 97721f0..0000000 --- a/flexmock-1.3.3-assert_raise_with_regex.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- flexmock-1.3.3/test/based_partials_test.rb.regex 2015-08-13 11:31:55.254160727 +0900 -+++ flexmock-1.3.3/test/based_partials_test.rb 2015-08-14 16:13:11.475229271 +0900 -@@ -37,9 +37,10 @@ - - def test_based_partials_disallow_stubbing_undefined_methods - dog = Dog.new -- assert_raise(NoMethodError, /cannot stub.*wag.*explicitly/) do -+ e = assert_raise NoMethodError do - flexmock(dog).should_receive(:wag => :mock_value) - end -+ assert_match(/cannot stub.*wag.*explicitly/i, e.message.delete("\n")) - end - - def test_based_partials_allow_explicitly_stubbing_undefined_methods ---- flexmock-1.3.3/test/partial_mock_test.rb.regex 2015-08-13 11:31:55.258160751 +0900 -+++ flexmock-1.3.3/test/partial_mock_test.rb 2015-08-14 16:14:28.983671985 +0900 -@@ -44,9 +44,10 @@ - obj = Object.new - flexmock(obj) - obj.instance_eval { @flexmock_proxy = nil } -- assert_raises(RuntimeError, /missing.*proxy/i) do -+ e = assert_raise RuntimeError do - obj.should_receive(:hi).and_return(:stub_hi) - end -+ assert_match(/missing.*proxy/i, e.message.delete("\n")) - end - - def test_stub_command_add_behavior_to_arbitrary_objects_via_flexmock -@@ -426,9 +427,10 @@ - def test_partial_mocks_disallow_stubbing_undefined_methods_when_using_on - dog = Dog.new - flexmock(dog, :on, Dog) -- assert_raise(NoMethodError, /meow.*explicitly/) do -+ e = assert_raise NoMethodError do - dog.should_receive(:meow).and_return(:something) - end -+ assert_match(/meow.*explicitly/i, e.message.delete("\n")) - end - - # The following test was suggested by Pat Maddox for the RSpec diff --git a/flexmock-create-missing-test-files.sh b/flexmock-create-missing-test-files.sh new file mode 100644 index 0000000..3322f63 --- /dev/null +++ b/flexmock-create-missing-test-files.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +usage() { + echo "$0 " +} + +set -e +set -x + +if [ $# -lt 1 ] ; then + usage + exit 1 +fi + +VERSION=$1 + +TMPDIR=$(mktemp -d /tmp/flexmock-XXXXXX) +CURDIR=$(pwd) + +pushd $TMPDIR + +git clone https://github.com/doudou/flexmock.git + +cd flexmock +git reset --hard $VERSION +cd .. + +tar czf $CURDIR/flexmock-${VERSION}-test-missing-files.tar.gz flexmock/test/ + +popd +rm -rf $TMPDIR + diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 5179913..08fd91e 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -2,26 +2,22 @@ %global gem_name flexmock -%if 0%{?fedora} >= 21 -%global gem_minitest rubygem(minitest4) -%else -%global gem_minitest rubygem(minitest) -%endif - Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 1.3.3 -Release: 5%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem -Patch0: flexmock-1.3.3-assert_raise_with_regex.patch +Source1: %{gem_name}-v%{version}-test-missing-files.tar.gz +# Source1 is created fron Source2 +Source2: flexmock-create-missing-test-files.sh Requires: ruby(release) BuildRequires: ruby(release) BuildRequires: rubygems-devel -BuildRequires: %gem_minitest +BuildRequires: rubygem(minitest) >= 5 BuildRequires: rubygem(test-unit) Requires: ruby(rubygems) Provides: rubygem(%{gem_name}) = %{version}-%{release} @@ -59,31 +55,31 @@ This package provides non-Gem support for %{gem_name}. find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 -pushd .%{gem_instdir} -%patch0 -p1 -popd - %build %install mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ +pushd %{buildroot}%{gem_instdir} +rm -rf \ + .autotest .gitignore .togglerc .travis.yml .yardopts \ + Gemfile \ + Rakefile \ + flexmock.blurb \ + flexmock.gemspec \ + install.rb %check pushd .%{gem_instdir} -ruby -Ilib:. \ - -e 'gem "minitest", "~>4"; Dir.glob("test/*_test.rb").each {|f| require f}' \ - || true -# Omit one failing test -sed -i.fail test/tu_integration_test.rb \ - -e "\@flexmock('m')\.should_receive(:hi)\.once@s@\([^ \t].*\)\$@return; \1@" +tar xf %{SOURCE1} +mv flexmock/test . -ruby -Ilib:. \ - -e 'gem "minitest", "~>4"; Dir.glob("test/*_test.rb").each {|f| require f}' - -find . -name \*.fail | while read f ; do mv $f ${f%.fail} ; done +ruby -Ilib:.:test \ + -e 'Dir.glob("test/*_test.rb").each {|f| require f}' +ruby -Ilib:.:test \ + -e 'gem "minitest" ; require "minitest/autorun" ; Dir.glob("test/minitest*/*_test.rb").each {|f| require f}' popd @@ -91,30 +87,22 @@ popd %defattr(-,root,root,-) %dir %{gem_instdir} %doc %{gem_instdir}/[A-Z]* -%exclude %{gem_instdir}/Gemfile* -%exclude %{gem_instdir}/TAGS -%exclude %{gem_instdir}/Rakefile -%exclude %{gem_instdir}/install.rb + %{gem_libdir} -%{gem_cache} +%{gem_instdir}/rakelib/ +%exclude %{gem_cache} %{gem_spec} %files doc %defattr(-,root,root,-) -%{gem_instdir}/Rakefile -%{gem_instdir}/flexmock.blurb +%{gem_instdir}/todo.txt %{gem_instdir}/doc/ -%{gem_instdir}/test/ -%{gem_dir}/doc/%{gem_name}-%{version}/ - -%if 0%{?fedora} < 17 -%files -n ruby-%{gem_name} -%defattr(-,root,root,-) -%{ruby_sitelib}/%{gem_name}.rb -%{ruby_sitelib}/%{gem_name}/ -%endif +%{gem_docdir}/ %changelog +* Thu Sep 24 2015 Mamoru TASAKA - 2.0.0-1 +- 2.0.0 + * Fri Aug 14 2015 Mamoru TASAKA - 1.3.3-5 - Fix two failing tests, and omit one test currently diff --git a/sources b/sources index a290b93..88997c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7307ec90dc58d55224acab53c3bfb90e flexmock-1.3.3.gem +178acc66c7d120a190780c1a63f4062e flexmock-2.0.0.gem From 1f13f0e0b1d2f6428a839a62808f9a3ac17697fe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 24 Sep 2015 00:39:56 +0900 Subject: [PATCH 36/83] add missing source --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b29fdf9..347dd7b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ flexmock-0.8.7.gem /flexmock-1.3.2.gem /flexmock-1.3.3.gem /flexmock-2.0.0.gem +/flexmock-v2.0.0-test-missing-files.tar.gz diff --git a/sources b/sources index 88997c6..e0a2c0f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 178acc66c7d120a190780c1a63f4062e flexmock-2.0.0.gem +c412f9d4da51e7a516678bc317e4b3b8 flexmock-v2.0.0-test-missing-files.tar.gz From 8dce264266c0c220966fea8365c30ddcab8b410d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 24 Sep 2015 22:44:09 +0900 Subject: [PATCH 37/83] 2.0.1 --- .gitignore | 2 ++ rubygem-flexmock.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 347dd7b..186e0f3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ flexmock-0.8.7.gem /flexmock-1.3.3.gem /flexmock-2.0.0.gem /flexmock-v2.0.0-test-missing-files.tar.gz +/flexmock-2.0.1.gem +/flexmock-v2.0.1-test-missing-files.tar.gz diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 08fd91e..f1f6f05 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -4,7 +4,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.0.0 +Version: 2.0.1 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Thu Sep 24 2015 Mamoru TASAKA - 2.0.1-1 +- 2.0.1 + * Thu Sep 24 2015 Mamoru TASAKA - 2.0.0-1 - 2.0.0 diff --git a/sources b/sources index e0a2c0f..165f148 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -178acc66c7d120a190780c1a63f4062e flexmock-2.0.0.gem -c412f9d4da51e7a516678bc317e4b3b8 flexmock-v2.0.0-test-missing-files.tar.gz +26a0858d0c634b613a34e0753c1d804a flexmock-2.0.1.gem +02a23ba5919c3a6e23dabccc958adc51 flexmock-v2.0.1-test-missing-files.tar.gz From 6e3fae68dc6c976cd2b941a95483f1a74dbf14d2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 18 Nov 2015 12:45:41 +0900 Subject: [PATCH 38/83] 2.0.2 --- .gitignore | 2 ++ flexmock-create-missing-test-files.sh | 2 +- rubygem-flexmock.spec | 5 ++++- sources | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 186e0f3..f7b2f96 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ flexmock-0.8.7.gem /flexmock-v2.0.0-test-missing-files.tar.gz /flexmock-2.0.1.gem /flexmock-v2.0.1-test-missing-files.tar.gz +/flexmock-2.0.2.gem +/flexmock-v2.0.2-test-missing-files.tar.gz diff --git a/flexmock-create-missing-test-files.sh b/flexmock-create-missing-test-files.sh index 3322f63..d161658 100644 --- a/flexmock-create-missing-test-files.sh +++ b/flexmock-create-missing-test-files.sh @@ -14,7 +14,7 @@ fi VERSION=$1 -TMPDIR=$(mktemp -d /tmp/flexmock-XXXXXX) +TMPDIR=$(mktemp -d /var/tmp/flexmock-XXXXXX) CURDIR=$(pwd) pushd $TMPDIR diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index f1f6f05..c29b7e0 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -4,7 +4,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Thu Sep 24 2015 Mamoru TASAKA - 2.0.2-1 +- 2.0.2 + * Thu Sep 24 2015 Mamoru TASAKA - 2.0.1-1 - 2.0.1 diff --git a/sources b/sources index 165f148..8a55e01 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -26a0858d0c634b613a34e0753c1d804a flexmock-2.0.1.gem -02a23ba5919c3a6e23dabccc958adc51 flexmock-v2.0.1-test-missing-files.tar.gz +fa09800b88e8aff8af46be3d5a9cb0ec flexmock-2.0.2.gem +45090d35d41b00db16288c3c4c8035b0 flexmock-v2.0.2-test-missing-files.tar.gz From 808f07545830964008e2c0085395c1b100f164fc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 16 Dec 2015 15:48:53 +0900 Subject: [PATCH 39/83] 2.0.3 --- .gitignore | 1 + rubygem-flexmock.spec | 5 ++++- sources | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f7b2f96..2152463 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ flexmock-0.8.7.gem /flexmock-v2.0.1-test-missing-files.tar.gz /flexmock-2.0.2.gem /flexmock-v2.0.2-test-missing-files.tar.gz +/flexmock-2.0.3.gem diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index c29b7e0..49f225c 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -4,7 +4,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Wed Dec 16 2015 Mamoru TASAKA - 2.0.3-1 +- 2.0.3 + * Thu Sep 24 2015 Mamoru TASAKA - 2.0.2-1 - 2.0.2 diff --git a/sources b/sources index 8a55e01..1a3e0f1 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -fa09800b88e8aff8af46be3d5a9cb0ec flexmock-2.0.2.gem -45090d35d41b00db16288c3c4c8035b0 flexmock-v2.0.2-test-missing-files.tar.gz +941bb79941fd73904cf75b4d0f04b33d flexmock-2.0.3.gem From 121476115b772a3300a16f603d55125387791ce0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 16 Dec 2015 15:57:47 +0900 Subject: [PATCH 40/83] add missng source --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 2152463..3341df9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ flexmock-0.8.7.gem /flexmock-2.0.2.gem /flexmock-v2.0.2-test-missing-files.tar.gz /flexmock-2.0.3.gem +/flexmock-v2.0.3-test-missing-files.tar.gz diff --git a/sources b/sources index 1a3e0f1..052a5b8 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 941bb79941fd73904cf75b4d0f04b33d flexmock-2.0.3.gem +5ba0d5dc9160132fc74101767c41ab9d flexmock-v2.0.3-test-missing-files.tar.gz From 99c2dc5556fcbeba6df8b40db2fe17506b7f36fd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 29 Dec 2015 15:43:19 +0900 Subject: [PATCH 41/83] 2.0.4 --- .gitignore | 2 ++ rubygem-flexmock.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3341df9..c9ae70f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ flexmock-0.8.7.gem /flexmock-v2.0.2-test-missing-files.tar.gz /flexmock-2.0.3.gem /flexmock-v2.0.3-test-missing-files.tar.gz +/flexmock-2.0.4.gem +/flexmock-v2.0.4-test-missing-files.tar.gz diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 49f225c..566b316 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -4,7 +4,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Tue Dec 29 2015 Mamoru TASAKA - 2.0.4-1 +- 2.0.4 + * Wed Dec 16 2015 Mamoru TASAKA - 2.0.3-1 - 2.0.3 diff --git a/sources b/sources index 052a5b8..67b518f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -941bb79941fd73904cf75b4d0f04b33d flexmock-2.0.3.gem -5ba0d5dc9160132fc74101767c41ab9d flexmock-v2.0.3-test-missing-files.tar.gz +c52d8ac35ad9dd8717a30532096331bf flexmock-2.0.4.gem +b2d9e84e2360b89d1e7af9e0847459ab flexmock-v2.0.4-test-missing-files.tar.gz From 04c86aa2d7295bf676da3f9cb482579158d6d367 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 22:42:29 +0000 Subject: [PATCH 42/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 566b316..afd428b 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -5,7 +5,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Dec 29 2015 Mamoru TASAKA - 2.0.4-1 - 2.0.4 From d4eb1aae5557555a7fe5636801ed6dda3d5925bd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Apr 2016 18:59:42 +0900 Subject: [PATCH 43/83] 2.0.5 --- .gitignore | 2 ++ rubygem-flexmock.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c9ae70f..a7d701c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ flexmock-0.8.7.gem /flexmock-v2.0.3-test-missing-files.tar.gz /flexmock-2.0.4.gem /flexmock-v2.0.4-test-missing-files.tar.gz +/flexmock-2.0.5.gem +/flexmock-v2.0.5-test-missing-files.tar.gz diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index afd428b..03e6da3 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -4,8 +4,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.0.4 -Release: 2%{?dist} +Version: 2.0.5 +Release: 1%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Wed Apr 13 2016 Mamoru TASAKA - 2.0.5-1 +- 2.0.5 + * Thu Feb 04 2016 Fedora Release Engineering - 2.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 67b518f..b8d4537 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c52d8ac35ad9dd8717a30532096331bf flexmock-2.0.4.gem -b2d9e84e2360b89d1e7af9e0847459ab flexmock-v2.0.4-test-missing-files.tar.gz +7ffe384ee7df74882f6859e2df5dbc5b flexmock-2.0.5.gem +aec0b37de0ce9b503ac6c372daba4165 flexmock-v2.0.5-test-missing-files.tar.gz From 2540fba3635619d0af16674e920a1cd7b5ef5aea Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 May 2016 18:01:26 +0900 Subject: [PATCH 44/83] 2.1.0 --- .gitignore | 2 ++ rubygem-flexmock.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a7d701c..42d8aa3 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ flexmock-0.8.7.gem /flexmock-v2.0.4-test-missing-files.tar.gz /flexmock-2.0.5.gem /flexmock-v2.0.5-test-missing-files.tar.gz +/flexmock-2.1.0.gem +/flexmock-v2.1.0-test-missing-files.tar.gz diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 03e6da3..8bda2c3 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -4,7 +4,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.0.5 +Version: 2.1.0 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Thu May 5 2016 Mamoru TASAKA - 2.1.0-1 +- 2.1.0 + * Wed Apr 13 2016 Mamoru TASAKA - 2.0.5-1 - 2.0.5 diff --git a/sources b/sources index b8d4537..8542ab5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7ffe384ee7df74882f6859e2df5dbc5b flexmock-2.0.5.gem -aec0b37de0ce9b503ac6c372daba4165 flexmock-v2.0.5-test-missing-files.tar.gz +8b85a2cbcd7456bd972b472f88d7794c flexmock-2.1.0.gem +d848e7275988303e503eed7403bd34fa flexmock-v2.1.0-test-missing-files.tar.gz From b75937691dbc56fee2c6a14870d0f2f33aada33e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 15 Jul 2016 22:16:43 +0900 Subject: [PATCH 45/83] 2.2.1 --- .gitignore | 2 ++ rubygem-flexmock.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 42d8aa3..cbb1124 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ flexmock-0.8.7.gem /flexmock-v2.0.5-test-missing-files.tar.gz /flexmock-2.1.0.gem /flexmock-v2.1.0-test-missing-files.tar.gz +/flexmock-2.2.1.gem +/flexmock-v2.2.1-test-missing-files.tar.gz diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 8bda2c3..a06484d 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -4,7 +4,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.1.0 +Version: 2.2.1 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Fri Jul 15 2016 Mamoru TASAKA - 2.2.1-1 +- 2.2.1 + * Thu May 5 2016 Mamoru TASAKA - 2.1.0-1 - 2.1.0 diff --git a/sources b/sources index 8542ab5..4c2ffaf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8b85a2cbcd7456bd972b472f88d7794c flexmock-2.1.0.gem -d848e7275988303e503eed7403bd34fa flexmock-v2.1.0-test-missing-files.tar.gz +ed0583859870661ed5cbd7eb3c796e76 flexmock-2.2.1.gem +4eabdece25dbc74dd1a971f32627027f flexmock-v2.2.1-test-missing-files.tar.gz From 07d5290a7d3a663891fcfcd62067c24a1bd272dd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 17 Oct 2016 14:06:04 +0900 Subject: [PATCH 46/83] 2.3.0 --- .gitignore | 2 ++ rubygem-flexmock.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cbb1124..4def62b 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ flexmock-0.8.7.gem /flexmock-v2.1.0-test-missing-files.tar.gz /flexmock-2.2.1.gem /flexmock-v2.2.1-test-missing-files.tar.gz +/flexmock-2.3.0.gem +/flexmock-v2.3.0-test-missing-files.tar.gz diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index a06484d..d9bf392 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -4,7 +4,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.2.1 +Version: 2.3.0 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Mon Oct 17 2016 Mamoru TASAKA - 2.3.0-1 +- 2.3.0 + * Fri Jul 15 2016 Mamoru TASAKA - 2.2.1-1 - 2.2.1 diff --git a/sources b/sources index 4c2ffaf..c0b2c2a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ed0583859870661ed5cbd7eb3c796e76 flexmock-2.2.1.gem -4eabdece25dbc74dd1a971f32627027f flexmock-v2.2.1-test-missing-files.tar.gz +d2e092c5c78f6593d1d57c9cd6373f26 flexmock-2.3.0.gem +26bee88ca9cd08d12fc7c6cdb7746fa2 flexmock-v2.3.0-test-missing-files.tar.gz From 5d7a4db4ab64b1664329c165be3187bb52bd08ed Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 1 Dec 2016 16:43:18 +0900 Subject: [PATCH 47/83] 2.3.4 --- .gitignore | 2 ++ rubygem-flexmock.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4def62b..6cddf1d 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ flexmock-0.8.7.gem /flexmock-v2.2.1-test-missing-files.tar.gz /flexmock-2.3.0.gem /flexmock-v2.3.0-test-missing-files.tar.gz +/flexmock-2.3.4.gem +/flexmock-v2.3.4-test-missing-files.tar.gz diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index d9bf392..6b4d6e3 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -4,7 +4,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.3.0 +Version: 2.3.4 Release: 1%{?dist} Group: Development/Languages License: Copyright only @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Thu Dec 1 2016 Mamoru TASAKA - 2.3.4-1 +- 2.3.4 + * Mon Oct 17 2016 Mamoru TASAKA - 2.3.0-1 - 2.3.0 diff --git a/sources b/sources index c0b2c2a..eea5237 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d2e092c5c78f6593d1d57c9cd6373f26 flexmock-2.3.0.gem -26bee88ca9cd08d12fc7c6cdb7746fa2 flexmock-v2.3.0-test-missing-files.tar.gz +77aee889ec83ef604e5b7097b58d2075 flexmock-2.3.4.gem +2948f87dd86e195ae0471d4267424866 flexmock-v2.3.4-test-missing-files.tar.gz From eb4aac68b148244a9c7414a1a9a178088a523abe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 12:13:45 +0000 Subject: [PATCH 48/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 6b4d6e3..245d95a 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -5,7 +5,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: Copyright only URL: http://flexmock.rubyforge.org @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Dec 1 2016 Mamoru TASAKA - 2.3.4-1 - 2.3.4 From 67b33746737e0fc2417de00fc145cbe79b0bc6dc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Mar 2017 10:53:03 +0900 Subject: [PATCH 49/83] 2.3.5 --- .gitignore | 2 ++ rubygem-flexmock.spec | 33 +++++++++++---------------------- sources | 4 ++-- 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 6cddf1d..99b4bfa 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ flexmock-0.8.7.gem /flexmock-v2.3.0-test-missing-files.tar.gz /flexmock-2.3.4.gem /flexmock-v2.3.4-test-missing-files.tar.gz +/flexmock-2.3.5.gem +/flexmock-v2.3.5-test-missing-files.tar.gz diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 245d95a..82e1f9f 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -1,15 +1,13 @@ -%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") - %global gem_name flexmock Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.3.4 -Release: 2%{?dist} +Version: 2.3.5 +Release: 1%{?dist} Group: Development/Languages -License: Copyright only -URL: http://flexmock.rubyforge.org -Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem +License: MIT +URL: https://github.com/doudou/flexmock +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: %{gem_name}-v%{version}-test-missing-files.tar.gz # Source1 is created fron Source2 Source2: flexmock-create-missing-test-files.sh @@ -18,13 +16,10 @@ Requires: ruby(release) BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: rubygem(minitest) >= 5 -BuildRequires: rubygem(test-unit) +BuildRequires: rubygem(rspec) >= 3 Requires: ruby(rubygems) Provides: rubygem(%{gem_name}) = %{version}-%{release} BuildArch: noarch -%if 0%{?fedora} >= 17 -Obsoletes: ruby-%{gem_name} < 0.9.0-3 -%endif %description FlexMock is a simple, but flexible, mock object library for Ruby unit @@ -38,15 +33,6 @@ Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. -%package -n ruby-%{gem_name} -Summary: Non-Gem support package for %{gem_name} -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Provides: ruby(%{gem_name}) = %{version}-%{release} - -%description -n ruby-%{gem_name} -This package provides non-Gem support for %{gem_name}. - %prep %setup -q -c -T @@ -69,6 +55,7 @@ rm -rf \ flexmock.blurb \ flexmock.gemspec \ install.rb +popd %check pushd .%{gem_instdir} @@ -78,8 +65,7 @@ mv flexmock/test . ruby -Ilib:.:test \ -e 'Dir.glob("test/*_test.rb").each {|f| require f}' -ruby -Ilib:.:test \ - -e 'gem "minitest" ; require "minitest/autorun" ; Dir.glob("test/minitest*/*_test.rb").each {|f| require f}' +rspec test/rspec_integration/ popd @@ -100,6 +86,9 @@ popd %{gem_docdir}/ %changelog +* Fri Mar 17 2017 Mamoru TASAKA - 2.3.5-1 +- 2.3.5 + * Sat Feb 11 2017 Fedora Release Engineering - 2.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index eea5237..afb0812 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -77aee889ec83ef604e5b7097b58d2075 flexmock-2.3.4.gem -2948f87dd86e195ae0471d4267424866 flexmock-v2.3.4-test-missing-files.tar.gz +SHA512 (flexmock-2.3.5.gem) = f941ef70b601b8e1ae2da8b44f159f42968020f3596df7dcb70059fffdcce240d2b825e5f2e162ce28aade5563c38d7bc8ff034e8f13c8879dd44425fb3c9ee6 +SHA512 (flexmock-v2.3.5-test-missing-files.tar.gz) = 56ff6b11d044c5e6fb06b930391d996aa7273655721565a9b8b980db223947ed5e79ff61839d215d2a5a749ea469ba7c274f66bb549e05fb2ad6acd96039ca20 From 1b4ed7104b37008e3b805e11bb806844b0e6ca6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 17:09:03 +0000 Subject: [PATCH 50/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 82e1f9f..0435307 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: MIT URL: https://github.com/doudou/flexmock @@ -86,6 +86,9 @@ popd %{gem_docdir}/ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Mar 17 2017 Mamoru TASAKA - 2.3.5-1 - 2.3.5 From e44f3864cec4ecb4d6cb1af384cfe986822e3dfc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 6 Oct 2017 18:57:13 +0900 Subject: [PATCH 51/83] 2.3.6 --- .gitignore | 2 ++ rubygem-flexmock.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 99b4bfa..178d97e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ flexmock-0.8.7.gem /flexmock-v2.3.4-test-missing-files.tar.gz /flexmock-2.3.5.gem /flexmock-v2.3.5-test-missing-files.tar.gz +/flexmock-2.3.6.gem +/flexmock-v2.3.6-test-missing-files.tar.gz diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 0435307..f8715b3 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -2,8 +2,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.3.5 -Release: 2%{?dist} +Version: 2.3.6 +Release: 1%{?dist} Group: Development/Languages License: MIT URL: https://github.com/doudou/flexmock @@ -86,6 +86,9 @@ popd %{gem_docdir}/ %changelog +* Fri Oct 6 2017 Mamoru TASAKA - 2.3.6-1 +- 2.3.6 + * Thu Jul 27 2017 Fedora Release Engineering - 2.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index afb0812..0adb2eb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (flexmock-2.3.5.gem) = f941ef70b601b8e1ae2da8b44f159f42968020f3596df7dcb70059fffdcce240d2b825e5f2e162ce28aade5563c38d7bc8ff034e8f13c8879dd44425fb3c9ee6 -SHA512 (flexmock-v2.3.5-test-missing-files.tar.gz) = 56ff6b11d044c5e6fb06b930391d996aa7273655721565a9b8b980db223947ed5e79ff61839d215d2a5a749ea469ba7c274f66bb549e05fb2ad6acd96039ca20 +SHA512 (flexmock-2.3.6.gem) = 9db8c95d8784e66743f089e7f1660a8205f6fbd63c820126ce551c581fe242b601cdcf34dfa2b93576ef83aaded29bedd6c0506d358d12fad9e423982b35f848 +SHA512 (flexmock-v2.3.6-test-missing-files.tar.gz) = d6265af9d3aa1d546046f985afd45da4de17342ba5897690708d420d7b695e75ed2f9c81fe17a2036cabbdcb0e81a1a233f4494ddc98f6625b88ceea3c959a93 From a8ae5c57e6e507e17372980bc262058764432c57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 13:55:54 +0000 Subject: [PATCH 52/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index f8715b3..0f553df 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: MIT URL: https://github.com/doudou/flexmock @@ -86,6 +86,9 @@ popd %{gem_docdir}/ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Oct 6 2017 Mamoru TASAKA - 2.3.6-1 - 2.3.6 From df1ff7312ac9ae2efdca48d34f61370268737988 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:36:54 -0500 Subject: [PATCH 53/83] Remove needless use of %defattr --- rubygem-flexmock.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 0f553df..aa34c0f 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -70,7 +70,6 @@ popd %files -%defattr(-,root,root,-) %dir %{gem_instdir} %doc %{gem_instdir}/[A-Z]* @@ -80,7 +79,6 @@ popd %{gem_spec} %files doc -%defattr(-,root,root,-) %{gem_instdir}/todo.txt %{gem_instdir}/doc/ %{gem_docdir}/ From 375f215249012730985218a8c82ef4e679add4b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 04:09:37 +0000 Subject: [PATCH 54/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index aa34c0f..5913141 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: MIT URL: https://github.com/doudou/flexmock @@ -84,6 +84,9 @@ popd %{gem_docdir}/ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 2.3.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 821375bdcc2567f4926620fecbf4803d63e08222 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:22 +0100 Subject: [PATCH 55/83] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- rubygem-flexmock.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 5913141..0f5ab94 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -4,7 +4,6 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 Release: 3%{?dist} -Group: Development/Languages License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -27,7 +26,6 @@ testing. %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} %description doc From c620e7680afd65db2bed71411b4275e7b45266c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 12:10:55 +0000 Subject: [PATCH 56/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 0f5ab94..599bcb5 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -82,6 +82,9 @@ popd %{gem_docdir}/ %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 2.3.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.3.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a51132ba9abab5d614948b1606e32eb865e7fc47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 19:19:57 +0000 Subject: [PATCH 57/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 599bcb5..c65e797 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -82,6 +82,9 @@ popd %{gem_docdir}/ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.3.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 2.3.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6725b5b46ae21734dfff9be69d553c590a232897 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 18:28:50 +0000 Subject: [PATCH 58/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index c65e797..d5b2ca4 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -82,6 +82,9 @@ popd %{gem_docdir}/ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 2.3.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 2.3.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ce19051a00b3945c59a66c5aa6436902253d536b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 06:22:58 +0000 Subject: [PATCH 59/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index d5b2ca4..e093cd5 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -82,6 +82,9 @@ popd %{gem_docdir}/ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.3.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 2.3.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 69f054c9a8f9aa572eaa3cbf5f1ff9de1d01074c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Jan 2021 03:20:08 +0900 Subject: [PATCH 60/83] Patch to support ruby 3.0 Use binding.source_location for test Properly accept argument and keywords Relax error message on test a bit --- rubygem-flexmock-2.3.6-accept-keywords.patch | 15 ++++++++ ...xmock-2.3.6-testsuite-binding-source.patch | 11 ++++++ ...2.3.6-workaround-relax-error-message.patch | 12 ++++++ rubygem-flexmock.spec | 38 +++++++++++++++---- 4 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 rubygem-flexmock-2.3.6-accept-keywords.patch create mode 100644 rubygem-flexmock-2.3.6-testsuite-binding-source.patch create mode 100644 rubygem-flexmock-2.3.6-workaround-relax-error-message.patch diff --git a/rubygem-flexmock-2.3.6-accept-keywords.patch b/rubygem-flexmock-2.3.6-accept-keywords.patch new file mode 100644 index 0000000..8eb92c4 --- /dev/null +++ b/rubygem-flexmock-2.3.6-accept-keywords.patch @@ -0,0 +1,15 @@ +diff -urp '--exclude=*~' flexmock-2.3.6/lib.orig/flexmock/composite_expectation.rb flexmock-2.3.6/lib/flexmock/composite_expectation.rb +--- flexmock-2.3.6/lib.orig/flexmock/composite_expectation.rb 2021-01-24 01:35:33.614853539 +0900 ++++ flexmock-2.3.6/lib/flexmock/composite_expectation.rb 2021-01-24 02:27:58.007313654 +0900 +@@ -16,9 +16,9 @@ class FlexMock + end + + # Apply the constraint method to all expectations in the composite. +- def method_missing(sym, *args, &block) ++ def method_missing(sym, *args, **keywords, &block) + @expectations.each do |expectation| +- expectation.send(sym, *args, &block) ++ expectation.send(sym, *args, **keywords, &block) + end + self + end diff --git a/rubygem-flexmock-2.3.6-testsuite-binding-source.patch b/rubygem-flexmock-2.3.6-testsuite-binding-source.patch new file mode 100644 index 0000000..a2d00d4 --- /dev/null +++ b/rubygem-flexmock-2.3.6-testsuite-binding-source.patch @@ -0,0 +1,11 @@ +--- flexmock-2.3.6/test/test_helper.rb.ruby3 2021-01-24 00:41:42.121385766 +0900 ++++ flexmock-2.3.6/test/test_helper.rb 2021-01-24 00:44:25.866236105 +0900 +@@ -50,7 +50,7 @@ + # added. + def assert_mock_failure(klass, options={}, &block) + ex = assert_failure(klass, options, &block) +- file = eval("__FILE__", block.binding) ++ file = block.binding.source_location.first + assert_matching_line(ex, file, options) + end + diff --git a/rubygem-flexmock-2.3.6-workaround-relax-error-message.patch b/rubygem-flexmock-2.3.6-workaround-relax-error-message.patch new file mode 100644 index 0000000..8a523e4 --- /dev/null +++ b/rubygem-flexmock-2.3.6-workaround-relax-error-message.patch @@ -0,0 +1,12 @@ +--- flexmock-2.3.6/test/partial_mock_test.rb.workaround 2021-01-24 02:36:13.468840410 +0900 ++++ flexmock-2.3.6/test/partial_mock_test.rb 2021-01-24 03:03:55.748278701 +0900 +@@ -621,7 +621,8 @@ + exception = assert_raises(NameError) do + obj.mocked_method + end +- assert_equal "undefined method `does_not_exist' for #{obj}", exception.message ++ assert(/undefined method `does_not_exist' for #<# %{gem_name}.gemspec + +( +cd flexmock +%patch1 -p1 +%patch3 -p1 +) +%patch2 -p1 find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 %build +gem build %{gem_name}.gemspec +%gem_install %install mkdir -p %{buildroot}%{gem_dir} @@ -56,12 +74,12 @@ rm -rf \ popd %check +cp -a flexmock/test .%{gem_instdir} pushd .%{gem_instdir} -tar xf %{SOURCE1} -mv flexmock/test . - -ruby -Ilib:.:test \ +export RUBYOPT=-W:deprecated +export RUBYLIB=$(pwd)/lib:$(pwd):$(pwd)/test +ruby \ -e 'Dir.glob("test/*_test.rb").each {|f| require f}' rspec test/rspec_integration/ popd @@ -82,6 +100,12 @@ popd %{gem_docdir}/ %changelog +* Sun Jan 24 2021 Mamoru TASAKA - 2.3.6-8 +- Patch to support ruby 3.0 + - Use binding.source_location for test + - Properly accept argument and keywords + - Relax error message on test a bit + * Wed Jul 29 2020 Fedora Release Engineering - 2.3.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From aeca81731cccfde053478a8bdb0ab4c25d573335 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 15:52:13 +0000 Subject: [PATCH 61/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 80ed7ca..98b6774 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.3.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Jan 24 2021 Mamoru TASAKA - 2.3.6-8 - Patch to support ruby 3.0 - Use binding.source_location for test From 83cd8a823ba2ead02a96720eef58bb13cd9e31d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 12:03:52 +0000 Subject: [PATCH 62/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 98b6774..14cc8eb 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 9%{?dist} +Release: 10%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.3.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 2.3.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d2ba456e462a42a6accbc6bb19b5be25b0e10856 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 18:32:09 +0000 Subject: [PATCH 63/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 14cc8eb..4fdaf49 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 10%{?dist} +Release: 11%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 2.3.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.3.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 7e3c79bae3473642e4a54e8e798eb11b1a29e7cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 01:32:49 +0000 Subject: [PATCH 64/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 4fdaf49..15537d2 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 11%{?dist} +Release: 12%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.3.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 2.3.6-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 1292fbfbf40b1290d2334203ce6513a052b64238 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 20:26:06 +0000 Subject: [PATCH 65/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 15537d2..277af48 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 12%{?dist} +Release: 13%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 2.3.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.3.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 3d76ecf515c1a7fc1c6fe86e6968a8e6de002900 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 17:36:20 +0000 Subject: [PATCH 66/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 277af48..6446ab7 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 13%{?dist} +Release: 14%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -100,6 +100,9 @@ popd %{gem_docdir}/ %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 2.3.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 2.3.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 7e8e3961dc4740ae6f76d8f049cb50addf6f36ff Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 8 Aug 2023 16:06:54 +0900 Subject: [PATCH 67/83] Handle MiniTest 5.19+ --- ...em-flexmock-2.3.6-minitest-5_19-compat.patch | 17 +++++++++++++++++ rubygem-flexmock.spec | 12 +++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 rubygem-flexmock-2.3.6-minitest-5_19-compat.patch diff --git a/rubygem-flexmock-2.3.6-minitest-5_19-compat.patch b/rubygem-flexmock-2.3.6-minitest-5_19-compat.patch new file mode 100644 index 0000000..927ff76 --- /dev/null +++ b/rubygem-flexmock-2.3.6-minitest-5_19-compat.patch @@ -0,0 +1,17 @@ +diff -urp flexmock-2.3.6.orig/lib/flexmock/minitest_integration.rb flexmock-2.3.6/lib/flexmock/minitest_integration.rb +--- flexmock-2.3.6.orig/lib/flexmock/minitest_integration.rb 2023-08-08 15:37:23.756749381 +0900 ++++ flexmock-2.3.6/lib/flexmock/minitest_integration.rb 2023-08-08 15:48:14.279445467 +0900 +@@ -8,11 +8,8 @@ + # above copyright notice is included. + #+++ + +-begin +- require 'minitest/assertions' +-rescue LoadError +- require 'minitest/unit' +-end ++require 'minitest/assertions' ++require 'minitest/unit' + + require 'flexmock/base' + require 'flexmock/test_unit_assert_spy_called' diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 6446ab7..8061d90 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -18,6 +18,8 @@ Patch1: rubygem-flexmock-2.3.6-testsuite-binding-source.patch Patch2: rubygem-flexmock-2.3.6-accept-keywords.patch # relax error messages on test suite on ruby 3.0 Patch3: rubygem-flexmock-2.3.6-workaround-relax-error-message.patch +# Support MiniTest 5.19+ +Patch4: rubygem-flexmock-2.3.6-minitest-5_19-compat.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -47,10 +49,11 @@ gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec ( cd flexmock -%patch1 -p1 -%patch3 -p1 +%patch -P1 -p1 +%patch -P3 -p1 ) -%patch2 -p1 +%patch -P2 -p1 +%patch -P4 -p1 find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 @@ -100,6 +103,9 @@ popd %{gem_docdir}/ %changelog +* Tue Aug 08 2023 Mamoru TASAKA - 2.3.6-15 +- Handle MiniTest 5.19+ + * Fri Jul 21 2023 Fedora Release Engineering - 2.3.6-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 91128a58b9bb6d85323a2994b249e7d589b8c7b3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 8 Aug 2023 16:24:02 +0900 Subject: [PATCH 68/83] Use modern spec style --- rubygem-flexmock.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 8061d90..15d951b 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -42,10 +42,8 @@ Requires: %{name} = %{version}-%{release} This package contains documentation for %{name}. %prep -gem unpack %{SOURCE0} -%setup -q -D -T -n %{gem_name}-%{version} -a 1 - -gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%setup -q -n %{gem_name}-%{version} -a 1 +mv ../%{gem_name}-%{version}.gemspec . ( cd flexmock @@ -59,7 +57,7 @@ find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 %build -gem build %{gem_name}.gemspec +gem build %{gem_name}-%{version}.gemspec %gem_install %install From 8fa7a6eddbfe3b54e2fdf9c0bc416ad2091d2ec7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 8 Aug 2023 16:49:35 +0900 Subject: [PATCH 69/83] bump spec --- rubygem-flexmock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 15d951b..2efff7c 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.6 -Release: 14%{?dist} +Release: 15%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem From b700d73c541453f8b75c081571cd5c495acfaa55 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 10:42:24 +0900 Subject: [PATCH 70/83] 2.3.8 --- .gitignore | 2 ++ ...em-flexmock-2.3.6-minitest-5_19-compat.patch | 17 ----------------- rubygem-flexmock.spec | 11 ++++++----- sources | 4 ++-- 4 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 rubygem-flexmock-2.3.6-minitest-5_19-compat.patch diff --git a/.gitignore b/.gitignore index 178d97e..633eeb3 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ flexmock-0.8.7.gem /flexmock-v2.3.5-test-missing-files.tar.gz /flexmock-2.3.6.gem /flexmock-v2.3.6-test-missing-files.tar.gz +/flexmock-2.3.8.gem +/flexmock-v2.3.8-test-missing-files.tar.gz diff --git a/rubygem-flexmock-2.3.6-minitest-5_19-compat.patch b/rubygem-flexmock-2.3.6-minitest-5_19-compat.patch deleted file mode 100644 index 927ff76..0000000 --- a/rubygem-flexmock-2.3.6-minitest-5_19-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urp flexmock-2.3.6.orig/lib/flexmock/minitest_integration.rb flexmock-2.3.6/lib/flexmock/minitest_integration.rb ---- flexmock-2.3.6.orig/lib/flexmock/minitest_integration.rb 2023-08-08 15:37:23.756749381 +0900 -+++ flexmock-2.3.6/lib/flexmock/minitest_integration.rb 2023-08-08 15:48:14.279445467 +0900 -@@ -8,11 +8,8 @@ - # above copyright notice is included. - #+++ - --begin -- require 'minitest/assertions' --rescue LoadError -- require 'minitest/unit' --end -+require 'minitest/assertions' -+require 'minitest/unit' - - require 'flexmock/base' - require 'flexmock/test_unit_assert_spy_called' diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 2efff7c..af0144c 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -2,8 +2,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.3.6 -Release: 15%{?dist} +Version: 2.3.8 +Release: 1%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -18,8 +18,6 @@ Patch1: rubygem-flexmock-2.3.6-testsuite-binding-source.patch Patch2: rubygem-flexmock-2.3.6-accept-keywords.patch # relax error messages on test suite on ruby 3.0 Patch3: rubygem-flexmock-2.3.6-workaround-relax-error-message.patch -# Support MiniTest 5.19+ -Patch4: rubygem-flexmock-2.3.6-minitest-5_19-compat.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -51,7 +49,6 @@ cd flexmock %patch -P3 -p1 ) %patch -P2 -p1 -%patch -P4 -p1 find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 @@ -67,6 +64,7 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ pushd %{buildroot}%{gem_instdir} rm -rf \ .autotest .gitignore .togglerc .travis.yml .yardopts \ + .github \ Gemfile \ Rakefile \ flexmock.blurb \ @@ -101,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Mon Aug 14 2023 Mamoru TASAKA - 2.3.8-1 +- 2.3.8 + * Tue Aug 08 2023 Mamoru TASAKA - 2.3.6-15 - Handle MiniTest 5.19+ diff --git a/sources b/sources index 0adb2eb..3b59fdf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (flexmock-2.3.6.gem) = 9db8c95d8784e66743f089e7f1660a8205f6fbd63c820126ce551c581fe242b601cdcf34dfa2b93576ef83aaded29bedd6c0506d358d12fad9e423982b35f848 -SHA512 (flexmock-v2.3.6-test-missing-files.tar.gz) = d6265af9d3aa1d546046f985afd45da4de17342ba5897690708d420d7b695e75ed2f9c81fe17a2036cabbdcb0e81a1a233f4494ddc98f6625b88ceea3c959a93 +SHA512 (flexmock-2.3.8.gem) = 9fd9925ceb7e6a8389b88fe788119e0d79199d5d6dc3654d588dc9f108a4fdf6a19cc5cc6528c706124a3e89ad626b4b67afd588ea49ff27ca6bf1245efe4816 +SHA512 (flexmock-v2.3.8-test-missing-files.tar.gz) = ab05c895bcb01eb2381fb6c4b8f93423342224fc401e6d47e36af950f396f9734462ad8df37cd97ef0461abd591be896f93d33ddcf5e523ac39725498533ac57 From 9363967cc170c0987537644a3ae009d4cbd3e33f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 12:52:35 +0000 Subject: [PATCH 71/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index af0144c..d9b2c77 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.8 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -99,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Aug 14 2023 Mamoru TASAKA - 2.3.8-1 - 2.3.8 From 95abe5201b85dc68b23418e26124935ecaee8189 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 16:49:09 +0000 Subject: [PATCH 72/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index d9b2c77..5b6fb35 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.8 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -99,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 2.3.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0484817cafcac910d6245f4943fdd32bee32f0bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:17:23 +0000 Subject: [PATCH 73/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 5b6fb35..69f8b75 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 2.3.8 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -99,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2.3.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jan 26 2024 Fedora Release Engineering - 2.3.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 07b8037da3d2b56ef5538e3b41083695f783fd00 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 3 Sep 2024 15:06:51 +0900 Subject: [PATCH 74/83] simplify .gitignore --- .gitignore | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 633eeb3..e8168ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,2 @@ -flexmock-0.8.7.gem -/flexmock-0.8.11.gem -/flexmock-0.9.0.gem -/flexmock-1.0.2.gem -/flexmock-1.0.3.gem -/flexmock-1.1.0.gem -/flexmock-1.2.0.gem -/flexmock-1.3.0.gem -/flexmock-1.3.1.gem -/flexmock-1.3.2.gem -/flexmock-1.3.3.gem -/flexmock-2.0.0.gem -/flexmock-v2.0.0-test-missing-files.tar.gz -/flexmock-2.0.1.gem -/flexmock-v2.0.1-test-missing-files.tar.gz -/flexmock-2.0.2.gem -/flexmock-v2.0.2-test-missing-files.tar.gz -/flexmock-2.0.3.gem -/flexmock-v2.0.3-test-missing-files.tar.gz -/flexmock-2.0.4.gem -/flexmock-v2.0.4-test-missing-files.tar.gz -/flexmock-2.0.5.gem -/flexmock-v2.0.5-test-missing-files.tar.gz -/flexmock-2.1.0.gem -/flexmock-v2.1.0-test-missing-files.tar.gz -/flexmock-2.2.1.gem -/flexmock-v2.2.1-test-missing-files.tar.gz -/flexmock-2.3.0.gem -/flexmock-v2.3.0-test-missing-files.tar.gz -/flexmock-2.3.4.gem -/flexmock-v2.3.4-test-missing-files.tar.gz -/flexmock-2.3.5.gem -/flexmock-v2.3.5-test-missing-files.tar.gz -/flexmock-2.3.6.gem -/flexmock-v2.3.6-test-missing-files.tar.gz -/flexmock-2.3.8.gem -/flexmock-v2.3.8-test-missing-files.tar.gz +/flexmock-*.gem +/flexmock-*-test-missing-files.tar.gz From f837203614f6b842f57eb0559778cc6c0775681b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 3 Sep 2024 15:08:23 +0900 Subject: [PATCH 75/83] 3.0.0 3.0.0 --- flexmock-create-missing-test-files.sh | 2 +- rubygem-flexmock-2.3.6-accept-keywords.patch | 15 ------- ...xmock-2.3.6-testsuite-binding-source.patch | 11 ----- ...2.3.6-workaround-relax-error-message.patch | 12 ------ rubygem-flexmock.spec | 40 +++++++++---------- sources | 4 +- 6 files changed, 21 insertions(+), 63 deletions(-) delete mode 100644 rubygem-flexmock-2.3.6-accept-keywords.patch delete mode 100644 rubygem-flexmock-2.3.6-testsuite-binding-source.patch delete mode 100644 rubygem-flexmock-2.3.6-workaround-relax-error-message.patch diff --git a/flexmock-create-missing-test-files.sh b/flexmock-create-missing-test-files.sh index d161658..4e56253 100644 --- a/flexmock-create-missing-test-files.sh +++ b/flexmock-create-missing-test-files.sh @@ -22,7 +22,7 @@ pushd $TMPDIR git clone https://github.com/doudou/flexmock.git cd flexmock -git reset --hard $VERSION +git reset --hard v$VERSION cd .. tar czf $CURDIR/flexmock-${VERSION}-test-missing-files.tar.gz flexmock/test/ diff --git a/rubygem-flexmock-2.3.6-accept-keywords.patch b/rubygem-flexmock-2.3.6-accept-keywords.patch deleted file mode 100644 index 8eb92c4..0000000 --- a/rubygem-flexmock-2.3.6-accept-keywords.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urp '--exclude=*~' flexmock-2.3.6/lib.orig/flexmock/composite_expectation.rb flexmock-2.3.6/lib/flexmock/composite_expectation.rb ---- flexmock-2.3.6/lib.orig/flexmock/composite_expectation.rb 2021-01-24 01:35:33.614853539 +0900 -+++ flexmock-2.3.6/lib/flexmock/composite_expectation.rb 2021-01-24 02:27:58.007313654 +0900 -@@ -16,9 +16,9 @@ class FlexMock - end - - # Apply the constraint method to all expectations in the composite. -- def method_missing(sym, *args, &block) -+ def method_missing(sym, *args, **keywords, &block) - @expectations.each do |expectation| -- expectation.send(sym, *args, &block) -+ expectation.send(sym, *args, **keywords, &block) - end - self - end diff --git a/rubygem-flexmock-2.3.6-testsuite-binding-source.patch b/rubygem-flexmock-2.3.6-testsuite-binding-source.patch deleted file mode 100644 index a2d00d4..0000000 --- a/rubygem-flexmock-2.3.6-testsuite-binding-source.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- flexmock-2.3.6/test/test_helper.rb.ruby3 2021-01-24 00:41:42.121385766 +0900 -+++ flexmock-2.3.6/test/test_helper.rb 2021-01-24 00:44:25.866236105 +0900 -@@ -50,7 +50,7 @@ - # added. - def assert_mock_failure(klass, options={}, &block) - ex = assert_failure(klass, options, &block) -- file = eval("__FILE__", block.binding) -+ file = block.binding.source_location.first - assert_matching_line(ex, file, options) - end - diff --git a/rubygem-flexmock-2.3.6-workaround-relax-error-message.patch b/rubygem-flexmock-2.3.6-workaround-relax-error-message.patch deleted file mode 100644 index 8a523e4..0000000 --- a/rubygem-flexmock-2.3.6-workaround-relax-error-message.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- flexmock-2.3.6/test/partial_mock_test.rb.workaround 2021-01-24 02:36:13.468840410 +0900 -+++ flexmock-2.3.6/test/partial_mock_test.rb 2021-01-24 03:03:55.748278701 +0900 -@@ -621,7 +621,8 @@ - exception = assert_raises(NameError) do - obj.mocked_method - end -- assert_equal "undefined method `does_not_exist' for #{obj}", exception.message -+ assert(/undefined method `does_not_exist' for #<# - 3.0.0-1 +- 3.0.0 + * Fri Jul 19 2024 Fedora Release Engineering - 2.3.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 3b59fdf..c7023c5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (flexmock-2.3.8.gem) = 9fd9925ceb7e6a8389b88fe788119e0d79199d5d6dc3654d588dc9f108a4fdf6a19cc5cc6528c706124a3e89ad626b4b67afd588ea49ff27ca6bf1245efe4816 -SHA512 (flexmock-v2.3.8-test-missing-files.tar.gz) = ab05c895bcb01eb2381fb6c4b8f93423342224fc401e6d47e36af950f396f9734462ad8df37cd97ef0461abd591be896f93d33ddcf5e523ac39725498533ac57 +SHA512 (flexmock-3.0.0.gem) = 06e9843e5769f2036c784c4e8e9c5cb4f27477d9c27941f1cd347fb2fae70861abbf3437e52703b9d01d7bda8a867e421e1439d4b8e99fe1cfb15f4a98ec6445 +SHA512 (flexmock-3.0.0-test-missing-files.tar.gz) = b384577680be6ee00ac2b835984d87e16a844bc7e59d11b7d6cd3b0a8275e28b0833c5cc999053f409530f3d2e1c2bfd5dbbcc6b22544db544ec46bc8102fad4 From d7f0efe8390e6115906a054cb3e16b6ca3fca7e7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 11 Sep 2024 17:00:41 +0900 Subject: [PATCH 76/83] 3.0.1 --- rubygem-flexmock.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index ca036d3..131fadf 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -2,7 +2,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} License: MIT URL: https://github.com/doudou/flexmock @@ -92,6 +92,9 @@ popd %{gem_docdir}/ %changelog +* Wed Sep 11 2024 Mamoru TASAKA - 3.0.1-1 +- 3.0.1 + * Tue Sep 03 2024 Mamoru TASAKA - 3.0.0-1 - 3.0.0 diff --git a/sources b/sources index c7023c5..c70812d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (flexmock-3.0.0.gem) = 06e9843e5769f2036c784c4e8e9c5cb4f27477d9c27941f1cd347fb2fae70861abbf3437e52703b9d01d7bda8a867e421e1439d4b8e99fe1cfb15f4a98ec6445 -SHA512 (flexmock-3.0.0-test-missing-files.tar.gz) = b384577680be6ee00ac2b835984d87e16a844bc7e59d11b7d6cd3b0a8275e28b0833c5cc999053f409530f3d2e1c2bfd5dbbcc6b22544db544ec46bc8102fad4 +SHA512 (flexmock-3.0.1.gem) = 3cc339d553b60b827ef970054a6afbb45b607697b74dca5850031bbf7520de9251092fe09f49a8c7c34aa49441080e847ac6a63bfc8e6124f2d2f10a14ac5734 +SHA512 (flexmock-3.0.1-test-missing-files.tar.gz) = f8567a323adbbafefd466b3f1024db2a4dc2ab4008bbd8cbd03c027c130492b317c8d0dbff9bfaef22cbbbe3313b7227291ab69b11ade290429beb14ce177cdc From 6b03bd80280dd77135de3577575a70aa7e40b2e5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 18 Nov 2024 16:00:07 +0900 Subject: [PATCH 77/83] Make testsuite compatible with ruby34 formatting change --- flexmock-3.0.1-testsuite-ruby34-formatting.patch | 13 +++++++++++++ rubygem-flexmock.spec | 12 +++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 flexmock-3.0.1-testsuite-ruby34-formatting.patch diff --git a/flexmock-3.0.1-testsuite-ruby34-formatting.patch b/flexmock-3.0.1-testsuite-ruby34-formatting.patch new file mode 100644 index 0000000..991e7b6 --- /dev/null +++ b/flexmock-3.0.1-testsuite-ruby34-formatting.patch @@ -0,0 +1,13 @@ +diff -urp flexmock.orig/test/partial_mock_test.rb flexmock/test/partial_mock_test.rb +--- flexmock.orig/test/partial_mock_test.rb 2024-11-18 15:38:57.625597258 +0900 ++++ flexmock/test/partial_mock_test.rb 2024-11-18 15:44:56.469851634 +0900 +@@ -633,7 +633,7 @@ class TestStubbing < Minitest::Test + exception = assert_raises(NameError) do + obj.mocked_method + end +- assert_match /undefined method `does_not_exist' for/, exception.message ++ assert_match /undefined method [`']does_not_exist' for/, exception.message + end + + def test_it_checks_whether_mocks_are_forbidden_before_forwarding_the_call +Only in flexmock/test: partial_mock_test.rb~ diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 131fadf..47dbb1a 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,13 +3,15 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: %{gem_name}-%{version}-test-missing-files.tar.gz # Source1 is created fron Source2 Source2: flexmock-create-missing-test-files.sh +# make testsuite compatible for ruby34 formatting change +Patch0: flexmock-3.0.1-testsuite-ruby34-formatting.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -35,6 +37,11 @@ This package contains documentation for %{name}. %setup -q -n %{gem_name}-%{version} -a 1 mv ../%{gem_name}-%{version}.gemspec . +( +cd flexmock/test +%patch -P0 -p2 +) + find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 @@ -92,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Mon Nov 18 2024 Mamoru TASAKA - 3.0.1-2 +- Make testsuite compatible with ruby34 formatting change + * Wed Sep 11 2024 Mamoru TASAKA - 3.0.1-1 - 3.0.1 From b854ecd8df8beb27ab947fae7ed7ca3b1ae7a62d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:15:26 +0000 Subject: [PATCH 78/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 47dbb1a..4a5e1e4 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 3.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -99,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Nov 18 2024 Mamoru TASAKA - 3.0.1-2 - Make testsuite compatible with ruby34 formatting change From 1ac95b83dbd96266d4aa089fd14d7b6a217a291c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:24:36 +0000 Subject: [PATCH 79/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 4a5e1e4..c03af0f 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 3.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -99,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 3.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 77919d8d64865d2e8c7b9492daa82746df2e97ad Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Aug 2025 16:40:39 +0900 Subject: [PATCH 80/83] rename --- ...ting.patch => flexmock-3.0.2-testsuite-ruby34-formatting.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename flexmock-3.0.1-testsuite-ruby34-formatting.patch => flexmock-3.0.2-testsuite-ruby34-formatting.patch (100%) diff --git a/flexmock-3.0.1-testsuite-ruby34-formatting.patch b/flexmock-3.0.2-testsuite-ruby34-formatting.patch similarity index 100% rename from flexmock-3.0.1-testsuite-ruby34-formatting.patch rename to flexmock-3.0.2-testsuite-ruby34-formatting.patch From ca5a1817cd1f69bcaf3e056f0fe7779e2a15c12f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Aug 2025 16:43:45 +0900 Subject: [PATCH 81/83] 3.0.2 --- rubygem-flexmock.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index c03af0f..b4e7edc 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -2,8 +2,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 3.0.1 -Release: 4%{?dist} +Version: 3.0.2 +Release: 1%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -11,7 +11,7 @@ Source1: %{gem_name}-%{version}-test-missing-files.tar.gz # Source1 is created fron Source2 Source2: flexmock-create-missing-test-files.sh # make testsuite compatible for ruby34 formatting change -Patch0: flexmock-3.0.1-testsuite-ruby34-formatting.patch +Patch0: flexmock-3.0.2-testsuite-ruby34-formatting.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -99,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Wed Aug 13 2025 Mamoru TASAKA - 3.0.2-1 +- 3.0.2 + * Fri Jul 25 2025 Fedora Release Engineering - 3.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index c70812d..9188481 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (flexmock-3.0.1.gem) = 3cc339d553b60b827ef970054a6afbb45b607697b74dca5850031bbf7520de9251092fe09f49a8c7c34aa49441080e847ac6a63bfc8e6124f2d2f10a14ac5734 -SHA512 (flexmock-3.0.1-test-missing-files.tar.gz) = f8567a323adbbafefd466b3f1024db2a4dc2ab4008bbd8cbd03c027c130492b317c8d0dbff9bfaef22cbbbe3313b7227291ab69b11ade290429beb14ce177cdc +SHA512 (flexmock-3.0.2.gem) = 07902e5641e2d014e626c1b64f65aeae493fff88ea4f7be42816e63f7609db92ff5fa3b1ad3010e6c352c88f81480667326d83257f55de17b388f3ab68ece827 +SHA512 (flexmock-3.0.2-test-missing-files.tar.gz) = 3660f0f4cdeab1f92d5b89a57217effdacfdf91fa80eea22fb0baa4bba99bed99b5a8f6c918fd6e008bd2c5d3005ec5a9bd18feb11d9c56c03b292a3a9cc3abd From 559502a2e931ba15433d74453fee5833ebcc00c0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Aug 2025 18:45:03 +0900 Subject: [PATCH 82/83] modify patch --- flexmock-3.0.2-testsuite-ruby34-formatting.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flexmock-3.0.2-testsuite-ruby34-formatting.patch b/flexmock-3.0.2-testsuite-ruby34-formatting.patch index 991e7b6..b37f0dd 100644 --- a/flexmock-3.0.2-testsuite-ruby34-formatting.patch +++ b/flexmock-3.0.2-testsuite-ruby34-formatting.patch @@ -5,9 +5,8 @@ diff -urp flexmock.orig/test/partial_mock_test.rb flexmock/test/partial_mock_tes exception = assert_raises(NameError) do obj.mocked_method end -- assert_match /undefined method `does_not_exist' for/, exception.message -+ assert_match /undefined method [`']does_not_exist' for/, exception.message +- assert_match(/undefined method `does_not_exist' for/, exception.message) ++ assert_match(/undefined method [`']does_not_exist' for/, exception.message) end def test_it_checks_whether_mocks_are_forbidden_before_forwarding_the_call -Only in flexmock/test: partial_mock_test.rb~ From 308e7d504e23c521336315006fb16c6b76a72d74 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Aug 2025 18:45:23 +0900 Subject: [PATCH 83/83] Fix warnigs for string literal being frozen in the future ruby --- ...k-3.0.2-ruby34-string-literal-frozen.patch | 33 +++++++++++++++++++ rubygem-flexmock.spec | 13 +++++--- 2 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 flexmock-3.0.2-ruby34-string-literal-frozen.patch diff --git a/flexmock-3.0.2-ruby34-string-literal-frozen.patch b/flexmock-3.0.2-ruby34-string-literal-frozen.patch new file mode 100644 index 0000000..8f12f6a --- /dev/null +++ b/flexmock-3.0.2-ruby34-string-literal-frozen.patch @@ -0,0 +1,33 @@ +diff -urp '--exclude=*~' flexmock-3.0.2.orig/lib/flexmock/spy_describers.rb flexmock-3.0.2/lib/flexmock/spy_describers.rb +--- flexmock-3.0.2.orig/lib/flexmock/spy_describers.rb 2025-08-13 16:49:42.102930421 +0900 ++++ flexmock-3.0.2/lib/flexmock/spy_describers.rb 2025-08-13 16:56:27.493387656 +0900 +@@ -18,7 +18,7 @@ class FlexMock + end + + def describe_spy(spy, sym, args, kw, options, not_clause="") +- result = "expected " ++ result = "expected ".dup + result << FlexMock.format_call(sym, args, kw) + result << " to#{not_clause} be received by " << spy.inspect + result << times_description(options[:times]) +@@ -29,7 +29,7 @@ class FlexMock + end + + def describe_calls(spy) +- result = '' ++ result = ''.dup + if spy.flexmock_calls.empty? + result << "No messages have been received\n" + else +diff -urp '--exclude=*~' flexmock-3.0.2.orig/test/container_methods_test.rb flexmock-3.0.2/test/container_methods_test.rb +--- flexmock-3.0.2.orig/test/container_methods_test.rb 2025-08-13 16:49:41.505249913 +0900 ++++ flexmock-3.0.2/test/container_methods_test.rb 2025-08-13 18:12:33.787388043 +0900 +@@ -112,7 +112,7 @@ class TestFlexmockContainerMethods < Min + end + + def test_stubbing_a_string +- s = "hello" ++ s = "hello".dup + flexmock(:base, s, :length => 2) + assert_equal 2, s.length + end diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index b4e7edc..be3040e 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -12,6 +12,8 @@ Source1: %{gem_name}-%{version}-test-missing-files.tar.gz Source2: flexmock-create-missing-test-files.sh # make testsuite compatible for ruby34 formatting change Patch0: flexmock-3.0.2-testsuite-ruby34-formatting.patch +# Remove warnings for string literal being frozen in the future +Patch1: flexmock-3.0.2-ruby34-string-literal-frozen.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -37,10 +39,10 @@ This package contains documentation for %{name}. %setup -q -n %{gem_name}-%{version} -a 1 mv ../%{gem_name}-%{version}.gemspec . -( -cd flexmock/test -%patch -P0 -p2 -) +mv flexmock/test . + +%patch -P0 -p1 +%patch -P1 -p1 find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 @@ -69,7 +71,7 @@ popd rm -f %{buildroot}%{gem_cache} %check -cp -a flexmock/test .%{gem_instdir} +cp -a test .%{gem_instdir} pushd .%{gem_instdir} export RUBYOPT=-W:deprecated @@ -101,6 +103,7 @@ popd %changelog * Wed Aug 13 2025 Mamoru TASAKA - 3.0.2-1 - 3.0.2 +- Fix warnigs for string literal being frozen in the future ruby * Fri Jul 25 2025 Fedora Release Engineering - 3.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild