From 5ef49146c827cce9d19be3c598c12c55a3f96d41 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Oct 01 2015 11:24:21 +0000 Subject: Update to formatador 0.2.5. --- diff --git a/.gitignore b/.gitignore index 2d195a5..77f8093 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /formatador-0.1.4.gem /formatador-0.2.1.gem /formatador-0.2.4.gem +/formatador-0.2.5.gem diff --git a/formatador-fix-tests-when-redirecting-to-file.patch b/formatador-fix-tests-when-redirecting-to-file.patch deleted file mode 100644 index 918fcb3..0000000 --- a/formatador-fix-tests-when-redirecting-to-file.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -ru ../rubygem-formatador-0.2.1.orig/usr/lib/ruby/gems/1.8/gems/formatador-0.2.1/tests/basic_tests.rb ./usr/lib/ruby/gems/1.8/gems/formatador-0.2.1/tests/basic_tests.rb ---- ../rubygem-formatador-0.2.1.orig/usr/lib/ruby/gems/1.8/gems/formatador-0.2.1/tests/basic_tests.rb 2011-10-17 08:23:00.000000000 +0200 -+++ ./usr/lib/ruby/gems/1.8/gems/formatador-0.2.1/tests/basic_tests.rb 2011-10-20 12:57:31.810397680 +0200 -@@ -10,6 +10,7 @@ - one - two - OUTPUT -+output = Formatador.parse(output) - - tests("#display_lines(['one', 'two']").returns(output) do - capture_stdout do -Only in ./usr/lib/ruby/gems/1.8/gems/formatador-0.2.1/tests: basic_tests.rb~ -diff -ru ../rubygem-formatador-0.2.1.orig/usr/lib/ruby/gems/1.8/gems/formatador-0.2.1/tests/table_tests.rb ./usr/lib/ruby/gems/1.8/gems/formatador-0.2.1/tests/table_tests.rb ---- ../rubygem-formatador-0.2.1.orig/usr/lib/ruby/gems/1.8/gems/formatador-0.2.1/tests/table_tests.rb 2011-10-17 08:23:00.000000000 +0200 -+++ ./usr/lib/ruby/gems/1.8/gems/formatador-0.2.1/tests/table_tests.rb 2011-10-20 12:58:33.930398612 +0200 -@@ -2,13 +2,14 @@ - - output = <<-OUTPUT - +---+ -- | \e[1ma\e[0m | -+ | [bold]a[/] | - +---+ - | 1 | - +---+ - | 2 | - +---+ - OUTPUT -+output = Formatador.parse(output) - - tests("#display_table([{:a => 1}, {:a => 2}])").returns(output) do - capture_stdout do -@@ -18,10 +19,11 @@ - - output = <<-OUTPUT - +--------+ -- | \e[1mheader\e[0m | -+ | [bold]header[/] | - +--------+ - +--------+ - OUTPUT -+output = Formatador.parse(output) - - tests("#display_table([], [:header])").returns(output) do - capture_stdout do -@@ -31,11 +33,12 @@ - - output = <<-OUTPUT - +--------+ -- | \e[1mheader\e[0m | -+ | [bold]header[/] | - +--------+ - | | - +--------+ - OUTPUT -+output = Formatador.parse(output) - - tests("#display_table([{:a => 1}], [:header])").returns(output) do - capture_stdout do -Only in ./usr/lib/ruby/gems/1.8/gems/formatador-0.2.1/tests: table_tests.rb~ diff --git a/rubygem-formatador.spec b/rubygem-formatador.spec index c86f29e..c7e32f5 100644 --- a/rubygem-formatador.spec +++ b/rubygem-formatador.spec @@ -1,35 +1,34 @@ %global gem_name formatador -%global bootstrap 0 +%{!?_with_bootstrap: %global bootstrap 0} -Summary: Ruby STDOUT text formatting Name: rubygem-%{gem_name} -Version: 0.2.4 -Release: 7%{?dist} +Version: 0.2.5 +Release: 1%{?dist} +Summary: Ruby STDOUT text formatting Group: Development/Languages License: MIT -URL: http://github.com/geemus/%{gem_name} -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -Requires: ruby(rubygems) -Requires: ruby(release) +URL: http://github.com/geemus/formatador +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +BuildRequires: ruby(release) BuildRequires: rubygems-devel -%if 0%{bootstrap} < 1 +%if ! 0%{?bootstrap} BuildRequires: rubygem(shindo) %endif BuildArch: noarch -Provides: rubygem(%{gem_name}) = %{version} %description -STDOUT text formatting +STDOUT text formatting. + %package doc Summary: Documentation for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description doc -Documentation for %{name} - +Documentation for %{name}. %prep %setup -q -c -T @@ -38,12 +37,12 @@ Documentation for %{name} %build %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{gem_dir} -cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ +cp -a .%{gem_dir}/* \ + %{buildroot}%{gem_dir}/ %check -%if 0%{bootstrap} < 1 +%if ! 0%{?bootstrap} pushd .%{gem_instdir} # if we don't use -Ilib, the already installed (perhaps older) gem will be used # but we want to test the actually packaged @@ -53,20 +52,26 @@ popd %files %dir %{gem_instdir} -%doc %{gem_instdir}/README.rdoc +%license %{gem_instdir}/LICENSE.md %{gem_libdir} -%{gem_cache} +%exclude %{gem_cache} %{gem_spec} %files doc %doc %{gem_docdir} -%doc %{gem_instdir}/changelog.txt +%doc %{gem_instdir}/CONTRIBUTING.md +%doc %{gem_instdir}/CONTRIBUTORS.md %{gem_instdir}/Gemfile +%doc %{gem_instdir}/README.rdoc %{gem_instdir}/Rakefile -%{gem_instdir}/tests +%doc %{gem_instdir}/changelog.txt %{gem_instdir}/formatador.gemspec +%{gem_instdir}/tests %changelog +* Thu Oct 01 2015 Vít Ondruch - 0.2.5-1 +- Update to formatador 0.2.5. + * Thu Jun 18 2015 Fedora Release Engineering - 0.2.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 6073ecf..f9432f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -724e245e4b983f24723cda7d456c9bab formatador-0.2.4.gem +f2d7213efd6a327ec6c34262185f6e2e formatador-0.2.5.gem