From 3c54a6862b97c5eca6bf12c56af3dbb7c4db92ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 19:00:06 +0000 Subject: [PATCH 01/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 04f1ce1..8f8e961 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 0.14.9 -Release: 1%{?dist} +Release: 2%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 @@ -146,6 +146,9 @@ popd %{gem_instdir}/templates/ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 0.14.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Mar 21 2019 Mamoru TASAKA - 0.14.9-1 - 0.14.9 From 693cff7f950b952d7b0f8e43ac69f71e26b9e387 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 17 Aug 2019 15:09:10 +0900 Subject: [PATCH 02/43] 0.14.11 --- .gitignore | 1 + rubygem-aruba.spec | 25 ++++++++++++------------- sources | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 30dd61a..5b41918 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /aruba-0.14.7.gem /aruba-0.14.8.gem /aruba-0.14.9.gem +/aruba-0.14.11.gem diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 8f8e961..b0e5046 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,8 +3,8 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 0.14.9 -Release: 2%{?dist} +Version: 0.14.11 +Release: 1%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 @@ -93,19 +93,15 @@ sed -i features/support/env.rb \ sed -i fixtures/cli-app/spec/spec_helper.rb \ -e "\@\$LOAD_PATH@s|\.\./\.\./lib|$(pwd)/lib|" -# zsh?? I don't use it. Just use echo -e -sed -i features/steps/command/shell.feature \ - -e 's|zsh|bash|' \ - -e '\@echo.*Hello.*c@s|echo|echo -e|' - # /usr/bin/python is reporting deprecation warning :/ +# No need to modify @requires-python (in run_commands.feature and hooks.rb) if ! grep -q python3 features/steps/command/shell.feature then - sed -i features/steps/command/shell.feature -e 's|python|python3|' - sed -i features/steps/command/shell.feature -e "s|python'|python3'|" + sed -i features/03_testing_frameworks/cucumber/steps/command/run_commands_which_require_a_shell.feature \ + -e 's|python|python3|' sed -i lib/aruba/generators/script_file.rb \ -e '\@interpreter@s|A-Z|A-Z0-9|' - sed -i features/getting_started/run_commands.feature \ + sed -i features/01_getting_started_with_aruba/run_commands.feature \ -e '\@[^-]python@s|python|python3|' fi @@ -116,10 +112,10 @@ sed -i Rakefile \ %{nil} # Adjust test cases referring to $HOME. -sed -i features/api/core/expand_path.feature -e "s|/home/\[\^/\]+|$(echo $HOME)|" -sed -i features/configuration/home_directory.feature \ +sed -i features/04_aruba_api/core/expand_path.feature -e "s|/home/\[\^/\]+|$(echo $HOME)|" +sed -i features/02_configure_aruba/home_directory.feature \ -e "\@Scenario: Default value@,\@Scenario@s|/home/|$(echo $HOME)|" -sed -i features/configuration/home_directory.feature \ +sed -i features/02_configure_aruba/home_directory.feature \ -e "\@Set to aruba's working directory@,\@Scenario@s|/home/|$(echo $HOME)/|" # Make the Aruba always awailable. @@ -146,6 +142,9 @@ popd %{gem_instdir}/templates/ %changelog +* Sat Aug 17 2019 Mamoru TASAKA - 0.14.11-1 +- 0.14.11 + * Fri Jul 26 2019 Fedora Release Engineering - 0.14.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index f2c1a1e..e37e1e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aruba-0.14.9.gem) = a8d66080b16a38dc1ebc00507b5778c5e94081592577a0cd52503ccbbfeb27948266f13d19811d55a571f8601f240969a4a9c0cf731466d53624f08f1134fc89 +SHA512 (aruba-0.14.11.gem) = 4026733c5872f675fa011660320bde76f5170888ee9330d7548adbaa90fc480fe5127a752a621dfe9d0330557744839492d8755ea3f0f4e8321ee99a940af3b4 From fd4b5bae461f562af90c021c339538d15bdb01e4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Nov 2019 14:37:34 +0900 Subject: [PATCH 03/43] 0.14.12 --- .gitignore | 1 + rubygem-aruba.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5b41918..6571a22 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /aruba-0.14.8.gem /aruba-0.14.9.gem /aruba-0.14.11.gem +/aruba-0.14.12.gem diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index b0e5046..f478264 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,7 +3,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 0.14.11 +Version: 0.14.12 Release: 1%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY @@ -142,6 +142,9 @@ popd %{gem_instdir}/templates/ %changelog +* Tue Nov 5 2019 Mamoru TASAKA - 0.14.12-1 +- 0.14.12 + * Sat Aug 17 2019 Mamoru TASAKA - 0.14.11-1 - 0.14.11 diff --git a/sources b/sources index e37e1e6..2022471 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aruba-0.14.11.gem) = 4026733c5872f675fa011660320bde76f5170888ee9330d7548adbaa90fc480fe5127a752a621dfe9d0330557744839492d8755ea3f0f4e8321ee99a940af3b4 +SHA512 (aruba-0.14.12.gem) = f75adf0b4ed04a4516111d7cc5834807f940c517baf652dc8062450d7c284f11c9dc68216757e431a4e1fd084c50c2b0eb274c2d2c3e25795785a44b0a61e06d From 3273ac94c39e426430271fd0d0252dfa91c98a32 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 26 Dec 2019 14:34:20 +0900 Subject: [PATCH 04/43] 0.14.13 --- .gitignore | 1 + rubygem-aruba.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6571a22..750b467 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /aruba-0.14.9.gem /aruba-0.14.11.gem /aruba-0.14.12.gem +/aruba-0.14.13.gem diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index f478264..809d7c0 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,7 +3,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 0.14.12 +Version: 0.14.13 Release: 1%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY @@ -142,6 +142,9 @@ popd %{gem_instdir}/templates/ %changelog +* Thu Dec 26 2019 Mamoru TASAKA - 0.14.13-1 +- 0.14.13 + * Tue Nov 5 2019 Mamoru TASAKA - 0.14.12-1 - 0.14.12 diff --git a/sources b/sources index 2022471..ce50782 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aruba-0.14.12.gem) = f75adf0b4ed04a4516111d7cc5834807f940c517baf652dc8062450d7c284f11c9dc68216757e431a4e1fd084c50c2b0eb274c2d2c3e25795785a44b0a61e06d +SHA512 (aruba-0.14.13.gem) = 1051626ecc1028222d3b1ae1aa77ad05aed5314c351487f8c1a1480705031122d56f83741d6e688701eddaf1da41b95a7cb520fb245eeac0e343d5d4597d1caf From 0bca9ebf3ac1cdde93b246ab6394aeaa6358a120 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2019 12:38:31 +0900 Subject: [PATCH 05/43] 0.14.14 --- .gitignore | 1 + rubygem-aruba.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 750b467..59478fb 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /aruba-0.14.11.gem /aruba-0.14.12.gem /aruba-0.14.13.gem +/aruba-0.14.14.gem diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 809d7c0..106290d 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,7 +3,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 0.14.13 +Version: 0.14.14 Release: 1%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY @@ -142,6 +142,9 @@ popd %{gem_instdir}/templates/ %changelog +* Mon Dec 30 2019 Mamoru TASAKA - 0.14.14-1 +- 0.14.14 + * Thu Dec 26 2019 Mamoru TASAKA - 0.14.13-1 - 0.14.13 diff --git a/sources b/sources index ce50782..9fa2664 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aruba-0.14.13.gem) = 1051626ecc1028222d3b1ae1aa77ad05aed5314c351487f8c1a1480705031122d56f83741d6e688701eddaf1da41b95a7cb520fb245eeac0e343d5d4597d1caf +SHA512 (aruba-0.14.14.gem) = 612b742bdf89e0272714d709a772eded1c61c654977bb58f7e6e5ef5a8b29dece848bf3c70aa6bc566e6c2a75b3e39e637fa5e37f869fbf4bf3d0997257df9f7 From 2fc35ed917265116c416cdaa0c1a6dfe88e60b5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 18:07:43 +0000 Subject: [PATCH 06/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 106290d..b107a02 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 0.14.14 -Release: 1%{?dist} +Release: 2%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 @@ -142,6 +142,9 @@ popd %{gem_instdir}/templates/ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 0.14.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 30 2019 Mamoru TASAKA - 0.14.14-1 - 0.14.14 From 4ae9ed5a201e827389dc15b275dde349e00116e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 06:07:53 +0000 Subject: [PATCH 07/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index b107a02..9c32490 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 0.14.14 -Release: 2%{?dist} +Release: 3%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 @@ -142,6 +142,9 @@ popd %{gem_instdir}/templates/ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.14.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 0.14.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 08c683c96882fc18cfbe3a60322611f39c222316 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 15:39:11 +0000 Subject: [PATCH 08/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 9c32490..2ef72ef 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 0.14.14 -Release: 3%{?dist} +Release: 4%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 @@ -142,6 +142,9 @@ popd %{gem_instdir}/templates/ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.14.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.14.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 190f25bf07ce8061a0c8305b995c6906e1460e97 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 1 Feb 2021 00:33:00 +0900 Subject: [PATCH 09/43] Disable cucumber test failing on ppc64le --- rubygem-aruba.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 2ef72ef..e33ef58 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 0.14.14 -Release: 4%{?dist} +Release: 5%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 @@ -105,6 +105,10 @@ then -e '\@[^-]python@s|python|python3|' fi +# The following test fails on ppc64le, due to different block size +# (expected: 64k actual: 4k), disabling +mv features/04_aruba_api/filesystem/report_disk_usage.feature{,.skip} + # Get rid of Bundler sed -i Rakefile \ -e '\@[Bb]undler@d' \ @@ -120,6 +124,10 @@ sed -i features/02_configure_aruba/home_directory.feature \ # Make the Aruba always awailable. RUBYOPT=-I$(pwd)/lib cucumber + +# Go back the skipped test +mv features/04_aruba_api/filesystem/report_disk_usage.feature{.skip,} + popd @@ -142,6 +150,9 @@ popd %{gem_instdir}/templates/ %changelog +* Mon Feb 1 2021 Mamoru TASAKA - 0.14.14-5 +- Disable cucumber test failing on ppc64le + * Wed Jan 27 2021 Fedora Release Engineering - 0.14.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 266740c629d05d695fa332328b6925989ba4f559 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Apr 2021 16:05:09 +0900 Subject: [PATCH 10/43] Add BR: rubygem(irb) --- rubygem-aruba.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index e33ef58..49d06f9 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 0.14.14 -Release: 5%{?dist} +Release: 6%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 @@ -23,6 +23,7 @@ BuildRequires: rubygem(pry) BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(contracts) >= 0.9 BuildRequires: rubygem(thor) >= 0.19 +BuildRequires: rubygem(irb) # features/steps/command/shell.feature:97 # Scenario: Running python commands BuildRequires: /usr/bin/python3 BuildArch: noarch @@ -150,6 +151,9 @@ popd %{gem_instdir}/templates/ %changelog +* Tue Apr 6 2021 Mamoru TASAKA - 0.14.14-6 +- Add BR: rubygem(irb) + * Mon Feb 1 2021 Mamoru TASAKA - 0.14.14-5 - Disable cucumber test failing on ppc64le From 46393b8cd77f7c4ba7ec7433b0ae49aab42cadf2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 11:49:47 +0000 Subject: [PATCH 11/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 49d06f9..4111dd9 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 0.14.14 -Release: 6%{?dist} +Release: 7%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 @@ -151,6 +151,9 @@ popd %{gem_instdir}/templates/ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.14.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Apr 6 2021 Mamoru TASAKA - 0.14.14-6 - Add BR: rubygem(irb) From 3a45f720e376810594b7eaf52ae11d50a66a5143 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Jan 2022 14:12:13 +0900 Subject: [PATCH 12/43] indentation --- rubygem-aruba.spec | 144 ++++++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 68 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 4111dd9..2aa9afb 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -1,75 +1,82 @@ # Generated from aruba-0.4.11.gem by gem2rpm -*- rpm-spec -*- -%global gem_name aruba +%global gem_name aruba + +Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba +Name: rubygem-%{gem_name} +Version: 0.14.14 +Release: 7%{?dist} -Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba -Name: rubygem-%{gem_name} -Version: 0.14.14 -Release: 7%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 # jquery.js includes sizzle.js, which is MIT or BSD or GPLv2 -License: MIT and CC-BY and (MIT or GPLv2) and (MIT or BSD or GPLv2) -URL: http://github.com/cucumber/aruba -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -BuildRequires: ruby(release) -BuildRequires: rubygems-devel -BuildRequires: ruby -BuildRequires: rubygem(cucumber) >= 1.3.19 -BuildRequires: rubygem(childprocess) >= 0.5.6 -BuildRequires: rubygem(ffi) >= 1.9.10 -BuildRequires: rubygem(minitest) -BuildRequires: rubygem(pry) -BuildRequires: rubygem(rspec) >= 3 -BuildRequires: rubygem(contracts) >= 0.9 -BuildRequires: rubygem(thor) >= 0.19 -BuildRequires: rubygem(irb) +License: MIT and CC-BY and (MIT or GPLv2) and (MIT or BSD or GPLv2) +URL: http://github.com/cucumber/aruba +Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem + +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby +# For %%check +BuildRequires: rubygem(cucumber) >= 1.3.19 +BuildRequires: rubygem(childprocess) >= 0.5.6 +BuildRequires: rubygem(ffi) >= 1.9.10 +BuildRequires: rubygem(minitest) +BuildRequires: rubygem(pry) +BuildRequires: rubygem(rspec) >= 3 +BuildRequires: rubygem(contracts) >= 0.9 +BuildRequires: rubygem(thor) >= 0.19 +BuildRequires: rubygem(irb) # features/steps/command/shell.feature:97 # Scenario: Running python commands -BuildRequires: /usr/bin/python3 -BuildArch: noarch +BuildRequires: %{_bindir}/python3 + +BuildArch: noarch %description Aruba is Cucumber extension for Command line applications written in any programming language. -%package doc -Summary: Documentation for %{name} -Requires: %{name} = %{version}-%{release} -BuildArch: noarch +%package doc +Summary: Documentation for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description doc Documentation for %{name} %prep %setup -q -n %{gem_name}-%{version} +mv ../%{gem_name}-%{version}.gemspec . -%gemspec_remove_dep -g childprocess '>= 0.6.3' +# Relax childprocess dependency +%gemspec_remove_dep -g childprocess '>= 0.6.3' -s %{gem_name}-%{version}.gemspec %build -gem build ../%{gem_name}-%{version}.gemspec +gem build %{gem_name}-%{version}.gemspec %gem_install - %install mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ - %{buildroot}%{gem_dir}/ + %{buildroot}%{gem_dir}/ rm -f %{buildroot}%{gem_cache} pushd %{buildroot}%{gem_instdir} rm -rf \ - .[^.]* \ - Gemfile \ - Rakefile \ - appveyor.yml \ - %{gem_name}.gemspec \ - cucumber.yml \ - config/ \ - fixtures/ \ - spec/ \ - script/ \ - %{nil} + .[^.]* \ + Gemfile \ + Rakefile \ + appveyor.yml \ + %{gem_name}.gemspec \ + cucumber.yml \ + config/ \ + features/ \ + fixtures/ \ + spec/ \ + script/ \ + %{nil} +popd %check pushd .%{gem_instdir} @@ -79,31 +86,32 @@ rm .rspec # We don't care about code coverage. # We don't need Bundler. sed -i spec/spec_helper.rb \ - -e '\@[sS]imple[Cc]ov@d' \ - -e '\@[Bb]undler@d' \ - %{nil} + -e '\@[sS]imple[Cc]ov@d' \ + -e '\@[Bb]undler@d' \ + %{nil} -RUBYOPT=-rtime rspec spec +env RUBYOPT=-rtime \ + rspec spec # We don't care about code coverage. sed -i features/support/env.rb \ - -e '\@require.*simplecov@d' + -e '\@require.*simplecov@d' > features/support/simplecov_setup.rb # Let the test cli-app find Aruba. sed -i fixtures/cli-app/spec/spec_helper.rb \ - -e "\@\$LOAD_PATH@s|\.\./\.\./lib|$(pwd)/lib|" + -e "\@\$LOAD_PATH@s|\.\./\.\./lib|$(pwd)/lib|" # /usr/bin/python is reporting deprecation warning :/ # No need to modify @requires-python (in run_commands.feature and hooks.rb) if ! grep -q python3 features/steps/command/shell.feature then - sed -i features/03_testing_frameworks/cucumber/steps/command/run_commands_which_require_a_shell.feature \ - -e 's|python|python3|' - sed -i lib/aruba/generators/script_file.rb \ - -e '\@interpreter@s|A-Z|A-Z0-9|' - sed -i features/01_getting_started_with_aruba/run_commands.feature \ - -e '\@[^-]python@s|python|python3|' + sed -i features/03_testing_frameworks/cucumber/steps/command/run_commands_which_require_a_shell.feature \ + -e 's|python|python3|' + sed -i lib/aruba/generators/script_file.rb \ + -e '\@interpreter@s|A-Z|A-Z0-9|' + sed -i features/01_getting_started_with_aruba/run_commands.feature \ + -e '\@[^-]python@s|python|python3|' fi # The following test fails on ppc64le, due to different block size @@ -112,19 +120,20 @@ mv features/04_aruba_api/filesystem/report_disk_usage.feature{,.skip} # Get rid of Bundler sed -i Rakefile \ - -e '\@[Bb]undler@d' \ - -e 's|bundle exec ||' \ - %{nil} + -e '\@[Bb]undler@d' \ + -e 's|bundle exec ||' \ + %{nil} # Adjust test cases referring to $HOME. sed -i features/04_aruba_api/core/expand_path.feature -e "s|/home/\[\^/\]+|$(echo $HOME)|" sed -i features/02_configure_aruba/home_directory.feature \ - -e "\@Scenario: Default value@,\@Scenario@s|/home/|$(echo $HOME)|" + -e "\@Scenario: Default value@,\@Scenario@s|/home/|$(echo $HOME)|" sed -i features/02_configure_aruba/home_directory.feature \ - -e "\@Set to aruba's working directory@,\@Scenario@s|/home/|$(echo $HOME)/|" + -e "\@Set to aruba's working directory@,\@Scenario@s|/home/|$(echo $HOME)/|" # Make the Aruba always awailable. -RUBYOPT=-I$(pwd)/lib cucumber +env RUBYOPT=-I$(pwd)/lib \ + cucumber # Go back the skipped test mv features/04_aruba_api/filesystem/report_disk_usage.feature{.skip,} @@ -133,21 +142,20 @@ popd %files -%dir %{gem_instdir} -%license %{gem_instdir}/LICENSE -%doc %{gem_instdir}/README.md +%dir %{gem_instdir} +%license %{gem_instdir}/LICENSE +%doc %{gem_instdir}/README.md + %{gem_libdir} %{gem_instdir}/bin/ -%exclude %{gem_instdir}/config %{gem_spec} %files doc -%doc %{gem_docdir} -%doc %{gem_instdir}/CONTRIBUTING.md -%doc %{gem_instdir}/CHANGELOG.md -%doc %{gem_instdir}/TODO.md +%doc %{gem_docdir} +%doc %{gem_instdir}/CONTRIBUTING.md +%doc %{gem_instdir}/CHANGELOG.md +%doc %{gem_instdir}/TODO.md %{gem_instdir}/doc/ -%{gem_instdir}/features/ %{gem_instdir}/templates/ %changelog From f0e9bc545fcbe234f4ea17b2416d2902fef77dc9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Jan 2022 16:32:11 +0900 Subject: [PATCH 13/43] update to 2.0.0 --- aruba-create-test-suite-tarball.sh | 30 ++++++ ...est-that-do-not-actually-test-output.patch | 43 --------- aruba-downgrade-childprocess-dependency.patch | 32 ------- ...em-aruba-2.0.0-make-bundler-optional.patch | 37 ++++++++ ....0-make-rubygems-dependency-explicit.patch | 9 ++ rubygem-aruba.spec | 94 ++++++++++--------- 6 files changed, 127 insertions(+), 118 deletions(-) create mode 100644 aruba-create-test-suite-tarball.sh delete mode 100644 aruba-disable-test-that-do-not-actually-test-output.patch delete mode 100644 aruba-downgrade-childprocess-dependency.patch create mode 100644 rubygem-aruba-2.0.0-make-bundler-optional.patch create mode 100644 rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch diff --git a/aruba-create-test-suite-tarball.sh b/aruba-create-test-suite-tarball.sh new file mode 100644 index 0000000..3a1ce57 --- /dev/null +++ b/aruba-create-test-suite-tarball.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +if [ $# -lt 1 ] +then + echo "$0 " + exit 1 +fi + +set -x +set -e + +GEMNAME=aruba +CURRDIR=$(pwd) +VERSION=$1 + +TMPDIRPATH=$(mktemp -d /var/tmp/${GEMNAME}-tar-XXXXXX) +pushd $TMPDIRPATH + +git clone https://github.com/cucumber/${GEMNAME}.git +pushd ${GEMNAME} +git reset --hard v${VERSION} +popd + +ln -sf ${GEMNAME} ${GEMNAME}-${VERSION} +tar czf ${CURRDIR}/rubygem-${GEMNAME}-${VERSION}-testsuite.tar.gz \ + ${GEMNAME}-${VERSION}/{features,fixtures,spec} + +popd + +rm -rf $TMPDIRPATH diff --git a/aruba-disable-test-that-do-not-actually-test-output.patch b/aruba-disable-test-that-do-not-actually-test-output.patch deleted file mode 100644 index d4e639c..0000000 --- a/aruba-disable-test-that-do-not-actually-test-output.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 3f8ed748d73fa9d39fe163f14540a7ef2a53a5c1 -Author: Jarl Friis -Date: Fri Oct 12 23:28:31 2012 +0200 - - These tests are actually not testing output from the process anyway, because the process is actually never started. - -diff --git a/features/exit_statuses.feature b/features/exit_statuses.feature -index 5c5dffe..b971152 100644 ---- a/features/exit_statuses.feature -+++ b/features/exit_statuses.feature -@@ -30,13 +30,3 @@ Feature: exit statuses - Scenario: Unsuccessfully run something - When I do aruba I successfully run `ruby -e 'exit 10'` - Then aruba should fail with "Exit status was 10" -- -- @posix -- Scenario: Try to run something that doesn't exist -- When I run `does_not_exist` -- Then the exit status should be 1 -- -- @posix -- Scenario: Try to run something that doesn't exist with ` -- When I run `does_not_exist` -- Then the exit status should be 1 -diff --git a/features/output.feature b/features/output.feature -index 35b931d..f577d26 100644 ---- a/features/output.feature -+++ b/features/output.feature -@@ -5,14 +5,6 @@ Feature: Output - I want to use the "the output should contain" step - - @posix -- Scenario: Run unknown command -- When I run `neverever gonna work` -- Then the output should contain: -- """ -- No such file or directory - neverever -- """ -- -- @posix - Scenario: Detect subset of one-line output - When I run `ruby -e 'puts \"hello world\"'` - Then the output should contain "hello world" diff --git a/aruba-downgrade-childprocess-dependency.patch b/aruba-downgrade-childprocess-dependency.patch deleted file mode 100644 index de6d093..0000000 --- a/aruba-downgrade-childprocess-dependency.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- specifications/aruba-0.4.11.gemspec.orig 2012-04-19 08:35:59.000000000 +0200 -+++ specifications/aruba-0.4.11.gemspec 2012-04-19 08:38:14.294458217 +0200 -@@ -20,8 +20,7 @@ - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 1.1.1"]) -- s.add_runtime_dependency(%q, [">= 0.2.3"]) -+ s.add_runtime_dependency(%q, [">= 0.2.0"]) -- s.add_runtime_dependency(%q, [">= 1.0.11"]) - s.add_runtime_dependency(%q, [">= 2.7.0"]) - s.add_development_dependency(%q, [">= 0.6.1"]) - s.add_development_dependency(%q, [">= 1.6.8"]) -@@ -28,8 +28,7 @@ - s.add_development_dependency(%q, [">= 0.9.2"]) - else - s.add_dependency(%q, [">= 1.1.1"]) -- s.add_dependency(%q, [">= 0.2.3"]) -+ s.add_dependency(%q, [">= 0.2.0"]) -- s.add_dependency(%q, [">= 1.0.11"]) - s.add_dependency(%q, [">= 2.7.0"]) - s.add_dependency(%q, [">= 0.6.1"]) - s.add_dependency(%q, [">= 1.6.8"]) -@@ -37,8 +37,7 @@ - end - else - s.add_dependency(%q, [">= 1.1.1"]) -- s.add_dependency(%q, [">= 0.2.3"]) -+ s.add_dependency(%q, [">= 0.2.0"]) -- s.add_dependency(%q, [">= 1.0.11"]) - s.add_dependency(%q, [">= 2.7.0"]) - s.add_dependency(%q, [">= 0.6.1"]) - s.add_dependency(%q, [">= 1.6.8"]) diff --git a/rubygem-aruba-2.0.0-make-bundler-optional.patch b/rubygem-aruba-2.0.0-make-bundler-optional.patch new file mode 100644 index 0000000..7fefeae --- /dev/null +++ b/rubygem-aruba-2.0.0-make-bundler-optional.patch @@ -0,0 +1,37 @@ +--- aruba-2.0.0/lib/aruba/api/bundler.rb.make_optional 2021-07-27 04:28:08.000000000 +0900 ++++ aruba-2.0.0/lib/aruba/api/bundler.rb 2022-01-14 14:40:50.369324292 +0900 +@@ -1,5 +1,4 @@ + require "aruba/api/environment" +-require "bundler" + + module Aruba + module Api +@@ -8,6 +7,19 @@ module Aruba + + # Unset variables used by bundler + def unset_bundler_env_vars ++ begin ++ require "bundler" ++ unset_bundler_env_vars_new ++ rescue LoadError ++ %w[RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE].each do |key| ++ delete_environment_variable(key) ++ end ++ end ++ end ++ ++ private ++ ++ def unset_bundler_env_vars_new + empty_env = with_environment { with_unbundled_env { ENV.to_h } } + aruba_env = aruba.environment.to_h + (aruba_env.keys - empty_env.keys).each do |key| +@@ -18,8 +30,6 @@ module Aruba + end + end + +- private +- + def with_unbundled_env(&block) + if ::Bundler.respond_to?(:with_unbundled_env) + ::Bundler.with_unbundled_env(&block) diff --git a/rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch b/rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch new file mode 100644 index 0000000..f79625f --- /dev/null +++ b/rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch @@ -0,0 +1,9 @@ +--- aruba-2.0.0/lib/aruba/platforms/unix_platform.rb.explicit 2021-07-27 04:28:08.000000000 +0900 ++++ aruba-2.0.0/lib/aruba/platforms/unix_platform.rb 2022-01-14 15:01:38.513634793 +0900 +@@ -1,5 +1,6 @@ + require "rbconfig" + require "pathname" ++require "rubygems" + + require "aruba/aruba_path" + diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 2aa9afb..7d979ad 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,8 +3,8 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 0.14.14 -Release: 7%{?dist} +Version: 2.0.0 +Release: 2%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY @@ -13,20 +13,26 @@ Release: 7%{?dist} License: MIT and CC-BY and (MIT or GPLv2) and (MIT or BSD or GPLv2) URL: http://github.com/cucumber/aruba Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem +Source1: %{name}-%{version}-testsuite.tar.gz +# Source1 is created by $ bash %%SOURCE2 %%VERSION +Source2: %{gem_name}-create-test-suite-tarball.sh +# Make bundler runtime dependency optional +Patch1: rubygem-aruba-2.0.0-make-bundler-optional.patch +# Workaround to make rspec-core rspec test suite pass +Patch2: rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby # For %%check -BuildRequires: rubygem(cucumber) >= 1.3.19 -BuildRequires: rubygem(childprocess) >= 0.5.6 -BuildRequires: rubygem(ffi) >= 1.9.10 +BuildRequires: rubygem(childprocess) +BuildRequires: rubygem(contracts) +BuildRequires: rubygem(cucumber) +BuildRequires: rubygem(irb) BuildRequires: rubygem(minitest) BuildRequires: rubygem(pry) BuildRequires: rubygem(rspec) >= 3 -BuildRequires: rubygem(contracts) >= 0.9 -BuildRequires: rubygem(thor) >= 0.19 -BuildRequires: rubygem(irb) +BuildRequires: rubygem(thor) # features/steps/command/shell.feature:97 # Scenario: Running python commands BuildRequires: %{_bindir}/python3 @@ -46,11 +52,13 @@ BuildArch: noarch Documentation for %{name} %prep -%setup -q -n %{gem_name}-%{version} +%autosetup -n %{gem_name}-%{version} -p1 -a 1 mv ../%{gem_name}-%{version}.gemspec . # Relax childprocess dependency -%gemspec_remove_dep -g childprocess '>= 0.6.3' -s %{gem_name}-%{version}.gemspec +%gemspec_remove_dep -g childprocess '>= 2.0' -s %{gem_name}-%{version}.gemspec +# Remove bundler dependency harder +sed -i '\@dependency.*bundler@d' %{gem_name}-%{version}.gemspec %build gem build %{gem_name}-%{version}.gemspec @@ -62,32 +70,23 @@ cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ rm -f %{buildroot}%{gem_cache} -pushd %{buildroot}%{gem_instdir} -rm -rf \ - .[^.]* \ - Gemfile \ - Rakefile \ - appveyor.yml \ - %{gem_name}.gemspec \ - cucumber.yml \ - config/ \ - features/ \ - fixtures/ \ - spec/ \ - script/ \ - %{nil} -popd %check +pushd %{gem_name}-%{version} +for f in * +do + basef=$(basename $f) + target=../%{gem_instdir}/${basef} + unlink $target || true + ln -sf $(pwd)/$f $target +done +popd + pushd .%{gem_instdir} -# Drop the fuubar dependency. -rm .rspec # We don't care about code coverage. -# We don't need Bundler. sed -i spec/spec_helper.rb \ -e '\@[sS]imple[Cc]ov@d' \ - -e '\@[Bb]undler@d' \ %{nil} env RUBYOPT=-rtime \ @@ -116,13 +115,14 @@ fi # The following test fails on ppc64le, due to different block size # (expected: 64k actual: 4k), disabling -mv features/04_aruba_api/filesystem/report_disk_usage.feature{,.skip} +PPC64_ENV_P=$(uname -m | grep -q ppc64 && echo 0 || echo 1) +if test x"${PPC64_ENV_P}" == x0 +then + mv features/04_aruba_api/filesystem/report_disk_usage.feature{,.skip} +fi -# Get rid of Bundler -sed -i Rakefile \ - -e '\@[Bb]undler@d' \ - -e 's|bundle exec ||' \ - %{nil} +# Disable bundler tests. +mv features/03_testing_frameworks/cucumber/disable_bundler.feature{,.skip} # Adjust test cases referring to $HOME. sed -i features/04_aruba_api/core/expand_path.feature -e "s|/home/\[\^/\]+|$(echo $HOME)|" @@ -133,13 +133,16 @@ sed -i features/02_configure_aruba/home_directory.feature \ # Make the Aruba always awailable. env RUBYOPT=-I$(pwd)/lib \ - cucumber + cucumber --publish-quiet # Go back the skipped test -mv features/04_aruba_api/filesystem/report_disk_usage.feature{.skip,} - -popd +if test x"${PPC64_ENV_P}" == x0 +then + mv features/04_aruba_api/filesystem/report_disk_usage.feature{.skip,} +fi +mv features/03_testing_frameworks/cucumber/disable_bundler.feature{.skip,} +popd # from .%%{gem_instdir} %files %dir %{gem_instdir} @@ -147,18 +150,23 @@ popd %doc %{gem_instdir}/README.md %{gem_libdir} -%{gem_instdir}/bin/ +%{gem_instdir}/exe %{gem_spec} %files doc %doc %{gem_docdir} %doc %{gem_instdir}/CONTRIBUTING.md %doc %{gem_instdir}/CHANGELOG.md -%doc %{gem_instdir}/TODO.md -%{gem_instdir}/doc/ -%{gem_instdir}/templates/ %changelog +* Fri Jan 14 2022 Mamoru TASAKA - 2.0.0-2 +- Make bundler optional again +- Workaround patch to make rspec-core test suite pass +- Some cleanup + +* Mon Sep 06 2021 Pavel Valena - 2.0.0-1 +- Update to aruba 2.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 0.14.14-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 153e38e77549e92653a5a348ae7dd3edb5b7b1da Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Jan 2022 16:33:22 +0900 Subject: [PATCH 14/43] upload files --- .gitignore | 2 ++ sources | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 59478fb..8137497 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /aruba-0.14.12.gem /aruba-0.14.13.gem /aruba-0.14.14.gem +/aruba-2.0.0.gem +/rubygem-aruba-2.0.0-testsuite.tar.gz diff --git a/sources b/sources index 9fa2664..678ccbf 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (aruba-0.14.14.gem) = 612b742bdf89e0272714d709a772eded1c61c654977bb58f7e6e5ef5a8b29dece848bf3c70aa6bc566e6c2a75b3e39e637fa5e37f869fbf4bf3d0997257df9f7 +SHA512 (aruba-2.0.0.gem) = 798a5aaf1f03132eb1e6872be93e61d0a0aa7ec21f0783110132207c357240dee2a0e75f5c9f7d91d4d471d38d385deccfaa07c31a43cc8cb8c54d6156b762f9 +SHA512 (rubygem-aruba-2.0.0-testsuite.tar.gz) = 67fd9c892a9da66d686baeb377748aea843872344e7a04c0f0910e1123bc8be9c66fe12fb56a2657388568ec0c586970aba8a3da4a1816ecbcbe42a843e8e80a From 490a64762651ee449e38e20b8903d86958f18aee Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 19 Jan 2022 23:16:07 +0900 Subject: [PATCH 15/43] Use upstream patch for rspec-core rspec test suite issue (Gem.win_platform? related) --- ...ensure-Gem-win_platform-is-available.patch | 74 +++++++++++++++++++ ....0-make-rubygems-dependency-explicit.patch | 9 --- rubygem-aruba.spec | 29 +++++++- 3 files changed, 99 insertions(+), 13 deletions(-) create mode 100644 rubygem-aruba-2.0.0-ensure-Gem-win_platform-is-available.patch delete mode 100644 rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch diff --git a/rubygem-aruba-2.0.0-ensure-Gem-win_platform-is-available.patch b/rubygem-aruba-2.0.0-ensure-Gem-win_platform-is-available.patch new file mode 100644 index 0000000..5827aff --- /dev/null +++ b/rubygem-aruba-2.0.0-ensure-Gem-win_platform-is-available.patch @@ -0,0 +1,74 @@ +From 01f468c61eecc83d931cb56434394770557c60c7 Mon Sep 17 00:00:00 2001 +From: Matijs van Zuijlen +Date: Sun, 16 Jan 2022 11:29:55 +0100 +Subject: [PATCH] Ensure Gem.win_platform? is available + +Even though rubygems is nearly always loaded by ruby automatically, it +is possible to avoid doing so. Therefore, to make platform detection +work, we have to require "rubygems" explicitly. +--- + lib/aruba/platforms/unix_platform.rb | 1 + + spec/aruba/platforms/unix_platform_spec.rb | 18 ++++++++++++++++++ + spec/aruba/platforms/windows_platform_spec.rb | 18 ++++++++++++++++++ + 3 files changed, 37 insertions(+) + create mode 100644 spec/aruba/platforms/unix_platform_spec.rb + create mode 100644 spec/aruba/platforms/windows_platform_spec.rb + +diff --git a/lib/aruba/platforms/unix_platform.rb b/lib/aruba/platforms/unix_platform.rb +index 2831bbb26..51f653ff9 100644 +--- a/lib/aruba/platforms/unix_platform.rb ++++ b/lib/aruba/platforms/unix_platform.rb +@@ -1,4 +1,5 @@ + require "rbconfig" ++require "rubygems" + require "pathname" + + require "aruba/aruba_path" +diff --git a/spec/aruba/platforms/unix_platform_spec.rb b/spec/aruba/platforms/unix_platform_spec.rb +new file mode 100644 +index 000000000..75718f726 +--- /dev/null ++++ b/spec/aruba/platforms/unix_platform_spec.rb +@@ -0,0 +1,18 @@ ++require "spec_helper" ++require "aruba/platforms/unix_platform" ++ ++RSpec.describe Aruba::Platforms::UnixPlatform do ++ include_context "uses aruba API" ++ ++ describe ".match?" do ++ it "works even when ruby is launched with --disable-gems and --disable-rubyopt" do ++ aruba_lib = File.expand_path("../../../lib", __dir__) ++ run_command_and_stop( ++ "ruby --disable-rubyopt --disable-gems -I#{aruba_lib}" \ ++ " -e 'require \"aruba/platforms/unix_platform\";" \ ++ " Aruba::Platforms::UnixPlatform.match?;'" ++ ) ++ expect(last_command_started).to be_successfully_executed ++ end ++ end ++end +diff --git a/spec/aruba/platforms/windows_platform_spec.rb b/spec/aruba/platforms/windows_platform_spec.rb +new file mode 100644 +index 000000000..5ae02e8ab +--- /dev/null ++++ b/spec/aruba/platforms/windows_platform_spec.rb +@@ -0,0 +1,18 @@ ++require "spec_helper" ++require "aruba/platforms/windows_platform" ++ ++RSpec.describe Aruba::Platforms::WindowsPlatform do ++ include_context "uses aruba API" ++ ++ describe ".match?" do ++ it "works even when ruby is launched with --disable-gems and --disable-rubyopt" do ++ aruba_lib = File.expand_path("../../../lib", __dir__) ++ run_command_and_stop( ++ "ruby --disable-rubyopt --disable-gems -I#{aruba_lib}" \ ++ " -e 'require \"aruba/platforms/windows_platform\";" \ ++ " Aruba::Platforms::WindowsPlatform.match?;'" ++ ) ++ expect(last_command_started).to be_successfully_executed ++ end ++ end ++end diff --git a/rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch b/rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch deleted file mode 100644 index f79625f..0000000 --- a/rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- aruba-2.0.0/lib/aruba/platforms/unix_platform.rb.explicit 2021-07-27 04:28:08.000000000 +0900 -+++ aruba-2.0.0/lib/aruba/platforms/unix_platform.rb 2022-01-14 15:01:38.513634793 +0900 -@@ -1,5 +1,6 @@ - require "rbconfig" - require "pathname" -+require "rubygems" - - require "aruba/aruba_path" - diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 7d979ad..4a95fe0 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY @@ -18,8 +18,10 @@ Source1: %{name}-%{version}-testsuite.tar.gz Source2: %{gem_name}-create-test-suite-tarball.sh # Make bundler runtime dependency optional Patch1: rubygem-aruba-2.0.0-make-bundler-optional.patch -# Workaround to make rspec-core rspec test suite pass -Patch2: rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch +# Make rspec-core rspec test suite pass +# https://github.com/cucumber/aruba/issues/852 +# https://github.com/cucumber/aruba/pull/858 +Patch2: rubygem-aruba-2.0.0-ensure-Gem-win_platform-is-available.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -52,7 +54,20 @@ BuildArch: noarch Documentation for %{name} %prep -%autosetup -n %{gem_name}-%{version} -p1 -a 1 +%setup -q -n %{gem_name}-%{version} -a 1 +pushd %{gem_name}-%{version} +for f in * +do + basef=$(basename $f) + target=../${basef} + ln -sf $(pwd)/$f $target +done +# For tests +ln -sf ../lib +popd +%patch1 -p1 +%patch2 -p1 + mv ../%{gem_name}-%{version}.gemspec . # Relax childprocess dependency @@ -89,6 +104,8 @@ sed -i spec/spec_helper.rb \ -e '\@[sS]imple[Cc]ov@d' \ %{nil} +# Forcely set + env RUBYOPT=-rtime \ rspec spec @@ -159,6 +176,10 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Wed Jan 19 2022 Mamoru TASAKA - 2.0.0-3 +- Use upstream patch for rspec-core rspec test suite issue + (Gem.win_platform? related) + * Fri Jan 14 2022 Mamoru TASAKA - 2.0.0-2 - Make bundler optional again - Workaround patch to make rspec-core test suite pass From 266b394af773e34246caa8d811e7edc959db9022 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 19 Jan 2022 23:25:42 +0900 Subject: [PATCH 16/43] kill unneeded comment... --- rubygem-aruba.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 4a95fe0..8d3303b 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -104,8 +104,6 @@ sed -i spec/spec_helper.rb \ -e '\@[sS]imple[Cc]ov@d' \ %{nil} -# Forcely set - env RUBYOPT=-rtime \ rspec spec From 30b9fc5a5bad14036476ae454cc2bb294b5ae5b9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 20 Jan 2022 10:51:00 +0900 Subject: [PATCH 17/43] simplicy gitignore --- .gitignore | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 8137497..c3ab02c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,2 @@ -/aruba-0.4.11.gem -/aruba-0.5.2.gem -/aruba-0.5.4.gem -/aruba-0.6.0.gem -/aruba-0.6.2.gem -/aruba-0.14.2.gem -/aruba-0.14.3.gem -/aruba-0.14.5.gem -/aruba-0.14.6.gem -/aruba-0.14.7.gem -/aruba-0.14.8.gem -/aruba-0.14.9.gem -/aruba-0.14.11.gem -/aruba-0.14.12.gem -/aruba-0.14.13.gem -/aruba-0.14.14.gem -/aruba-2.0.0.gem -/rubygem-aruba-2.0.0-testsuite.tar.gz +/aruba-*.gem +/rubygem-aruba-*-testsuite.tar.gz From 97dd4e0b1dd79d1a2608bf6abdf324bedd37ca4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 18:16:59 +0000 Subject: [PATCH 18/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 8d3303b..3a14e8e 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY @@ -174,6 +174,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 2.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 19 2022 Mamoru TASAKA - 2.0.0-3 - Use upstream patch for rspec-core rspec test suite issue (Gem.win_platform? related) From f1928d69779391eeaa2c637d8788c4bd1b67fe96 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Apr 2022 19:09:26 +0900 Subject: [PATCH 19/43] 2.0.1 --- ...ensure-Gem-win_platform-is-available.patch | 74 ------------------- rubygem-aruba.spec | 12 ++- sources | 4 +- 3 files changed, 7 insertions(+), 83 deletions(-) delete mode 100644 rubygem-aruba-2.0.0-ensure-Gem-win_platform-is-available.patch diff --git a/rubygem-aruba-2.0.0-ensure-Gem-win_platform-is-available.patch b/rubygem-aruba-2.0.0-ensure-Gem-win_platform-is-available.patch deleted file mode 100644 index 5827aff..0000000 --- a/rubygem-aruba-2.0.0-ensure-Gem-win_platform-is-available.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 01f468c61eecc83d931cb56434394770557c60c7 Mon Sep 17 00:00:00 2001 -From: Matijs van Zuijlen -Date: Sun, 16 Jan 2022 11:29:55 +0100 -Subject: [PATCH] Ensure Gem.win_platform? is available - -Even though rubygems is nearly always loaded by ruby automatically, it -is possible to avoid doing so. Therefore, to make platform detection -work, we have to require "rubygems" explicitly. ---- - lib/aruba/platforms/unix_platform.rb | 1 + - spec/aruba/platforms/unix_platform_spec.rb | 18 ++++++++++++++++++ - spec/aruba/platforms/windows_platform_spec.rb | 18 ++++++++++++++++++ - 3 files changed, 37 insertions(+) - create mode 100644 spec/aruba/platforms/unix_platform_spec.rb - create mode 100644 spec/aruba/platforms/windows_platform_spec.rb - -diff --git a/lib/aruba/platforms/unix_platform.rb b/lib/aruba/platforms/unix_platform.rb -index 2831bbb26..51f653ff9 100644 ---- a/lib/aruba/platforms/unix_platform.rb -+++ b/lib/aruba/platforms/unix_platform.rb -@@ -1,4 +1,5 @@ - require "rbconfig" -+require "rubygems" - require "pathname" - - require "aruba/aruba_path" -diff --git a/spec/aruba/platforms/unix_platform_spec.rb b/spec/aruba/platforms/unix_platform_spec.rb -new file mode 100644 -index 000000000..75718f726 ---- /dev/null -+++ b/spec/aruba/platforms/unix_platform_spec.rb -@@ -0,0 +1,18 @@ -+require "spec_helper" -+require "aruba/platforms/unix_platform" -+ -+RSpec.describe Aruba::Platforms::UnixPlatform do -+ include_context "uses aruba API" -+ -+ describe ".match?" do -+ it "works even when ruby is launched with --disable-gems and --disable-rubyopt" do -+ aruba_lib = File.expand_path("../../../lib", __dir__) -+ run_command_and_stop( -+ "ruby --disable-rubyopt --disable-gems -I#{aruba_lib}" \ -+ " -e 'require \"aruba/platforms/unix_platform\";" \ -+ " Aruba::Platforms::UnixPlatform.match?;'" -+ ) -+ expect(last_command_started).to be_successfully_executed -+ end -+ end -+end -diff --git a/spec/aruba/platforms/windows_platform_spec.rb b/spec/aruba/platforms/windows_platform_spec.rb -new file mode 100644 -index 000000000..5ae02e8ab ---- /dev/null -+++ b/spec/aruba/platforms/windows_platform_spec.rb -@@ -0,0 +1,18 @@ -+require "spec_helper" -+require "aruba/platforms/windows_platform" -+ -+RSpec.describe Aruba::Platforms::WindowsPlatform do -+ include_context "uses aruba API" -+ -+ describe ".match?" do -+ it "works even when ruby is launched with --disable-gems and --disable-rubyopt" do -+ aruba_lib = File.expand_path("../../../lib", __dir__) -+ run_command_and_stop( -+ "ruby --disable-rubyopt --disable-gems -I#{aruba_lib}" \ -+ " -e 'require \"aruba/platforms/windows_platform\";" \ -+ " Aruba::Platforms::WindowsPlatform.match?;'" -+ ) -+ expect(last_command_started).to be_successfully_executed -+ end -+ end -+end diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 3a14e8e..fd48fea 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,8 +3,8 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 2.0.0 -Release: 4%{?dist} +Version: 2.0.1 +Release: 1%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY @@ -18,10 +18,6 @@ Source1: %{name}-%{version}-testsuite.tar.gz Source2: %{gem_name}-create-test-suite-tarball.sh # Make bundler runtime dependency optional Patch1: rubygem-aruba-2.0.0-make-bundler-optional.patch -# Make rspec-core rspec test suite pass -# https://github.com/cucumber/aruba/issues/852 -# https://github.com/cucumber/aruba/pull/858 -Patch2: rubygem-aruba-2.0.0-ensure-Gem-win_platform-is-available.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -66,7 +62,6 @@ done ln -sf ../lib popd %patch1 -p1 -%patch2 -p1 mv ../%{gem_name}-%{version}.gemspec . @@ -174,6 +169,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Sun Apr 24 2022 Mamoru TASAKA - 2.0.1-1 +- 2.0.1 + * Fri Jan 21 2022 Fedora Release Engineering - 2.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 678ccbf..57824a9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.0.0.gem) = 798a5aaf1f03132eb1e6872be93e61d0a0aa7ec21f0783110132207c357240dee2a0e75f5c9f7d91d4d471d38d385deccfaa07c31a43cc8cb8c54d6156b762f9 -SHA512 (rubygem-aruba-2.0.0-testsuite.tar.gz) = 67fd9c892a9da66d686baeb377748aea843872344e7a04c0f0910e1123bc8be9c66fe12fb56a2657388568ec0c586970aba8a3da4a1816ecbcbe42a843e8e80a +SHA512 (aruba-2.0.1.gem) = a83bdf722eb5ed6617c5296bc79c057b88b775aaccb6c570933c6c3cf52ea7119a3264dc955d2130d41084d8a478153b06af1610143f41d24c9785ae3acaf72b +SHA512 (rubygem-aruba-2.0.1-testsuite.tar.gz) = 21e5b201950879c63057c67e68a77eb7ef60001b90050e3dd2d368e0244cdb64b93a5f8dbe4170bec1e3eff775b8aa82a03863b7e02d0cd7869442b621956c03 From 23ab4f4fd1fad8b0392a092c2d1126893f9977b3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 26 May 2022 21:50:29 +0900 Subject: [PATCH 20/43] 2.1.0 --- rubygem-aruba.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index fd48fea..2cd63b9 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,7 +3,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 2.0.1 +Version: 2.1.0 Release: 1%{?dist} # aruba itself is MIT @@ -143,7 +143,7 @@ sed -i features/02_configure_aruba/home_directory.feature \ # Make the Aruba always awailable. env RUBYOPT=-I$(pwd)/lib \ - cucumber --publish-quiet + cucumber --publish-quiet -f progress # Go back the skipped test if test x"${PPC64_ENV_P}" == x0 @@ -169,6 +169,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Thu May 26 2022 Mamoru TASAKA - 2.1.0-1 +- 2.1.0 + * Sun Apr 24 2022 Mamoru TASAKA - 2.0.1-1 - 2.0.1 diff --git a/sources b/sources index 57824a9..8fa6a58 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.0.1.gem) = a83bdf722eb5ed6617c5296bc79c057b88b775aaccb6c570933c6c3cf52ea7119a3264dc955d2130d41084d8a478153b06af1610143f41d24c9785ae3acaf72b -SHA512 (rubygem-aruba-2.0.1-testsuite.tar.gz) = 21e5b201950879c63057c67e68a77eb7ef60001b90050e3dd2d368e0244cdb64b93a5f8dbe4170bec1e3eff775b8aa82a03863b7e02d0cd7869442b621956c03 +SHA512 (aruba-2.1.0.gem) = 28a132f479f770437959601d0e30b7cfcb2aa1e8450b8ed292a319dbff37304f6fea83cbc18fc882434f51b3c2eff525e0c6b97145e7e2ddbf898c6ebba8d6e7 +SHA512 (rubygem-aruba-2.1.0-testsuite.tar.gz) = 428e0d2e48de7b326e5da85ccf6fb474f32e19555bda03e9307eb6674acd37a2dcc359dfcc12dbdb27f34ad004388bd48532dfb8f9d1fced3b84c188b9903c1c From 14b1a9c2929b6104cde56956cb440d317ac8539f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 01:17:08 +0000 Subject: [PATCH 21/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 2cd63b9..dd612a8 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY @@ -169,6 +169,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu May 26 2022 Mamoru TASAKA - 2.1.0-1 - 2.1.0 From db4cdc92f27e610f6d6d6c0ec74703095afe2a3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 20:11:04 +0000 Subject: [PATCH 22/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index dd612a8..a9dbd48 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} # aruba itself is MIT # icons in templates/images are CC-BY @@ -169,6 +169,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1d78048fc40bc1206d8a4192d4b8d4a32eb9fc11 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 21 Mar 2023 15:23:42 +0900 Subject: [PATCH 23/43] correct license tag --- rubygem-aruba.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index a9dbd48..21c214f 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,13 +4,11 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.1.0 -Release: 3%{?dist} +Release: 4%{?dist} -# aruba itself is MIT -# icons in templates/images are CC-BY -# jquery.js itself is MIT or GPLv2 -# jquery.js includes sizzle.js, which is MIT or BSD or GPLv2 -License: MIT and CC-BY and (MIT or GPLv2) and (MIT or BSD or GPLv2) +# SPDX confirmed +# templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above +License: MIT URL: http://github.com/cucumber/aruba Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: %{name}-%{version}-testsuite.tar.gz @@ -169,6 +167,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Tue Mar 21 2023 Mamoru TASAKA - 2.1.0-4 +- Correct license tag + * Fri Jan 20 2023 Fedora Release Engineering - 2.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3de893e2a373b1ab3386d4f657e2fc99874b584d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 17:20:29 +0000 Subject: [PATCH 24/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 21c214f..ebff6a1 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -167,6 +167,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 2.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Mar 21 2023 Mamoru TASAKA - 2.1.0-4 - Correct license tag From 65f279cdeb3d4537cdf832417ca2e03b77e5f786 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 8 Sep 2023 12:37:02 +0900 Subject: [PATCH 25/43] 2.2.0 Relax cucumber dependency --- rubygem-aruba.spec | 17 +++++++++++------ sources | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index ebff6a1..5dcd833 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,8 +3,8 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 2.1.0 -Release: 5%{?dist} +Version: 2.2.0 +Release: 1%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -30,7 +30,7 @@ BuildRequires: rubygem(pry) BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(thor) # features/steps/command/shell.feature:97 # Scenario: Running python commands -BuildRequires: %{_bindir}/python3 +BuildRequires: /usr/bin/python3 BuildArch: noarch @@ -59,12 +59,13 @@ done # For tests ln -sf ../lib popd -%patch1 -p1 +%patch -P1 -p1 mv ../%{gem_name}-%{version}.gemspec . -# Relax childprocess dependency -%gemspec_remove_dep -g childprocess '>= 2.0' -s %{gem_name}-%{version}.gemspec +# Relax cucumber dependency +# Partially revert https://github.com/cucumber/aruba/pull/906 +sed -i '\@cucumber@s|>= 8.0|>= 7.0|' %{gem_name}-%{version}.gemspec # Remove bundler dependency harder sed -i '\@dependency.*bundler@d' %{gem_name}-%{version}.gemspec @@ -167,6 +168,10 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Fri Sep 8 2023 Mamoru TASAKA - 2.2.0-1 +- 2.2.0 +- Relax cucumber dependency + * Fri Jul 21 2023 Fedora Release Engineering - 2.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 8fa6a58..9522e46 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.1.0.gem) = 28a132f479f770437959601d0e30b7cfcb2aa1e8450b8ed292a319dbff37304f6fea83cbc18fc882434f51b3c2eff525e0c6b97145e7e2ddbf898c6ebba8d6e7 -SHA512 (rubygem-aruba-2.1.0-testsuite.tar.gz) = 428e0d2e48de7b326e5da85ccf6fb474f32e19555bda03e9307eb6674acd37a2dcc359dfcc12dbdb27f34ad004388bd48532dfb8f9d1fced3b84c188b9903c1c +SHA512 (aruba-2.2.0.gem) = 61f87f9aa98b583359e7d00c3bc7e2302ba5ecc925dc6216dd15e03967a072be0f076f31abd9f756fb8bf31781191e23ca47d2858f832f020633cd65e408298c +SHA512 (rubygem-aruba-2.2.0-testsuite.tar.gz) = 22d3caeb01885cbc4669af5f162d09c58d8259c393f9c74fbb8358a312f28570ec0f2aeeb97ba7923da0b24d9bc07772721e119b2b9d674c6767cfdb0221c501 From db54bf3ba796bbbdaec6ba28b19236df291df632 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 11 Sep 2023 18:18:21 +0900 Subject: [PATCH 26/43] Kill python test entirely to redure BR, it is not important (related to bug 2237692) --- rubygem-aruba.spec | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 5dcd833..a621b39 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -29,8 +29,6 @@ BuildRequires: rubygem(minitest) BuildRequires: rubygem(pry) BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(thor) -# features/steps/command/shell.feature:97 # Scenario: Running python commands -BuildRequires: /usr/bin/python3 BuildArch: noarch @@ -110,17 +108,10 @@ sed -i features/support/env.rb \ sed -i fixtures/cli-app/spec/spec_helper.rb \ -e "\@\$LOAD_PATH@s|\.\./\.\./lib|$(pwd)/lib|" -# /usr/bin/python is reporting deprecation warning :/ -# No need to modify @requires-python (in run_commands.feature and hooks.rb) -if ! grep -q python3 features/steps/command/shell.feature -then - sed -i features/03_testing_frameworks/cucumber/steps/command/run_commands_which_require_a_shell.feature \ - -e 's|python|python3|' - sed -i lib/aruba/generators/script_file.rb \ - -e '\@interpreter@s|A-Z|A-Z0-9|' - sed -i features/01_getting_started_with_aruba/run_commands.feature \ - -e '\@[^-]python@s|python|python3|' -fi +# Kill tests which requires python explicitly +# (to reduce BR, anyway this test is not important) +sed -i features/step_definitions/hooks.rb \ + -e '\@platform.which@s|"python"|"no-python"|' # The following test fails on ppc64le, due to different block size # (expected: 64k actual: 4k), disabling @@ -168,6 +159,10 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Mon Sep 11 2023 Mamoru TASAKA - 2.2.0-2 +- Kill python test entirely to redure BR, it is not important + (related to bug 2237692) + * Fri Sep 8 2023 Mamoru TASAKA - 2.2.0-1 - 2.2.0 - Relax cucumber dependency From d096ea30df743675fd09fd99df1d65a07441fe77 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 9 Nov 2023 15:59:52 +0900 Subject: [PATCH 27/43] Explicitly add BR: less for BR: pry Change cucumber publish quiet method --- rubygem-aruba.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index a621b39..29840ba 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -29,6 +29,7 @@ BuildRequires: rubygem(minitest) BuildRequires: rubygem(pry) BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(thor) +BuildRequires: less BuildArch: noarch @@ -132,8 +133,8 @@ sed -i features/02_configure_aruba/home_directory.feature \ -e "\@Set to aruba's working directory@,\@Scenario@s|/home/|$(echo $HOME)/|" # Make the Aruba always awailable. -env RUBYOPT=-I$(pwd)/lib \ - cucumber --publish-quiet -f progress +export CUCUMBER_PUBLISH_QUIET=true +env RUBYOPT=-I$(pwd)/lib cucumber -f progress # Go back the skipped test if test x"${PPC64_ENV_P}" == x0 @@ -159,6 +160,10 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Thu Nov 9 2923 Mamoru TASAKA - 2.2.0-3 +- Explicitly add BR: less for BR: pry +- Change cucumber publish quiet method + * Mon Sep 11 2023 Mamoru TASAKA - 2.2.0-2 - Kill python test entirely to redure BR, it is not important (related to bug 2237692) From 99d8062c61802d50342651e32f4f640897c9d218 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 9 Nov 2023 16:25:08 +0900 Subject: [PATCH 28/43] fix date... --- rubygem-aruba.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 29840ba..1f0a564 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.2.0 -Release: 3%{?dist} +Release: 4%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -160,7 +160,7 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog -* Thu Nov 9 2923 Mamoru TASAKA - 2.2.0-3 +* Thu Nov 9 2023 Mamoru TASAKA - 2.2.0-4 - Explicitly add BR: less for BR: pry - Change cucumber publish quiet method From a038b38933bbfdb5270eb114e90e7128f6eb30be Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 27 Dec 2023 16:37:14 +0900 Subject: [PATCH 29/43] Patch for ruby3.3 --- aruba-pr914-ruby33.patch | 140 +++++++++++++++++++++++++++++++++++++++ rubygem-aruba.spec | 10 ++- 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 aruba-pr914-ruby33.patch diff --git a/aruba-pr914-ruby33.patch b/aruba-pr914-ruby33.patch new file mode 100644 index 0000000..bce1afb --- /dev/null +++ b/aruba-pr914-ruby33.patch @@ -0,0 +1,140 @@ +From bdf5edee50d6fda19a05147d1269370340b642c4 Mon Sep 17 00:00:00 2001 +From: Matijs van Zuijlen +Date: Fri, 8 Dec 2023 16:10:57 +0100 +Subject: [PATCH 2/4] Use plain irb in debugging scenario + +In Ruby 3.3, requiring readline does not load the real readline library +but falls back to reline by default. This creates odd output when the +terminal is not a real TTY and a prompt is used when getting input. +Because pry uses a prompt, this makes the interactive debugging scenario +fail. + +This change works around this issue by switching to irb. Irb will not +use a prompt, possibly because the output is not a TTY. + +See https://github.com/cucumber/aruba/issues/910. Also, see +https://github.com/ruby/reline/issues/616 for the resulting reline +issue. +--- + .../command/debug_your_command_in_aruba.feature | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/features/03_testing_frameworks/cucumber/steps/command/debug_your_command_in_aruba.feature b/features/03_testing_frameworks/cucumber/steps/command/debug_your_command_in_aruba.feature +index 1c7bbc1cd..7a0f2785f 100644 +--- a/features/03_testing_frameworks/cucumber/steps/command/debug_your_command_in_aruba.feature ++++ b/features/03_testing_frameworks/cucumber/steps/command/debug_your_command_in_aruba.feature +@@ -10,19 +10,15 @@ Feature: Debug your command in cucumber-test-run + Scenario: You can use a debug repl in your cli program + + If you want to debug an error, which only occurs in one of your +- `cucumber`-tests, the `@debug`-tag becomes handy. This will use the ++ Cucumber tests, the `@debug`-tag becomes handy. This will use the + DebugProcess runner, making your program use the default stdin, stdout and + stderr streams so you can interact with it directly. + +- This will, for example, make `binding.pry` and `byebug` work in your ++ This will, for example, make `binding.irb` and `byebug` work in your + program. However, Aruba steps that access the input and output of your + program will not work. + +- Please make sure, that there's a statement after the `binding.pry`-call. +- Otherwise you might not get an interactive shell, because your program will +- just exit. +- +- We are going to demonstrate this using `pry`, but any other interactive ++ We are going to demonstrate this using `irb`, but any other interactive + debugger for any other programming language should also work. + + Given an executable named "bin/aruba-test-cli" with: +@@ -27,8 +27,7 @@ Feature: Debug your command in cucumber-test-run + + foo = 'hello' + +- require 'pry' +- binding.pry ++ binding.irb + + exit 0 + """ +@@ -44,9 +43,9 @@ Feature: Debug your command in cucumber-test-run + And I type "exit" + Then the output should contain: + """ +- [1] pry(main)> foo +- => "hello" +- [2] pry(main)> exit ++ foo ++ "hello" ++ exit + """ + + Scenario: Can handle announcers + +From 2837d30ca5c32c7dca9333242fe8da7db6f8e753 Mon Sep 17 00:00:00 2001 +From: Matijs van Zuijlen +Date: Sun, 24 Dec 2023 08:15:31 +0100 +Subject: [PATCH 3/4] Stop requiring 'irb/ext/save-history' extension in Aruba + console + +See https://github.com/ruby/irb/pull/623. The file was removed and the +corresponding feature should be activated by setting :EVAL_HISTORY. +--- + lib/aruba/console.rb | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/lib/aruba/console.rb b/lib/aruba/console.rb +index ba8c680c1..3bd200ce5 100644 +--- a/lib/aruba/console.rb ++++ b/lib/aruba/console.rb +@@ -29,7 +29,6 @@ def start + IRB.conf[:RC] = false + + require "irb/completion" +- require "irb/ext/save-history" + IRB.conf[:READLINE] = true + IRB.conf[:SAVE_HISTORY] = 1000 + IRB.conf[:HISTORY_FILE] = Aruba.config.console_history_file + +From fd45d9e794ee880bf8c9f750ad6b7b3bbcaee400 Mon Sep 17 00:00:00 2001 +From: Matijs van Zuijlen +Date: Sun, 24 Dec 2023 09:19:34 +0100 +Subject: [PATCH 4/4] Ensure irb uses a consistent prompt format in tests on + all Ruby versions + +The default prompt format for irb changed in Ruby 3.3. Using the classic +format instead ensures the same result is achieved in all Ruby versions. +--- + .../steps/command/wait_for_output_of_command.feature | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/features/03_testing_frameworks/cucumber/steps/command/wait_for_output_of_command.feature b/features/03_testing_frameworks/cucumber/steps/command/wait_for_output_of_command.feature +index 0bf83f010..749d3f37a 100644 +--- a/features/03_testing_frameworks/cucumber/steps/command/wait_for_output_of_command.feature ++++ b/features/03_testing_frameworks/cucumber/steps/command/wait_for_output_of_command.feature +@@ -12,7 +12,7 @@ Feature: Wait for output of commands + """cucumber + Feature: Run command + Scenario: Run command +- When I run `irb --prompt default` interactively ++ When I run `irb --prompt classic` interactively + And I wait for output to contain "irb" + And I type "puts 6 + 5" + And I type "exit" +@@ -32,7 +32,7 @@ Feature: Wait for output of commands + """cucumber + Feature: Run command + Scenario: Run command +- When I run `irb --prompt default` interactively ++ When I run `irb --prompt classic` interactively + And I wait for output to contain: + \"\"\" + irb(main):001:0> +@@ -49,7 +49,7 @@ Feature: Wait for output of commands + """cucumber + Feature: Run command + Scenario: Run command +- When I run `irb --prompt default` interactively ++ When I run `irb --prompt classic` interactively + And I wait for output to contain: + \"\"\" + irb(main):001:0> diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 1f0a564..75bcd8e 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.2.0 -Release: 4%{?dist} +Release: 5%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -16,6 +16,10 @@ Source1: %{name}-%{version}-testsuite.tar.gz Source2: %{gem_name}-create-test-suite-tarball.sh # Make bundler runtime dependency optional Patch1: rubygem-aruba-2.0.0-make-bundler-optional.patch +# https://github.com/cucumber/aruba/pull/914 +# Patch for ruby3.3 +Patch2: aruba-pr914-ruby33.patch + BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -59,6 +63,7 @@ done ln -sf ../lib popd %patch -P1 -p1 +%patch -P2 -p1 mv ../%{gem_name}-%{version}.gemspec . @@ -160,6 +165,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Wed Dec 27 2023 Mamoru TASAKA - 2.2.0-5 +- Patch for ruby3.3 + * Thu Nov 9 2023 Mamoru TASAKA - 2.2.0-4 - Explicitly add BR: less for BR: pry - Change cucumber publish quiet method From 835dd91fa49e5aaabb81d9e5bac2fe782448a757 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 Jan 2024 19:09:28 +0900 Subject: [PATCH 30/43] use https --- rubygem-aruba.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 75bcd8e..b08f526 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -9,8 +9,8 @@ Release: 5%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above License: MIT -URL: http://github.com/cucumber/aruba -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem +URL: https://github.com/cucumber/aruba +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: %{name}-%{version}-testsuite.tar.gz # Source1 is created by $ bash %%SOURCE2 %%VERSION Source2: %{gem_name}-create-test-suite-tarball.sh From d10ed68b352bee30e4a06a9fd632f23c29d87a7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 12:28:45 +0000 Subject: [PATCH 31/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index b08f526..f90a6b0 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.2.0 -Release: 5%{?dist} +Release: 6%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -165,6 +165,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Dec 27 2023 Mamoru TASAKA - 2.2.0-5 - Patch for ruby3.3 From 538b3d26029006ea0679862d9d11a8d6fa82755e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 16:34:40 +0000 Subject: [PATCH 32/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index f90a6b0..3bbc382 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.2.0 -Release: 6%{?dist} +Release: 7%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -165,6 +165,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 2.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a624ae482af37a3bbbb5c57c24156dcbf349b44b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Feb 2024 21:03:10 +0900 Subject: [PATCH 33/43] Adjust testsuite for Minitest 5.22.2 --- rubygem-aruba.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 3bbc382..47db09b 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.2.0 -Release: 7%{?dist} +Release: 8%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -130,6 +130,18 @@ fi # Disable bundler tests. mv features/03_testing_frameworks/cucumber/disable_bundler.feature{,.skip} +# Output changed with minitest 5.22.2, adjusting +# Needs reporting upstream +status=$(ruby -e "require 'minitest'; p Minitest::VERSION >= '5.22.0'") +if [ $status == "true" ] ; then + sed -i features/06_use_aruba_cli/initialize_project_with_aruba.feature \ + -e 's|0 runs, 0 assertions, 0 failures, 0 errors, 0 skips|create test/use_aruba_with_minitest.rb|' \ + %{nil} + sed -i features/01_getting_started_with_aruba/supported_testing_frameworks.feature \ + -e '\@-Ilib:test test/use_aruba_with_minitest.rb@,$s|the tests should all pass|the exit status should be 0|' \ + %{nil} +fi + # Adjust test cases referring to $HOME. sed -i features/04_aruba_api/core/expand_path.feature -e "s|/home/\[\^/\]+|$(echo $HOME)|" sed -i features/02_configure_aruba/home_directory.feature \ @@ -165,6 +177,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Thu Feb 08 2024 Mamoru TASAKA - 2.2.0-8 +- Adjust testsuite for Minitest 5.22.2 + * Fri Jan 26 2024 Fedora Release Engineering - 2.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From eb630ff8873ec95157a52193c818b78288880f47 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 22 Feb 2024 23:24:24 +0900 Subject: [PATCH 34/43] add upstream bug reference --- rubygem-aruba.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 47db09b..cb4906f 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -131,7 +131,7 @@ fi mv features/03_testing_frameworks/cucumber/disable_bundler.feature{,.skip} # Output changed with minitest 5.22.2, adjusting -# Needs reporting upstream +# https://github.com/cucumber/aruba/issues/920 status=$(ruby -e "require 'minitest'; p Minitest::VERSION >= '5.22.0'") if [ $status == "true" ] ; then sed -i features/06_use_aruba_cli/initialize_project_with_aruba.feature \ From 9388d9646ba62434bff3565382bcb735a3b829a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:03:22 +0000 Subject: [PATCH 35/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index cb4906f..6342c05 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.2.0 -Release: 8%{?dist} +Release: 9%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -177,6 +177,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Feb 08 2024 Mamoru TASAKA - 2.2.0-8 - Adjust testsuite for Minitest 5.22.2 From 2588a28886aac68f873b6d9f22e8dbae9aaeb6ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 28 Nov 2024 17:23:08 +0100 Subject: [PATCH 36/43] Drop `BR: rubygem(pry)` The dependency is removed by Patch2 and every other traces are further removed upstream in next version. https://github.com/cucumber/aruba/pull/939 --- rubygem-aruba.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 6342c05..063a184 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -30,7 +30,6 @@ BuildRequires: rubygem(contracts) BuildRequires: rubygem(cucumber) BuildRequires: rubygem(irb) BuildRequires: rubygem(minitest) -BuildRequires: rubygem(pry) BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(thor) BuildRequires: less From 9d5514744d532cc8d2564a09dccc93375f93da1a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Nov 2024 16:25:07 +0900 Subject: [PATCH 37/43] bump release and build --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 063a184..20e9684 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.2.0 -Release: 9%{?dist} +Release: 10%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -176,6 +176,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Thu Nov 28 2024 Vít Ondruch - 2.2.0-10 +- Drop BR: rubygem(pry) + * Fri Jul 19 2024 Fedora Release Engineering - 2.2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8f3db8287714fdee07e2af160b4a4b26d2c6c51a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 3 Jan 2025 15:39:29 +0900 Subject: [PATCH 38/43] 2.3.0 --- aruba-pr914-ruby33.patch | 140 ------------------ ...em-aruba-2.0.0-make-bundler-optional.patch | 8 +- rubygem-aruba.spec | 23 +-- sources | 4 +- 4 files changed, 12 insertions(+), 163 deletions(-) delete mode 100644 aruba-pr914-ruby33.patch diff --git a/aruba-pr914-ruby33.patch b/aruba-pr914-ruby33.patch deleted file mode 100644 index bce1afb..0000000 --- a/aruba-pr914-ruby33.patch +++ /dev/null @@ -1,140 +0,0 @@ -From bdf5edee50d6fda19a05147d1269370340b642c4 Mon Sep 17 00:00:00 2001 -From: Matijs van Zuijlen -Date: Fri, 8 Dec 2023 16:10:57 +0100 -Subject: [PATCH 2/4] Use plain irb in debugging scenario - -In Ruby 3.3, requiring readline does not load the real readline library -but falls back to reline by default. This creates odd output when the -terminal is not a real TTY and a prompt is used when getting input. -Because pry uses a prompt, this makes the interactive debugging scenario -fail. - -This change works around this issue by switching to irb. Irb will not -use a prompt, possibly because the output is not a TTY. - -See https://github.com/cucumber/aruba/issues/910. Also, see -https://github.com/ruby/reline/issues/616 for the resulting reline -issue. ---- - .../command/debug_your_command_in_aruba.feature | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/features/03_testing_frameworks/cucumber/steps/command/debug_your_command_in_aruba.feature b/features/03_testing_frameworks/cucumber/steps/command/debug_your_command_in_aruba.feature -index 1c7bbc1cd..7a0f2785f 100644 ---- a/features/03_testing_frameworks/cucumber/steps/command/debug_your_command_in_aruba.feature -+++ b/features/03_testing_frameworks/cucumber/steps/command/debug_your_command_in_aruba.feature -@@ -10,19 +10,15 @@ Feature: Debug your command in cucumber-test-run - Scenario: You can use a debug repl in your cli program - - If you want to debug an error, which only occurs in one of your -- `cucumber`-tests, the `@debug`-tag becomes handy. This will use the -+ Cucumber tests, the `@debug`-tag becomes handy. This will use the - DebugProcess runner, making your program use the default stdin, stdout and - stderr streams so you can interact with it directly. - -- This will, for example, make `binding.pry` and `byebug` work in your -+ This will, for example, make `binding.irb` and `byebug` work in your - program. However, Aruba steps that access the input and output of your - program will not work. - -- Please make sure, that there's a statement after the `binding.pry`-call. -- Otherwise you might not get an interactive shell, because your program will -- just exit. -- -- We are going to demonstrate this using `pry`, but any other interactive -+ We are going to demonstrate this using `irb`, but any other interactive - debugger for any other programming language should also work. - - Given an executable named "bin/aruba-test-cli" with: -@@ -27,8 +27,7 @@ Feature: Debug your command in cucumber-test-run - - foo = 'hello' - -- require 'pry' -- binding.pry -+ binding.irb - - exit 0 - """ -@@ -44,9 +43,9 @@ Feature: Debug your command in cucumber-test-run - And I type "exit" - Then the output should contain: - """ -- [1] pry(main)> foo -- => "hello" -- [2] pry(main)> exit -+ foo -+ "hello" -+ exit - """ - - Scenario: Can handle announcers - -From 2837d30ca5c32c7dca9333242fe8da7db6f8e753 Mon Sep 17 00:00:00 2001 -From: Matijs van Zuijlen -Date: Sun, 24 Dec 2023 08:15:31 +0100 -Subject: [PATCH 3/4] Stop requiring 'irb/ext/save-history' extension in Aruba - console - -See https://github.com/ruby/irb/pull/623. The file was removed and the -corresponding feature should be activated by setting :EVAL_HISTORY. ---- - lib/aruba/console.rb | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lib/aruba/console.rb b/lib/aruba/console.rb -index ba8c680c1..3bd200ce5 100644 ---- a/lib/aruba/console.rb -+++ b/lib/aruba/console.rb -@@ -29,7 +29,6 @@ def start - IRB.conf[:RC] = false - - require "irb/completion" -- require "irb/ext/save-history" - IRB.conf[:READLINE] = true - IRB.conf[:SAVE_HISTORY] = 1000 - IRB.conf[:HISTORY_FILE] = Aruba.config.console_history_file - -From fd45d9e794ee880bf8c9f750ad6b7b3bbcaee400 Mon Sep 17 00:00:00 2001 -From: Matijs van Zuijlen -Date: Sun, 24 Dec 2023 09:19:34 +0100 -Subject: [PATCH 4/4] Ensure irb uses a consistent prompt format in tests on - all Ruby versions - -The default prompt format for irb changed in Ruby 3.3. Using the classic -format instead ensures the same result is achieved in all Ruby versions. ---- - .../steps/command/wait_for_output_of_command.feature | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/features/03_testing_frameworks/cucumber/steps/command/wait_for_output_of_command.feature b/features/03_testing_frameworks/cucumber/steps/command/wait_for_output_of_command.feature -index 0bf83f010..749d3f37a 100644 ---- a/features/03_testing_frameworks/cucumber/steps/command/wait_for_output_of_command.feature -+++ b/features/03_testing_frameworks/cucumber/steps/command/wait_for_output_of_command.feature -@@ -12,7 +12,7 @@ Feature: Wait for output of commands - """cucumber - Feature: Run command - Scenario: Run command -- When I run `irb --prompt default` interactively -+ When I run `irb --prompt classic` interactively - And I wait for output to contain "irb" - And I type "puts 6 + 5" - And I type "exit" -@@ -32,7 +32,7 @@ Feature: Wait for output of commands - """cucumber - Feature: Run command - Scenario: Run command -- When I run `irb --prompt default` interactively -+ When I run `irb --prompt classic` interactively - And I wait for output to contain: - \"\"\" - irb(main):001:0> -@@ -49,7 +49,7 @@ Feature: Wait for output of commands - """cucumber - Feature: Run command - Scenario: Run command -- When I run `irb --prompt default` interactively -+ When I run `irb --prompt classic` interactively - And I wait for output to contain: - \"\"\" - irb(main):001:0> diff --git a/rubygem-aruba-2.0.0-make-bundler-optional.patch b/rubygem-aruba-2.0.0-make-bundler-optional.patch index 7fefeae..d488572 100644 --- a/rubygem-aruba-2.0.0-make-bundler-optional.patch +++ b/rubygem-aruba-2.0.0-make-bundler-optional.patch @@ -1,8 +1,10 @@ --- aruba-2.0.0/lib/aruba/api/bundler.rb.make_optional 2021-07-27 04:28:08.000000000 +0900 +++ aruba-2.0.0/lib/aruba/api/bundler.rb 2022-01-14 14:40:50.369324292 +0900 -@@ -1,5 +1,4 @@ - require "aruba/api/environment" --require "bundler" +@@ -1,7 +1,6 @@ + # frozen_string_literal: true + + require 'aruba/api/environment' +-require 'bundler' module Aruba module Api diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 6342c05..ba9d2b3 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,8 +3,8 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 2.2.0 -Release: 9%{?dist} +Version: 2.3.0 +Release: 1%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -16,9 +16,6 @@ Source1: %{name}-%{version}-testsuite.tar.gz Source2: %{gem_name}-create-test-suite-tarball.sh # Make bundler runtime dependency optional Patch1: rubygem-aruba-2.0.0-make-bundler-optional.patch -# https://github.com/cucumber/aruba/pull/914 -# Patch for ruby3.3 -Patch2: aruba-pr914-ruby33.patch BuildRequires: ruby(release) @@ -63,7 +60,6 @@ done ln -sf ../lib popd %patch -P1 -p1 -%patch -P2 -p1 mv ../%{gem_name}-%{version}.gemspec . @@ -130,18 +126,6 @@ fi # Disable bundler tests. mv features/03_testing_frameworks/cucumber/disable_bundler.feature{,.skip} -# Output changed with minitest 5.22.2, adjusting -# https://github.com/cucumber/aruba/issues/920 -status=$(ruby -e "require 'minitest'; p Minitest::VERSION >= '5.22.0'") -if [ $status == "true" ] ; then - sed -i features/06_use_aruba_cli/initialize_project_with_aruba.feature \ - -e 's|0 runs, 0 assertions, 0 failures, 0 errors, 0 skips|create test/use_aruba_with_minitest.rb|' \ - %{nil} - sed -i features/01_getting_started_with_aruba/supported_testing_frameworks.feature \ - -e '\@-Ilib:test test/use_aruba_with_minitest.rb@,$s|the tests should all pass|the exit status should be 0|' \ - %{nil} -fi - # Adjust test cases referring to $HOME. sed -i features/04_aruba_api/core/expand_path.feature -e "s|/home/\[\^/\]+|$(echo $HOME)|" sed -i features/02_configure_aruba/home_directory.feature \ @@ -177,6 +161,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Fri Jan 03 2025 Mamoru TASAKA - 2.3.0-1 +- 2.3.0 + * Fri Jul 19 2024 Fedora Release Engineering - 2.2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 9522e46..c00ed5f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.2.0.gem) = 61f87f9aa98b583359e7d00c3bc7e2302ba5ecc925dc6216dd15e03967a072be0f076f31abd9f756fb8bf31781191e23ca47d2858f832f020633cd65e408298c -SHA512 (rubygem-aruba-2.2.0-testsuite.tar.gz) = 22d3caeb01885cbc4669af5f162d09c58d8259c393f9c74fbb8358a312f28570ec0f2aeeb97ba7923da0b24d9bc07772721e119b2b9d674c6767cfdb0221c501 +SHA512 (aruba-2.3.0.gem) = aa011aef7ffa996585612e1600085bef93920c2b4f718602cb4f4f9532941a1e0b989f6756c8e25af79d0e55554c59ccb9544fcd03ade9e9d44a6744d1b7790c +SHA512 (rubygem-aruba-2.3.0-testsuite.tar.gz) = 0bcbe1315bed0a6e8143d2f7f4f890180af2a170da9d131039faffaf6537d2fc8f3eae363ee19899b1666091a9727b6553082dc6df328014c56611d2055a7fb1 From a4d13598b67eb9cd08e207a07a061e9e4abbbaea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 22:58:47 +0000 Subject: [PATCH 39/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index a0da79c..c1edc57 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -160,6 +160,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jan 03 2025 Mamoru TASAKA - 2.3.0-1 - 2.3.0 From c9f30db5b6d83e21d05653ced974facdccb0d349 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 15 Jun 2025 21:58:19 +0900 Subject: [PATCH 40/43] 2.3.1 --- rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch | 42 +++++++++++++++++++ rubygem-aruba.spec | 11 ++++- sources | 4 +- 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch diff --git a/rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch b/rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch new file mode 100644 index 0000000..93994cf --- /dev/null +++ b/rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch @@ -0,0 +1,42 @@ +From bd2aea600f7e989e4da734c3e823c3ce12ce629b Mon Sep 17 00:00:00 2001 +From: Matijs van Zuijlen +Date: Sun, 6 Apr 2025 23:32:36 +0200 +Subject: [PATCH] Update expected diff output to match changes in diff-lcs + +Version 1.6.0 of diff-lcs included a bug fix that corrects the hunk +ranges it outputs. This change bumps the minimum version of diff-lcs to +1.6.0 so this change is sure to be included, and updates the +expectations in the cucumber scenarios that depend on exact diff-lcs +output. +--- + aruba.gemspec | 1 + + .../cucumber/steps/command/check_output_of_command.feature | 2 +- + .../cucumber/steps/command/check_stderr_of_command.feature | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature b/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature +index 3266514b..1f0d1997 100644 +--- a/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature ++++ b/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature +@@ -353,7 +353,7 @@ Feature: All output of commands which were executed + world" to output string is eq: "hello + worl" + Diff: +- @@ -1,3 +1,3 @@ ++ @@ -1,2 +1,2 @@ + hello + -worl + +world +diff --git a/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature b/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature +index cc0e7aad..d3b4c9a9 100644 +--- a/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature ++++ b/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature +@@ -82,7 +82,7 @@ Feature: STDERR of commands which were executed + expected "hello + world!" to output string is eq: "" + Diff: +- @@ -1,2 +1,4 @@ ++ @@ -0,0 +1,2 @@ + +hello + +world! + """ diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index c1edc57..69517fd 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,8 +3,8 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 2.3.0 -Release: 2%{?dist} +Version: 2.3.1 +Release: 1%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -16,6 +16,9 @@ Source1: %{name}-%{version}-testsuite.tar.gz Source2: %{gem_name}-create-test-suite-tarball.sh # Make bundler runtime dependency optional Patch1: rubygem-aruba-2.0.0-make-bundler-optional.patch +# https://github.com/cucumber/aruba/commit/bd2aea600f7e989e4da734c3e823c3ce12ce629b +# We still use diff-lcs 1.5, revert the above patch for now +Patch2: rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch BuildRequires: ruby(release) @@ -59,6 +62,7 @@ done ln -sf ../lib popd %patch -P1 -p1 +%patch -P2 -p1 -R mv ../%{gem_name}-%{version}.gemspec . @@ -160,6 +164,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Sun Jun 15 2025 Mamoru TASAKA - 2.3.1-1 +- 2.3.1 + * Sat Jan 18 2025 Fedora Release Engineering - 2.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index c00ed5f..ea90ac5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.3.0.gem) = aa011aef7ffa996585612e1600085bef93920c2b4f718602cb4f4f9532941a1e0b989f6756c8e25af79d0e55554c59ccb9544fcd03ade9e9d44a6744d1b7790c -SHA512 (rubygem-aruba-2.3.0-testsuite.tar.gz) = 0bcbe1315bed0a6e8143d2f7f4f890180af2a170da9d131039faffaf6537d2fc8f3eae363ee19899b1666091a9727b6553082dc6df328014c56611d2055a7fb1 +SHA512 (aruba-2.3.1.gem) = 79b69bdf2076aee13a4f4d5d51154db2d8edcf3ea45407eecde9fc5608ae1928b9c72adb50d22b44043865f73438d18500aa12c6424627a9d52bbbc396392b7f +SHA512 (rubygem-aruba-2.3.1-testsuite.tar.gz) = 743aed57645719c2d462e314850cf9ae1c8bc62aae643095c3d1ad34b7e269cef8c8a396048b2f65bb2c3fbe6f61e7f7aa60a2438d374b43ef052d65af953099 From 72a6bf7bf1e8912ac9e8f8d24bd8660cafd38b9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:16:30 +0000 Subject: [PATCH 41/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 69517fd..216fcae 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.3.1 -Release: 1%{?dist} +Release: 2%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -164,6 +164,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jun 15 2025 Mamoru TASAKA - 2.3.1-1 - 2.3.1 From 0f8a25e69c1134a591b6e020c6fbcc02534688bd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 14 Sep 2025 16:22:15 +0900 Subject: [PATCH 42/43] 2.3.2 --- rubygem-aruba.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 216fcae..d9fbe5f 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,8 +3,8 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 2.3.1 -Release: 2%{?dist} +Version: 2.3.2 +Release: 1%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -164,6 +164,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Sun Sep 14 2025 Mamoru TASAKA - 2.3.2-1 +- 2.3.2 + * Fri Jul 25 2025 Fedora Release Engineering - 2.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index ea90ac5..0237194 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.3.1.gem) = 79b69bdf2076aee13a4f4d5d51154db2d8edcf3ea45407eecde9fc5608ae1928b9c72adb50d22b44043865f73438d18500aa12c6424627a9d52bbbc396392b7f -SHA512 (rubygem-aruba-2.3.1-testsuite.tar.gz) = 743aed57645719c2d462e314850cf9ae1c8bc62aae643095c3d1ad34b7e269cef8c8a396048b2f65bb2c3fbe6f61e7f7aa60a2438d374b43ef052d65af953099 +SHA512 (aruba-2.3.2.gem) = daab8f3271722335596e707e104bad3865cff06ed67aa7d0ca63aaa13ec9266bad9c353782e60b52eee91a2c149f997e60db3a4de02a914d2a086d8546c8202b +SHA512 (rubygem-aruba-2.3.2-testsuite.tar.gz) = 2bf54b095a72a564a4399e95ca826d6031a189fb2b7f97cefd3e2d6e2cea050656bb3a6dcff04014bfb447f08b5632605c30aff0924a2f38f4339db1cd6f65c8 From a15dbce6d22914c0ff2451bef573411e37a8bb71 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 Dec 2025 23:48:57 +0900 Subject: [PATCH 43/43] 2.3.3 --- rubygem-aruba.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index d9fbe5f..2f9f1eb 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,7 +3,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 2.3.2 +Version: 2.3.3 Release: 1%{?dist} # SPDX confirmed @@ -164,6 +164,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* Sat Dec 06 2025 Mamoru TASAKA - 2.3.3-1 +- 2.3.3 + * Sun Sep 14 2025 Mamoru TASAKA - 2.3.2-1 - 2.3.2 diff --git a/sources b/sources index 0237194..01de0ee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.3.2.gem) = daab8f3271722335596e707e104bad3865cff06ed67aa7d0ca63aaa13ec9266bad9c353782e60b52eee91a2c149f997e60db3a4de02a914d2a086d8546c8202b -SHA512 (rubygem-aruba-2.3.2-testsuite.tar.gz) = 2bf54b095a72a564a4399e95ca826d6031a189fb2b7f97cefd3e2d6e2cea050656bb3a6dcff04014bfb447f08b5632605c30aff0924a2f38f4339db1cd6f65c8 +SHA512 (aruba-2.3.3.gem) = 4892651a703d0b2badf15a7f45e461ab1478e53d290fc39e7b0a3fa2a4c4830754bdcabddb38ba3e161bd34071da85aad4f56ccaea5ff8b37a5d74ae1e7ca8c2 +SHA512 (rubygem-aruba-2.3.3-testsuite.tar.gz) = a2aa74d9c920dbc3b9709358f5e219886e54f92b85b34de15bd9614308dccd48a3f97bed2f286e8e4dc520259e63063d167a74d72ed70a0635cb8c7348ccb175