From 8f4d002b4082b3dd088441754fc7aa9a4535fce2 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Thu, 8 Oct 2020 17:51:41 +0200
Subject: [PATCH] Update to cucumber 7.0.0

also enhance .spec and .gitignore files.
Bootstrap Aruba.

Resolves: rhbz#1842885
---
 .gitignore            | 10 +++-------
 rubygem-cucumber.spec | 44 +++++++++++++++----------------------------
 sources               |  6 +++---
 3 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 52e22f8..8e5cc8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-cucumber-1.2.1.gem/cucumber-1.3.15.gem
-/cucumber-1.3.18.gem
-/cucumber-2.3.3.gem
-/cucumber-2.4.0.gem
-/cucumber-3.1.2.gem
-/rubygem-cucumber-3.1.2-features.tar.gz
-/rubygem-cucumber-3.1.2-spec.tar.gz
+/cucumber-*.gem
+/rubygem-cucumber-*-features.txz
+/rubygem-cucumber-*-spec.txz
diff --git a/rubygem-cucumber.spec b/rubygem-cucumber.spec
index edc77fb..37b7600 100644
--- a/rubygem-cucumber.spec
+++ b/rubygem-cucumber.spec
@@ -1,27 +1,20 @@
 %global gem_name cucumber
 
-%bcond_with bootstrap
+%bcond_without bootstrap
 
 Name: rubygem-%{gem_name}
-Version: 3.1.2
-Release: 11%{?dist}
+Version: 7.0.0
+Release: 1%{?dist}
 Summary: Tool to execute plain-text documents as functional tests
 License: MIT
 URL: https://cucumber.io/
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-# git clone https://github.com/cucumber/cucumber-ruby.git && cd cucumber-ruby
-# git checkout v3.1.2 && tar czvf rubygem-cucumber-3.1.2-spec.tar.gz spec/ cucumber.yml
-Source1: %{name}-%{version}-spec.tar.gz
-# git clone https://github.com/cucumber/cucumber-ruby.git && cd cucumber-ruby
-# git checkout v3.1.2 && tar czvf rubygem-cucumber-3.1.2-features.tar.gz features/
-Source2: %{name}-%{version}-features.tar.gz
-# Fix wire protocol.
-# https://github.com/cucumber/cucumber-ruby/commit/486e4fe98b93580b63b504579d99c37790f4557d
-Patch0: rubygem-cucumber-3.1.2-Pass-the-registry-to-the-Wire-plugin.patch
-# Properly filter Ruby StdLib locations from backtrace.
-# https://github.com/cucumber/cucumber-ruby/pull/1345
-Patch1: rubygem-cucumber-3.1.2-Respect-Ruby-configuration-when-filtering-backtrace.patch
-Patch2: rubygem-cucumber-3.1.2-Respect-Ruby-configuration-when-filtering-backtrace-test.patch
+# git clone --no-checkout https://github.com/cucumber/cucumber-ruby.git
+# git -C cucumber-ruby archive -v -o rubygem-cucumber-7.0.0-spec.txz v7.0.0 spec/ cucumber.yml
+Source1: %{name}-%{version}-spec.txz
+# git clone --no-checkout https://github.com/cucumber/cucumber-ruby.git
+# git -C cucumber-ruby archive -v -o rubygem-cucumber-7.0.0-features.txz v7.0.0 features/
+Source2: %{name}-%{version}-features.txz
 Requires: js-jquery < 4
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
@@ -37,6 +30,8 @@ BuildRequires: rubygem(bundler)
 BuildRequires: rubygem(cucumber-core)
 BuildRequires: rubygem(cucumber-expressions)
 BuildRequires: rubygem(cucumber-wire)
+BuildRequires: rubygem(cucumber-messages)
+BuildRequires: rubygem(cucumber-create-meta)
 BuildRequires: rubygem(multi_json)
 BuildRequires: rubygem(multi_test)
 BuildRequires: rubygem(nokogiri)
@@ -60,19 +55,6 @@ Documentation for %{name}.
 %prep
 %setup -q -n %{gem_name}-%{version} -b 1 -b 2
 
-%patch0 -p1
-%gemspec_remove_file "lib/cucumber/step_argument.rb"
-rm %{_builddir}/spec/cucumber/step_argument_spec.rb
-
-%patch1 -p1
-pushd %{_builddir}
-%patch2 -p1
-popd
-
-# We don't have gherkin 5.1.0 in Fedora yet
-%gemspec_remove_dep -s ../%{gem_name}-%{version}.gemspec -g gherkin '~> 5.1.0'
-%gemspec_add_dep -s ../%{gem_name}-%{version}.gemspec -g gherkin '>= 4.1.0'
-
 %build
 # Create the gem as gem install only works on a gem file
 gem build ../%{gem_name}-%{version}.gemspec
@@ -142,6 +124,10 @@ popd
 %doc %{gem_instdir}/CHANGELOG.md
 
 %changelog
+* Mon Sep 06 2021 Pavel Valena <pvalena@redhat.com> - 7.0.0-1
+- Update to cucumber 7.0.0.
+  Resolves: rhbz#1842885
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index c0ef8af..9f04135 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (cucumber-3.1.2.gem) = 71c97553e2a6d6fd2b6397827fce3f3495da1b97f1baa02d983018d5679a270588f7c8b441726f8e85936822b3822dd1ccdbdbbd8cdc2cc087f889828bb9719f
-SHA512 (rubygem-cucumber-3.1.2-features.tar.gz) = 2b0f1dd664893e5bbe46d7a4681add550ee213f2a6a573bee683c234f9158685afc1a858b31a563548490565833432b7b9c96a3e71c31ef460e6ec8a0920d84f
-SHA512 (rubygem-cucumber-3.1.2-spec.tar.gz) = a7093188ae1b91d23d2ab5052c8e493f4627b094f561829740c3059da43183dc516008a62086e724784d4b2dec3438393d3f95550c3adaa878b6c3dfb19eedca
+SHA512 (cucumber-7.0.0.gem) = 90ca6953b4394ef5e58bc9ecfa70bacc66dc6c647900409ee6eeed74f6b882536b48af2541c0f0240aaeed5fccf745a9e8fed28f9321263210eb5f43241157e2
+SHA512 (rubygem-cucumber-7.0.0-spec.txz) = 0cc7012a38ed583cc946353d49d0a8d791adf5cd41cb8b21af606f3237be16392998a7fe9b4b13ad865465a2ff9605ad49bace5945b47239321fadde060cc1f6
+SHA512 (rubygem-cucumber-7.0.0-features.txz) = d6c162854d0ea772b681dce5bde964e0c10d0b28fd3bf94ae8a4a9bb426b57b9f4abacc1dd36669f188966aba99348bb4fc0f2fb601d51b9ae36ed4523eac158