From a9cbc863afee4835be8f02df220137537f34f5aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 13 Apr 2016 17:11:12 +0200 Subject: [PATCH] Update to Cucumber 2.3.3. Bootstrap round. --- .gitignore | 1 + rubygem-cucumber.spec | 126 ++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 85 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 87ecf07..2b1c1b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ cucumber-1.2.1.gem/cucumber-1.3.15.gem /cucumber-1.3.18.gem +/cucumber-2.3.3.gem diff --git a/rubygem-cucumber.spec b/rubygem-cucumber.spec index 3153888..4ef75ae 100644 --- a/rubygem-cucumber.spec +++ b/rubygem-cucumber.spec @@ -1,16 +1,34 @@ %global gem_name cucumber -Summary: Tool to execute plain-text documents as functional tests -Name: rubygem-%{gem_name} -Version: 1.3.18 -Release: 3%{?dist} -Group: Development/Languages -License: MIT -URL: http://cukes.info -Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: rubygems-devel -BuildArch: noarch +%{?_with_bootstrap: %global bootstrap 1} +%global bootstrap 1 + +Name: rubygem-%{gem_name} +Version: 2.3.3 +Release: 0.1%{?dist} +Summary: Tool to execute plain-text documents as functional tests +Group: Development/Languages +License: MIT +URL: http://cukes.info +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +Requires: js-jquery1 +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby +BUildRequires: js-jquery1 +BuildRequires: web-assets-devel +# Aruba has circular dependency with Cucumber. +%if ! 0%{?bootstrap} +BuildRequires: rubygem(aruba) +%endif +BuildRequires: rubygem(builder) +BuildRequires: rubygem(cucumber-core) +BuildRequires: rubygem(cucumber-wire) +BuildRequires: rubygem(multi_json) +BuildRequires: rubygem(multi_test) +BuildRequires: rubygem(nokogiri) +BuildRequires: rubygem(rspec) +BuildArch: noarch %description Cucumber lets software development teams describe how software should behave @@ -18,6 +36,15 @@ in plain text. The text is written in a business-readable domain-specific language and serves as documentation, automated tests and development-aid. +%package doc +Summary: Documentation for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +Documentation for %{name}. + %prep %setup -q -c -T %gem_install -n %{SOURCE0} @@ -27,7 +54,7 @@ language and serves as documentation, automated tests and development-aid. %install mkdir -p %{buildroot}%{gem_dir} -cp -pa .%{gem_dir}/* \ +cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ @@ -37,46 +64,59 @@ cp -pa .%{_bindir}/* \ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x -rm -f $RPM_BUILD_ROOT%{gem_instdir}/.ruby-gemset -rm -f $RPM_BUILD_ROOT%{gem_instdir}/.ruby-version -rm -f $RPM_BUILD_ROOT%{gem_instdir}/.yardopts -rm -f $RPM_BUILD_ROOT%{gem_instdir}/.gitattributes -rm -f $RPM_BUILD_ROOT%{gem_instdir}/.gitmodules -rm -f $RPM_BUILD_ROOT%{gem_instdir}/.yardopts -rm -f $RPM_BUILD_ROOT%{gem_instdir}/.travis.yml -rm -f $RPM_BUILD_ROOT%{gem_instdir}/Gemfile.lock -rm -f $RPM_BUILD_ROOT%{gem_instdir}/.rspec -find $RPM_BUILD_ROOT%{gem_instdir} -type f | grep '.gitignore' | xargs rm -f +# Fix permissions. +# https://github.com/cucumber/cucumber-ruby/pull/968 +chmod a-x %{buildroot}%{gem_instdir}/lib/cucumber/formatter/cucumber.* + +# Replave the bundled jQuery with system version. +ln -sf %{_jsdir}/jquery/1/jquery.min.js %{buildroot}%{gem_libdir}/cucumber/formatter/jquery-min.js + +%check +pushd .%{gem_instdir} +# We don't need Pry. +sed -i '/require.*pry/ s/^/#/' spec/spec_helper.rb -# Remove zero-length documentation files -find $RPM_BUILD_ROOT%{gem_docdir} -empty -delete +rspec spec + +%if ! 0%{?bootstrap} +# There are several test failures, such as: +# superclass mismatch for class HiddenBackgroundPrinter (TypeError) +# - Not really sure what is the reason and how to fix this. +# missing Bundler and missing git +# - But adding Bundler uncovers missing git repository, now worth of the +# effort probably. +cucumber | grep '1113 steps (7 failed, 3 skipped, 1103 passed)' +%endif +popd %files -%defattr(-,root,root,-) -%{_bindir}/cucumber %dir %{gem_instdir} +%{_bindir}/cucumber +%exclude %{gem_instdir}/.* %{gem_instdir}/bin -%{gem_instdir}/features -%{gem_instdir}/gem_tasks +%license %{gem_instdir}/LICENSE %{gem_libdir} -%{gem_instdir}/fixtures -%{gem_instdir}/spec -%{gem_instdir}/cucumber.yml -%{gem_instdir}/cucumber.gemspec -%{gem_instdir}/Rakefile -%doc %{gem_instdir}/examples +%exclude %{gem_cache} +%{gem_spec} + +%files doc %doc %{gem_docdir} -%doc %{gem_instdir}/LICENSE +%doc %{gem_instdir}/CONTRIBUTING.md +%{gem_instdir}/Gemfile* %doc %{gem_instdir}/History.md %doc %{gem_instdir}/README.md -%doc %{gem_instdir}/CONTRIBUTING.md -%doc %{gem_instdir}/Gemfile -%doc %{gem_instdir}/legacy_features -%{gem_cache} -%{gem_spec} - +%{gem_instdir}/Rakefile +%{gem_instdir}/cucumber.yml +%{gem_instdir}/cucumber.gemspec +%{gem_instdir}/examples +%{gem_instdir}/features +%{gem_instdir}/gem_tasks +%{gem_instdir}/spec %changelog +* Tue Apr 05 2016 Vít Ondruch - 2.3.3-1 +- Update to Cucumber 2.3.3. + * Thu Feb 04 2016 Fedora Release Engineering - 1.3.18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild @@ -103,7 +143,7 @@ find $RPM_BUILD_ROOT%{gem_docdir} -empty -delete * Thu Feb 14 2013 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Thu Nov 13 2012 Mo Morsi - 1.2.1-1 +* Tue Nov 13 2012 Mo Morsi - 1.2.1-1 - Update cucumber to version 1.2.1 * Sat Jul 21 2012 Fedora Release Engineering - 1.1.9-2 @@ -146,7 +186,7 @@ find $RPM_BUILD_ROOT%{gem_docdir} -empty -delete * Wed Aug 04 2010 Michal Fojtik - 0.8.3-3 - Removed JSON patch (JSON updated in Fedora) -* Wed Aug 01 2010 Michal Fojtik - 0.8.3-2 +* Sun Aug 01 2010 Michal Fojtik - 0.8.3-2 - Patched Rakefile and replaced rspec beta version dependency - Patched Rakefile and downgraded JSON dependency diff --git a/sources b/sources index 3bed581..5fdef69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f477b6628c4e9bc4e4764d3ff585682d cucumber-1.3.18.gem +53e558c2f29a73b48399381071e10385 cucumber-2.3.3.gem