[rubygem-sinatra] Fixed tests and doc

[Michal Fojtik]

commit e76b6a9ea7469295fbd85b88fb9b13e108f1b0a1
Author: Michal Fojtik <mi at mifo.sk>
Date:   Mon Jan 2 16:30:30 2012 +0100

    Fixed tests and doc

 rubygem-sinatra.spec |   64 +++++++++++++++++++++++++++++--------------------
 1 files changed, 38 insertions(+), 26 deletions(-)
---
diff --git a/rubygem-sinatra.spec b/rubygem-sinatra.spec
index 91662f0..344cc9a 100644
--- a/rubygem-sinatra.spec
+++ b/rubygem-sinatra.spec
@@ -1,4 +1,3 @@
-%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global gemname sinatra
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
@@ -6,17 +5,16 @@
 Summary:        Ruby-based web application framework
 Name:           rubygem-%{gemname}
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://sinatra.rubyforge.org
-Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Source0:        http://rubygems.org/downloads/%{gemname}-%{version}.gem
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       ruby(abi) = 1.8
 Requires:       rubygems
-Requires:       rubygem(rack) >= 0.9.1
+Requires:       rubygem(rack) >= 1.3.0
 Requires:       rubygem(tilt)
-Requires:       rubygem(rack-test) >= 0.3.0
 BuildRequires:  rubygems
 BuildArch:      noarch
 Provides:       rubygem(%{gemname}) = %{version}
@@ -26,46 +24,60 @@ Epoch:          1
 Sinatra is a DSL intended for quickly creating web-applications in Ruby
 with minimal effort.
 
+%package	doc
+Summary:	Documentation for %{name}
+Group:		Documentation
 
-%prep
+Requires:	%{name} = %{version}-%{release}
+Requires:	ruby(rubygems)
+
+%description	doc
+This package contains documentation for %{name}.
 
+%prep
+%setup -q -c -T
+%{__mkdir_p} .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            --force -V %{SOURCE0}
 
 %build
 
+%check
+pushd .%{geminstdir}
+%define test_files $(find * -path 'test/*_test.rb' -not -path "test/filter_test.rb" -not -path "test/integration_test.rb" | awk '{ print "-r"$1 }')
+ruby -I. -rubygems %{test_files} -e ""
+popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{gemdir}
-gem install --local --install-dir $RPM_BUILD_ROOT%{gemdir} \
-        --force --rdoc %{SOURCE0}
-rm $RPM_BUILD_ROOT/%geminstdir/.yardopts
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+mkdir -p %{buildroot}%{gemdir}
+cp -rv .%{gemdir}/* %{buildroot}%{gemdir}
+rm %{buildroot}/%geminstdir/.yardopts # Remove YARD configuration
 
 %files
-%defattr(-,root,root,-)
 %dir %{geminstdir}
 %{geminstdir}/lib
 %{geminstdir}/sinatra.gemspec
 %{geminstdir}/test
 %{geminstdir}/Rakefile
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/README.rdoc
-%doc %{geminstdir}/README.*.rdoc
-%doc %{geminstdir}/LICENSE
-%doc %{geminstdir}/AUTHORS
-%doc %{geminstdir}/CHANGES
-%doc %{geminstdir}/examples
-%doc %{geminstdir}/Gemfile
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
+%files doc
+%{gemdir}/doc/%{gemname}-%{version}
+%{geminstdir}/README.rdoc
+%{geminstdir}/README.*.rdoc
+%{geminstdir}/LICENSE
+%{geminstdir}/AUTHORS
+%{geminstdir}/CHANGES
+%{geminstdir}/examples
+%{geminstdir}/Gemfile
 
 %changelog
-* Mon Jan 02 2012 Michal Fojtik <mfojtik at redhat.com> - 1.3.2-1
+* Mon Jan 02 2012 Michal Fojtik <mfojtik at redhat.com> - 1.3.2-2
+- Added tests
+- Added doc subpackage
+
+* Mon Jan 02 2012 Michal Fojtik <mfojtik at redhat.com> - 1.3.2-2
 - Version bump
 
 * Thu Feb 10 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.6-1