Compare commits

...
Sign in to create a new pull request.

19 commits

Author SHA1 Message Date
Mamoru TASAKA
a15dbce6d2 2.3.3 2025-12-06 23:48:57 +09:00
Mamoru TASAKA
0f8a25e69c 2.3.2 2025-09-14 16:22:15 +09:00
Fedora Release Engineering
72a6bf7bf1 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 12:16:30 +00:00
Mamoru TASAKA
c9f30db5b6 2.3.1 2025-06-15 21:58:19 +09:00
Fedora Release Engineering
a4d13598b6 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-18 22:58:47 +00:00
Mamoru TASAKA
c656b3f675 merge 2025-01-06 10:50:56 +09:00
Mamoru TASAKA
8f3db82877 2.3.0 2025-01-03 15:39:29 +09:00
Mamoru TASAKA
9d5514744d bump release and build 2024-11-29 16:25:07 +09:00
Vít Ondruch
2588a28886 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
2024-11-28 17:29:09 +01:00
Fedora Release Engineering
9388d9646b Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-19 19:03:22 +00:00
Mamoru TASAKA
eb630ff887 add upstream bug reference 2024-02-22 23:24:24 +09:00
Mamoru TASAKA
a624ae482a Adjust testsuite for Minitest 5.22.2 2024-02-08 21:03:10 +09:00
Fedora Release Engineering
538b3d2602 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-26 16:34:40 +00:00
Fedora Release Engineering
d10ed68b35 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 12:28:45 +00:00
Mamoru TASAKA
835dd91fa4 use https 2024-01-12 19:09:28 +09:00
Mamoru TASAKA
a038b38933 Patch for ruby3.3 2023-12-27 16:37:14 +09:00
Mamoru TASAKA
99d8062c61 fix date... 2023-11-09 16:25:08 +09:00
Mamoru TASAKA
d096ea30df Explicitly add BR: less for BR: pry
Change cucumber publish quiet method
2023-11-09 15:59:52 +09:00
Mamoru TASAKA
db54bf3ba7 Kill python test entirely to redure BR, it is not important
(related to bug 2237692)
2023-09-11 18:18:21 +09:00
4 changed files with 108 additions and 24 deletions

View file

@ -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

View file

@ -0,0 +1,42 @@
From bd2aea600f7e989e4da734c3e823c3ce12ce629b Mon Sep 17 00:00:00 2001
From: Matijs van Zuijlen <matijs@matijs.net>
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!
"""

View file

@ -3,19 +3,23 @@
Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba
Name: rubygem-%{gem_name}
Version: 2.2.0
Version: 2.3.3
Release: 1%{?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
# 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)
BuildRequires: rubygems-devel
@ -26,11 +30,9 @@ BuildRequires: rubygem(contracts)
BuildRequires: rubygem(cucumber)
BuildRequires: rubygem(irb)
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
BuildRequires: less
BuildArch: noarch
@ -60,6 +62,7 @@ done
ln -sf ../lib
popd
%patch -P1 -p1
%patch -P2 -p1 -R
mv ../%{gem_name}-%{version}.gemspec .
@ -110,17 +113,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
@ -141,8 +137,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
@ -168,6 +164,50 @@ popd # from .%%{gem_instdir}
%doc %{gem_instdir}/CHANGELOG.md
%changelog
* Sat Dec 06 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.3-1
- 2.3.3
* Sun Sep 14 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.2-1
- 2.3.2
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jun 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.1-1
- 2.3.1
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jan 03 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.0-1
- 2.3.0
* Thu Nov 28 2024 Vít Ondruch <vondruch@redhat.com> - 2.2.0-10
- Drop BR: rubygem(pry)
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Feb 08 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-8
- Adjust testsuite for Minitest 5.22.2
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Dec 27 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-5
- Patch for ruby3.3
* Thu Nov 9 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-4
- Explicitly add BR: less for BR: pry
- Change cucumber publish quiet method
* Mon Sep 11 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 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 <mtasaka@fedoraproject.org> - 2.2.0-1
- 2.2.0
- Relax cucumber dependency

View file

@ -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.3.gem) = 4892651a703d0b2badf15a7f45e461ab1478e53d290fc39e7b0a3fa2a4c4830754bdcabddb38ba3e161bd34071da85aad4f56ccaea5ff8b37a5d74ae1e7ca8c2
SHA512 (rubygem-aruba-2.3.3-testsuite.tar.gz) = a2aa74d9c920dbc3b9709358f5e219886e54f92b85b34de15bd9614308dccd48a3f97bed2f286e8e4dc520259e63063d167a74d72ed70a0635cb8c7348ccb175