From 8dcd75241881cc3df1e7851c506f6358ac6f7fcf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Feb 2021 15:11:40 +0900 Subject: [PATCH] 1.11.0 --- .gitignore | 2 + ruby-progressbar-create-test-suite-tarball.sh | 34 ++++++++++++++ rubygem-ruby-progressbar.spec | 47 +++++++++++++++---- sources | 3 +- 4 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 ruby-progressbar-create-test-suite-tarball.sh diff --git a/.gitignore b/.gitignore index c2da2c0..a00be4d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /ruby-progressbar-1.9.0.gem /ruby-progressbar-1.10.0.gem /ruby-progressbar-1.10.1.gem +/ruby-progressbar-1.11.0.gem +/rubygem-ruby-progressbar-1.11.0-testsuite.tar.gz diff --git a/ruby-progressbar-create-test-suite-tarball.sh b/ruby-progressbar-create-test-suite-tarball.sh new file mode 100644 index 0000000..88c98f7 --- /dev/null +++ b/ruby-progressbar-create-test-suite-tarball.sh @@ -0,0 +1,34 @@ +#!/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} +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-ruby-progressbar.spec b/rubygem-ruby-progressbar.spec index 215c6ad..ca6ef0b 100644 --- a/rubygem-ruby-progressbar.spec +++ b/rubygem-ruby-progressbar.spec @@ -1,17 +1,23 @@ %global gem_name ruby-progressbar Name: rubygem-%{gem_name} -Version: 1.10.1 -Release: 5%{?dist} +Version: 1.11.0 +Release: 1%{?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: %{name}-%{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 @@ -31,40 +37,61 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} +%setup -q -n %{gem_name}-%{version} -a 1 +pushd %{gem_name}-%{version}/ +# rspectacular does nothing significant, removing +sed -i spec/spec_helper.rb -e '\@rspectacular@d' +popd +cp -a %{gem_name}-%{version}/spec . %build gem build ../%{gem_name}-%{version}.gemspec %gem_install - %install mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ +pushd %{buildroot}%{gem_instdir} +rm -f \ + Rakefile \ + %{nil} +popd + +%check +rm -rf .%{gem_instdir}/spec +cp -a spec .%{gem_instdir} + +pushd .%{gem_instdir} +export RUBYLIB=$(pwd)/lib + +# Need investigation +sed -i spec/lib/ruby-progressbar/base_spec.rb \ + -e '\@can be converted into a hash@s|it|xit|' + +ruby -rruby-progressbar -rtimecop -S rspec spec +popd %files %license %{gem_instdir}/LICENSE.txt %dir %{gem_instdir} - %{gem_libdir} - -%exclude %{gem_cache} - %{gem_spec} +%exclude %{gem_cache} %files doc %doc %{gem_docdir} %doc %{gem_instdir}/README.md -%{gem_instdir}/Rakefile - %changelog +* Mon Feb 15 2021 Mamoru TASAKA - 1.11.0-1 +- 1.11.0 + * Wed Jan 27 2021 Fedora Release Engineering - 1.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 7866e70..b6122d1 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (ruby-progressbar-1.10.1.gem) = 1a474e697d1e9849cc67842a756bad605aa8341fe8451a984f115f1c64754f522b4496d09ef8b47d16135fc165f4d02ea8944f99767573c699ca694ec3205f52 +SHA512 (ruby-progressbar-1.11.0.gem) = 4c1b20c1a7a982a8da9cd85ba53f043dd72aa7c4d98d47013d311d305d30461d760300ae0d60cdd2767c73d99c55fe07607b7086803f90ebf261549111524f27 +SHA512 (rubygem-ruby-progressbar-1.11.0-testsuite.tar.gz) = 7616db951ea10d6a21cd8c71fc3944f3048c8dc2b537e571fead1d8b0ea34f07bc85cee32eed56a2e737768d2d4954018ffd806c2457fc1fbbfa46b503b9a994