diff --git a/.gitignore b/.gitignore index fb0aa65..fc1de2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ -/progressbar-*.gem -/rubygem-ruby-progressbar-*-testsuite.tar.gz +/progressbar-0.9.0.gem +/rubygem-progressbar-test-load-path-fix.patch +/progressbar-0.11.0.gem +/progressbar-0.21.0.gem diff --git a/ruby-progressbar-create-test-suite-tarball.sh b/ruby-progressbar-create-test-suite-tarball.sh deleted file mode 100644 index 7625e74..0000000 --- a/ruby-progressbar-create-test-suite-tarball.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -if [ $# -lt 1 ] -then - echo "$0 " - exit 1 -fi - -set -x -set -e - -CURRDIR=$(pwd) -NAME=ruby-progressbar - -TMPDIRPATH=$(mktemp -d /var/tmp/${NAME}-tar-XXXXXX) -pushd $TMPDIRPATH - -NAME=ruby-progressbar -VERSION=$1 - - -VERSION_TAG=releases/v${VERSION} - -git clone https://github.com/jfelchner/${NAME}.git -pushd ${NAME} -git checkout -b fedora-${VERSION} ${VERSION_TAG} || - git checkout -b fedora-${VERSION} master -popd - -ln -sf ${NAME} ${NAME}-${VERSION} -tar czf ${CURRDIR}/rubygem-${NAME}-${VERSION}-testsuite.tar.gz ${NAME}-${VERSION}/./spec/ - -popd - -rm -rf $TMPDIRPATH diff --git a/rubygem-progressbar.spec b/rubygem-progressbar.spec index d4d3972..dc72eea 100644 --- a/rubygem-progressbar.spec +++ b/rubygem-progressbar.spec @@ -1,166 +1,78 @@ %global gem_name progressbar -Name: rubygem-%{gem_name} -Version: 1.13.0 -Release: 6%{?dist} -Summary: Ruby/ProgressBar is a flexible text progress bar library -License: MIT - -URL: https://github.com/jfelchner/ruby-progressbar -Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: rubygem-ruby-progressbar-%{version}-testsuite.tar.gz -# Source1 is created from $ bash %%{SOURCE2} -Source2: ruby-progressbar-create-test-suite-tarball.sh - -BuildRequires: ruby(release) -BuildRequires: rubygems-devel -BuildRequires: ruby -# check -BuildRequires: rubygem(timecop) -BuildRequires: rubygem(rspec) - -BuildArch: noarch +Summary: Ruby text progress bar generator library +Name: rubygem-%{gem_name} +Version: 0.21.0 +Release: 1%{?dist} +Group: Development/Languages +License: BSD or Ruby +URL: http://github.com/peleteiro/progressbar +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +BuildRequires: rubygems-devel +BuildRequires: rubygem(minitest) +BuildArch: noarch %description -Ruby/ProgressBar is an extremely flexible text progress bar library for Ruby. -The output can be customized with a flexible formatting system including: -percentage, bars of various formats, elapsed time and estimated time -remaining. +ProgressBar is a text progress bar library for Ruby. It can indicate +progress with percentage, a progress bar, and estimated remaining time. +%package doc +Summary: Documentation for %{name} +Group: Documentation +Requires:%{name} = %{version}-%{release} -%package doc -Summary: Documentation for %{name} -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description doc +%description doc Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -a 1 - -pushd ruby-%{gem_name}-%{version}/ -# rspectacular does nothing significant, removing -sed -i spec/spec_helper.rb -e '\@rspectacular@d' -popd -cp -a ruby-%{gem_name}-%{version}/spec . +%setup -q -c -T +%gem_install -n %{SOURCE0} %build -gem build ../%{gem_name}-%{version}.gemspec - -%gem_install %install +rm -rf %{buildroot} mkdir -p %{buildroot}%{gem_dir} -cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ - -pushd %{buildroot}%{gem_instdir} -rm -f \ - Rakefile \ - %{nil} -popd +cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir} %check -rm -rf .%{gem_instdir}/spec -cp -a spec .%{gem_instdir} - pushd .%{gem_instdir} -export RUBYLIB=$(pwd)/lib +# Run the tests using minitest 5. +ruby -Ilib -rminitest/autorun - << \EOF + module Kernel + alias orig_require require + remove_method :require -# Need investigation -sed -i spec/lib/ruby-progressbar/base_spec.rb \ - -e '\@can be converted into a hash@s|it|xit|' -# ??? -sed -i spec/lib/ruby-progressbar/projector/smoothed_average_spec.rb \ - -e 's|\.to be \([0-9][0-9]*\.[0-9][0-9]*\)|.to eq(\1)|' + def require path + orig_require path unless path == 'test/unit' + end + end + + Test = Minitest + + Dir.glob "./test/test.rb", &method(:require) +EOF -ruby -rprogressbar -rtimecop -S rspec spec popd %files -%license %{gem_instdir}/LICENSE.txt - %dir %{gem_instdir} +%exclude %{gem_instdir}/.* %{gem_libdir} +%doc %{gem_instdir}/LICENSE +%exclude %{gem_cache} %{gem_spec} -%exclude %{gem_cache} - %files doc -%doc %{gem_docdir} -%doc %{gem_instdir}/README.md - +%{gem_docdir} +%doc %{gem_instdir}/ChangeLog +%doc %{gem_instdir}/Gemfile* +%doc %{gem_instdir}/README.rdoc +%{gem_instdir}/Rakefile +%{gem_instdir}/%{gem_name}.gemspec +%{gem_instdir}/test %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.13.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.13.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.13.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jan 26 2024 Fedora Release Engineering - 1.13.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.13.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun Mar 5 2023 Mamoru TASAKA - 1.13.0-1 -- 1.13.0 - -* Fri Mar 3 2023 Mamoru TASAKA - 1.12.0-1 -- 1.12.0 - -* Fri Jan 20 2023 Fedora Release Engineering - 1.11.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.11.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.11.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Feb 15 2021 Mamoru TASAKA - 1.11.0-1 -- 1.11.0 - -* Wed Jan 27 2021 Fedora Release Engineering - 0.21.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.21.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 0.21.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 0.21.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 0.21.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.21.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.21.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.21.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.21.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 0.21.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 0.21.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - * Wed Jul 16 2014 Vít Ondruch - 0.21.0-1 - Update to progressbar 0.21.0. diff --git a/sources b/sources index 303c7c3..a774212 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (progressbar-1.13.0.gem) = 29835e3dd5b4f4f1fb6f62e2faead89abbbe4b969c77089d00bacdea25f8f093ff771f101490bc3e897f8e8bdce677b52c1f4d8bbc5ed79294699a4601063fec -SHA512 (rubygem-ruby-progressbar-1.13.0-testsuite.tar.gz) = 3ab35873192a7873df8f516fe209bab614d2e4c6b8cecb8a089f91806e1112adb73164ccfb82d433f46ece4e6243912cc67c014f4bf0a6aaf4cdc17b25c504a2 +d9f376cd8782e71c05a42bfda5b41a9f progressbar-0.21.0.gem